update to 2.9.0 (no change)

keep compatibility using laminas-zendframework-bridge
  as this is only used using compat autolader

2 files changed, 36 insertions, 25 deletions

diff --git a/composer.json b/composer.json
index 60665cd..d4c15fc 100644
--- a/composer.json
+++ b/composer.json
@@ -21,21 +21,21 @@
     "extra": {
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-stdlib": "^3.2.1",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "laminas/laminas-stdlib": "^3.2.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
         "laminas/laminas-crypt": "^2.6 || ^3.2.1",
-        "laminas/laminas-db": "^2.8.2",
-        "laminas/laminas-http": "^2.7",
-        "laminas/laminas-ldap": "^2.8",
-        "laminas/laminas-session": "^2.8",
+        "laminas/laminas-db": "^2.13",
+        "laminas/laminas-http": "^2.15.0",
+        "laminas/laminas-ldap": "^2.12",
+        "laminas/laminas-session": "^2.12",
         "laminas/laminas-uri": "^2.5.2",
         "laminas/laminas-validator": "^2.10.1",
         "phpunit/phpunit": "^9.3",
         "psalm/plugin-phpunit": "^0.15.1",
+        "squizlabs/php_codesniffer": "^2.9.2 || ^3.6",
         "vimeo/psalm": "^4.6"
     },
     "suggest": {
@@ -70,7 +70,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-authentication": "^2.7.0"
+    "conflict": {
+        "zendframework/zend-authentication": "*"
     }
 }
diff --git a/php-laminas-authentication.spec b/php-laminas-authentication.spec
index 863ca39..27b8d9c 100644
--- a/php-laminas-authentication.spec
+++ b/php-laminas-authentication.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    0b77d353a3a039d65c15318c98dd055d62f010b6
+%global gh_commit    cf611a6fe50b4e4905be22a4cd59ba303bc039fc
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-authentication
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        2.8.0
+Version:        2.9.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -47,18 +47,21 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0
 # From composer, "require-dev": {
 #        "laminas/laminas-coding-standard": "~1.0.0",
 #        "laminas/laminas-crypt": "^2.6 || ^3.2.1",
-#        "laminas/laminas-db": "^2.8.2",
-#        "laminas/laminas-http": "^2.7",
-#        "laminas/laminas-ldap": "^2.8",
-#        "laminas/laminas-session": "^2.8",
+#        "laminas/laminas-db": "^2.13",
+#        "laminas/laminas-http": "^2.15",
+#        "laminas/laminas-ldap": "^2.12",
+#        "laminas/laminas-session": "^2.12",
 #        "laminas/laminas-uri": "^2.5.2",
 #        "laminas/laminas-validator": "^2.10.1",
-#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+#        "phpunit/phpunit": "^9.3",
+#        "psalm/plugin-phpunit": "^0.15.1",
+#        "squizlabs/php_codesniffer": "^2.9.2 || ^3.6",
+#        "vimeo/psalm": "^4.6"
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-crypt)          >= 3.2.1         with php-autoloader(%{gh_owner}/laminas-crypt)                < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-db)             >= 2.8.2         with php-autoloader(%{gh_owner}/laminas-db)                   < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-http)           >= 2.7           with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-ldap)           >= 2.8           with php-autoloader(%{gh_owner}/laminas-ldap)                 < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)        >= 2.8           with php-autoloader(%{gh_owner}/laminas-session)              < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-db)             >= 2.13          with php-autoloader(%{gh_owner}/laminas-db)                   < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-http)           >= 2.15          with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-ldap)           >= 2.12          with php-autoloader(%{gh_owner}/laminas-ldap)                 < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)        >= 2.12          with php-autoloader(%{gh_owner}/laminas-session)              < 3)
 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)
 # remirepo:11
@@ -80,9 +83,8 @@ BuildRequires:  phpunit9 >= 9.3
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0",
-#        "laminas/laminas-stdlib": "^3.2.1",
-#        "laminas/laminas-zendframework-bridge": "^1.0"
+#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+#        "laminas/laminas-stdlib": "^3.2.1"
 Requires:       php(language) >= 7.3
 %if ! %{bootstrap}
 # remirepo:1
@@ -199,10 +201,11 @@ exit (class_exists("\\Zend\\%{library}\\Result") ? 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} || ret=1
+    $1 ${2:-%{_bindir}/phpunit9} \
+      || ret=1
   fi
 done
 exit $ret
@@ -222,6 +225,14 @@ exit $ret
 
 
 %changelog
+* Tue Dec  7 2021 Remi Collet <remi@remirepo.net> - 2.9.0-1
+- update to 2.9.0 (no change)
+- keep compatibility using laminas-zendframework-bridge
+  as this is only used using compat autolader
+
+* Wed Nov 10 2021 Remi Collet <remi@remirepo.net> - 2.8.0-3
+- ignore tests for deprecation
+
 * Thu Mar 18 2021 Remi Collet <remi@remirepo.net> - 2.8.0-1
 - update to 2.8.0
 - raise dependency on PHP 7.3