From b6438a629e6e1aa7384833371fc7586971e6c872 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 13 Oct 2022 11:00:12 +0200
Subject: update to 3.0.4

---
 composer.json                  |  8 ++++----
 php-doctrine-persistence3.spec | 24 +++++++++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index 3e7653f..3dbf70e 100644
--- a/composer.json
+++ b/composer.json
@@ -21,20 +21,20 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "doctrine/event-manager": "^1.0",
+        "doctrine/event-manager": "^1 || ^2",
         "psr/cache": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.11",
-        "phpstan/phpstan": "1.5.0",
+        "phpstan/phpstan": "1.8.8",
         "phpstan/phpstan-phpunit": "^1",
         "phpstan/phpstan-strict-rules": "^1.1",
         "doctrine/annotations": "^1.7",
-        "doctrine/coding-standard": "^9.0",
+        "doctrine/coding-standard": "^10",
         "doctrine/common": "^3.0",
         "phpunit/phpunit": "^8.5 || ^9.5",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
-        "vimeo/psalm": "4.22.0"
+        "vimeo/psalm": "4.29.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.7 || >=2.0",
diff --git a/php-doctrine-persistence3.spec b/php-doctrine-persistence3.spec
index 3bee6b6..dddb022 100644
--- a/php-doctrine-persistence3.spec
+++ b/php-doctrine-persistence3.spec
@@ -8,7 +8,7 @@
 #
 
 %global bootstrap    0
-%global gh_commit    ac6fce61f037d7e54dbb2435f5b5648d86548e23
+%global gh_commit    05612da375f8a3931161f435f91d6704926e6ec5
 %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:        3.0.3
+Version:        3.0.4
 Release:        1%{?dist}
 Summary:        Doctrine Persistence abstractions, version %{major}
 
@@ -45,19 +45,19 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json
 #        "composer/package-versions-deprecated": "^1.11",
-#        "phpstan/phpstan": "1.5.0",
+#        "phpstan/phpstan": "1.8.8",
 #        "phpstan/phpstan-phpunit": "^1",
 #        "phpstan/phpstan-strict-rules": "^1.1",
 #        "doctrine/annotations": "^1.7",
-#        "doctrine/coding-standard": "^9.0",
+#        "doctrine/coding-standard": "^10",
 #        "doctrine/common": "^3.0",
 #        "phpunit/phpunit": "^8.5 || ^9.5",
 #        "symfony/cache": "^4.4 || ^5.4 || ^6.0",
-#        "vimeo/psalm": "4.21.0"
+#        "vimeo/psalm": "4.29.0"
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(doctrine/annotations)   >= 1.7   with php-composer(doctrine/annotations)   < 2)
-BuildRequires: (php-composer(doctrine/event-manager) >= 1.0   with php-composer(doctrine/event-manager) < 2)
+BuildRequires: (php-composer(doctrine/event-manager) >= 1     with php-composer(doctrine/event-manager) < 3)
 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)          < 7)
 BuildRequires: (php-composer(psr/cache)              >= 1.0   with php-composer(psr/cache)              < 2)
@@ -75,12 +75,12 @@ BuildRequires:  phpunit9 >= 9.5
 
 # From composer.json
 #        "php": "^7.2 || ^8.0"
-#        "doctrine/event-manager": "^1.0",
+#        "doctrine/event-manager": "^1 || ^2",
 #        "psr/cache": "^1.0 || ^2.0 || ^3.0"
 Requires:       php(language) >= 7.2
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(doctrine/event-manager) >= 1.0   with php-composer(doctrine/event-manager) < 2)
+Requires:      (php-composer(doctrine/event-manager) >= 1     with php-composer(doctrine/event-manager) < 3)
 # ignore v2 and v3
 Requires:      (php-composer(psr/cache)              >= 1.0   with php-composer(psr/cache)              < 2)
 # remirepo:4
@@ -126,7 +126,10 @@ cat << 'EOF' | tee -a src/%{ns_subproj}%{major}/autoload.php
 // Dependencies
 \Fedora\Autoloader\Dependencies::required([
     '%{_datadir}/php/Psr/Cache/autoload.php',
-    '%{_datadir}/php/%{ns_vendor}/%{ns_project}/EventManager/autoload.php',
+    [
+        '%{_datadir}/php/%{ns_vendor}/EventManager2/autoload.php',
+        '%{_datadir}/php/%{ns_vendor}/%{ns_project}/EventManager/autoload.php',
+    ],
 ]);
 EOF
 
@@ -187,6 +190,9 @@ exit $ret
 
 
 %changelog
+* Thu Oct 13 2022 Remi Collet <remi@remirepo.net> - 3.0.4-1
+- update to 3.0.4
+
 * Fri Aug  5 2022 Remi Collet <remi@remirepo.net> - 3.0.3-1
 - update to 3.0.3
 - drop dependency on doctrine/collections
-- 
cgit