update to 3.4.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-json 3.3
raise dependency on laminas-stdlib 3.6

2 files changed, 38 insertions, 32 deletions

diff --git a/composer.json b/composer.json
index e842b20..0c9c879 100644
--- a/composer.json
+++ b/composer.json
@@ -21,18 +21,17 @@
     "extra": {
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "ext-json": "*",
-        "laminas/laminas-http": "^2.14",
-        "laminas/laminas-json": "^3.2",
-        "laminas/laminas-stdlib": "^3.3",
-        "laminas/laminas-zendframework-bridge": "^1.1"
+        "laminas/laminas-http": "^2.15",
+        "laminas/laminas-json": "^3.3",
+        "laminas/laminas-stdlib": "^3.6"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~2.1.4",
-        "laminas/laminas-config": "^3.4",
-        "laminas/laminas-validator": "^2.14",
-        "phpunit/phpunit": "^9.4.3"
+        "laminas/laminas-coding-standard": "~2.3.0",
+        "laminas/laminas-config": "^3.7",
+        "laminas/laminas-validator": "^2.15",
+        "phpunit/phpunit": "^9.5.4"
     },
     "suggest": {
         "laminas/laminas-validator": "~2.0, if using ReCaptcha's Mailhide API"
@@ -57,7 +56,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zendservice-recaptcha": "^3.2.0"
+    "conflict": {
+        "zendframework/zendservice-recaptcha": "*"
     }
 }
diff --git a/php-laminas-recaptcha.spec b/php-laminas-recaptcha.spec
index 31d4be7..552aa72 100644
--- a/php-laminas-recaptcha.spec
+++ b/php-laminas-recaptcha.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    3275b19ee8a58007e508b2ea3fd2160582abdb73
+%global gh_commit    f3bdb2fcaf859b9f725f397dc1bc38b4a7696a71
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-recaptcha
@@ -17,7 +17,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_project}
-Version:        3.3.0
+Version:        3.4.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -33,17 +33,17 @@ BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-json
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.14   with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-json)                 >= 3.2    with php-autoloader(%{gh_owner}/laminas-json)                 < 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-json)                 >= 3.3    with php-autoloader(%{gh_owner}/laminas-json)                 < 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.1    with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer.json, "require-dev": {
-#        "laminas/laminas-coding-standard": "~2.1.4",
-#        "laminas/laminas-config": "^3.4",
-#        "laminas/laminas-validator": "^2.14",
-#        "phpunit/phpunit": "^9.4.3"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-config)               >= 3.4    with php-autoloader(%{gh_owner}/laminas-config)               < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.14   with php-autoloader(%{gh_owner}/laminas-validator)            < 3)
+#        "laminas/laminas-coding-standard": "~2.3.0",
+#        "laminas/laminas-config": "^3.7",
+#        "laminas/laminas-validator": "^2.15",
+#        "phpunit/phpunit": "^9.5.4"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-config)               >= 3.7    with php-autoloader(%{gh_owner}/laminas-config)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.15   with php-autoloader(%{gh_owner}/laminas-validator)            < 3)
 # remirepo:8
 %else
 BuildRequires:  php-laminas-http
@@ -54,25 +54,24 @@ BuildRequires:  php-laminas-config3
 BuildRequires:  php-laminas-validator
 %endif
 %global phpunit %{_bindir}/phpunit9
-BuildRequires:  phpunit9 >= 9.4.3
+BuildRequires:  phpunit9 >= 9.5.4
 %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",
 #        "ext-json": "*",
-#        "laminas/laminas-http": "^2.14",
-#        "laminas/laminas-json": "^3.2",
-#        "laminas/laminas-stdlib": "^3.3",
-#        "laminas/laminas-zendframework-bridge": "^1.0"
+#        "laminas/laminas-http": "^2.15",
+#        "laminas/laminas-json": "^3.3",
+#        "laminas/laminas-stdlib": "^3.6"
 Requires:       php(language) >= 7.3
 Requires:       php-json
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.14   with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
-Requires:      (php-autoloader(%{gh_owner}/laminas-json)                 >= 3.2    with php-autoloader(%{gh_owner}/laminas-json)                 < 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-json)                 >= 3.3    with php-autoloader(%{gh_owner}/laminas-json)                 < 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.1    with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "suggest": {
 #        "laminas/laminas-validator": "~2.0, if using ReCaptcha's Mailhide API"
@@ -165,7 +164,7 @@ exit (class_exists("\\ZendService\\%{library}\\ReCaptcha") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} --exclude online --verbose || ret=1
@@ -189,6 +188,14 @@ exit $ret
 
 
 %changelog
+* Mon Nov 29 2021 Remi Collet <remi@remirepo.net> - 3.4.0-1
+- update to 3.4.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-json 3.3
+- raise dependency on laminas-stdlib 3.6
+
 * Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 3.3.0-1
 - update to 3.3.0
 - raise dependency on PHP 7.3