update to 2.11.0

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

2 files changed, 21 insertions, 18 deletions

diff --git a/composer.json b/composer.json
index 6dbd0af..f48becd 100644
--- a/composer.json
+++ b/composer.json
@@ -18,18 +18,16 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-    },
+    "extra": {},
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas/laminas-math": "^2.7 || ^3.0",
-        "laminas/laminas-stdlib": "^3.3",
-        "laminas/laminas-zendframework-bridge": "^1.1"
+        "laminas/laminas-stdlib": "^3.6"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.1.4",
         "laminas/laminas-recaptcha": "^3.0",
-        "laminas/laminas-session": "^2.10",
+        "laminas/laminas-session": "^2.12",
         "laminas/laminas-text": "^2.8",
         "laminas/laminas-validator": "^2.14",
         "phpunit/phpunit": "^9.4.3",
@@ -63,7 +61,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-captcha": "^2.9.0"
+    "conflict": {
+        "zendframework/zend-captcha": "*"
     }
 }
diff --git a/php-laminas-captcha.spec b/php-laminas-captcha.spec
index 2fdb015..8fa5c44 100644
--- a/php-laminas-captcha.spec
+++ b/php-laminas-captcha.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    9a0134e434cd792934ecca42cb66f316be7bba50
+%global gh_commit    6b0b98d388b713119cbb5788ea0b90cd6e63513a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-captcha
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        2.10.0
+Version:        2.11.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -41,19 +41,19 @@ BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-math)                 >= 2.7     with php-autoloader(%{gh_owner}/laminas-math)                 < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 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, "require-dev": {
 #        "laminas/laminas-coding-standard": "~2.1.4",
 #        "laminas/laminas-recaptcha": "^3.0",
-#        "laminas/laminas-session": "^2.10",
+#        "laminas/laminas-session": "^2.12",
 #        "laminas/laminas-text": "^2.8",
 #        "laminas/laminas-validator": "^2.14",
 #        "phpunit/phpunit": "^9.4.3",
 #        "psalm/plugin-phpunit": "^0.15.1",
 #        "vimeo/psalm": "^4.6"
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-recaptcha)            >= 3.0     with php-autoloader(%{gh_owner}/laminas-recaptcha)            < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)              >= 2.10    with php-autoloader(%{gh_owner}/laminas-session)              < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)              >= 2.12    with php-autoloader(%{gh_owner}/laminas-session)              < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-text)                 >= 2.8     with php-autoloader(%{gh_owner}/laminas-text)                 < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.14    with php-autoloader(%{gh_owner}/laminas-validator)            < 3)
 # remirepo:9
@@ -73,16 +73,15 @@ BuildRequires:  phpunit9 >= 9.4.3
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0",
+#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
 #        "laminas/laminas-math": "^2.7 || ^3.0",
-#        "laminas/laminas-stdlib": "^3.3",
-#        "laminas/laminas-zendframework-bridge": "^1.0"
+#        "laminas/laminas-stdlib": "^3.6"
 Requires:       php(language) >= 7.3
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-autoloader(%{gh_owner}/laminas-math)                 >= 2.7     with php-autoloader(%{gh_owner}/laminas-math)                 < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 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-i18n-resources": "Translations of captcha messages",
@@ -194,7 +193,7 @@ exit (class_exists("\\Zend\\%{library}\\Image") ? 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 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -217,6 +216,12 @@ exit $ret
 
 
 %changelog
+* Mon Oct  4 2021 Remi Collet <remi@remirepo.net> - 2.11.0-1
+- update to 2.11.0
+- keep compatibility using laminas-zendframework-bridge
+  as this is only used using compat autolader
+- raise dependency on laminas-stdlib 3.6
+
 * Thu Mar 18 2021 Remi Collet <remi@remirepo.net> - 2.10.0-1
 - update to 2.10.0
 - raise dependency on laminas-stdlib 3.3