update to 1.6.0HEADmaster

raise dependency on PHP 7.4
raise dependency on laminas-mvc 3.13.3
raise dependency on laminas-session 2.12.1
raise dependency on laminas-stdlib 3.10.1

2 files changed, 45 insertions, 27 deletions

diff --git a/composer.json b/composer.json
index 9fce112..c6a921e 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,13 @@
         "forum": "https://discourse.laminas.dev"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "platform": {
+            "php": "7.4.99"
+        },
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "extra": {
         "laminas": {
@@ -24,14 +30,16 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
-        "laminas/laminas-mvc": "^3.0",
-        "laminas/laminas-session": "^2.8.5",
-        "laminas/laminas-stdlib": "^3.3.0"
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "laminas/laminas-mvc": "^3.3.3",
+        "laminas/laminas-session": "^2.12.1",
+        "laminas/laminas-stdlib": "^3.10.1"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~1.0.0",
-        "phpunit/phpunit": "^9.3"
+        "laminas/laminas-coding-standard": "~2.3.0",
+        "phpunit/phpunit": "^9.5.21",
+        "psalm/plugin-phpunit": "^0.17.0",
+        "vimeo/psalm": "^4.24"
     },
     "autoload": {
         "psr-4": {
@@ -51,7 +59,8 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "static-analysis": "psalm --shepherd --stats"
     },
     "conflict": {
         "zendframework/zend-mvc-plugin-prg": "*"
diff --git a/php-laminas-mvc-plugin-prg.spec b/php-laminas-mvc-plugin-prg.spec
index 641c170..8a1b95b 100644
--- a/php-laminas-mvc-plugin-prg.spec
+++ b/php-laminas-mvc-plugin-prg.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for php-laminas-mvc-plugin-prg
 #
-# Copyright (c) 2016-2021 Remi Collet
+# Copyright (c) 2016-2022 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    f35eb80cbe8c0e1a5d8966e3b0a24fbaeb902f56
+%global gh_commit    d6e1052fbc6027b516fb325063961e192a16883e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-mvc-plugin-prg
@@ -24,7 +24,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        1.5.0
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library}/%{subproj}/%{subsubp} component
 
@@ -36,16 +36,18 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 7.3
+BuildRequires:  php(language) >= 7.4
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc)                  >= 3.0    with php-autoloader(%{gh_owner}/laminas-mvc)                  < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)              >= 2.8.5  with php-autoloader(%{gh_owner}/laminas-session)              < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc)                  >= 3.3.3  with php-autoloader(%{gh_owner}/laminas-mvc)                  < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)              >= 2.12.1 with php-autoloader(%{gh_owner}/laminas-session)              < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.10.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)
 # From composer, "require-dev": {
-#        "laminas/laminas-coding-standard": "~1.0.0",
-#        "phpunit/phpunit": "^9.3"
+#        "laminas/laminas-coding-standard": "~2.3.0",
+#        "phpunit/phpunit": "^9.5.21",
+#        "psalm/plugin-phpunit": "^0.17.0",
+#        "vimeo/psalm": "^4.24"
 # remirepo:6
 %else
 BuildRequires:  php-laminas-mvc
@@ -54,22 +56,22 @@ BuildRequires:  php-laminas-stdlib
 BuildRequires:  php-laminas-zendframework-bridge
 %endif
 %global phpunit %{_bindir}/phpunit9
-BuildRequires:  phpunit9 >= 9.3
+BuildRequires:  phpunit9 >= 9.5.21
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
-#        "laminas/laminas-mvc": "^3.0",
-#        "laminas/laminas-session": "^2.8.5",
-#        "laminas/laminas-stdlib": "^3.3"
-Requires:       php(language) >= 7.3
+#        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+#        "laminas/laminas-mvc": "^3.3.3",
+#        "laminas/laminas-session": "^2.12.1",
+#        "laminas/laminas-stdlib": "^3.10.1"
+Requires:       php(language) >= 7.4
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 
-Requires:      (php-autoloader(%{gh_owner}/laminas-mvc)                  >= 3.0    with php-autoloader(%{gh_owner}/laminas-mvc)                  < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-session)              >= 2.8.5  with php-autoloader(%{gh_owner}/laminas-session)              < 3)
-Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3    with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-mvc)                  >= 3.3.3  with php-autoloader(%{gh_owner}/laminas-mvc)                  < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-session)              >= 2.12.1 with php-autoloader(%{gh_owner}/laminas-session)              < 3)
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.10.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)
 # remirepo:6
 %else
@@ -153,7 +155,7 @@ exit (class_exists("\\Zend\\%{library}\\%{subproj}\\%{subsubp}\\Module") ? 0 : 1
 
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -178,6 +180,13 @@ exit $ret
 
 
 %changelog
+* Fri Jul 22 2022 Remi Collet <remi@remirepo.net> - 1.6.0-1
+- update to 1.6.0
+- raise dependency on PHP 7.4
+- raise dependency on laminas-mvc 3.13.3
+- raise dependency on laminas-session 2.12.1
+- raise dependency on laminas-stdlib 3.10.1
+
 * Thu Dec 16 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1
 - update to 1.5.0 (no change)