From c35b1c5d698e634a89c578a453bc253f442be4e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Apr 2022 09:28:33 +0200 Subject: update to 3.3.0 allow doctrine/persistence v3 --- composer.json | 2 +- php-doctrine-common3.spec | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 34a67fc..1afabad 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ ], "require": { "php": "^7.1 || ^8.0", - "doctrine/persistence": "^2.0" + "doctrine/persistence": "^2.0 || ^3.0" }, "require-dev": { "phpstan/phpstan": "^1.4.1", diff --git a/php-doctrine-common3.spec b/php-doctrine-common3.spec index a96e5b7..2678437 100644 --- a/php-doctrine-common3.spec +++ b/php-doctrine-common3.spec @@ -10,8 +10,8 @@ %global github_owner doctrine %global github_name common -%global github_version 3.2.2 -%global github_commit 295082d3750987065912816a9d536c2df735f637 +%global github_version 3.3.0 +%global github_commit c824e95d4c83b7102d8bc60595445a6f7d540f96 %global major 3 %global composer_vendor doctrine @@ -22,9 +22,9 @@ # "php": "^7.1 || ^8.0" %global php_min_ver 7.1 -# "doctrine/persistence": "^2.0" +# "doctrine/persistence": "^2.0 || ^3.0" %global doctrine_pers_min_ver 2.0 -%global doctrine_pers_max_ver 3 +%global doctrine_pers_max_ver 4 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -108,9 +108,12 @@ phpab --template fedora \ lib/%{ns_vendor}/%{ns_project} cat <<'AUTOLOAD' | tee -a lib/%{ns_vendor}/%{ns_project}/autoload.php -\Fedora\Autoloader\Dependencies::required(array( - '%{phpdir}/%{ns_vendor}/Persistence2/autoload.php', -)); +\Fedora\Autoloader\Dependencies::required([ + [ + '%{phpdir}/%{ns_vendor}/Persistence3/autoload.php', + '%{phpdir}/%{ns_vendor}/Persistence2/autoload.php', + ], +]); AUTOLOAD @@ -151,6 +154,10 @@ exit $RETURN_CODE %changelog +* Tue Apr 19 2022 Remi Collet - 3.3.0-1 +- update to 3.3.0 +- allow doctrine/persistence v3 + * Wed Feb 2 2022 Remi Collet - 3.2.2-1 - update to 3.2.2 -- cgit