diff options
| -rw-r--r-- | composer.json | 38 | ||||
| -rw-r--r-- | php-doctrine-doctrine-bundle2.spec | 85 |
2 files changed, 82 insertions, 41 deletions
diff --git a/composer.json b/composer.json index fb87cb2..6bbb041 100644 --- a/composer.json +++ b/composer.json @@ -26,32 +26,34 @@ ], "require": { "php": "^7.1 || ^8.0", + "doctrine/cache": "^1.11 || ^2.0", "doctrine/dbal": "^2.9.0|^3.0", "doctrine/persistence": "^1.3.3|^2.0", "doctrine/sql-formatter": "^1.0.1", - "symfony/cache": "^4.3.3|^5.0", - "symfony/config": "^4.3.3|^5.0", - "symfony/console": "^3.4.30|^4.3.3|^5.0", - "symfony/dependency-injection": "^4.3.3|^5.0", - "symfony/doctrine-bridge": "^4.4.7|^5.0", - "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0", + "symfony/cache": "^4.3.3|^5.0|^6.0", + "symfony/config": "^4.4.3|^5.0|^6.0", + "symfony/console": "^3.4.30|^4.3.3|^5.0|^6.0", + "symfony/dependency-injection": "^4.3.3|^5.0|^6.0", + "symfony/deprecation-contracts": "^2.1", + "symfony/doctrine-bridge": "^4.4.22|^5.2.7|^6.0", + "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0|^6.0", "symfony/service-contracts": "^1.1.1|^2.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", - "doctrine/orm": "^2.6", + "doctrine/coding-standard": "^9.0", + "doctrine/orm": "^2.9", "friendsofphp/proxy-manager-lts": "^1.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3", "psalm/plugin-phpunit": "^0.15.1", - "psalm/plugin-symfony": "^2.2.4", - "symfony/phpunit-bridge": "^5.2", - "symfony/property-info": "^4.3.3|^5.0", - "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0", - "symfony/security-bundle": "^4.4|^5.0", - "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0", - "symfony/validator": "^3.4.30|^4.3.3|^5.0", - "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0", - "symfony/yaml": "^3.4.30|^4.3.3|^5.0", + "psalm/plugin-symfony": "^2.3.0", + "symfony/phpunit-bridge": "^5.2|^6.0", + "symfony/property-info": "^4.3.3|^5.0|^6.0", + "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0|^6.0", + "symfony/security-bundle": "^4.4|^5.0|^6.0", + "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0|^6.0", + "symfony/validator": "^3.4.30|^4.3.3|^5.0|^6.0", + "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0|^6.0", + "symfony/yaml": "^3.4.30|^4.3.3|^5.0|^6.0", "twig/twig": "^1.34|^2.12|^3.0", "vimeo/psalm": "^4.7" }, @@ -59,7 +61,7 @@ "sort-packages": true }, "conflict": { - "doctrine/orm": "<2.6", + "doctrine/orm": "<2.9", "twig/twig": "<1.34|>=2.0,<2.4" }, "suggest": { diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec index 9a7cbe9..3fe6b7a 100644 --- a/php-doctrine-doctrine-bundle2.spec +++ b/php-doctrine-doctrine-bundle2.spec @@ -13,8 +13,8 @@ %global github_owner doctrine %global github_name DoctrineBundle -%global github_version 2.3.2 -%global github_commit d6b3c37804539a24ba8a7d647a6144cab2f13242 +%global github_version 2.4.1 +%global github_commit 7f472cc85eba050a83fcf38cece87b868877d7e2 %global major 2 %global composer_vendor doctrine @@ -22,37 +22,40 @@ # "php": "^7.1 || ^8.0" %global php_min_ver 7.1 +# "doctrine/cache": "^1.11|^2.0" +%global cache_min_ver 1.11 +%global cache_max_ver 3 # "doctrine/dbal": "^2.9.0|^3.0" %global dbal_min_ver 2.9 %global dbal_max_ver 4 # "doctrine/persistence": "^1.3.3|^2.0", %global persistence_min_ver 1.3.3 %global persistence_max_ver 3 -# "doctrine/orm": "~2.6" -%global orm_min_ver 2.6 +# "doctrine/orm": "~2.9" +%global orm_min_ver 2.9 %global orm_max_ver 3.0 # "doctrine/sql-formatter": "^1.0.1" %global sql_formatter_min_ver 1.0.1 %global sql_formatter_max_ver 2.0 -# "symfony/config": "^4.3.3|^5.0", -# "symfony/console": "^3.4.30|^4.3.3|^5.0" -# "symfony/dependency-injection": "^^4.3.3|^5.0" -# "symfony/doctrine-bridge": "^4.3.7|^5.0" -# "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0" -# "symfony/cache": "^4.3.3|^5.0", -# "symfony/property-info": "^4.3.3|^5.0" -# "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0" -# "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0", -# "symfony/validator": "^3.4.30|^4.3.3|^5.0" -# "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0" -# "symfony/yaml": "^3.4.30|^4.3.3|^5.0" +# "symfony/config": "^4.3.3|^5.0|^6.0", +# "symfony/console": "^3.4.30|^4.3.3|^5.0|^6.0" +# "symfony/dependency-injection": "^^4.3.3|^5.0|^6.0" +# "symfony/doctrine-bridge": "^4.3.7|^5.0|^6.0" +# "symfony/framework-bundle": "^3.4.30|^4.3.3|^5.0|^6.0" +# "symfony/cache": "^4.3.3|^5.0|^6.0", +# "symfony/property-info": "^4.3.3|^5.0|^6.0" +# "symfony/proxy-manager-bridge": "^3.4|^4.3.3|^5.0|^6.0" +# "symfony/twig-bridge": "^3.4.30|^4.3.3|^5.0|^6.0", +# "symfony/validator": "^3.4.30|^4.3.3|^5.0|^6.0" +# "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0|^6.0" +# "symfony/yaml": "^3.4.30|^4.3.3|^5.0|^6.0" %global symfony_min_ver 4.3.7 -%global symfony_max_ver 5 +%global symfony_max_ver 6 %global symfony_br_ver %{symfony_min_ver} # "symfony/service-contracts": "^1.1.1|^2.0", -# TODO v2 is not yet packaged -%global contracts_min_ver 1.1.1 -%global contracts_max_ver 2 +# "symfony/deprecation-contracts": "^2.1", +%global contracts_min_ver 2.1 +%global contracts_max_ver 3 # "twig/twig": "^1.34|^2.12|^3.0" %global twig_min_ver 1.34 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 @@ -89,15 +92,19 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-theseer-autoload # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires:(php-composer(doctrine/cache) >= %{cache_min_ver} with php-composer(doctrine/cache) < %{cache_max_ver}) BuildRequires:(php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_max_ver}) BuildRequires:(php-composer(doctrine/orm) >= %{orm_min_ver} with php-composer(doctrine/orm) < %{orm_max_ver}) BuildRequires:(php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_max_ver}) BuildRequires:(php-composer(doctrine/sql-formatter) >= %{sql_formatter_min_ver} with php-composer(doctrine/sql-formatter) < %{sql_formatter_max_ver}) +BuildRequires:(php-composer(symfony/deprecation-contracts) >= %{contracts_min_ver} with php-composer(symfony/deprecation-contracts) < %{contracts_max_ver}) BuildRequires:(php-composer(symfony/service-contracts) >= %{contracts_min_ver} with php-composer(symfony/service-contracts) < %{contracts_max_ver}) BuildRequires:(php-composer(friendsofphp/proxy-manager-lts) >= %{proxy_manager_min_ver} with php-composer(friendsofphp/proxy-manager-lts) < %{proxy_manager_max_ver}) BuildRequires:(php-composer(twig/twig) >= %{twig_min_ver} with php-composer(twig/twig) < %{twig_max_ver}) -# remirepo:16 +# remirepo:20 %else +BuildRequires: php-composer(doctrine/cache) < %{cache_max_ver} +BuildRequires: php-composer(doctrine/cache) >= %{cache_min_ver} BuildRequires: php-composer(doctrine/dbal) < %{dbal_max_ver} BuildRequires: php-composer(doctrine/dbal) >= %{dbal_min_ver} BuildRequires: php-composer(doctrine/persistence) < %{persistence_max_ver} @@ -106,6 +113,8 @@ BuildRequires: php-composer(doctrine/orm) < %{orm_max_ver} BuildRequires: php-composer(doctrine/orm) >= %{orm_min_ver} BuildRequires: php-composer(doctrine/sql-formatter) < %{sql_formatter_max_ver} BuildRequires: php-composer(doctrine/sql-formatter) >= %{sql_formatter_min_ver} +BuildRequires: php-composer(symfony/deprecation-contracts) < %{contracts_max_ver} +BuildRequires: php-composer(symfony/deprecation-contracts) >= %{contracts_min_ver} BuildRequires: php-composer(symfony/service-contracts) < %{contracts_max_ver} BuildRequires: php-composer(symfony/service-contracts) >= %{contracts_min_ver} BuildRequires: php-composer(friendsofphp/proxy-manager-lts) < %{proxy_manager_max_ver} @@ -148,18 +157,22 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= %{php_min_ver} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(doctrine/cache) >= %{cache_min_ver} with php-composer(doctrine/cache) < %{cache_max_ver}) Requires: (php-composer(doctrine/dbal) >= %{dbal_min_ver} with php-composer(doctrine/dbal) < %{dbal_max_ver}) Requires: (php-composer(doctrine/persistence) >= %{persistence_min_ver} with php-composer(doctrine/persistence) < %{persistence_max_ver}) Requires: (php-composer(doctrine/sql-formatter) >= %{sql_formatter_min_ver} with php-composer(doctrine/sql-formatter) < %{sql_formatter_max_ver}) Requires: (php-composer(symfony/cache) >= %{symfony_min_ver} with php-composer(symfony/cache) < %{symfony_max_ver}) Requires: (php-composer(symfony/config) >= %{symfony_min_ver} with php-composer(symfony/config) < %{symfony_max_ver}) Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) +Requires: (php-composer(symfony/deprecation-contracts) >= %{contracts_min_ver} with php-composer(symfony/deprecation-contracts) < %{contracts_max_ver}) Requires: (php-composer(symfony/service-contracts) >= %{contracts_min_ver} with php-composer(symfony/service-contracts) < %{contracts_max_ver}) Requires: (php-composer(symfony/dependency-injection) >= %{symfony_min_ver} with php-composer(symfony/dependency-injection) < %{symfony_max_ver}) Requires: (php-composer(symfony/doctrine-bridge) >= %{symfony_min_ver} with php-composer(symfony/doctrine-bridge) < %{symfony_max_ver}) Requires: (php-composer(symfony/framework-bundle) >= %{symfony_min_ver} with php-composer(symfony/framework-bundle) < %{symfony_max_ver}) -# remirepo:22 +# remirepo:26 %else +Requires: php-composer(doctrine/cache) < %{cache_max_ver} +Requires: php-composer(doctrine/cache) >= %{cache_min_ver} Requires: php-composer(doctrine/dbal) >= %{dbal_min_ver} Requires: php-composer(doctrine/dbal) < %{dbal_max_ver} Requires: php-composer(doctrine/persistence) < %{persistence_max_ver} @@ -172,6 +185,8 @@ Requires: php-composer(symfony/config) >= %{symfony_min_ver Requires: php-composer(symfony/config) < %{symfony_max_ver} Requires: php-composer(symfony/console) >= %{symfony_min_ver} Requires: php-composer(symfony/console) < %{symfony_max_ver} +Requires: php-composer(symfony/deprecation-contracts) < %{contracts_max_ver} +Requires: php-composer(symfony/deprecation-contracts) >= %{contracts_min_ver} Requires: php-composer(symfony/service-contracts) < %{contracts_max_ver} Requires: php-composer(symfony/service-contracts) >= %{contracts_min_ver} Requires: php-composer(symfony/dependency-injection) >= %{symfony_min_ver} @@ -246,6 +261,9 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; ]); \Fedora\Autoloader\Dependencies::required([ [ + '%{phpdir}/Doctrine/Common/Cache2/autoload.php', + '%{phpdir}/Doctrine/Common/Cache/autoload.php', + ], [ '%{phpdir}/Doctrine/DBAL3/autoload.php', '%{phpdir}/Doctrine/DBAL/autoload.php', ], [ @@ -253,23 +271,35 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; '%{phpdir}/Doctrine/Persistence/autoload.php', ], '%{phpdir}/Doctrine/SqlFormatter/autoload.php', - '%{phpdir}/Symfony/Contracts/autoload.php', + '%{phpdir}/Symfony/Contracts2/autoload.php', [ + '%{phpdir}/Symfony6/Bridge/Doctrine/autoload.php', + '%{phpdir}/Symfony5/Bridge/Doctrine/autoload.php', '%{phpdir}/Symfony4/Bridge/Doctrine/autoload.php', '%{phpdir}/Symfony3/Bridge/Doctrine/autoload.php', ], [ + '%{phpdir}/Symfony6/Bundle/FrameworkBundle/autoload.php', + '%{phpdir}/Symfony5/Bundle/FrameworkBundle/autoload.php', '%{phpdir}/Symfony4/Bundle/FrameworkBundle/autoload.php', '%{phpdir}/Symfony3/Bundle/FrameworkBundle/autoload.php', ], [ + '%{phpdir}/Symfony6/Component/Cache/autoload.php', + '%{phpdir}/Symfony5/Component/Cache/autoload.php', '%{phpdir}/Symfony4/Component/Cache/autoload.php', '%{phpdir}/Symfony3/Component/Cache/autoload.php', ], [ + '%{phpdir}/Symfony6/Component/Config/autoload.php', + '%{phpdir}/Symfony5/Component/Config/autoload.php', '%{phpdir}/Symfony4/Component/Config/autoload.php', '%{phpdir}/Symfony3/Component/Config/autoload.php', ], [ + '%{phpdir}/Symfony6/Component/Console/autoload.php', + '%{phpdir}/Symfony5/Component/Console/autoload.php', '%{phpdir}/Symfony4/Component/Console/autoload.php', '%{phpdir}/Symfony3/Component/Console/autoload.php', ], [ + '%{phpdir}/Symfony6/Component/DependencyInjection/autoload.php', + '%{phpdir}/Symfony5/Component/DependencyInjection/autoload.php', '%{phpdir}/Symfony4/Component/DependencyInjection/autoload.php', '%{phpdir}/Symfony3/Component/DependencyInjection/autoload.php', ]]); @@ -296,7 +326,9 @@ require '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle%{major}/autoload.p ]); EOF +: Skip symfony/phpunit-bridge usage sed -e '/listener/d' phpunit.xml.dist >phpunit.xml +rm Tests/DependencyInjection/Compiler/CacheCompatibilityPassTest.php : Upstream tests with SCLs if available RETURN_CODE=0 @@ -327,6 +359,13 @@ exit $RETURN_CODE %changelog +* Wed Jun 2 2021 Remi Collet <remi@remirepo.net> - 2.4.1-1 +- update to 2.4.1 +- add dependency on doctrine/cache +- raise dependency on doctrine/orm 2.9 +- allow symfony 5 and 6 +- switch to symfony/contracts 2 + * Mon May 10 2021 Remi Collet <remi@remirepo.net> - 2.3.2-1 - update to 2.3.2 |