From c2463cb1109f9055894ceb4034e1113accc88952 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 09:58:30 +0100 Subject: raise dependency on PHP 7.0 drop dependency on symfony/polyfill-php56 and symfony/polyfill-php70 --- php-symfony3-generate-autoloaders.php | 28 +++----------------- php-symfony3.spec | 48 +++++++---------------------------- 2 files changed, 13 insertions(+), 63 deletions(-) diff --git a/php-symfony3-generate-autoloaders.php b/php-symfony3-generate-autoloaders.php index 90d2c50..6ab565b 100755 --- a/php-symfony3-generate-autoloaders.php +++ b/php-symfony3-generate-autoloaders.php @@ -229,30 +229,10 @@ final class AutoloadGenerator { 'symfony/polyfill-intl-icu' => false, 'symfony/polyfill-intl-normalizer' => false, 'symfony/polyfill-mbstring' => false, - 'symfony/polyfill-php54' => (PHP_VERSION_ID < 50400) - ? [ - 'prefix' => 'FEDORA_SYMFONY3_PHP_DIR', - 'path' => 'Symfony/Polyfill/autoload.php', - ] - : false, - 'symfony/polyfill-php55' => (PHP_VERSION_ID < 50500) - ? [ - 'prefix' => 'FEDORA_SYMFONY3_PHP_DIR', - 'path' => 'Symfony/Polyfill/autoload.php', - ] - : false, - 'symfony/polyfill-php56' => (PHP_VERSION_ID < 50600) - ? [ - 'prefix' => 'FEDORA_SYMFONY3_PHP_DIR', - 'path' => 'Symfony/Polyfill/autoload.php', - ] - : false, - 'symfony/polyfill-php70' => (PHP_VERSION_ID < 70000) - ? [ - 'prefix' => 'FEDORA_SYMFONY3_PHP_DIR', - 'path' => 'Symfony/Polyfill/autoload.php', - ] - : false, + 'symfony/polyfill-php54' => false, + 'symfony/polyfill-php55' => false, + 'symfony/polyfill-php56' => false, + 'symfony/polyfill-php70' => false, 'symfony/polyfill-util' => [ 'prefix' => 'FEDORA_SYMFONY3_PHP_DIR', 'path' => 'Symfony/Polyfill/autoload.php', diff --git a/php-symfony3.spec b/php-symfony3.spec index e5675b2..4afce24 100644 --- a/php-symfony3.spec +++ b/php-symfony3.spec @@ -20,7 +20,8 @@ %global composer_project symfony # "php": "^5.5.9|>=7.0.8" -%global php_min_ver 5.5.9 +# to avoid polyfill-php56 and polyfill-php70 +%global php_min_ver 7.0.8 # "cache/integration-tests": "dev-master" # NOTE: Min and max versions added to restrict to single major version %global cache_integration_tests_min_ver 0 @@ -118,7 +119,7 @@ Name: php-%{composer_project}3 Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Symfony PHP framework (version 3) # MIT and CC-BY-SA: @@ -154,7 +155,6 @@ BuildRequires:(php-composer(psr/container) >= %{psr_container_min_ver} with php- BuildRequires:(php-composer(psr/link) >= %{psr_link_min_ver} with php-composer(psr/link) < %{psr_link_max_ver}) BuildRequires:(php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) BuildRequires:(php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver} with php-composer(psr/simple-cache) < %{psr_simple_cache_max_ver}) -BuildRequires:(php-composer(symfony/polyfill) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill) < %{symfony_polyfill_max_ver}) BuildRequires:(php-composer(symfony/security-acl) >= %{symfony_security_acl_min_ver} with php-composer(symfony/security-acl) < %{symfony_security_acl_max_ver}) BuildRequires:(php-composer(twig/twig) >= %{twig_min_ver} with php-composer(twig/twig) < %{twig_max_ver}) %else @@ -167,7 +167,8 @@ BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} BuildRequires: php-composer(doctrine/common) < %{doctrine_common_max_ver} BuildRequires: php-composer(doctrine/common) >= %{doctrine_common_min_ver} BuildRequires: php-composer(doctrine/data-fixtures) < %{doctrine_datafixtures_max_ver} -BuildRequires: php-composer(doctrine/data-fixtures) >= %{doctrine_datafixtures_min_ver} +# ignore min version as optional +BuildRequires: php-composer(doctrine/data-fixtures) >= 1.0 BuildRequires: php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver} BuildRequires: php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} BuildRequires: php-composer(doctrine/doctrine-bundle) < %{doctrine_bundle_max_ver} @@ -193,8 +194,6 @@ BuildRequires: php-composer(psr/log) < %{psr_log_max_ver} BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} BuildRequires: php-composer(psr/simple-cache) < %{psr_simple_cache_max_ver} BuildRequires: php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver} -BuildRequires: php-composer(symfony/polyfill) < %{symfony_polyfill_max_ver} -BuildRequires: php-composer(symfony/polyfill) >= %{symfony_polyfill_min_ver} BuildRequires: php-composer(symfony/security-acl) < %{symfony_security_acl_max_ver} BuildRequires: php-composer(symfony/security-acl) >= %{symfony_security_acl_min_ver} BuildRequires: php-composer(twig/twig) < %{twig_max_ver} @@ -590,11 +589,7 @@ Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/config) = %{version} Requires: php-composer(%{composer_vendor}/security) = %{version} %if %{with_range_dependencies} -Requires: (php-composer(symfony/polyfill-php70) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php70) < %{symfony_polyfill_max_ver}) Suggests: php-composer(%{composer_vendor}/security-acl) -%else -Requires: php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver} -Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} %endif # phpcompatinfo (computed from version 3.3.6) Requires: php-pcre @@ -652,8 +647,6 @@ License: MIT and CC-BY-SA # composer.json Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} -Requires: php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver} -Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} Requires: php-composer(%{composer_vendor}/routing) = %{version} Requires: php-composer(%{composer_vendor}/twig-bundle) = %{version} Requires: php-composer(%{composer_vendor}/var-dumper) = %{version} @@ -1211,13 +1204,6 @@ Summary: Symfony HttpFoundation Component (version 3) URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/http_foundation.html Requires: %{name}-common = %{version}-%{release} -%if %{with_range_dependencies} -Requires: (php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} with php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver}) -Suggests: php-pecl(mongo) -%else -Requires: php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver} -Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} -%endif # phpcompatinfo (computed from version 3.3.6) Requires: php-date Requires: php-fileinfo @@ -1259,7 +1245,6 @@ Requires: php-composer(%{composer_vendor}/debug) = %{version} Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version} Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} %if %{with_range_dependencies} -Requires: (php-composer(%{composer_vendor}/polyfill-php56) >= %{symfony_polyfill_min_ver} with php-composer(%{composer_vendor}/polyfill-php56) < %{symfony_polyfill_max_ver}) Requires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) # composer.json: optional Suggests: php-composer(%{composer_vendor}/browser-kit) @@ -1273,8 +1258,6 @@ Suggests: php-pecl(apcu) Suggests: php-pecl(opcache) Suggests: php-pecl(Xdebug) %else -Requires: php-composer(%{composer_vendor}/polyfill-php56) < %{symfony_polyfill_max_ver} -Requires: php-composer(%{composer_vendor}/polyfill-php56) >= %{symfony_polyfill_min_ver} Requires: php-composer(psr/log) >= %{psr_log_min_ver} Requires: php-composer(psr/log) < %{psr_log_max_ver} %endif @@ -1364,12 +1347,6 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/ldap.html Requires: %{name}-common = %{version}-%{release} # composer.json Requires: php-composer(%{composer_vendor}/options-resolver) = %{version} -%if %{with_range_dependencies} -Requires: (php-composer(%{composer_vendor}/polyfill-php56) >= %{symfony_polyfill_min_ver} with php-composer(%{composer_vendor}/polyfill-php56) < %{symfony_polyfill_max_ver}) -%else -Requires: php-composer(%{composer_vendor}/polyfill-php56) < %{symfony_polyfill_max_ver} -Requires: php-composer(%{composer_vendor}/polyfill-php56) >= %{symfony_polyfill_min_ver} -%endif Requires: php-ldap # phpcompatinfo (computed from version 3.3.6) Requires: php-spl @@ -1466,12 +1443,8 @@ URL: http://symfony.com/doc/%{symfony3_doc_ver}/components/property_access # composer.json Requires: php-composer(%{composer_vendor}/inflector) = %{version} %if %{with_range_dependencies} -Requires: (php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} with php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver}) # composer.json: optional Suggests: php-composer(psr/cache-implementation) -%else -Requires: php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver} -Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} %endif # phpcompatinfo (computed from version 3.3.6) Requires: php-pcre @@ -1562,19 +1535,12 @@ Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/property-access) = %{version} %if %{with_range_dependencies} -Requires: (php-composer(%{composer_vendor}/polyfill-php56) >= %{symfony_polyfill_min_ver} with php-composer(%{composer_vendor}/polyfill-php56) < %{symfony_polyfill_max_ver}) -Requires: (php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} with php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver}) # composer.json: optional Suggests: php-composer(%{composer_vendor}/expression-language) Suggests: php-composer(%{composer_vendor}/form) Suggests: php-composer(%{composer_vendor}/ldap) Suggests: php-composer(%{composer_vendor}/routing) Suggests: php-composer(%{composer_vendor}/validator) -%else -Requires: php-composer(%{composer_vendor}/polyfill-php56) < %{symfony_polyfill_max_ver} -Requires: php-composer(%{composer_vendor}/polyfill-php56) >= %{symfony_polyfill_min_ver} -Requires: php-composer(%{composer_vendor}/polyfill-php70) < %{symfony_polyfill_max_ver} -Requires: php-composer(%{composer_vendor}/polyfill-php70) >= %{symfony_polyfill_min_ver} %endif # phpcompatinfo (computed from version 3.3.6) Requires: php-ctype @@ -2875,6 +2841,10 @@ exit $RET # ############################################################################## %changelog +* Mon Oct 26 2020 Remi Collet - 3.4.45-2 +- raise dependency on PHP 7.0 +- drop dependency on symfony/polyfill-php56 and symfony/polyfill-php70 + * Mon Sep 28 2020 Remi Collet - 3.4.45-1 - update to 3.4.45 -- cgit