update to 2.13.0

raise dependency on PHP 7.4
raise dependency on laminas-eventmanager 3.5
raise dependency on laminas-servicemanager 3.15.1
raise dependency on laminas-stdlib 3.10.1

3 files changed, 62 insertions, 37 deletions

diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
 package-*.xml
 *.tgz
+*.tar.bz2
 *.tar.gz
 *.tar.xz
 *.tar.xz.asc
diff --git a/composer.json b/composer.json
index 3e2d75f..e76dd77 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,14 @@
         "forum": "https://discourse.laminas.dev"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "platform": {
+            "php": "7.4.99"
+        },
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "ocramius/package-versions": true
+        }
     },
     "extra": {
         "laminas": {
@@ -25,23 +32,24 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
-        "laminas/laminas-eventmanager": "^3.4",
-        "laminas/laminas-stdlib": "^3.6"
+        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "laminas/laminas-eventmanager": "^3.5",
+        "laminas/laminas-servicemanager": "^3.15.1",
+        "laminas/laminas-stdlib": "^3.10.1"
     },
     "require-dev": {
-        "container-interop/container-interop": "^1.1",
-        "laminas/laminas-cache": "3.0.x-dev",
-        "laminas/laminas-cache-storage-adapter-memory": "2.0.x-dev",
-        "laminas/laminas-coding-standard": "~2.2.1",
+        "laminas/laminas-cache": "^3.1.3",
+        "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
+        "laminas/laminas-coding-standard": "~2.3.0",
         "laminas/laminas-db": "^2.13.4",
         "laminas/laminas-http": "^2.15",
-        "laminas/laminas-servicemanager": "^3.7",
         "laminas/laminas-validator": "^2.15",
-        "mongodb/mongodb": "v1.9.x-dev",
+        "mongodb/mongodb": "~1.12.0",
         "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.5.9"
+        "phpunit/phpunit": "^9.5.9",
+        "psalm/plugin-phpunit": "^0.17.0",
+        "vimeo/psalm": "^4.24.0"
     },
     "suggest": {
         "laminas/laminas-cache": "Laminas\\Cache component",
@@ -72,7 +80,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-session": "*"
diff --git a/php-laminas-session.spec b/php-laminas-session.spec
index e97dda9..6c75445 100644
--- a/php-laminas-session.spec
+++ b/php-laminas-session.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    888c6a344e9a4c9f34ab6e09346640eac9be3fcf
+%global gh_commit    9f8a6077dd22b3b253583b1be84ddd5bf6fa1ef4
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-session
@@ -22,7 +22,7 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        2.12.1
+Version:        2.13.0
 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-date
 BuildRequires:  php-hash
 BuildRequires:  php-pcre
@@ -42,41 +42,40 @@ BuildRequires:  php-session
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.4     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.5     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.15.1  with php-autoloader(%{gh_owner}/laminas-servicemanager)        < 4)
+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": {
 #        "container-interop/container-interop": "^1.1",
-#        "laminas/laminas-cache": "3.0.x-dev",
-#        "laminas/laminas-cache-storage-adapter-memory": "2.0.x-dev",
-#        "laminas/laminas-coding-standard": "~2.2.1",
+#        "laminas/laminas-cache": "3.1.3",
+#        "laminas/laminas-cache-storage-adapter-memory": "2.0.0",
+#        "laminas/laminas-coding-standard": "~2.3.0",
 #        "laminas/laminas-db": "^2.13.4",
 #        "laminas/laminas-http": "^2.15",
-#        "laminas/laminas-servicemanager": "^3.7",
 #        "laminas/laminas-validator": "^2.15",
-#        "mongodb/mongodb": "v1.9.x-dev",
+#        "mongodb/mongodb": "v1.12.0",
 #        "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
 #        "phpspec/prophecy-phpunit": "^2.0",
-#        "phpunit/phpunit": "^9.5.9"
-BuildRequires: (php-composer(container-interop/container-interop)        >= 1.1    with php-composer(container-interop/container-interop)         < 2)
+#        "phpunit/phpunit": "^9.5.9",
+#        "psalm/plugin-phpunit": "^0.17.0",
+#        "vimeo/psalm": "^4.24.0"
 # ignore versions
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache)                >= 2.6.1  with php-autoloader(%{gh_owner}/laminas-cache)                 < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-db)                   >= 2.13.4 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-servicemanager)       >= 3.7    with php-autoloader(%{gh_owner}/laminas-servicemanager)        < 4)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.15   with php-autoloader(%{gh_owner}/laminas-validator)             < 3)
 BuildRequires: (php-composer(php-mock/php-mock-phpunit)                  >= 2.0    with php-composer(php-mock/php-mock-phpunit)                   < 3)
 BuildRequires: (php-composer(phpspec/prophecy-phpunit)                   >= 2.0    with php-composer(phpspec/prophecy-phpunit)                    < 3)
