update to 3.5.0

raise dependency on PHP 7.3
raise dependency on laminas-dom 2.8
raise dependency on laminas-http 2.13
raise dependency on laminas-stdlib 3.3
raise dependency on laminas-zendframework-bridge 1.1
drop support for phpunit < 8

2 files changed, 56 insertions, 80 deletions

diff --git a/composer.json b/composer.json
index 43a11ee..c96f5dd 100644
--- a/composer.json
+++ b/composer.json
@@ -19,44 +19,39 @@
         "sort-packages": true
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "3.4.x-dev",
-            "dev-develop": "3.5.x-dev"
-        }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.3 || ~8.0.0",
         "laminas/laminas-console": "^2.6",
-        "laminas/laminas-dom": "^2.6",
-        "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-        "laminas/laminas-http": "^2.8.3",
+        "laminas/laminas-dom": "^2.8",
+        "laminas/laminas-eventmanager": "^3.0",
+        "laminas/laminas-http": "^2.13",
         "laminas/laminas-mvc": "^3.0",
-        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-        "laminas/laminas-stdlib": "^2.7 || ^3.0",
+        "laminas/laminas-servicemanager": "^3.0.3",
+        "laminas/laminas-stdlib": "^3.3",
         "laminas/laminas-uri": "^2.5",
         "laminas/laminas-view": "^2.6.3",
-        "laminas/laminas-zendframework-bridge": "^1.0",
-        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+        "laminas/laminas-zendframework-bridge": "^1.1",
+        "vimeo/psalm": "^4.7.0",
+        "psalm/plugin-phpunit": "^0.15.0",
+        "phpunit/phpunit": "^8.0 || ^9.0"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-coding-standard": "~2.2.1",
         "laminas/laminas-i18n": "^2.6",
         "laminas/laminas-log": "^2.7.1",
         "laminas/laminas-modulemanager": "^2.7.1",
         "laminas/laminas-mvc-console": "^1.1.8",
-        "laminas/laminas-mvc-plugin-flashmessenger": "^0.1.0",
+        "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
         "laminas/laminas-serializer": "^2.6.1",
         "laminas/laminas-session": "^2.8.5",
         "laminas/laminas-validator": "^2.8",
-        "mikey179/vfsstream": "~1.2"
+        "mikey179/vfsstream": "^1.6.8"
     },
     "suggest": {
         "laminas/laminas-mvc-console": "^1.1.8, to test MVC <-> console integration"
     },
     "autoload": {
-        "files": [
-            "autoload/phpunit-class-aliases.php"
-        ],
         "psr-4": {
             "Laminas\\Test\\": "src/"
         }
@@ -74,7 +69,8 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "static-analysis": "psalm --shepherd --stats"
     },
     "replace": {
         "zendframework/zend-test": "^3.3.0"
diff --git a/php-laminas-test.spec b/php-laminas-test.spec
index 0a2f111..e7037c4 100644
--- a/php-laminas-test.spec
+++ b/php-laminas-test.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    da508dd32bdedd8f2757887ad7dfed3cf5faea2d
+%global gh_commit    a91af6342c1f0d8d917609fca1fe960cfaac4c2e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-test
@@ -22,8 +22,8 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        3.4.2
-Release:        4%{?dist}
+Version:        3.5.0
+Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
 License:        BSD
@@ -34,44 +34,42 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.6
+BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-pcre
-BuildRequires:  phpunit
-BuildRequires:  phpunit7
 BuildRequires:  phpunit8
 BuildRequires:  phpunit9
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-console)              >= 2.6     with php-autoloader(%{gh_owner}/laminas-console)              < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-dom)                  >= 2.6     with php-autoloader(%{gh_owner}/laminas-dom)                  < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-dom)                  >= 2.8     with php-autoloader(%{gh_owner}/laminas-dom)                  < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.0     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.8.3   with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.13    with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc)                  >= 3.0     with php-autoloader(%{gh_owner}/laminas-mvc)                  < 4)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.0.3   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri)                  >= 2.5     with php-autoloader(%{gh_owner}/laminas-uri)                  < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-view)                 >= 2.6.3   with php-autoloader(%{gh_owner}/laminas-view)                 < 3)
-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-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.2.1",
 #        "laminas/laminas-i18n": "^2.6",
 #        "laminas/laminas-log": "^2.7.1",
 #        "laminas/laminas-modulemanager": "^2.7.1",
 #        "laminas/laminas-mvc-console": "^1.1.8",
