diff options
| -rw-r--r-- | composer.json | 90 | ||||
| -rw-r--r-- | php-doctrine-doctrine-bundle2.spec | 164 |
2 files changed, 176 insertions, 78 deletions
diff --git a/composer.json b/composer.json index 6bbb041..df36d3a 100644 --- a/composer.json +++ b/composer.json @@ -1,11 +1,14 @@ { "name": "doctrine/doctrine-bundle", - "type": "symfony-bundle", "description": "Symfony DoctrineBundle", - "keywords": ["DBAL", "ORM", "Database", "Persistence"], - "homepage": "http://www.doctrine-project.org", "license": "MIT", - "minimum-stability": "dev", + "type": "symfony-bundle", + "keywords": [ + "DBAL", + "ORM", + "Database", + "Persistence" + ], "authors": [ { "name": "Fabien Potencier", @@ -17,62 +20,75 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" }, { "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org/" + "homepage": "https://www.doctrine-project.org/" } ], + "homepage": "https://www.doctrine-project.org", "require": { "php": "^7.1 || ^8.0", + "doctrine/annotations": "^1", "doctrine/cache": "^1.11 || ^2.0", - "doctrine/dbal": "^2.9.0|^3.0", - "doctrine/persistence": "^1.3.3|^2.0", + "doctrine/dbal": "^2.13.1 || ^3.3.2", + "doctrine/persistence": "^2.2 || ^3", "doctrine/sql-formatter": "^1.0.1", - "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" + "symfony/cache": "^4.4 || ^5.4 || ^6.0", + "symfony/config": "^4.4.3 || ^5.4 || ^6.0", + "symfony/console": "^4.4 || ^5.4 || ^6.0", + "symfony/dependency-injection": "^4.4.18 || ^5.4 || ^6.0", + "symfony/deprecation-contracts": "^2.1 || ^3", + "symfony/doctrine-bridge": "^4.4.22 || ^5.4 || ^6.0", + "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/service-contracts": "^1.1.1 || ^2.0 || ^3" }, "require-dev": { "doctrine/coding-standard": "^9.0", - "doctrine/orm": "^2.9", + "doctrine/orm": "^2.11 || ^3.0", "friendsofphp/proxy-manager-lts": "^1.0", - "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3", - "psalm/plugin-phpunit": "^0.15.1", - "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", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3 || ^10.0", + "psalm/plugin-phpunit": "^0.16.1", + "psalm/plugin-symfony": "^3", + "psr/log": "^1.1.4 || ^2.0 || ^3.0", + "symfony/phpunit-bridge": "^6.1", + "symfony/property-info": "^4.4 || ^5.4 || ^6.0", + "symfony/proxy-manager-bridge": "^4.4 || ^5.4 || ^6.0", + "symfony/security-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/twig-bridge": "^4.4 || ^5.4 || ^6.0", + "symfony/validator": "^4.4 || ^5.4 || ^6.0", + "symfony/web-profiler-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/yaml": "^4.4 || ^5.4 || ^6.0", + "twig/twig": "^1.34 || ^2.12 || ^3.0", "vimeo/psalm": "^4.7" }, - "config": { - "sort-packages": true - }, "conflict": { - "doctrine/orm": "<2.9", - "twig/twig": "<1.34|>=2.0,<2.4" + "doctrine/orm": "<2.11 || >=3.0", + "twig/twig": "<1.34 || >=2.0,<2.4" }, "suggest": { - "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", "ext-pdo": "*", + "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", "symfony/web-profiler-bundle": "To use the data collector." }, + "minimum-stability": "dev", "autoload": { - "psr-4": { "Doctrine\\Bundle\\DoctrineBundle\\": "" } + "psr-4": { + "Doctrine\\Bundle\\DoctrineBundle\\": "" + } }, "autoload-dev": { - "psr-4": { "": "Tests/DependencyInjection" } + "psr-4": { + "": "Tests/DependencyInjection" + } + }, + "config": { + "allow-plugins": { + "composer/package-versions-deprecated": true, + "dealerdirect/phpcodesniffer-composer-installer": true, + "symfony/flex": true + }, + "sort-packages": true } } diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec index 3fe6b7a..d4bc3b9 100644 --- a/php-doctrine-doctrine-bundle2.spec +++ b/php-doctrine-doctrine-bundle2.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-doctrine-doctrine-bundle2 # -# Copyright (c) 2015-2020 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2015-2022 Shawn Iwinski <shawn.iwinski@gmail.com> # Remi Collet <remi@fedoraproject.org> # # License: MIT @@ -13,8 +13,8 @@ %global github_owner doctrine %global github_name DoctrineBundle -%global github_version 2.4.1 -%global github_commit 7f472cc85eba050a83fcf38cece87b868877d7e2 +%global github_version 2.7.2 +%global github_commit 22d53b2c5ad03929628fb4a928b01135585b7179 %global major 2 %global composer_vendor doctrine @@ -22,40 +22,46 @@ # "php": "^7.1 || ^8.0" %global php_min_ver 7.1 +# "doctrine/annotations": "^1", +%global annotations_min_ver 1 +%global annotations_max_ver 2 +# "psr/log": "^1.1.4|^2.0|^3.0", +%global psr_log_min_ver 1.1.4 +%global psr_log_max_ver 4 # "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 +# "doctrine/dbal": "^2.13.1|^3.3.2" +%global dbal_min_ver 2.13.1 %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.9" -%global orm_min_ver 2.9 -%global orm_max_ver 3.0 +# "doctrine/persistence": "^2.2|^3", +%global persistence_min_ver 2.2 +%global persistence_max_ver 4 +# "doctrine/orm": "~2.11 || ^3.0" +%global orm_min_ver 2.11 +%global orm_max_ver 4 # "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|^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 6 +# "symfony/cache": "^4.4|^5.4|^6.0", +# "symfony/config": "^4.4.3|^5.4|^6.0", +# "symfony/console": "^4.4|^5.4|^6.0" +# "symfony/dependency-injection": "^4.4.18|^5.4|^6.0" +# "symfony/doctrine-bridge": "^4.4.22|^5.4|^6.0" +# "symfony/framework-bundle": "^4.4|^5.4|^6.0" +# "symfony/property-info": "^4.4|^5.4|^6.0" +# "symfony/proxy-manager-bridge": "^4.4|^5.4|^6.0" +# "symfony/twig-bridge": "^4.4|^5.4|^6.0", +# "symfony/validator": "^4.4|^5.4|^6.0" +# "symfony/web-profiler-bundle": "^4.4|^5.4|^6.0" +# "symfony/yaml": "^4.4|^5.4|^6.0" +%global symfony_min_ver 4.4.22 +%global symfony_max_ver 7 %global symfony_br_ver %{symfony_min_ver} -# "symfony/service-contracts": "^1.1.1|^2.0", -# "symfony/deprecation-contracts": "^2.1", +# "symfony/service-contracts": "^1.1.1|^2.0|^3", +# "symfony/deprecation-contracts": "^2.1|^3", %global contracts_min_ver 2.1 -%global contracts_max_ver 3 +%global contracts_max_ver 4 # "twig/twig": "^1.34|^2.12|^3.0" %global twig_min_ver 1.34 %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 @@ -92,17 +98,21 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-theseer-autoload # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires:(php-composer(doctrine/annotations) >= %{annotations_min_ver} with php-composer(doctrine/annotations) < %{annotations_max_ver}) 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(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_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:20 +# remirepo:24 %else +BuildRequires: php-composer(doctrine/annotations) < %{annotations_max_ver} +BuildRequires: php-composer(doctrine/annotations) >= %{annotations_min_ver} BuildRequires: php-composer(doctrine/cache) < %{cache_max_ver} BuildRequires: php-composer(doctrine/cache) >= %{cache_min_ver} BuildRequires: php-composer(doctrine/dbal) < %{dbal_max_ver} @@ -113,6 +123,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(psr/log) < %{psr_log_max_ver} +BuildRequires: php-composer(psr/log) >= %{psr_log_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} @@ -157,6 +169,7 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= %{php_min_ver} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(doctrine/annotations) >= %{annotations_min_ver} with php-composer(doctrine/annotations) < %{annotations_max_ver}) 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}) @@ -169,8 +182,10 @@ Requires: (php-composer(symfony/service-contracts) >= %{contracts_min_v 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:26 +# remirepo:28 %else +Requires: php-composer(doctrine/annotations) < %{annotations_max_ver} +Requires: php-composer(doctrine/annotations) >= %{annotations_min_ver} Requires: php-composer(doctrine/cache) < %{cache_max_ver} Requires: php-composer(doctrine/cache) >= %{cache_min_ver} Requires: php-composer(doctrine/dbal) >= %{dbal_min_ver} @@ -249,10 +264,13 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Bundle\\DoctrineBundle\\', __DIR__); \Fedora\Autoloader\Dependencies::optional([ - '%{phpdir}/Doctrine/ORM/autoload.php', [ + '%{phpdir}/Doctrine/ORM3/autoload.php', + '%{phpdir}/Doctrine/ORM/autoload.php', + ], [ + '%{phpdir}/Symfony6/Bundle/WebProfilerBundle/autoload.php', + '%{phpdir}/Symfony5/Bundle/WebProfilerBundle/autoload.php', '%{phpdir}/Symfony4/Bundle/WebProfilerBundle/autoload.php', - '%{phpdir}/Symfony3/Bundle/WebProfilerBundle/autoload.php', ], [ '%{phpdir}/Twig3/autoload.php', '%{phpdir}/Twig2/autoload.php', @@ -260,6 +278,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; ], ]); \Fedora\Autoloader\Dependencies::required([ + '%{phpdir}/Doctrine/Common/Annotations/autoload.php', [ '%{phpdir}/Doctrine/Common/Cache2/autoload.php', '%{phpdir}/Doctrine/Common/Cache/autoload.php', @@ -267,41 +286,37 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; '%{phpdir}/Doctrine/DBAL3/autoload.php', '%{phpdir}/Doctrine/DBAL/autoload.php', ], [ + '%{phpdir}/Doctrine/Persistence3/autoload.php', '%{phpdir}/Doctrine/Persistence2/autoload.php', - '%{phpdir}/Doctrine/Persistence/autoload.php', ], '%{phpdir}/Doctrine/SqlFormatter/autoload.php', - '%{phpdir}/Symfony/Contracts2/autoload.php', [ + '%{phpdir}/Symfony/Contracts3/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', ]]); AUTOLOAD @@ -323,6 +338,11 @@ require '%{buildroot}%{phpdir}/Doctrine/Bundle/DoctrineBundle%{major}/autoload.p '%{phpdir}/Symfony4/Bridge/ProxyManager/autoload.php', '%{phpdir}/Symfony4/Bridge/Twig/autoload.php', '%{phpdir}/FriendsOfPHP/ProxyManager/autoload.php', + [ + '%{phpdir}/Psr/Log3/autoload.php', + '%{phpdir}/Psr/Log2/autoload.php', + '%{phpdir}/Psr/Log/autoload.php', + ], ]); EOF @@ -332,11 +352,15 @@ rm Tests/DependencyInjection/Compiler/CacheCompatibilityPassTest.php : Upstream tests with SCLs if available RETURN_CODE=0 -for CMDARG in "php %{phpunit}" php73 php74 php80; do +for CMDARG in "php %{phpunit}" php80 php81 php82; do if which $CMDARG; then set $CMDARG $1 ${2:-%{_bindir}/phpunit9} \ +%if 0%{?rhel} == 7 + --filter '^((?!(testBacktraceLogged|testExecuteXmlWithBundle|testExecuteAnnotationsWithBundle|testExecuteXmlWithNamespace|testExecuteAnnotationsWithNamespace)).)*$' \ +%else --filter '^((?!(testBacktraceLogged)).)*$' \ +%endif --bootstrap bs.php \ --verbose || RETURN_CODE=1 fi @@ -359,6 +383,64 @@ exit $RETURN_CODE %changelog +* Wed Dec 7 2022 Remi Collet <remi@remirepo.net> - 2.7.2-1 +- update to 2.7.2 + +* Tue Nov 8 2022 Remi Collet <remi@remirepo.net> - 2.7.1-1 +- update to 2.7.1 +- raise dependency on Symfony 4.4.22 + +* Mon Jun 13 2022 Remi Collet <remi@remirepo.net> - 2.7.0-1 +- update to 2.7.0 + +* Mon Apr 25 2022 Remi Collet <remi@remirepo.net> - 2.6.3-1 +- update to 2.6.3 +- allow doctrine/persistence v3 + +* Mon Apr 11 2022 Remi Collet <remi@remirepo.net> - 2.6.2-1 +- update to 2.6.2 + +* Mon Apr 4 2022 Remi Collet <remi@remirepo.net> - 2.6.1-1 +- update to 2.6.1 + +* Wed Mar 30 2022 Remi Collet <remi@remirepo.net> - 2.6.0-1 +- update to 2.6.0 + +* Mon Mar 7 2022 Remi Collet <remi@remirepo.net> - 2.5.7-1 +- update to 2.5.7 + +* Tue Feb 15 2022 Remi Collet <remi@remirepo.net> - 2.5.6-1 +- update to 2.5.6 + +* Thu Jan 6 2022 Remi Collet <remi@remirepo.net> - 2.5.5-1 +- update to 2.5.5 + +* Mon Jan 3 2022 Remi Collet <remi@remirepo.net> - 2.5.4-1 +- update to 2.5.4 +- allow doctrin/orm 3 + +* Thu Dec 2 2021 Remi Collet <remi@remirepo.net> - 2.5.2-1 +- update to 2.5.2 +- allow symfony/contracts 3 + +* Tue Nov 30 2021 Remi Collet <remi@remirepo.net> - 2.5.1-1 +- update to 2.5.1 + +* Mon Nov 22 2021 Remi Collet <remi@remirepo.net> - 2.5.0-1 +- update to 2.5.0 +- raise dependency on doctrine/dbal 2.13.1 +- raise dependency on dbal doctrine/persistence 2.2 + +* Mon Nov 22 2021 Remi Collet <remi@remirepo.net> - 2.4.4-1 +- update to 2.4.4 + +* Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 2.4.3-1 +- update to 2.4.3 +- add dependency on doctrine/annotations + +* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 2.4.2-1 +- update to 2.4.2 + * Wed Jun 2 2021 Remi Collet <remi@remirepo.net> - 2.4.1-1 - update to 2.4.1 - add dependency on doctrine/cache |