update to 2.10.0 (no change)

raise dependency on PHP 7.3
switch to phpunit9

2 files changed, 28 insertions, 22 deletions

diff --git a/composer.json b/composer.json
index 16e84a1..6068928 100644
--- a/composer.json
+++ b/composer.json
@@ -19,17 +19,13 @@
         "sort-packages": true
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "2.9.x-dev",
-            "dev-develop": "2.10.x-dev"
-        },
         "laminas": {
             "component": "Laminas\\Navigation",
             "config-provider": "Laminas\\Navigation\\ConfigProvider"
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.3 || ~8.0.0",
         "laminas/laminas-stdlib": "^2.7 || ^3.0",
         "laminas/laminas-zendframework-bridge": "^1.0"
     },
@@ -43,10 +39,11 @@
         "laminas/laminas-mvc": "^2.7.9 || ^3.0.4",
         "laminas/laminas-permissions-acl": "^2.6",
         "laminas/laminas-router": "^3.0.2",
-        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+        "laminas/laminas-servicemanager": "^3.2.1",
         "laminas/laminas-uri": "^2.5.2",
         "laminas/laminas-view": "^2.9",
-        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.4.1"
     },
     "suggest": {
         "laminas/laminas-config": "^2.6 || ^3.1, to provide page configuration (optional, as arrays and Traversables are also allowed)",
@@ -76,6 +73,6 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
     "replace": {
-        "zendframework/zend-navigation": "self.version"
+        "zendframework/zend-navigation": "^2.9.1"
     }
 }
diff --git a/php-laminas-navigation.spec b/php-laminas-navigation.spec
index d34b150..228fda9 100644
--- a/php-laminas-navigation.spec
+++ b/php-laminas-navigation.spec
@@ -8,7 +8,7 @@
 #
 # when build without permission-acl
 %global bootstrap    1
-%global gh_commit    1b4210ea3afeffb8a69e502e169088180ba3275d
+%global gh_commit    e67b37da3dcbbb377789c40725f884e60e8db605
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-navigation
@@ -19,8 +19,8 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_project}
-Version:        2.9.1
-Release:        3%{?dist}
+Version:        2.10.0
+Release:        1%{?dist}
 Summary:        %{namespace} Framework %{library} component
 
 License:        BSD
@@ -31,7 +31,7 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.6
+BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer, "require-dev": {
@@ -44,10 +44,11 @@ BuildRequires:  php-spl
 #        "laminas/laminas-mvc": "^2.7.9 || ^3.0.4",
 #        "laminas/laminas-permissions-acl": "^2.6",
 #        "laminas/laminas-router": "^3.0.2",
-#        "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+#        "laminas/laminas-servicemanager": "^3.2.1",
 #        "laminas/laminas-uri": "^2.5.2",
 #        "laminas/laminas-view": "^2.9",
-#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+#        "phpspec/prophecy-phpunit": "^2.0",
+#        "phpunit/phpunit": "^9.4.1"
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib)               >= 3.0     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
@@ -62,10 +63,11 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc)                  >= 3.0.
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl)      >= 2.6     with php-autoloader(%{gh_owner}/laminas-permissions-acl)      < 3)
 %endif
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-router)               >= 3.0.2   with php-autoloader(%{gh_owner}/laminas-router)               < 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-servicemanager)       >= 3.2.1   with php-autoloader(%{gh_owner}/laminas-servicemanager)       < 4)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri)                  >= 2.5.2   with php-autoloader(%{gh_owner}/laminas-uri)                  < 3)
 BuildRequires: (php-autoloader(%{gh_owner}/laminas-view)                 >= 2.9     with php-autoloader(%{gh_owner}/laminas-view)                 < 3)
-# remirepo:17
+BuildRequires: (php-composer(phpspec/prophecy-phpunit)                   >= 2.0     with php-composer(phpspec/prophecy-phpunit)                   < 3)
+# remirepo:18
 %else
 BuildRequires:  php-laminas-stdlib
 BuildRequires:  php-laminas-zendframework-bridge
@@ -82,18 +84,19 @@ BuildRequires:  php-laminas-router
 BuildRequires:  php-laminas-servicemanager
 BuildRequires:  php-laminas-uri
 BuildRequires:  php-laminas-view
+BuildRequires:  php-phpspec-prophecy-phpunit
 %endif
-%global phpunit %{_bindir}/phpunit7
-BuildRequires:  phpunit7 >= 7.1.2
+%global phpunit %{_bindir}/phpunit9
+BuildRequires:  phpunit9 >= 9.4.1
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.6 || ^7.0",
+#        "php": "^7.3 || ~8.0.0",
 #        "laminas/laminas-stdlib": "^2.7 || ^3.0",
 #        "laminas/laminas-zendframework-bridge": "^1.0"
-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-stdlib)               >= 3.0     with php-autoloader(%{gh_owner}/laminas-stdlib)               < 4)
@@ -199,6 +202,7 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
     '%{php_home}/%{namespace}/Log/autoload.php',
     '%{php_home}/%{namespace}/Mvc/autoload.php',
     '%{php_home}/%{namespace}/Uri/autoload.php',
+    '%{php_home}/Prophecy/PhpUnit/autoload.php',
 ]);
 \Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
 EOF
@@ -212,10 +216,10 @@ exit (class_exists("\\Zend\\%{library}\\%{library}") ? 0 : 1);
 # testProvidesExpectedConfiguration need fix after Laminas move
 : upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php73 php74 php80; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit7} \
+    $1 ${2:-%{_bindir}/phpunit9} \
 %if %{bootstrap}
       --filter '^((?!(testProvidesExpectedConfiguration|testSetResourceInterface)).)*$' \
 %else
@@ -241,6 +245,11 @@ exit $ret
 
 
 %changelog
+* Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 2.10.0-1
+- update to 2.10.0 (no change)
+- raise dependency on PHP 7.3
+- switch to phpunit9
+
 * Mon Jan 27 2020 Remi Collet <remi@remirepo.net> - 2.9.1-3
 - bootstrap build without permissions-acl