update to 2.4.0

2 files changed, 37 insertions, 27 deletions

diff --git a/composer.json b/composer.json
index b264f63..1eea8a9 100644
--- a/composer.json
+++ b/composer.json
@@ -29,28 +29,35 @@
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.11",
-        "phpstan/phpstan": "1.2.0",
+        "phpstan/phpstan": "1.4.6",
         "doctrine/annotations": "^1.0",
-        "doctrine/coding-standard": "^6.0 || ^9.0",
+        "doctrine/coding-standard": "^9.0",
         "doctrine/common": "^3.0",
-        "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0",
-        "symfony/cache": "^4.4 || ^5.0 || ^6.0",
-        "vimeo/psalm": "4.13.1"
+        "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5",
+        "symfony/cache": "^4.4 || ^5.4 || ^6.0",
+        "vimeo/psalm": "4.21.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.0 || >=2.0",
-        "doctrine/common": "<2.10@dev"
+        "doctrine/common": "<2.10"
     },
     "autoload": {
         "psr-4": {
-            "Doctrine\\Common\\": "lib/Doctrine/Common",
-            "Doctrine\\Persistence\\": "lib/Doctrine/Persistence"
+            "Doctrine\\Common\\": "src/Common",
+            "Doctrine\\Persistence\\": "src/Persistence"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Doctrine\\Tests\\": "tests/Doctrine/Tests",
-            "Doctrine\\Tests_PHP74\\": "tests/Doctrine/Tests_PHP74"
+            "Doctrine\\Tests\\": "tests",
+            "Doctrine\\Tests_PHP74\\": "tests_php74",
+            "Doctrine\\Tests_PHP81\\": "tests_php81"
+        }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "composer/package-versions-deprecated": true
         }
     }
 }
diff --git a/php-doctrine-persistence2.spec b/php-doctrine-persistence2.spec
index 03b98ab..c6a71b7 100644
--- a/php-doctrine-persistence2.spec
+++ b/php-doctrine-persistence2.spec
@@ -8,7 +8,7 @@
 #
 
 %global bootstrap    0
-%global gh_commit    f8af155c1e7963f3d2b4415097d55757bbaa53d8
+%global gh_commit    e7c8edcf98e819638af00e7b3cbbbd7734b9b2fb
 %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.3.0
-Release:        2%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        Doctrine Persistence abstractions
 
 License:        MIT
@@ -45,13 +45,13 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json
 #        "composer/package-versions-deprecated": "^1.11",
-#        "phpstan/phpstan": "1.2.0",
+#        "phpstan/phpstan": "1.4.6",
 #        "doctrine/annotations": "^1.0",
-#        "doctrine/coding-standard": "^6.0 || ^8.0",
+#        "doctrine/coding-standard": "^9.0",
 #        "doctrine/common": "^3.0",
-#        "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0",
-#        "symfony/cache": "^4.4 || ^5.0 || ^6.0",
-#        "vimeo/psalm": "4.13.1"
+#        "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5",
+#        "symfony/cache": "^4.4 || ^5.4 || ^6.0",
+#        "vimeo/psalm": "4.21.0"
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(doctrine/annotations)   >= 1.0   with php-composer(doctrine/annotations)   < 2)
@@ -124,19 +124,19 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-mv lib/%{ns_vendor}/%{ns_subproj} \
-   lib/%{ns_vendor}/%{ns_subproj}%{major}
-mv lib/%{ns_vendor}/%{ns_project}/%{ns_subproj} \
-   lib/%{ns_vendor}/%{ns_project}/%{ns_subproj}%{major}
+mv src/%{ns_subproj} \
+   src/%{ns_subproj}%{major}
+mv src/%{ns_project}/%{ns_subproj} \
+   src/%{ns_project}/%{ns_subproj}%{major}
 
 
 %build
 : Generate a simple autoloader
 %{_bindir}/phpab \
-    --output lib/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php \
+    --output src/%{ns_subproj}%{major}/autoload.php \
     --template fedora \
-    lib/%{ns_vendor}
-cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php
+    src
+cat << 'EOF' | tee -a src/%{ns_subproj}%{major}/autoload.php
 
 // Dependencies
 \Fedora\Autoloader\Dependencies::required([
@@ -153,8 +153,8 @@ EOF
 
 
 %install
-mkdir -p                %{buildroot}%{_datadir}/php
-cp -pr lib/%{ns_vendor} %{buildroot}%{_datadir}/php/%{ns_vendor}
+mkdir -p   %{buildroot}%{_datadir}/php
+cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}
 
 
 %check
@@ -209,6 +209,9 @@ exit $ret
 
 
 %changelog
+* Tue Mar 15 2022 Remi Collet <remi@remirepo.net> - 2.4.0-1
+- update to 2.4.0
+
 * Fri Jan 21 2022 Remi Collet <remi@remirepo.net> - 2.3.0-2
 - fix autoloader