From 3560f36bb024b18c8136c1789a3a4148f04607dd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Jan 2022 08:33:27 +0100 Subject: fix autoloader for 7.4 --- php-symfony4-generate-autoloaders.php | 29 +++++++++-------------------- php-symfony4.spec | 10 +++++++--- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/php-symfony4-generate-autoloaders.php b/php-symfony4-generate-autoloaders.php index 8955b93..be8a720 100755 --- a/php-symfony4-generate-autoloaders.php +++ b/php-symfony4-generate-autoloaders.php @@ -325,30 +325,19 @@ final class AutoloadGenerator { 'symfony/polyfill-intl-icu' => false, 'symfony/polyfill-intl-idn' => false, 'symfony/polyfill-mbstring' => false, - 'symfony/polyfill-php72' => (PHP_VERSION_ID < 70200) - ? [ + 'symfony/polyfill-php72' => false, + 'symfony/polyfill-php73' => false, + 'symfony/polyfill-php74' => false, + 'symfony/polyfill-php80' => + [ 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', // external 'path' => 'Symfony/Polyfill/autoload.php', - ] - : false, - 'symfony/polyfill-php73' => (PHP_VERSION_ID < 70300) - ? [ - 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', // external - 'path' => 'Symfony/Polyfill/autoload.php', - ] - : false, - 'symfony/polyfill-php80' => (PHP_VERSION_ID < 80000) - ? [ - 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', // external - 'path' => 'Symfony/Polyfill/autoload.php', - ] - : false, - 'symfony/polyfill-php81' => (PHP_VERSION_ID < 80100) - ? [ + ], + 'symfony/polyfill-php81' => + [ 'prefix' => 'FEDORA_SYMFONY4_PHP_DIR', // external 'path' => 'Symfony/Polyfill/autoload.php', - ] - : false, + ], 'symfony/process' => [ 'prefix' => 'FEDORA_SYMFONY4_DIR', 'path' => 'Component/Process/autoload.php', diff --git a/php-symfony4.spec b/php-symfony4.spec index 7f959a4..a9ee2bf 100644 --- a/php-symfony4.spec +++ b/php-symfony4.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-symfony4 # -# Copyright (c) 2016-2021 Shawn Iwinski +# Copyright (c) 2016-2022 Shawn Iwinski # Remi Collet # # License: MIT @@ -21,7 +21,8 @@ %global composer_project symfony # "php": ">=7.1.3" -%global php_min_ver 7.1.3 +# use 7.4 as older polyfills are disabled +%global php_min_ver 7.4 # "cache/integration-tests": "dev-master" # NOTE: Min and max versions added to restrict to single major version %global cache_integration_tests_min_ver 0 @@ -144,7 +145,7 @@ Name: php-%{composer_project}4 Version: %{github_version} -Release: 1%{?github_prerelease:.%{github_prerelease}}%{?dist} +Release: 2%{?github_prerelease:.%{github_prerelease}}%{?dist} Summary: Symfony PHP framework (version 4) # MIT and CC-BY-SA: @@ -3315,6 +3316,9 @@ exit $RET # ############################################################################## %changelog +* Thu Jan 13 2022 Remi Collet - 4.4.36-2 +- fix autoloader for 7.4 + * Mon Jan 3 2022 Remi Collet - 4.4.36-1 - update to 4.4.36 -- cgit