update to 2.10.0

raise dependency on PHP 7.3
add dependency on brick/varexporter
raise dependency on laminas/laminas-config 3.4
raise dependency on laminas/laminas-eventmanager 3.3
raise dependency on laminas/laminas-stdlib 3.3
raise dependency on laminas/laminas-zendframework-bridge 1.1
switch to phpunit 9.3

2 files changed, 67 insertions, 58 deletions

diff --git a/composer.json b/composer.json
index 65d8054..890c7be 100644
--- a/composer.json
+++ b/composer.json
@@ -20,26 +20,27 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.9.x-dev",
-            "dev-develop": "2.10.x-dev"
+            "dev-master": "2.10.x-dev",
+            "dev-develop": "2.11.x-dev"
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
-        "laminas/laminas-config": "^3.1 || ^2.6",
-        "laminas/laminas-eventmanager": "^3.2 || ^2.6.3",
-        "laminas/laminas-stdlib": "^3.1 || ^2.7",
-        "laminas/laminas-zendframework-bridge": "^1.0",
+        "php": "^7.3 || ^8.0",
+        "brick/varexporter": "^0.3.2",
+        "laminas/laminas-config": "^3.4",
+        "laminas/laminas-eventmanager": "^3.3",
+        "laminas/laminas-stdlib": "^3.3",
+        "laminas/laminas-zendframework-bridge": "^1.1",
         "webimpress/safe-writer": "^1.0.2 || ^2.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
-        "laminas/laminas-console": "^2.6",
-        "laminas/laminas-di": "^2.6",
-        "laminas/laminas-loader": "^2.5",
-        "laminas/laminas-mvc": "^3.0 || ^2.7",
-        "laminas/laminas-servicemanager": "^3.0.3 || ^2.7.5",
-        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
+        "laminas/laminas-console": "^2.8",
+        "laminas/laminas-di": "^2.6.1",
+        "laminas/laminas-loader": "^2.6.1",
+        "laminas/laminas-mvc": "^3.1.1",
+        "laminas/laminas-servicemanager": "^3.4.1",
+        "phpunit/phpunit": "^9.3.7"
     },
     "suggest": {
         "laminas/laminas-console": "Laminas\\Console component",
diff --git a/php-laminas-modulemanager.spec b/php-laminas-modulemanager.spec
index 004bea4..c5f5650 100644
--- a/php-laminas-modulemanager.spec
+++ b/php-laminas-modulemanager.spec
@@ -10,7 +10,7 @@
 %bcond_with          bootstrap
 %bcond_without       tests
 
-%global gh_commit    789bbd4ab391da9221f265f6bb2d594f8f11855b
+%global gh_commit    d3bd00f46df22c3e3710f3c822f19864e00c9f9b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-modulemanager
@@ -20,7 +20,7 @@
 %global library      ModuleManager
 
 Name:           php-%{gh_project}
-Version:        2.9.0
+Version:        2.10.0
 Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
@@ -32,34 +32,35 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with tests}
-BuildRequires:  php(language) >= 5.6
+BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-config)               >= 2.6     with php-autoloader(%{gh_owner}/laminas-config)               < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.2     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.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)
+BuildRequires: (php-composer(brick/varexporter)                          >= 0.3.2   with php-composer(brick/varexporter)                          < 1)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-config)               >= 3.4     with php-autoloader(%{gh_owner}/laminas-config)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.3     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1     with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 BuildRequires: (php-composer(webimpress/safe-writer)                     >= 2.1     with php-composer(webimpress/safe-writer)                     < 3)
 # From composer, "require-dev": {
 #        "laminas/laminas-coding-standard": "~1.0.0",
-#        "laminas/laminas-console": "^2.6",
-#        "laminas/laminas-di": "^2.6",
-#        "laminas/laminas-loader": "^2.5",
-#        "laminas/laminas-mvc": "^3.0 || ^2.7",
-#        "laminas/laminas-servicemanager": "^3.0.3 || ^2.7.5",
-#        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-console)              >= 2.6     with php-autoloader(%{gh_owner}/laminas-console)              < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-di)                   >= 2.6     with php-autoloader(%{gh_owner}/laminas-di)                   < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader)               >= 2.5     with php-autoloader(%{gh_owner}/laminas-loader)               < 3)
+#        "laminas/laminas-console": "^2.8",
+#        "laminas/laminas-di": "^2.6.1",
+#        "laminas/laminas-loader": "^2.6.1",
+#        "laminas/laminas-mvc": "^3.1.1",
+#        "laminas/laminas-servicemanager": "^3.4.1",
+#        "phpunit/phpunit": "^9.3.7"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-console)              >= 2.8     with php-autoloader(%{gh_owner}/laminas-console)              < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-di)                   >= 2.6.1   with php-autoloader(%{gh_owner}/laminas-di)                   < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader)               >= 2.6.1   with php-autoloader(%{gh_owner}/laminas-loader)               < 3)
 %if %{without bootstrap}
