diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rwxr-xr-x | php-symfony4-generate-autoloaders.php | 6 | ||||
| -rw-r--r-- | php-symfony4.spec | 17 | ||||
| -rw-r--r-- | src/Symfony/Bundle/SecurityBundle/composer.json | 2 | ||||
| -rw-r--r-- | src/Symfony/Component/Config/composer.json | 3 |
5 files changed, 25 insertions, 7 deletions
diff --git a/composer.json b/composer.json index 39a35f3..c3ef535 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,8 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php72": "~1.5", "symfony/polyfill-php73": "^1.11", - "symfony/polyfill-php80": "^1.15" + "symfony/polyfill-php80": "^1.15", + "symfony/polyfill-php81": "^1.22" }, "replace": { "symfony/asset": "self.version", @@ -124,7 +125,6 @@ "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "^2.6|^3.0", "doctrine/orm": "^2.6.3", - "doctrine/doctrine-bundle": "^1.5|^2.0", "guzzlehttp/promises": "^1.4", "masterminds/html5": "^2.6", "monolog/monolog": "^1.25.1", diff --git a/php-symfony4-generate-autoloaders.php b/php-symfony4-generate-autoloaders.php index 682b508..0554653 100755 --- a/php-symfony4-generate-autoloaders.php +++ b/php-symfony4-generate-autoloaders.php @@ -340,6 +340,12 @@ final class AutoloadGenerator { 'path' => 'Symfony/Polyfill/autoload.php', ] : false, + 'symfony/polyfill-php81' => (PHP_VERSION_ID < 80100) + ? [ + '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 3d6829d..769f055 100644 --- a/php-symfony4.spec +++ b/php-symfony4.spec @@ -13,8 +13,8 @@ %global github_owner symfony %global github_name symfony -%global github_version 4.4.24 -%global github_commit 854af7600a6249c34bdbf4120e078aef6ece660e +%global github_version 4.4.25 +%global github_commit c71e9ba222f7a970e92399c1fb5d82af18c77dd4 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor symfony @@ -94,7 +94,8 @@ # "symfony/polyfill-php72": "~1.5" # "symfony/polyfill-php73": "~1.11" # "symfony/polyfill-php80": "^1.15" -%global symfony_polyfill_min_ver 1.15 +# "symfony/polyfill-php81": "^1.22" +%global symfony_polyfill_min_ver 1.22 %global symfony_polyfill_max_ver 2.0 # "symfony/security-acl": "~2.8|~3.0" %global symfony_security_acl_min_ver 2.8 @@ -913,6 +914,12 @@ URL: http://symfony.com/doc/%{symfony4_doc_ver}/components/config.html # composer.json Requires: php-composer(%{composer_vendor}/filesystem) = %{version} +%if %{with_range_dependencies} +Requires:(php-composer(%{composer_vendor}/polyfill-php81) >= %{symfony_polyfill_min_ver} with php-composer(%{composer_vendor}/polyfill-php81) < %{symfony_polyfill_max_ver}) +%else +Requires: php-composer(%{composer_vendor}/polyfill-php81) < %{symfony_polyfill_max_ver} +Requires: php-composer(%{composer_vendor}/polyfill-php81) >= %{symfony_polyfill_min_ver} +%endif # composer.json: optional %if %{with_range_dependencies} Suggests: php-composer(%{composer_vendor}/yaml) @@ -3303,6 +3310,10 @@ exit $RET # ############################################################################## %changelog +* Tue Jun 1 2021 Remi Collet <remi@remirepo.net> - 4.4.25-1 +- update to 4.4.25 +- add dependency on symfony/polyfill-php81 + * Wed May 19 2021 Remi Collet <remi@remirepo.net> - 4.4.24-1 - update to 4.4.24 diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 872ef66..eb0ac43 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -27,7 +27,7 @@ "symfony/security-http": "^4.4.5" }, "require-dev": { - "doctrine/doctrine-bundle": "^1.5|^2.0", + "doctrine/annotations": "^1.10.4", "symfony/asset": "^3.4|^4.0|^5.0", "symfony/browser-kit": "^4.2|^5.0", "symfony/console": "^3.4|^4.0|^5.0", diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json index d71373b..13e4cd4 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -18,7 +18,8 @@ "require": { "php": ">=7.1.3", "symfony/filesystem": "^3.4|^4.0|^5.0", - "symfony/polyfill-ctype": "~1.8" + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php81": "^1.22" }, "require-dev": { "symfony/event-dispatcher": "^3.4|^4.0|^5.0", |