update to 2.12.1

raise dependency on PHP 7.4

2 files changed, 43 insertions, 34 deletions

diff --git a/composer.json b/composer.json
index b4e292d..ef05667 100644
--- a/composer.json
+++ b/composer.json
@@ -25,20 +25,21 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
         "ext-json": "*",
-        "laminas/laminas-stdlib": "^3.6.0"
+        "laminas/laminas-stdlib": "^3.6.2"
     },
     "require-dev": {
-        "laminas/laminas-cache": "^2.13.0",
-        "laminas/laminas-coding-standard": "~2.1.4",
-        "laminas/laminas-config": "^2.6.0",
-        "laminas/laminas-filter": "^2.11.1",
-        "laminas/laminas-servicemanager": "^3.7.0",
-        "laminas/laminas-view": "^2.14.1",
+        "laminas/laminas-cache": "^3.1.2",
+        "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
+        "laminas/laminas-coding-standard": "^2.3.0",
+        "laminas/laminas-config": "^3.7.0",
+        "laminas/laminas-filter": "^2.13.0",
+        "laminas/laminas-servicemanager": "^3.10.0",
+        "laminas/laminas-view": "^2.15.0",
         "phpunit/phpunit": "^9.5.10",
-        "psalm/plugin-phpunit": "^0.15.1",
-        "vimeo/psalm": "^4.10.0"
+        "psalm/plugin-phpunit": "^0.16.1",
+        "vimeo/psalm": "^4.15.0"
     },
     "suggest": {
         "laminas/laminas-cache": "Laminas\\Cache component to support cache features",
diff --git a/php-laminas-paginator.spec b/php-laminas-paginator.spec
index 7aab3c0..d2a9627 100644
--- a/php-laminas-paginator.spec
+++ b/php-laminas-paginator.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    7f00d5fdecd1b4f67c8e84e6f6d57bbabda4b7d8
+%global gh_commit    fe51fdf2c938f7f8299e67c6f19628d890ef6868
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-paginator
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        2.11.0
+Version:        2.12.1
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -34,7 +34,7 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 7.3
+BuildRequires:  php(language) >= 7.4
 BuildRequires:  php-json
 BuildRequires:  php-spl
 # remirepo:1
@@ -42,30 +42,31 @@ BuildRequires:  php-spl
 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.0.4   with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer, "require-dev": {
-#        "laminas/laminas-cache": "^2.13.0",
-#        "laminas/laminas-coding-standard": "~2.1.4",
-#        "laminas/laminas-config": "^2.6.0",
-#        "laminas/laminas-filter": "^2.11.1",
-#        "laminas/laminas-servicemanager": "^3.7.0",
-#        "laminas/laminas-view": "^2.14.1",
+#        "laminas/laminas-cache": "^3.1.2",
+#        "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
+#        "laminas/laminas-coding-standard": "^2.3.0",
+#        "laminas/laminas-config": "^3.7.0",
+#        "laminas/laminas-filter": "^2.13.0",
+#        "laminas/laminas-servicemanager": "^3.10.0",
+#        "laminas/laminas-view": "^2.15.0",
 #        "phpunit/phpunit": "^9.5.5",
-#        "psalm/plugin-phpunit": "^0.15.1",
-#        "vimeo/psalm": "^4.10.0"
+#        "psalm/plugin-phpunit": "^0.16.1",
+#        "vimeo/psalm": "^4.15.0"
 # ignore cache min version for now
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache)                >= 2.9.0   with php-autoloader(%{gh_owner}/laminas-cache)                <  3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-config)               >= 2.6.0   with php-autoloader(%{gh_owner}/laminas-config)               <  3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter)               >= 2.11.1  with php-autoloader(%{gh_owner}/laminas-filter)               <  3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.7     with php-autoloader(%{gh_owner}/laminas-servicemanager)       <  4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-view)                 >= 2.14.1  with php-autoloader(%{gh_owner}/laminas-view)                 <  3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-config)               >= 3.7.0   with php-autoloader(%{gh_owner}/laminas-config)               <  4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter)               >= 2.13.0  with php-autoloader(%{gh_owner}/laminas-filter)               <  3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.10.0  with php-autoloader(%{gh_owner}/laminas-servicemanager)       <  4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-view)                 >= 2.15.0  with php-autoloader(%{gh_owner}/laminas-view)                 <  3)
 # remirepo:11
 %else
 BuildRequires:  php-laminas-stdlib                                       >= 3.6
 BuildRequires:  php-laminas-zendframework-bridge                         >= 1.0.4
 BuildRequires:  php-laminas-cache                                        >= 2.9.0
-BuildRequires:  php-laminas-config                                       >= 2.6.0
-BuildRequires:  php-laminas-filter                                       >= 2.11.1
-BuildRequires:  php-laminas-servicemanager                               >= 3.7
-BuildRequires:  php-laminas-view                                         >= 2.11.4
+BuildRequires:  php-laminas-config3                                      >= 3.7.0
+BuildRequires:  php-laminas-filter                                       >= 2.13
+BuildRequires:  php-laminas-servicemanager                               >= 3.10.0
+BuildRequires:  php-laminas-view                                         >= 2.15.0
 %endif
 %global phpunit %{_bindir}/phpunit9
 BuildRequires:  phpunit9 >= 9.5.5
@@ -74,11 +75,11 @@ BuildRequires:  phpunit9 >= 9.5.5
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
+#        "php": "^7.4 || ~8.0.0 || ~8.1.0",
 #        "ext-json": "*",
 #        "laminas/laminas-stdlib": "^3.6.0",
 #        "laminas/laminas-zendframework-bridge": "^1.0.4"
-Requires:       php(language) >= 7.3
+Requires:       php(language) >= 7.4
 Requires:       php-json
 %if ! %{bootstrap}
 # remirepo:1
@@ -140,7 +141,10 @@ cat << 'EOF' | tee -a src/autoload.php
     '%{php_home}/%{namespace}/Stdlib/autoload.php',
 ]);
 \Fedora\Autoloader\Dependencies::optional([
-    '%{php_home}/%{namespace}/Cache/autoload.php',
+    [
+        '%{php_home}/%{namespace}/Cache3/autoload.php',
+        '%{php_home}/%{namespace}/Cache/autoload.php',
+    ],
     '%{php_home}/%{namespace}/Filter/autoload.php',
     '%{php_home}/%{namespace}/ServiceManager/autoload.php',
     '%{php_home}/%{namespace}/View/autoload.php',
@@ -174,7 +178,7 @@ cat << 'EOF' | tee vendor/autoload.php
 <?php
 require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/%{namespace}/Config/autoload.php',
+    '%{php_home}/%{namespace}/Config3/autoload.php',
 ]);
 \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
 EOF
@@ -187,7 +191,7 @@ exit (class_exists("\\Zend\\%{library}\\Factory") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -210,6 +214,10 @@ exit $ret
 
 
 %changelog
+* Mon Dec 20 2021 Remi Collet <remi@remirepo.net> - 2.12.1-1
+- update to 2.12.1
+- raise dependency on PHP 7.4
+
 * Fri Oct 15 2021 Remi Collet <remi@remirepo.net> - 2.11.0-1
 - update to 2.11.0
 - keep compatibility using laminas-zendframework-bridge