-#        "laminas/laminas-mvc-plugin-flashmessenger": "^0.1.0",
+#        "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
 #        "laminas/laminas-serializer": "^2.6.1",
 #        "laminas/laminas-session": "^2.8.5",
 #        "laminas/laminas-validator": "^2.8",
-#        "mikey179/vfsstream": "~1.2"
+#        "mikey179/vfsstream": "~1.6.8"
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n)                 >= 2.6     with php-autoloader(%{gh_owner}/laminas-i18n)                < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-log)                  >= 2.7.1   with php-autoloader(%{gh_owner}/laminas-log)                 < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager)        >= 2.7.1   with php-autoloader(%{gh_owner}/laminas-modulemanager)       < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-console)          >= 1.1.8   with php-autoloader(%{gh_owner}/laminas-mvc-console)         < 2)
-BuildRequires:  php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 0.1.0
+BuildRequires:  php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.0
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer)           >= 2.6.1   with php-autoloader(%{gh_owner}/laminas-serializer)          < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-session)              >= 2.8.5   with php-autoloader(%{gh_owner}/laminas-session)             < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator)            >= 2.8     with php-autoloader(%{gh_owner}/laminas-validator)           < 3)
-BuildRequires: (php-composer(mikey179/vfsstream)                         >= 1.2     with php-composer(mikey179/vfsstream)                        < 2)
+BuildRequires: (php-composer(mikey179/vfsstream)                         >= 1.6.8   with php-composer(mikey179/vfsstream)                        < 2)
 # remirepo:21
 %else
 BuildRequires:  php-laminas-console
@@ -99,38 +97,36 @@ BuildRequires:  php-laminas-validator
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.6 || ^7.0",
+#        "php": "^7.3 || ~8.0.0",
 #        "laminas/laminas-console": "^2.6",
-#        "laminas/laminas-dom": "^2.6",
-#        "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-#        "laminas/laminas-http": "^2.8.3",
+#        "laminas/laminas-dom": "^2.8",
+#        "laminas/laminas-eventmanager": "^3.0",
+#        "laminas/laminas-http": "^2.13",
 #        "laminas/laminas-mvc": "^3.0",
-#        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-#        "laminas/laminas-stdlib": "^2.7 || ^3.0",
+#        "laminas/laminas-servicemanager": "^3.0.3",
+#        "laminas/laminas-stdlib": "^3.3",
 #        "laminas/laminas-uri": "^2.5",
 #        "laminas/laminas-view": "^2.6.3",
-#        "laminas/laminas-zendframework-bridge": "^1.0",
-#        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
-Requires:       php(language) >= 5.6
+#        "laminas/laminas-zendframework-bridge": "^1.1",
+#        "vimeo/psalm": "^4.7.0",
+#        "psalm/plugin-phpunit": "^0.15.0",
+#        "phpunit/phpunit": "^8.0 || ^9.0"
+Requires:       php(language) >= 7.3
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 # Maintained versions
 Recommends:     phpunit9
 Recommends:     phpunit8
-# EOL versions
-Suggests:       phpunit7
-Suggests:       phpunit6
-Suggests:       phpunit
 Requires:      (php-autoloader(%{gh_owner}/laminas-console)              >= 2.6     with php-autoloader(%{gh_owner}/laminas-console)              < 3)
