update to 2.2.0

drop runtime dependency on doctrine/reflection
add build dependency on doctrine/common v3
add build dependency on symfony/cache v4

2 files changed, 30 insertions, 23 deletions

diff --git a/composer.json b/composer.json
index 35b7701..259ecdf 100644
--- a/composer.json
+++ b/composer.json
@@ -22,17 +22,18 @@
     "require": {
         "php": "^7.1 || ^8.0",
         "doctrine/annotations": "^1.0",
-        "doctrine/cache": "^1.0",
+        "doctrine/cache": "^1.0|^2.0",
         "doctrine/collections": "^1.0",
-        "doctrine/event-manager": "^1.0",
-        "doctrine/reflection": "^1.2"
+        "doctrine/event-manager": "^1.0"
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.11",
         "phpstan/phpstan": "^0.12",
         "doctrine/coding-standard": "^6.0 || ^8.0",
-        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
-        "vimeo/psalm": "^3.11"
+        "doctrine/common": "^3.0",
+        "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0",
+        "symfony/cache": "^4.4",
+        "vimeo/psalm": "^4.3.1"
     },
     "conflict": {
         "doctrine/common": "<2.10@dev"
diff --git a/php-doctrine-persistence2.spec b/php-doctrine-persistence2.spec
index 545d453..347eb10 100644
--- a/php-doctrine-persistence2.spec
+++ b/php-doctrine-persistence2.spec
@@ -8,7 +8,7 @@
 #
 
 %global bootstrap    0
-%global gh_commit    3bc796882c9f69526b7833b46ba3cd0c06b0460f
+%global gh_commit    bac0f7fc16fc294e4c38b8763de21657dcf803f0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     doctrine
 %global gh_project   persistence
@@ -27,7 +27,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.1.0
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Doctrine Persistence abstractions
 
@@ -47,54 +47,51 @@ BuildRequires:  php-spl
 #        "composer/package-versions-deprecated": "^1.11",
 #        "phpstan/phpstan": "^0.12",
 #        "doctrine/coding-standard": "^6.0 || ^8.0",
-#        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
-#        "vimeo/psalm": "^3.11"
+#        "doctrine/common": "^3.0",
+#        "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0",
+#        "symfony/cache": "^4.4",
+#        "vimeo/psalm": "^4.3.1"
 # 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)         < 2)
 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/reflection)    >= 1.2   with php-composer(doctrine/reflection)    < 2)
-# remirepo:7
+BuildRequires: (php-composer(doctrine/common)        >= 3.0   with php-composer(doctrine/common)        < 4)
+BuildRequires: (php-composer(symfony/cache)          >= 4.4   with php-composer(symfony/cache)          < 5)
+# remirepo:8
 %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-reflection              >= 1.2
+BuildRequires:  php-doctrine-common3                 >= 3.0
+BuildRequires:  php-symfony4-cache                   >= 4.4
 %endif
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
 %global phpunit %{_bindir}/phpunit9
 BuildRequires:  phpunit9
-%else
-%global phpunit %{_bindir}/phpunit8
-BuildRequires:  phpunit8
-%endif
 %endif
 
 # From composer.json
 #        "php": "^7.1 || ^8.0"
 #        "doctrine/annotations": "^1.0",
-#        "doctrine/cache": "^1.0",
+#        "doctrine/cache": "^1.0|^2.0",
 #        "doctrine/collections": "^1.0",
 #        "doctrine/event-manager": "^1.0",
-#        "doctrine/reflection": "^1.2"
 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)
+# ignore 2.0 for now
 Requires:      (php-composer(doctrine/cache)         >= 1.0   with php-composer(doctrine/cache)         < 2)
 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)
-Requires:      (php-composer(doctrine/reflection)    >= 1.2   with php-composer(doctrine/reflection)    < 2)
-# remirepo:7
+# remirepo:6
 %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-reflection              >= 1.2
 %endif
 # From phpcompatinfo report for version 1.0.0
 Requires:       php-reflection
@@ -139,7 +136,6 @@ cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php
     '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Cache/autoload.php',
     '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Collections/autoload.php',
     '%{_datadir}/php/%{ns_vendor}/%{ns_project}/EventManager/autoload.php',
-    '%{_datadir}/php/%{ns_vendor}/%{ns_project}/Reflection/autoload.php',
 ]);
 EOF
 
@@ -160,6 +156,10 @@ mkdir vendor
 
 cat << 'EOF' | tee -a vendor/autoload.php
 require "%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php";
+\Fedora\Autoloader\Dependencies::required([
+    '%{_datadir}/php/%{ns_vendor}/Common3/autoload.php',
+    '%{_datadir}/php/Symfony4/Component/Cache/autoload.php',
+]);
 EOF
 
 # we don't want PHPStan (which pull nette framework)
@@ -191,6 +191,12 @@ exit $ret
 
 
 %changelog
+* Mon May 17 2021 Remi Collet <remi@remirepo.net> - 2.2.0-1
+- update to 2.2.0
+- drop runtime dependency on doctrine/reflection
+- add build dependency on doctrine/common v3
+- add build dependency on symfony/cache v4
+
 * Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 2.1.0-1
 - update to 2.1.0
 - switch to phpunit9