update to 3.5.0

keep compatibility using laminas-zendframework-bridge
  as this is only used using compat autolader
raise dependency on laminas-http 2.15
raise dependency on laminas-servicemanager 3.7
raise dependency on laminas-stdlib 3.6

2 files changed, 37 insertions, 26 deletions

diff --git a/composer.json b/composer.json
index 200d71e..b558eeb 100644
--- a/composer.json
+++ b/composer.json
@@ -25,17 +25,18 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "container-interop/container-interop": "^1.2",
-        "laminas/laminas-http": "^2.8.1",
-        "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
-        "laminas/laminas-stdlib": "^3.3",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "laminas/laminas-http": "^2.15",
+        "laminas/laminas-servicemanager": "^3.7",
+        "laminas/laminas-stdlib": "^3.6"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-coding-standard": "~2.2.1",
         "laminas/laminas-i18n": "^2.7.4",
-        "phpunit/phpunit": "^9.4"
+        "phpunit/phpunit": "^9.5.5",
+        "psalm/plugin-phpunit": "^0.15.1",
+        "vimeo/psalm": "^4.7"
     },
     "suggest": {
         "laminas/laminas-i18n": "^2.7.4, if defining translatable HTTP path segments"
@@ -57,10 +58,11 @@
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
+        "static-analysis": "psalm --shepherd --stats",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-router": "^3.3.0"
+    "conflict": {
+        "zendframework/zend-router": "*"
     }
 }
diff --git a/php-laminas-router.spec b/php-laminas-router.spec
index 160a1b6..8a15be1 100644
--- a/php-laminas-router.spec
+++ b/php-laminas-router.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    aaf2eb364eedeb5c4d5b9ee14cd2938d0f7e89b7
+%global gh_commit    44759e71620030c93d99e40b394fe9fff8f0beda
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-router
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        3.4.5
+Version:        3.5.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -40,14 +40,16 @@ BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(container-interop/container-interop)        >= 1.2    with php-composer(container-interop/container-interop)        < 2)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.8.1  with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.3    with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.15   with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.7    with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0    with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "require-dev": {
-#        "laminas/laminas-coding-standard": "~1.0.0",
+#        "laminas/laminas-coding-standard": "~2.2.1",
 #        "laminas/laminas-i18n": "^2.7.4",
-#        "phpunit/phpunit": "^9.4"
+#        "phpunit/phpunit": "^9.5.5",
+#        "psalm/plugin-phpunit": "^0.15.1",
+#        "vimeo/psalm": "^4.7"
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n)                 >= 2.6    with php-autoloader(%{gh_owner}/laminas-i18n)                 < 3)
 # remirepo:8
 %else
@@ -59,26 +61,25 @@ BuildRequires:  php-laminas-zendframework-bridge
 BuildRequires:  php-laminas-i18n
 %endif
 %global phpunit %{_bindir}/phpunit9
-BuildRequires:  phpunit9 >= 9.4
+BuildRequires:  phpunit9 >= 9.5.5
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0",
+#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
 #        "container-interop/container-interop": "^1.2",
-#        "laminas/laminas-http": "^2.8.1",
-#        "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
-#        "laminas/laminas-stdlib": "^3.3",
-#        "laminas/laminas-zendframework-bridge": "^1.0"
+#        "laminas/laminas-http": "^2.15",
+#        "laminas/laminas-servicemanager": "^3.7",
+#        "laminas/laminas-stdlib": "^3.6"
 Requires:       php(language) >= 7.3
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-composer(container-interop/container-interop)        >= 1.2    with php-composer(container-interop/container-interop)        < 2)
-Requires:      (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.8.1  with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
-Requires:      (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.3    with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.15   with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
+Requires:      (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.7    with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
 Requires:      (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0    with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "suggest": {
 #        "zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments"
@@ -188,7 +189,7 @@ exit (class_exists("\\Zend\\%{library}\\RouterFactory") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -211,6 +212,14 @@ exit $ret
 
 
 %changelog
+* Thu Oct 14 2021 Remi Collet <remi@remirepo.net> - 3.5.0-1
+- update to 3.5.0
+- keep compatibility using laminas-zendframework-bridge
+  as this is only used using compat autolader
+- raise dependency on laminas-http 2.15
+- raise dependency on laminas-servicemanager 3.7
+- raise dependency on laminas-stdlib 3.6
+
 * Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 3.4.5-1
 - update to 3.4.5 (no change)