-# remirepo:13
+# remirepo:12
 %else
 BuildRequires:  php-laminas-eventmanager
+BuildRequires:  php-laminas-servicemanager
 BuildRequires:  php-laminas-stdlib
 BuildRequires:  php-laminas-zendframework-bridge
-BuildRequires:  php-container-interop
 BuildRequires:  php-laminas-cache
 BuildRequires:  php-laminas-db
 BuildRequires:  php-laminas-http
-BuildRequires:  php-laminas-servicemanager
 BuildRequires:  php-laminas-validator
 BuildRequires:  php-mock-phpunit2 >= 2.1.0
 BuildRequires:  php-phpspec-prophecy-phpunit
@@ -87,15 +86,17 @@ BuildRequires:  phpunit9 >= 9.5
 BuildRequires:   php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.3 || ~8.0.0 || ~8.1.0",
-#        "laminas/laminas-eventmanager": "^3.4",
-#        "laminas/laminas-stdlib": "^3.6"
-Requires:       php(language) >= 7.3
+#        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+#        "laminas/laminas-eventmanager": "^3.5",
+#        "laminas/laminas-servicemanager": "^3.15.1",
+#        "laminas/laminas-stdlib": "^3.10.1"
+Requires:       php(language) >= 7.4
 %if ! %{bootstrap}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.4     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.6     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.5     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.15.1  with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+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)
 # From composer, "suggest": {
 #        "laminas/laminas-cache": "Laminas\\Cache component",
@@ -110,11 +111,12 @@ Suggests:       php-autoloader(%{gh_owner}/laminas-http)
 Suggests:       php-autoloader(%{gh_owner}/laminas-servicemanager)
 Suggests:       php-autoloader(%{gh_owner}/laminas-validator)
 Suggests:       php-composer(mongodb/mongodb)
-# remirepo:5
+# remirepo:6
 %else
 Requires:       php-laminas-eventmanager
 Requires:       php-laminas-stdlib
 Requires:       php-laminas-zendframework-bridge
+Requires:       php-laminas-servicemanager
 %endif
 %endif
 # Autoloader
@@ -156,6 +158,7 @@ mv LICENSE.md LICENSE
 phpab --template fedora --output src/autoload.php src
 cat << 'EOF' | tee -a src/autoload.php
 \Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/%{namespace}/ServiceManager/autoload.php',
     '%{php_home}/%{namespace}/EventManager/autoload.php',
     '%{php_home}/%{namespace}/Stdlib/autoload.php',
 ]);
@@ -164,7 +167,6 @@ cat << 'EOF' | tee -a src/autoload.php
     '%{php_home}/%{namespace}/Cache/autoload.php',
     '%{php_home}/%{namespace}/Db/autoload.php',
     '%{php_home}/%{namespace}/Http/autoload.php',
-    '%{php_home}/%{namespace}/ServiceManager/autoload.php',
     '%{php_home}/%{namespace}/Validator/autoload.php',
 ]);
 EOF
@@ -199,6 +201,7 @@ cat << 'EOF' | tee vendor/autoload.php
 <?php
 require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/%{namespace}/ServiceManager/autoload.php',
     '%{php_home}/phpmock2/phpunit/autoload.php',
     '%{php_home}/Prophecy/PhpUnit/autoload.php',
     dirname(__DIR__) . '/autoload-dev/ReturnTypeWillChange.php',
@@ -214,7 +217,7 @@ exit (class_exists("\\Zend\\%{library}\\Container") ? 0 : 1);
 
 : upstream test suite
 ret=0
-for cmd in php php74 php80 php81; do
+for cmd in php php80 php81 php82; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit9 \
       --filter '^((?!(testSetEntropyFileError|testGetEntropyFileError|testGetEntropyLengthError|testSetEntropyLengthError|testGetHashFunctionError|testSetHashFunctionError|testGetHashBitsPerCharacterError|testSetHashBitsPerCharacterError)).)*$' \
@@ -238,6 +241,17 @@ exit $ret
 
 
 %changelog
+* Fri Jul 22 2022 Remi Collet <remi@remirepo.net> - 2.13.0-1
+- update to 2.13.0
+- raise dependency on PHP 7.4
+- raise dependency on laminas-eventmanager 3.5
+- raise dependency on laminas-servicemanager 3.15.1
+- raise dependency on laminas-stdlib 3.10.1
+
+* Thu Jun 23 2022 Remi Collet <remi@remirepo.net> - 2.12.1-2
+- drop dependency on container-interop/container-interop
+  replaced by servicemanager >= 3.12
+
 * Wed Feb 16 2022 Remi Collet <remi@remirepo.net> - 2.12.1-1
 - update to 2.12.1