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

2
legacy/application/configs/airtime-conf-production.php
View file

@ -26,7 +26,7 @@ $conf = [
],
'default' => 'airtime',
],
'generator_version' => '1.7.0',
'generator_version' => '1.7.3-dev',
];
$conf['classmap'] = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-airtime-conf.php';

4
legacy/application/configs/airtime-conf.php
View file

@ -1,6 +1,6 @@
<?php
// This file generated by Propel 1.7.0 convert-conf target
// This file generated by Propel 1.7.3-dev convert-conf target
// from XML runtime conf file /vagrant/legacy/build/runtime-conf.xml
$conf = [
'datasources' => [
@ -18,7 +18,7 @@ $conf = [
],
'default' => 'airtime',
],
'generator_version' => '1.7.0',
'generator_version' => '1.7.3-dev',
];
$conf['classmap'] = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-airtime-conf.php';

16
legacy/application/configs/classmap-airtime-conf.php
View file

@ -1,6 +1,6 @@
<?php
// This file generated by Propel 1.7.0 convert-conf target
// This file generated by Propel 1.7.3-dev convert-conf target
return [
'BaseCcBlock' => 'airtime/om/BaseCcBlock.php',
'BaseCcBlockPeer' => 'airtime/om/BaseCcBlockPeer.php',
@ -83,9 +83,6 @@ return [
'BaseCcStreamSetting' => 'airtime/om/BaseCcStreamSetting.php',
'BaseCcStreamSettingPeer' => 'airtime/om/BaseCcStreamSettingPeer.php',
'BaseCcStreamSettingQuery' => 'airtime/om/BaseCcStreamSettingQuery.php',
'BaseCcTracktypes' => 'airtime/om/BaseCcTracktypes.php',
'BaseCcTracktypesPeer' => 'airtime/om/BaseCcTracktypesPeer.php',
'BaseCcTracktypesQuery' => 'airtime/om/BaseCcTracktypesQuery.php',
'BaseCcSubjs' => 'airtime/om/BaseCcSubjs.php',
'BaseCcSubjsPeer' => 'airtime/om/BaseCcSubjsPeer.php',
'BaseCcSubjsQuery' => 'airtime/om/BaseCcSubjsQuery.php',
@ -95,6 +92,9 @@ return [
'BaseCcTimestamp' => 'airtime/om/BaseCcTimestamp.php',
'BaseCcTimestampPeer' => 'airtime/om/BaseCcTimestampPeer.php',
'BaseCcTimestampQuery' => 'airtime/om/BaseCcTimestampQuery.php',
'BaseCcTracktypes' => 'airtime/om/BaseCcTracktypes.php',
'BaseCcTracktypesPeer' => 'airtime/om/BaseCcTracktypesPeer.php',
'BaseCcTracktypesQuery' => 'airtime/om/BaseCcTracktypesQuery.php',
'BaseCcWebstream' => 'airtime/om/BaseCcWebstream.php',
'BaseCcWebstreamMetadata' => 'airtime/om/BaseCcWebstreamMetadata.php',
'BaseCcWebstreamMetadataPeer' => 'airtime/om/BaseCcWebstreamMetadataPeer.php',
@ -230,10 +230,6 @@ return [
'CcStreamSettingPeer' => 'airtime/CcStreamSettingPeer.php',
'CcStreamSettingQuery' => 'airtime/CcStreamSettingQuery.php',
'CcStreamSettingTableMap' => 'airtime/map/CcStreamSettingTableMap.php',
'CcTracktypes' => 'airtime/CcTracktypes.php',
'CcTracktypesPeer' => 'airtime/CcTracktypesPeer.php',
'CcTracktypesQuery' => 'airtime/CcTracktypesQuery.php',
'CcTracktypesTableMap' => 'airtime/map/CcTracktypesTableMap.php',
'CcSubjs' => 'airtime/CcSubjs.php',
'CcSubjsPeer' => 'airtime/CcSubjsPeer.php',
'CcSubjsQuery' => 'airtime/CcSubjsQuery.php',
@ -246,6 +242,10 @@ return [
'CcTimestampPeer' => 'airtime/CcTimestampPeer.php',
'CcTimestampQuery' => 'airtime/CcTimestampQuery.php',
'CcTimestampTableMap' => 'airtime/map/CcTimestampTableMap.php',
'CcTracktypes' => 'airtime/CcTracktypes.php',
'CcTracktypesPeer' => 'airtime/CcTracktypesPeer.php',
'CcTracktypesQuery' => 'airtime/CcTracktypesQuery.php',
'CcTracktypesTableMap' => 'airtime/map/CcTracktypesTableMap.php',
'CcWebstream' => 'airtime/CcWebstream.php',
'CcWebstreamMetadata' => 'airtime/CcWebstreamMetadata.php',
'CcWebstreamMetadataPeer' => 'airtime/CcWebstreamMetadataPeer.php',