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

4
legacy/application/models/Scheduler.php
View file

@ -991,7 +991,7 @@ final class Application_Model_Scheduler
$insert_sql = 'INSERT INTO cc_schedule ' .
'(starts, ends, cue_in, cue_out, fade_in, fade_out, ' .
'clip_length, position, instance_id, file_id, stream_id) VALUES ' .
implode($values, ',') . ' RETURNING id';
implode(',', $values) . ' RETURNING id';
$stmt = $this->con->prepare($insert_sql);
if ($stmt->execute()) {
@ -1020,7 +1020,7 @@ final class Application_Model_Scheduler
"WHERE starts >= '{$initalStartDT->format(DEFAULT_MICROTIME_FORMAT)}' " .
"AND instance_id = {$instanceId} ";
if (count($excludeIds) > 0) {
$followingItems_sql .= 'AND id NOT IN (' . implode($excludeIds, ',') . ') ';
$followingItems_sql .= 'AND id NOT IN (' . implode(',', $excludeIds) . ') ';
}
$followingItems_sql .= 'ORDER BY starts';
$followingSchedItems = Application_Common_Database::prepareAndExecute(