Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Feature: Support php7.4 (#1354)

Browse source 
* Run CI tests against php 7.4

* Sort composer dependencies

* Remove unused Aws S3 php library

* Pin simplepie dependency to ^1.5

* Pin getid3 dependency to ^1.9

* Pin composer semver to ^3.2

* Pin php-amqplib to ^2.12

* Drop sentry logging support

* Update composer dependencies

* Move propel regenerate to Makefile

* Regenerate propel files with v1.7.0

* Pin propel orm to ^1.7

* Regenerate propel files with v1.7.2

* fix: generator_version in airtime-conf-production.php

* Replace propel/propel1 with jooola/propel1

* Regenerate propel files with v1.7.3-dev

* Fix php7.4 compatibility

Using php-cs-fixer:

    '@PhpCsFixer' => true,
    'concat_space' => ['spacing' => 'one'],
    'ordered_class_elements' => false,
    'yoda_style' => false,
    '@PHP74Migration' => true,
    'assign_null_coalescing_to_coalesce_equal' => false,
    'ternary_to_null_coalescing' => false,
    'heredoc_indentation' => false,
    '@PHP74Migration:risky' => true,
    'declare_strict_types' => false,
    'void_return' => false,
    'use_arrow_functions' => false,

* Fix pre-commit
This commit is contained in:
Jonas L 2021-10-17 17:19:53 +02:00 • committed by GitHub
parent 30b3470a06
commit 5e8d8db6e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
90 changed files with 887 additions and 1310 deletions
Download patch file Download diff file Expand all files Collapse all files

14
legacy/application/services/HistoryService.php
View file

@ -122,7 +122,7 @@ class Application_Service_HistoryService
' FROM cc_files AS file' .
') AS file_md';
$fileMd = str_replace('%NON_NULL_FILE_SELECT%', join(', ', $nonNullFileSelect), $fileMd);
$fileMd = str_replace('%NON_NULL_FILE_SELECT%', implode(', ', $nonNullFileSelect), $fileMd);
//null files are from manually added data (filling in webstream info etc)
$nullFile = '(' .
@ -135,11 +135,11 @@ class Application_Service_HistoryService
//building the file inner query
$fileSqlQuery =
'SELECT ' . join(', ', $fileSelect) .
'SELECT ' . implode(', ', $fileSelect) .
" FROM {$historyFile}" .
" LEFT JOIN {$fileMd} USING (file_id)" .
' UNION' .
' SELECT ' . join(', ', $nullFileSelect) .
' SELECT ' . implode(', ', $nullFileSelect) .
" FROM {$nullFile}";
foreach ($fileMdFilters as $filter) {
@ -159,7 +159,7 @@ class Application_Service_HistoryService
}
$mainSqlQuery .=
'SELECT ' . join(', ', $mainSelect) .
'SELECT ' . implode(', ', $mainSelect) .
" FROM {$historyRange}";
if (isset($fileSqlQuery)) {
@ -214,7 +214,7 @@ class Application_Service_HistoryService
}
if (count($orderBys) > 0) {
$orders = join(', ', $orderBys);
$orders = implode(', ', $orderBys);
$mainSqlQuery .=
" ORDER BY {$orders}";
@ -340,7 +340,7 @@ class Application_Service_HistoryService
LEFT JOIN cc_files AS file ON (file.id = playout.file_id)) AS summary';
$mainSqlQuery .=
'SELECT ' . join(', ', $select) .
'SELECT ' . implode(', ', $select) .
" FROM {$fileSummaryTable}";
//-------------------------------------------------------------------------
@ -373,7 +373,7 @@ class Application_Service_HistoryService
}
if ($numOrderColumns > 0) {
$orders = join(', ', $orderBys);
$orders = implode(', ', $orderBys);
$mainSqlQuery .=
" ORDER BY {$orders}";