update to 2.10.0

raise dependency on laminas-stdlib 3.3
raise dependency on laminas-zendframework-bridge 1.1
switch to phpunit9

2 files changed, 45 insertions, 38 deletions

diff --git a/composer.json b/composer.json
index 96420e3..6dbd0af 100644
--- a/composer.json
+++ b/composer.json
@@ -19,24 +19,22 @@
         "sort-packages": true
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "2.9.x-dev",
-            "dev-develop": "2.10.x-dev"
-        }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.3 || ~8.0.0",
         "laminas/laminas-math": "^2.7 || ^3.0",
-        "laminas/laminas-stdlib": "^3.2.1",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "laminas/laminas-stdlib": "^3.3",
+        "laminas/laminas-zendframework-bridge": "^1.1"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-coding-standard": "~2.1.4",
         "laminas/laminas-recaptcha": "^3.0",
-        "laminas/laminas-session": "^2.8",
-        "laminas/laminas-text": "^2.6",
-        "laminas/laminas-validator": "^2.10.1",
-        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+        "laminas/laminas-session": "^2.10",
+        "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"
     },
     "suggest": {
         "laminas/laminas-i18n-resources": "Translations of captcha messages",
@@ -66,6 +64,6 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
     "replace": {
-        "zendframework/zend-captcha": "self.version"
+        "zendframework/zend-captcha": "^2.9.0"
     }
 }
diff --git a/php-laminas-captcha.spec b/php-laminas-captcha.spec
index ec2ec0c..2fdb015 100644
--- a/php-laminas-captcha.spec
+++ b/php-laminas-captcha.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for php-laminas-captcha
 #
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    b88f650f3adf2d902ef56f6377cceb5cd87b9876
+%global gh_commit    9a0134e434cd792934ecca42cb66f316be7bba50
 %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.9.0
+Version:        2.10.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -34,26 +34,28 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.6
+BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-date
 BuildRequires:  php-gd
 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.2.1   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)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3     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": "~1.0.0",
+#        "laminas/laminas-coding-standard": "~2.1.4",
 #        "laminas/laminas-recaptcha": "^3.0",
-#        "laminas/laminas-session": "^2.8",
-#        "laminas/laminas-text": "^2.6",
-#        "laminas/laminas-validator": "^2.10.1",
-#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+#        "laminas/laminas-session": "^2.10",
+#        "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.8     with php-autoloader(%{gh_owner}/laminas-session)              < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-text)                 >= 2.6     with php-autoloader(%{gh_owner}/laminas-text)                 < 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-session)              >= 2.10    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
 %else
 BuildRequires:  php-laminas-math
@@ -64,24 +66,24 @@ BuildRequires:  php-laminas-session
 BuildRequires:  php-laminas-text
 BuildRequires:  php-laminas-validator
 %endif
-%global phpunit %{_bindir}/phpunit7
-BuildRequires:  phpunit7 >= 7.1.2
+%global phpunit %{_bindir}/phpunit9
+BuildRequires:  phpunit9 >= 9.4.3
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.6 || ^7.0",
+#        "php": "^7.3 || ~8.0.0",
 #        "laminas/laminas-math": "^2.7 || ^3.0",
-#        "laminas/laminas-stdlib": "^3.2.1",
+#        "laminas/laminas-stdlib": "^3.3",
 #        "laminas/laminas-zendframework-bridge": "^1.0"
-Requires:       php(language) >= 5.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.2.1   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)
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3     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",
 #        "laminas/laminas-recaptcha": "Laminas\\ReCaptcha component",
@@ -107,11 +109,12 @@ Requires:       php-date
 Requires:       php-gd
 Requires:       php-spl
 
+# remirepo:2
 Obsoletes:      php-ZendFramework2-%{library}             < 2.5
 Provides:       php-ZendFramework2-%{library}             = %{version}
 # Compatibily ensure by the bridge
-Obsoletes:      php-zendframework-%{zf_name}              < 2.9.0-99
-Provides:       php-zendframework-%{zf_name}              = %{version}-99
+Obsoletes:      php-zendframework-%{zf_name}              < 2.9.1
+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}
@@ -191,10 +194,10 @@ exit (class_exists("\\Zend\\%{library}\\Image") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php73 php74 php80; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
+    $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
   fi
 done
 exit $ret
@@ -214,6 +217,12 @@ exit $ret
 
 
 %changelog
+* 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
+- raise dependency on laminas-zendframework-bridge 1.1
+- switch to phpunit9
+
 * Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 2.9.0-1
 - switch to Laminas