-Requires:      (php-autoloader(%{gh_owner}/laminas-dom)                  >= 2.6     with php-autoloader(%{gh_owner}/laminas-dom)                  < 3)
+Requires:      (php-autoloader(%{gh_owner}/laminas-dom)                  >= 2.8     with php-autoloader(%{gh_owner}/laminas-dom)                  < 3)
 Requires:      (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.0     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.8.3   with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
+Requires:      (php-autoloader(%{gh_owner}/laminas-http)                 >= 2.13    with php-autoloader(%{gh_owner}/laminas-http)                 < 3)
 Requires:      (php-autoloader(%{gh_owner}/laminas-mvc)                  >= 3.0     with php-autoloader(%{gh_owner}/laminas-mvc)                  < 4)
 Requires:      (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.0.3   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
 Requires:      (php-autoloader(%{gh_owner}/laminas-uri)                  >= 2.5     with php-autoloader(%{gh_owner}/laminas-uri)                  < 3)
 Requires:      (php-autoloader(%{gh_owner}/laminas-view)                 >= 2.6.3   with php-autoloader(%{gh_owner}/laminas-view)                 < 3)
-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-zendframework-bridge) >= 1.1     with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 # From composer.json, "suggest": {
 #       "laminas/laminas-mvc-console": "^1.1.8, to test MVC <-> console integration"
 Suggests:       php-autoloader(%{gh_owner}/laminas-mvc-console)
@@ -179,8 +175,6 @@ Documentation: https://docs.laminas.dev/%{gh_project}/
 
 mv LICENSE.md LICENSE
 
-mv autoload/phpunit-class-aliases.php src/
-
 
 %build
 : Generate autoloader
@@ -200,9 +194,6 @@ cat << 'EOF' | tee -a src/autoload.php
 \Fedora\Autoloader\Dependencies::optional([
     '%{php_home}/%{namespace}/Mvc/Console/autoload.php',
 ]);
-if (class_exists('PHPUnit_Framework_TestCase') || class_exists('PHPUnit\\Framework\\TestCase')) {
-    require_once __DIR__ . '/phpunit-class-aliases.php';
-}
 EOF
 
 cat << 'EOF' | tee zf.php
@@ -253,36 +244,16 @@ exit (class_exists("\\Zend\\%{library}\\Util\ModuleLoader") ? 0 : 1);
 
 : upstream test suite
 ret=0
-if [ -x %{_bindir}/phpunit ]; then
-  for cmd in php php72 php73 php74; do
-    if which $cmd; then
-      $cmd %{_bindir}/phpunit --verbose || ret=1
-    fi
-  done
-fi
-if [ -x %{_bindir}/phpunit6 ]; then
-  for cmd in php php72 php73 php74; do
-    if which $cmd; then
-      $cmd %{_bindir}/phpunit6 --verbose || ret=1
-    fi
-  done
-fi
-if [ -x %{_bindir}/phpunit7 ]; then
-  for cmd in php php72 php73 php74; do
-    if which $cmd; then
-      $cmd %{_bindir}/phpunit7 --verbose || ret=1
-    fi
-  done
-fi
-if [ -x %{_bindir}/phpunit ]; then
-  for cmd in php php72 php73 php74; do
+if [ -x %{_bindir}/phpunit8 ]; then
+  for cmd in php php73 php74; do
     if which $cmd; then
       $cmd %{_bindir}/phpunit8 --verbose || ret=1
     fi
   done
 fi
+# TODO php81
 if [ -x %{_bindir}/phpunit9 ]; then
-  for cmd in php php73 php74; do
+  for cmd in php php73 php74 php80; do
     if which $cmd; then
       $cmd %{_bindir}/phpunit9 --verbose || ret=1
     fi
@@ -305,6 +276,15 @@ exit $ret
 
 
 %changelog
+* Thu Jun 10 2021 Remi Collet <remi@remirepo.net> - 3.5.0-1
+- update to 3.5.0
+- raise dependency on PHP 7.3
+- raise dependency on laminas-dom 2.8
+- raise dependency on laminas-http 2.13
+- raise dependency on laminas-stdlib 3.3
+- raise dependency on laminas-zendframework-bridge 1.1
+- drop support for phpunit < 8
+
 * Thu Mar 25 2021 Remi Collet <remi@remirepo.net> - 3.4.2-4
 - drop phpunit6 build dependency