update to 1.2.0HEADmaster

add dependency on doctrine/deprecations

2 files changed, 79 insertions, 29 deletions

diff --git a/composer.json b/composer.json
index 8973b3f..deeb7e0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
 {
     "name": "doctrine/event-manager",
-    "type": "library",
     "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.",
+    "license": "MIT",
+    "type": "library",
     "keywords": [
         "events",
         "event",
@@ -9,42 +10,60 @@
         "event manager",
         "event system"
     ],
-    "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
-    "license": "MIT",
     "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"},
-        {"name": "Marco Pivetta", "email": "ocramius@gmail.com"}
+        {
+            "name": "Guilherme Blanco",
+            "email": "guilhermeblanco@gmail.com"
+        },
+        {
+            "name": "Roman Borschel",
+            "email": "roman@code-factory.org"
+        },
+        {
+            "name": "Benjamin Eberlei",
+            "email": "kontakt@beberlei.de"
+        },
+        {
+            "name": "Jonathan Wage",
+            "email": "jonwage@gmail.com"
+        },
+        {
+            "name": "Johannes Schmitt",
+            "email": "schmittjoh@gmail.com"
+        },
+        {
+            "name": "Marco Pivetta",
+            "email": "ocramius@gmail.com"
+        }
     ],
+    "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
     "require": {
-        "php": "^7.1 || ^8.0"
+        "php": "^7.1 || ^8.0",
+        "doctrine/deprecations": "^0.5.3 || ^1"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^9",
-        "phpstan/phpstan": "~1.4.10 || ^1.5.4",
+        "doctrine/coding-standard": "^9 || ^10",
+        "phpstan/phpstan": "~1.4.10 || ^1.8.8",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-        "vimeo/psalm": "^4.22"
+        "vimeo/psalm": "^4.24"
     },
     "conflict": {
         "doctrine/common": "<2.9"
     },
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
-        },
-        "sort-packages": true
-    },
     "autoload": {
         "psr-4": {
-            "Doctrine\\Common\\": "lib/Doctrine/Common"
+            "Doctrine\\Common\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Doctrine\\Tests\\": "tests/Doctrine/Tests"
+            "Doctrine\\Tests\\Common\\": "tests"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        },
+        "sort-packages": true
     }
 }
diff --git a/php-doctrine-event-manager.spec b/php-doctrine-event-manager.spec
index adfbb31..6ce5e8e 100644
--- a/php-doctrine-event-manager.spec
+++ b/php-doctrine-event-manager.spec
@@ -8,7 +8,7 @@
 #
 
 %global bootstrap    0
-%global gh_commit    eb2ecf80e3093e8f3c2769ac838e27d8ede8e683
+%global gh_commit    95aa4cb529f1e96576f3fda9f5705ada4056a520
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     doctrine
 %global gh_project   event-manager
@@ -26,7 +26,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.1.2
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Simple PHP event system
 
@@ -39,13 +39,33 @@ BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
 BuildRequires:  php(language) >= 7.1
+BuildRequires:  php-reflection
+BuildRequires:  php-spl
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(doctrine/deprecations)  >= 0.5.3 with php-composer(doctrine/deprecations)  < 2)
+# remirepo:4
+%else
+BuildRequires:  php-composer(doctrine/deprecations)  <  2
+BuildRequires:  php-composer(doctrine/deprecations)  >= 0.5.3
+%endif
 BuildRequires:  phpunit9
 %endif
 
 # From composer.json
 #        "php": "^7.1 || ^8.0"
+#        "doctrine/deprecations": "^0.5.3 || ^1"
 Requires:       php(language) >= 7.1
-# From phpcompatinfo report for version 1.0.0: only "core"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-composer(doctrine/deprecations)  >= 0.5.3 with php-composer(doctrine/deprecations)  < 2)
+# remirepo:4
+%else
+Requires:       php-composer(doctrine/deprecations)  <  2
+Requires:       php-composer(doctrine/deprecations)  >= 0.5.3
+%endif
+# From phpcompatinfo report for version 1.2.0
+Requires:       php-spl
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 
@@ -67,16 +87,23 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.ph
 
 %build
 : Generate a simple autoloader
-mkdir lib/%{ns_vendor}/%{ns_project}/%{ns_subproj}
+mkdir src/%{ns_subproj}
 %{_bindir}/phpab \
-    --output lib/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php \
+    --output src/%{ns_subproj}/autoload.php \
     --template fedora \
-    lib/%{ns_vendor}/%{ns_project}
+    src
+
+cat << 'AUTOLOAD' | tee -a src/%{ns_subproj}/autoload.php
+
+\Fedora\Autoloader\Dependencies::required([
+    '%{_datadir}/php/Doctrine/Deprecations/autoload.php',
+]);
+AUTOLOAD
 
 
 %install
-mkdir -p                              %{buildroot}%{_datadir}/php/%{ns_vendor}
-cp -pr lib/%{ns_vendor}/%{ns_project} %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}
+mkdir -p   %{buildroot}%{_datadir}/php/%{ns_vendor}
+cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}
 
 
 %check
@@ -117,6 +144,10 @@ exit $ret
 
 
 %changelog
+* Thu Oct 13 2022 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- update to 1.2.0
+- add dependency on doctrine/deprecations
+
 * Thu Jul 28 2022 Remi Collet <remi@remirepo.net> - 1.1.2-1
 - update to 1.1.2
 - switch to phpunit9