diff options
| -rw-r--r-- | composer.json | 14 | ||||
| -rw-r--r-- | php-doctrine-doctrine-bundle2.spec | 18 |
2 files changed, 21 insertions, 11 deletions
diff --git a/composer.json b/composer.json index c584b48..9b51b86 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "symfony-bundle", "description": "Symfony DoctrineBundle", "keywords": ["DBAL", "ORM", "Database", "Persistence"], - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "license": "MIT", "minimum-stability": "dev", "authors": [ @@ -17,11 +17,11 @@ }, { "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/" } ], "require": { @@ -42,7 +42,7 @@ }, "require-dev": { "doctrine/coding-standard": "^9.0", - "doctrine/orm": "^2.9", + "doctrine/orm": "^2.9 || ^3.0", "friendsofphp/proxy-manager-lts": "^1.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3 || ^10.0", "psalm/plugin-phpunit": "^0.16.1", @@ -59,7 +59,11 @@ "vimeo/psalm": "^4.7" }, "config": { - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "composer/package-versions-deprecated": true, + "dealerdirect/phpcodesniffer-composer-installer": true + } }, "conflict": { "doctrine/orm": "<2.9", diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec index 7588cd0..6715699 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.5.2 -%global github_commit 5b77477ba2981a00b423d1bb17084b87eb57a4a5 +%global github_version 2.5.4 +%global github_commit f6191c50600bad1c0195638413f53aee6158b909 %global major 2 %global composer_vendor doctrine @@ -34,9 +34,9 @@ # "doctrine/persistence": "^2.2", %global persistence_min_ver 2.2 %global persistence_max_ver 3 -# "doctrine/orm": "~2.9" +# "doctrine/orm": "~2.9 || ^3.0" %global orm_min_ver 2.9 -%global orm_max_ver 3.0 +%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 @@ -258,8 +258,10 @@ 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}/Symfony4/Bundle/WebProfilerBundle/autoload.php', '%{phpdir}/Symfony3/Bundle/WebProfilerBundle/autoload.php', ], [ @@ -369,6 +371,10 @@ exit $RETURN_CODE %changelog +* 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 |