update to 3.5.0

raise dependency on PHP 7.3
raise dependency on laminas-eventmanager 3.3
raise dependency on laminas-zendframework-bridge 1..1
switch to phpunit9

2 files changed, 44 insertions, 43 deletions

diff --git a/composer.json b/composer.json
index a996318..cd9dd0c 100644
--- a/composer.json
+++ b/composer.json
@@ -19,23 +19,18 @@
         "sort-packages": true
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "3.4.x-dev",
-            "dev-develop": "3.5.x-dev",
-            "dev-dev-4.0": "4.0.x-dev"
-        }
     },
     "require": {
-        "php": "^7.1",
-        "laminas/laminas-eventmanager": "^2.6 || ^3.0",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "php": "^7.3 || ~8.0.0",
+        "laminas/laminas-eventmanager": "^3.3",
+        "laminas/laminas-zendframework-bridge": "^1.1"
     },
     "require-dev": {
         "ext-phar": "*",
-        "doctrine/annotations": "^1.7",
-        "laminas/laminas-coding-standard": "^1.0",
-        "laminas/laminas-stdlib": "^2.7 || ^3.0",
-        "phpunit/phpunit": "^7.5.16 || ^8.4"
+        "doctrine/annotations": "^1.10.4",
+        "laminas/laminas-coding-standard": "^1.0.0",
+        "laminas/laminas-stdlib": "^3.3.0",
+        "phpunit/phpunit": "^9.4.2"
     },
     "conflict": {
         "phpspec/prophecy": "<1.9.0"
@@ -65,6 +60,6 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
     "replace": {
-        "zendframework/zend-code": "self.version"
+        "zendframework/zend-code": "^3.4.1"
     }
 }
diff --git a/php-laminas-code.spec b/php-laminas-code.spec
index cfbdff5..643d4a3 100644
--- a/php-laminas-code.spec
+++ b/php-laminas-code.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    1cb8f203389ab1482bf89c0e70a04849bacd7766
+%global gh_commit    cb90ef428da9260c2deaa827b037c20695f968ae
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-code
@@ -22,8 +22,8 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        3.4.1
-Release:        2%{?dist}
+Version:        3.5.0
+Release:        1%{?dist}
 Summary:        Laminas Framework %{library} component
 
 License:        BSD
@@ -41,39 +41,38 @@ BuildRequires:  php-spl
 BuildRequires:  php-tokenizer
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)       >= 3.0   with php-autoloader(%{gh_owner}/laminas-eventmanager)       < 4)
-BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0   with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)       >= 3.3   with php-autoloader(%{gh_owner}/laminas-eventmanager)       < 4)
+BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.1   with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "require-dev": {
 #        "ext-phar": "*",
-#        "doctrine/annotations": "^1.7",
-#        "laminas/laminas-coding-standard": "^1.0",
-#        "laminas/laminas-stdlib": "^2.7 || ^3.0",
-#        "phpunit/phpunit": "^7.5.16 || ^8.4"
-BuildRequires: (php-composer(doctrine/annotations)                     >= 1.7    with php-composer(doctrine/annotations)                    < 2)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)             >= 3.0    with php-autoloader(%{gh_owner}/laminas-stdlib)            < 4)
-# remirepo:7
+#        "doctrine/annotations": "^1.10.4",
+#        "laminas/laminas-coding-standard": "^1.0.0",
+#        "laminas/laminas-stdlib": "^3.3.0",
+#        "phpunit/phpunit": "^9.4.2"
+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:6
 %else
-BuildRequires:  php-laminas-eventmanager
-BuildRequires:  php-laminas-zendframework-bridge
-BuildRequires:  php-composer(doctrine/annotations)                     <  2
-BuildRequires:  php-composer(doctrine/annotations)                     >= 1.7
-BuildRequires:  php-laminas-stdlib
+BuildRequires:  php-laminas-eventmanager                               >= 3.3
+BuildRequires:  php-laminas-zendframework-bridge                       >= 1.1
+BuildRequires:  php-doctrine-annotations                               >= 1.10.4
+BuildRequires:  php-laminas-stdlib                                     >= 3.3
 %endif
-BuildRequires:  phpunit8 >= 8.4
+BuildRequires:  phpunit9 >= 9.4.2
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.1",
-#        "laminas/laminas-eventmanager": "^2.6 || ^3.0",
-#        "laminas/laminas-zendframework-bridge": "^1.0"
-Requires:       php(language) >= 7.1
+#        "php": "^7.3 || ~8.0.0",
+#        "laminas/laminas-eventmanager": "^3.3",
+#        "laminas/laminas-zendframework-bridge": "^1.1"
+Requires:       php(language) >= 7.3
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-autoloader(%{gh_owner}/laminas-eventmanager)       >= 3.0   with php-autoloader(%{gh_owner}/laminas-eventmanager)       < 4)
-Requires:      (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0   with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2)
+Requires:      (php-autoloader(%{gh_owner}/laminas-eventmanager)       >= 3.3   with php-autoloader(%{gh_owner}/laminas-eventmanager)       < 4)
+Requires:      (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.1   with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "suggest": {
 #         "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
 #         "laminas/laminas-stdlib": "Laminas\\Stdlib component"
@@ -81,8 +80,8 @@ Suggests:       php-composer(doctrine/annotations)
 Suggests:       php-autoloader(%{gh_owner}/laminas-stdlib)
 # remirepo:4
 %else
-Requires:       php-laminas-eventmanager
-Requires:       php-laminas-zendframework-bridge
+Requires:       php-laminas-eventmanager                               >= 3.3
+Requires:       php-laminas-zendframework-bridge                       >= 1.1
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
@@ -97,8 +96,8 @@ Requires:       php-tokenizer
 Obsoletes:      php-ZendFramework2-%{library}             < 2.5
 Provides:       php-ZendFramework2-%{library}             = %{version}
 # Compatibily ensure by the bridge
-Obsoletes:      php-zendframework-%{zf_name}              < 3.4.1-99
-Provides:       php-zendframework-%{zf_name}              = %{version}-99
+Obsoletes:      php-zendframework-%{zf_name}              < 3.4.2
+Provides:       php-zendframework-%{zf_name}              = %{version}
 Provides:       php-composer(%{gh_owner}/%{gh_project})   = %{version}
 Provides:       php-composer(zendframework/%{zf_name})    = %{version}
 Provides:       php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
@@ -165,9 +164,9 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php73 php74 php80; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit8 --verbose || ret=1
+    $cmd %{_bindir}/phpunit9 --verbose || ret=1
   fi
 done
 
@@ -194,6 +193,13 @@ exit $ret
 
 
 %changelog
+* Thu Nov 12 2020 Remi Collet <remi@remirepo.net> - 3.5.0-1
+- update to 3.5.0
+- raise dependency on PHP 7.3
+- raise dependency on laminas-eventmanager 3.3
+- raise dependency on laminas-zendframework-bridge 1..1
+- switch to phpunit9
+
 * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 3.4.1-2
 - cleanup