update to 2.2.1

raise dependency on doctrine/cache v1.11 and v2
add dependency on doctrine/deprecations
add dependency on psr/cache

2 files changed, 34 insertions, 16 deletions

diff --git a/composer.json b/composer.json
index 259ecdf..175a404 100644
--- a/composer.json
+++ b/composer.json
@@ -22,18 +22,20 @@
     "require": {
         "php": "^7.1 || ^8.0",
         "doctrine/annotations": "^1.0",
-        "doctrine/cache": "^1.0|^2.0",
+        "doctrine/cache": "^1.11 || ^2.0",
         "doctrine/collections": "^1.0",
-        "doctrine/event-manager": "^1.0"
+        "doctrine/event-manager": "^1.0",
+        "psr/cache": "^1.0|^2.0|^3.0",
+        "doctrine/deprecations": "^0.5.3"
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.11",
-        "phpstan/phpstan": "^0.12",
-        "doctrine/coding-standard": "^6.0 || ^8.0",
+        "phpstan/phpstan": "0.12.84",
+        "doctrine/coding-standard": "^6.0 || ^9.0",
         "doctrine/common": "^3.0",
         "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0",
-        "symfony/cache": "^4.4",
-        "vimeo/psalm": "^4.3.1"
+        "symfony/cache": "^4.4|^5.0",
+        "vimeo/psalm": "4.7.0"
     },
     "conflict": {
         "doctrine/common": "<2.10@dev"
diff --git a/php-doctrine-persistence2.spec b/php-doctrine-persistence2.spec
index a237a17..0d0de8e 100644
--- a/php-doctrine-persistence2.spec
+++ b/php-doctrine-persistence2.spec
@@ -8,7 +8,7 @@
 #
 
 %global bootstrap    0
-%global gh_commit    bac0f7fc16fc294e4c38b8763de21657dcf803f0
+%global gh_commit    d138f3ab5f761055cab1054070377cfd3222e368
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     doctrine
 %global gh_project   persistence
@@ -27,8 +27,8 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.2.0
-Release:        2%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        Doctrine Persistence abstractions
 
 License:        MIT
@@ -54,19 +54,23 @@ BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(doctrine/annotations)   >= 1.0   with php-composer(doctrine/annotations)   < 2)
-BuildRequires: (php-composer(doctrine/cache)         >= 1.0   with php-composer(doctrine/cache)         < 3)
+BuildRequires: (php-composer(doctrine/cache)         >= 1.11  with php-composer(doctrine/cache)         < 3)
 BuildRequires: (php-composer(doctrine/collections)   >= 1.0   with php-composer(doctrine/collections)   < 2)
 BuildRequires: (php-composer(doctrine/event-manager) >= 1.0   with php-composer(doctrine/event-manager) < 2)
 BuildRequires: (php-composer(doctrine/common)        >= 3.0   with php-composer(doctrine/common)        < 4)
+BuildRequires: (php-composer(doctrine/deprecations)  >= 0.5.3 with php-composer(doctrine/deprecations)  < 1)
 BuildRequires: (php-composer(symfony/cache)          >= 4.4   with php-composer(symfony/cache)          < 5)
-# remirepo:8
+BuildRequires: (php-composer(psr/cache)              >= 1.0   with php-composer(psr/cache)              < 2)
+# remirepo:10
 %else
 BuildRequires:  php-doctrine-annotations             >= 1.0
 BuildRequires:  php-doctrine-cache                   >= 1.0
 BuildRequires:  php-doctrine-collections             >= 1.0
 BuildRequires:  php-doctrine-event-manager           >= 1.0
 BuildRequires:  php-doctrine-common3                 >= 3.0
+BuildRequires:  php-doctrine-deprecations            >= 0.5.3
 BuildRequires:  php-symfony4-cache                   >= 4.4
+BuildRequires:  php-psr-cache                       >= 1.0
 %endif
 %global phpunit %{_bindir}/phpunit9
 BuildRequires:  phpunit9
@@ -75,22 +79,29 @@ BuildRequires:  phpunit9
 # From composer.json
 #        "php": "^7.1 || ^8.0"
 #        "doctrine/annotations": "^1.0",
-#        "doctrine/cache": "^1.0|^2.0",
+#        "doctrine/cache": "^1.11 || ^2.0",
 #        "doctrine/collections": "^1.0",
 #        "doctrine/event-manager": "^1.0",
+#        "psr/cache": "^1.0|^2.0|^3.0",
+#        "doctrine/deprecations": "^0.5.3"
 Requires:       php(language) >= 7.1
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-composer(doctrine/annotations)   >= 1.0   with php-composer(doctrine/annotations)   < 2)
-Requires:      (php-composer(doctrine/cache)         >= 1.0   with php-composer(doctrine/cache)         < 3)
+Requires:      (php-composer(doctrine/cache)         >= 1.11  with php-composer(doctrine/cache)         < 3)
 Requires:      (php-composer(doctrine/collections)   >= 1.0   with php-composer(doctrine/collections)   < 2)
 Requires:      (php-composer(doctrine/event-manager) >= 1.0   with php-composer(doctrine/event-manager) < 2)
-# remirepo:6
+Requires:      (php-composer(doctrine/deprecations)  >= 0.5.3 with php-composer(doctrine/deprecations)  < 1)
+# ignore v2 and v3
+Requires:      (php-composer(psr/cache)              >= 1.0   with php-composer(psr/cache)              < 2)
+# remirepo:8
 %else
 Requires:       php-doctrine-annotations             >= 1.0
 Requires:       php-doctrine-cache                   >= 1.0
 Requires:       php-doctrine-collections             >= 1.0
 Requires:       php-doctrine-event-manager           >= 1.0
+Requires:       php-doctrine-deprecations            >= 0.5.3
+Requires:       php-psr-cache                        >= 1.0
 %endif
 # From phpcompatinfo report for version 1.0.0
 Requires:       php-reflection
@@ -131,6 +142,8 @@ cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php
 
 // Dependencies
 \Fedora\Autoloader\Dependencies::required([
+    '%{_datadir}/php/Psr/Cache/autoload.php',
+    '%{_datadir}/php/%{ns_vendor}/Deprecations/autoload.php',
     '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Annotations/autoload.php',
     [
         '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Cache2/autoload.php',
@@ -193,8 +206,11 @@ exit $ret
 
 
 %changelog
-* Mon May 17 2021 Remi Collet <remi@remirepo.net> - 2.2.0-2
-- allow doctrine/cache v2
+* Wed May 19 2021 Remi Collet <remi@remirepo.net> - 2.2.1-1
+- update to 2.2.1
+- raise dependency on doctrine/cache v1.11 and v2
+- add dependency on doctrine/deprecations
+- add dependency on psr/cache
 
 * Mon May 17 2021 Remi Collet <remi@remirepo.net> - 2.2.0-1
 - update to 2.2.0