update to 2.15.0

keep compatibility using laminas-zendframework-bridge
  as this is only used using compat autolader
raise dependency on zend-loader >= 2.8
raise dependency on zend-stdlib >= 3.6
raise dependency on zend-uri >= 2.9.1
raise dependency on zend-validator >= 2.15

2 files changed, 34 insertions, 28 deletions

diff --git a/composer.json b/composer.json
index 7ee29fe..642144a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,17 +20,15 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-loader": "^2.5.1",
-        "laminas/laminas-stdlib": "^3.2.1",
-        "laminas/laminas-uri": "^2.5.2",
-        "laminas/laminas-validator": "^2.10.1",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "laminas/laminas-loader": "^2.8",
+        "laminas/laminas-stdlib": "^3.6",
+        "laminas/laminas-uri": "^2.9.1",
+        "laminas/laminas-validator": "^2.15"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~1.0.0",
-        "laminas/laminas-config": "^3.1 || ^2.6",
-        "phpunit/phpunit": "^9.3"
+        "laminas/laminas-coding-standard": "~2.2.1",
+        "phpunit/phpunit": "^9.5.5"
     },
     "suggest": {
         "paragonie/certainty": "For automated management of cacert.pem"
@@ -55,7 +53,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-http": "^2.11.2"
+    "conflict": {
+        "zendframework/zend-http": "*"
     }
 }
diff --git a/php-laminas-http.spec b/php-laminas-http.spec
index f2141ef..50bb719 100644
--- a/php-laminas-http.spec
+++ b/php-laminas-http.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    bfaab8093e382274efed7fdc3ceb15f09ba352bb
+%global gh_commit    e1f3420ab35e21ea135913d213b8d570e5e7b513
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-http
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        2.14.3
+Version:        2.15.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -45,10 +45,10 @@ BuildRequires:  php-spl
 BuildRequires:  php-zlib
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader)               >= 2.5.1  with php-autoloader(%{gh_owner}/laminas-loader)               < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.2.1  with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri)                  >= 2.5.2  with php-autoloader(%{gh_owner}/laminas-uri)                  < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator)            < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader)               >= 2.8    with php-autoloader(%{gh_owner}/laminas-loader)               < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri)                  >= 2.9.1  with php-autoloader(%{gh_owner}/laminas-uri)                  < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.15   with php-autoloader(%{gh_owner}/laminas-validator)            < 3)
 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",
@@ -71,20 +71,19 @@ BuildRequires:  phpunit9 >= 9.3
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ^8.0",
-#        "laminas/laminas-loader": "^2.5.1",
-#        "laminas/laminas-stdlib": "^3.2.1",
-#        "laminas/laminas-uri": "^2.5.2",
-#        "laminas/laminas-validator": "^2.10.1",
-#        "laminas/laminas-zendframework-bridge": "^1.0"
+#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+#        "laminas/laminas-loader": "^2.8",
+#        "laminas/laminas-stdlib": "^3.6",
+#        "laminas/laminas-uri": "^2.9.1",
+#        "laminas/laminas-validator": "^2.15"
 Requires:       php(language) >= 7.3
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-autoloader(%{gh_owner}/laminas-loader)               >= 2.5.1  with php-autoloader(%{gh_owner}/laminas-loader)               < 3)
-Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.2.1  with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-uri)                  >= 2.5.2  with php-autoloader(%{gh_owner}/laminas-uri)                  < 3)
-Requires:      (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator)            < 3)
+Requires:      (php-autoloader(%{gh_owner}/laminas-loader)               >= 2.8    with php-autoloader(%{gh_owner}/laminas-loader)               < 3)
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-uri)                  >= 2.9.1  with php-autoloader(%{gh_owner}/laminas-uri)                  < 3)
+Requires:      (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.15   with php-autoloader(%{gh_owner}/laminas-validator)            < 3)
 Requires:      (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0    with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # remirepo:7
 %else
@@ -189,7 +188,7 @@ exit (class_exists("\\Zend\\%{library}\\Client") ? 0 : 1);
 : upstream test suite
 # testStreamCompression: online test
 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 ${2:-%{_bindir}/phpunit9} \
@@ -214,6 +213,15 @@ exit $ret
 
 
 %changelog
+* Fri Sep 10 2021 Remi Collet <remi@remirepo.net> - 2.15.0-1
+- update to 2.15.0
+- keep compatibility using laminas-zendframework-bridge
+  as this is only used using compat autolader
+- raise dependency on zend-loader >= 2.8
+- raise dependency on zend-stdlib >= 3.6
+- raise dependency on zend-uri >= 2.9.1
+- raise dependency on zend-validator >= 2.15
+
 * Thu Feb 25 2021 Remi Collet <remi@remirepo.net> - 2.14.3-1
 - update to 2.14.3 (no change)