-# ignore max version, test suite pass with 3.1
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc)                  >= 2.7     with php-autoloader(%{gh_owner}/laminas-mvc)                  < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc)                  >= 3.1.1     with php-autoloader(%{gh_owner}/laminas-mvc)                < 4)
 %endif
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.0.3   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
-# remirepo:14
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager)       >= 3.4.1   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
+# remirepo:15
 %else
-BuildRequires:  php-laminas-config
+BuildRequires:  php-brick-varexporter
+BuildRequires:  php-laminas-config3
 BuildRequires:  php-laminas-eventmanager
 BuildRequires:  php-laminas-stdlib
 BuildRequires:  php-laminas-zendframework-bridge
@@ -72,26 +73,28 @@ BuildRequires:  php-laminas-mvc
 %endif
 BuildRequires:  php-laminas-servicemanager
 %endif
-%global phpunit %{_bindir}/phpunit7
-BuildRequires:  phpunit7 >= 7.5.16
+%global phpunit %{_bindir}/phpunit9
+BuildRequires:  phpunit9 >= 9.3.7
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.6 || ^7.0",
-#        "laminas/laminas-config": "^3.1 || ^2.6",
-#        "laminas/laminas-eventmanager": "^3.2 || ^2.6.3",
-#        "laminas/laminas-stdlib": "^3.1 || ^2.7",
-#        "laminas/laminas-zendframework-bridge": "^1.0",
+#        "php": "^7.3 || ^8.0",
+#        "brick/varexporter": "^0.3.2",
+#        "laminas/laminas-config": "^3.4",
+#        "laminas/laminas-eventmanager": "^3.3",
+#        "laminas/laminas-stdlib": "^3.3",
+#        "laminas/laminas-zendframework-bridge": "^1.1",
 #        "webimpress/safe-writer": "^1.0.2 || ^2.1"
-Requires:       php(language) >= 5.6
+Requires:       php(language) >= 7.3
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-autoloader(%{gh_owner}/laminas-config)               >= 2.6     with php-autoloader(%{gh_owner}/laminas-config)               < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.2     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
-Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.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)
+Requires:      (php-composer(brick/varexporter)                          >= 0.3.2   with php-composer(brick/varexporter)                          < 1)
+Requires:      (php-autoloader(%{gh_owner}/laminas-config)               >= 3.4     with php-autoloader(%{gh_owner}/laminas-config)               < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-eventmanager)         >= 3.3     with php-autoloader(%{gh_owner}/laminas-eventmanager)         < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.3     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
+Requires:      (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1     with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
 Requires:      (php-composer(webimpress/safe-writer)                     >= 2.1     with php-composer(webimpress/safe-writer)                     < 3)
 # From composer, "suggest": {
 #        "laminas/laminas-console": "Laminas\\Console component",
@@ -102,9 +105,10 @@ Suggests:       php-autoloader(%{gh_owner}/laminas-console)
 Suggests:       php-autoloader(%{gh_owner}/laminas-loader)
 Suggests:       php-autoloader(%{gh_owner}/laminas-mvc)
 Suggests:       php-autoloader(%{gh_owner}/laminas-servicemanager)
-# remirepo:7
+# remirepo:8
 %else
-Requires:       php-laminas-config
+Requires:       php-brick-varexporter
+Requires:       php-laminas-config3
 Requires:       php-laminas-eventmanager
 Requires:       php-laminas-stdlib
 Requires:       php-laminas-zendframework-bridge
@@ -152,10 +156,8 @@ 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}/Config3/autoload.php',
-        '%{php_home}/%{namespace}/Config/autoload.php',
-    ],
+    '%{php_home}/Brick/VarExporter/autoload.php',
+    '%{php_home}/%{namespace}/Config3/autoload.php',
     '%{php_home}/%{namespace}/EventManager/autoload.php',
     '%{php_home}/%{namespace}/Stdlib/autoload.php',
     '%{php_home}/Webimpress/SafeWriter/autoload.php',
@@ -210,16 +212,12 @@ require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php";
 exit (class_exists("\\Zend\\%{library}\\ModuleEvent") ? 0 : 1);
 '
 
-%if %{without bootstrap}
-rm -r test/Listener/
-%endif
-
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php72 php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php73 php74 php80; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
+    $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
   fi
 done
 exit $ret
@@ -239,6 +237,16 @@ exit $ret
 
 
 %changelog
+* Tue Aug 25 2020 Remi Collet <remi@remirepo.net> - 2.10.0-1
+- update to 2.10.0
+- raise dependency on PHP 7.3
+- add dependency on brick/varexporter
+- raise dependency on laminas/laminas-config 3.4
+- raise dependency on laminas/laminas-eventmanager 3.3
+- raise dependency on laminas/laminas-stdlib 3.3
+- raise dependency on laminas/laminas-zendframework-bridge 1.1
+- switch to phpunit 9.3
+
 * Tue Aug 25 2020 Remi Collet <remi@remirepo.net> - 2.9.0-1
 - update to 2.9.0
 - add dependency on webimpress/safe-writer