From 3220241e508a92b60785d4c1d990828aa663ca61 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Nov 2022 10:35:06 +0100 Subject: update to 2.7.1 raise dependency on Symfony 4.4.22 --- composer.json | 82 +++++++++++++++++++++----------------- php-doctrine-doctrine-bundle2.spec | 47 +++++++++++----------- 2 files changed, 69 insertions(+), 60 deletions(-) diff --git a/composer.json b/composer.json index edb0391..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": "https://www.doctrine-project.org", "license": "MIT", - "minimum-stability": "dev", + "type": "symfony-bundle", + "keywords": [ + "DBAL", + "ORM", + "Database", + "Persistence" + ], "authors": [ { "name": "Fabien Potencier", @@ -24,21 +27,22 @@ "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.13.1|^3.3.2", - "doctrine/persistence": "^2.2|^3", + "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.4.18|^5.0|^6.0", - "symfony/deprecation-contracts": "^2.1|^3", - "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|^3" + "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", @@ -47,38 +51,44 @@ "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": "^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", + "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, - "allow-plugins": { - "composer/package-versions-deprecated": true, - "dealerdirect/phpcodesniffer-composer-installer": true - } - }, "conflict": { - "doctrine/orm": "<2.10|>=3.0", - "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 b2f25f8..db109c0 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.7.0 -%global github_commit d2088fc50494e4e7441fecca54732245a613eeb6 +%global github_version 2.7.1 +%global github_commit a2dcad48741c9d12fd6040398cf075025030096e %global major 2 %global composer_vendor doctrine @@ -43,20 +43,20 @@ # "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.4.18|^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.4.18 -%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|^3", # "symfony/deprecation-contracts": "^2.1|^3", @@ -268,8 +268,9 @@ require_once '%{phpdir}/Fedora/Autoloader/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', @@ -296,32 +297,26 @@ require_once '%{phpdir}/Fedora/Autoloader/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 @@ -357,7 +352,7 @@ rm Tests/DependencyInjection/Compiler/CacheCompatibilityPassTest.php : Upstream tests with SCLs if available RETURN_CODE=0 -for CMDARG in "php %{phpunit}" php74 php80 php81; do +for CMDARG in "php %{phpunit}" php74 php80 php81 php82; do if which $CMDARG; then set $CMDARG $1 ${2:-%{_bindir}/phpunit9} \ @@ -388,6 +383,10 @@ exit $RETURN_CODE %changelog +* Tue Nov 8 2022 Remi Collet - 2.7.1-1 +- update to 2.7.1 +- raise dependency on Symfony 4.4.22 + * Mon Jun 13 2022 Remi Collet - 2.7.0-1 - update to 2.7.0 -- cgit