update to 4.4.0

drop dependency on laminas-eventmanager

2 files changed, 26 insertions, 35 deletions

diff --git a/composer.json b/composer.json
index fc6a8f6..f44c879 100644
--- a/composer.json
+++ b/composer.json
@@ -1,27 +1,18 @@
 {
     "name": "laminas/laminas-code",
     "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
-    "license": "BSD-3-Clause",
     "keywords": [
         "laminas",
         "laminasframework",
         "code"
     ],
     "homepage": "https://laminas.dev",
-    "support": {
-        "docs": "https://docs.laminas.dev/laminas-code/",
-        "issues": "https://github.com/laminas/laminas-code/issues",
-        "source": "https://github.com/laminas/laminas-code",
-        "rss": "https://github.com/laminas/laminas-code/releases.atom",
-        "chat": "https://laminas.dev/chat",
-        "forum": "https://discourse.laminas.dev"
-    },
-    "config": {
-        "sort-packages": true
-    },
+    "license": "BSD-3-Clause",
     "require": {
-        "php": "^7.4 || ~8.0.0",
-        "laminas/laminas-eventmanager": "^3.3"
+        "php": "^7.4 || ~8.0.0"
+    },
+    "conflict": {
+        "phpspec/prophecy": "<1.9.0"
     },
     "require-dev": {
         "ext-phar": "*",
@@ -32,14 +23,14 @@
         "psalm/plugin-phpunit": "^0.14.0",
         "vimeo/psalm": "^4.3.1"
     },
-    "conflict": {
-        "phpspec/prophecy": "<1.9.0"
-    },
     "suggest": {
         "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
         "laminas/laminas-stdlib": "Laminas\\Stdlib component",
         "laminas/laminas-zendframework-bridge": "A bridge with Zend Framework"
     },
+    "config": {
+        "sort-packages": true
+    },
     "autoload": {
         "psr-4": {
             "Laminas\\Code\\": "src/"
@@ -57,11 +48,16 @@
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
+        "static-analysis": "psalm --shepherd --stats",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "static-analysis": "psalm --shepherd --stats"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-code": "self.version"
+    "support": {
+        "issues": "https://github.com/laminas/laminas-code/issues",
+        "forum": "https://discourse.laminas.dev",
+        "chat": "https://laminas.dev/chat",
+        "source": "https://github.com/laminas/laminas-code",
+        "docs": "https://docs.laminas.dev/laminas-code/",
+        "rss": "https://github.com/laminas/laminas-code/releases.atom"
     }
 }
diff --git a/php-laminas-code4.spec b/php-laminas-code4.spec
index 0217a17..faf5c08 100644
--- a/php-laminas-code4.spec
+++ b/php-laminas-code4.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    1beb4447f9efd26041eba7eff50614e798c353fd
+%global gh_commit    2b0bb59ade31a045fd3ff0097dc558bb896f6596
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-code
@@ -23,7 +23,7 @@
 %endif
 
 Name:           php-%{gh_project}%{major}
-Version:        4.3.0
+Version:        4.4.0
 Release:        1%{?dist}
 Summary:        Laminas Framework %{library} component
 
@@ -42,7 +42,6 @@ BuildRequires:  php-spl
 BuildRequires:  php-tokenizer
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)       >= 3.3   with php-autoloader(%{gh_owner}/laminas-eventmanager)       < 4)
 # From composer, "require-dev": {
 #        "ext-phar": "*",
 #        "doctrine/annotations": "^1.10.4",
@@ -53,9 +52,8 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)       >= 3.3
 #        "vimeo/psalm": "^4.3.1"
 BuildRequires: (php-composer(doctrine/annotations)                     >= 1.10.4 with php-composer(doctrine/annotations)                    < 2)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)             >= 3.3    with php-autoloader(%{gh_owner}/laminas-stdlib)            < 4)
-# remirepo:5
+# remirepo:4
 %else
-BuildRequires:  php-laminas-eventmanager                               >= 3.3
 BuildRequires:  php-doctrine-annotations                               >= 1.10.4
 BuildRequires:  php-laminas-stdlib                                     >= 3.3
 %endif
@@ -65,21 +63,16 @@ BuildRequires:  phpunit9 >= 9.4.2
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.4 || ~8.0.0",
-#        "laminas/laminas-eventmanager": "^3.3",
+#        "php": "^7.4 || ~8.0.0"
 Requires:       php(language) >= 7.4
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-autoloader(%{gh_owner}/laminas-eventmanager)       >= 3.3   with php-autoloader(%{gh_owner}/laminas-eventmanager)       < 4)
 # From composer, "suggest": {
 #         "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
 #         "laminas/laminas-stdlib": "Laminas\\Stdlib component"
 Suggests:       php-composer(doctrine/annotations)
 Suggests:       php-autoloader(%{gh_owner}/laminas-stdlib)
-# remirepo:3
-%else
-Requires:       php-laminas-eventmanager                               >= 3.3
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
@@ -115,9 +108,6 @@ mv LICENSE.md LICENSE
 : Create autoloader
 phpab --template fedora --output src/autoload.php src
 cat << 'EOF' | tee -a src/autoload.php
-\Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/%{namespace}/EventManager/autoload.php',
-]);
 \Fedora\Autoloader\Dependencies::optional([
     '%{php_home}/Doctrine/Common/Annotations/autoload.php',
     '%{php_home}/%{namespace}/Stdlib/autoload.php',
@@ -141,6 +131,7 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}%{major}/autoload.p
 EOF
 
 ret=0
+# TODO php81 (1 failure)
 for cmd in php php74 php80; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit9 --verbose || ret=1
@@ -163,6 +154,10 @@ exit $ret
 
 
 %changelog
+* Fri Jun 18 2021 Remi Collet <remi@remirepo.net> - 4.4.0-1
+- update to 4.4.0
+- drop dependency on laminas-eventmanager
+
 * Mon May 17 2021 Remi Collet <remi@remirepo.net> - 4.3.0-1
 - update to 4.3.0