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

16
legacy/application/models/Datatables.php
View file

@ -20,8 +20,8 @@ class Application_Model_Datatables
$input2 = null;
}
} elseif ($dbname == 'bit_rate' || $dbname == 'sample_rate') {
$input1 = isset($info[0]) ? doubleval($info[0]) * 1000 : null;
$input2 = isset($info[1]) ? doubleval($info[1]) * 1000 : null;
$input1 = isset($info[0]) ? floatval($info[0]) * 1000 : null;
$input2 = isset($info[1]) ? floatval($info[1]) * 1000 : null;
} else {
$input1 = isset($info[0]) ? $info[0] : null;
$input2 = isset($info[1]) ? $info[1] : null;
@ -82,10 +82,10 @@ class Application_Model_Datatables
$orig2searchTerm = [];
foreach ($data as $key => $d) {
if (strstr($key, 'mDataProp_')) {
list($dump, $index) = explode('_', $key);
[$dump, $index] = explode('_', $key);
$current2dbname[$index] = $d;
} elseif (strstr($key, 'sSearch_')) {
list($dump, $index) = explode('_', $key);
[$dump, $index] = explode('_', $key);
$orig2searchTerm[$index] = $d;
}
}
@ -112,7 +112,7 @@ class Application_Model_Datatables
$advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm);
if (!empty($advancedWhere['clause'])) {
$where[] = join(' AND ', $advancedWhere['clause']);
$where[] = implode(' AND ', $advancedWhere['clause']);
$params = $advancedWhere['params'];
}
}
@ -122,7 +122,7 @@ class Application_Model_Datatables
}
$selectorCount = 'SELECT COUNT(*) ';
$selectorRows = 'SELECT ' . join(',', $displayColumns) . ' ';
$selectorRows = 'SELECT ' . implode(',', $displayColumns) . ' ';
$sql = $selectorCount . ' FROM ' . $fromTable;
$sqlTotalRows = $sql;
@ -157,14 +157,14 @@ class Application_Model_Datatables
$orderby[] = $data["mDataProp_{$num}"] . ' ' . $data['sSortDir_' . $i];
}
$orderby[] = 'id';
$orderby = join(',', $orderby);
$orderby = implode(',', $orderby);
// End Order By clause
$displayLength = intval($data['iDisplayLength']);
$needToBind = false;
if (count($where) > 0) {
$needToBind = true;
$where = join(' OR ', $where);
$where = implode(' OR ', $where);
$sql = $selectorCount . ' FROM ' . $fromTable . ' WHERE ' . $where;
$sqlTotalDisplayRows = $sql;