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

12
legacy/application/models/Show.php
View file

@ -353,7 +353,7 @@ SQL;
$sql_gen = 'UPDATE cc_show_instances ' .
'SET ends = (ends + :deltaDay1::INTERVAL + :interval1::INTERVAL) ' .
'WHERE (id IN (' . implode($instanceIds, ',') . ') ' .
'WHERE (id IN (' . implode(',', $instanceIds) . ') ' .
'AND ends > :current_timestamp1) ' .
"AND ((ends + :deltaDay2::INTERVAL + :interval2::INTERVAL - starts) <= interval '24:00')";
@ -371,7 +371,7 @@ SQL;
$sql_gen = 'UPDATE cc_show_days ' .
'SET duration = (CAST(duration AS interval) + :deltaDay3::INTERVAL + :interval3::INTERVAL) ' .
'WHERE id IN (' . implode($showDayIds, ',') . ') ' .
'WHERE id IN (' . implode(',', $showDayIds) . ') ' .
"AND ((CAST(duration AS interval) + :deltaDay4::INTERVAL + :interval4::INTERVAL) <= interval '24:00')";
Application_Common_Database::prepareAndExecute(
@ -671,7 +671,7 @@ SQL;
*/
public function getStartDate()
{
list($date) = explode(' ', $this->getStartDateAndTime());
[$date] = explode(' ', $this->getStartDateAndTime());
return $date;
}
@ -684,7 +684,7 @@ SQL;
*/
public function getStartTime()
{
list(, $time) = explode(' ', $this->getStartDateAndTime());
[, $time] = explode(' ', $this->getStartDateAndTime());
return $time;
}
@ -1214,9 +1214,9 @@ SQL;
}
//$hashValue = (md5($date->format('d'))[0] % $cols) + ((intval($date->format('h'))/24) % $rows);
$row = intval($date->format('w')) % sizeof($palette);
$row = intval($date->format('w')) % count($palette);
$foo = $date->format('H');
$col = intval(intval($date->format('H')) / 24.0 * sizeof($palette[0]));
$col = intval(intval($date->format('H')) / 24.0 * count($palette[0]));
//$color = $palette[$hashValue % sizeof($palette)];
return $palette[$row][$col];
}