update to 1.7.0

raise dependency on PHP 7.3
switch to phpunit9

2 files changed, 30 insertions, 20 deletions

diff --git a/composer.json b/composer.json
index f7c965b..4a3704e 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.3 || ~8.0.0",
         "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
@@ -35,9 +35,10 @@
         "guzzlehttp/guzzle": "^5.3.3 || ^6.3.3",
         "laminas/laminas-coding-standard": "~1.0.0",
         "laminas/laminas-loader": "^2.0",
-        "mikey179/vfsstream": "^1.6",
+        "mikey179/vfsstream": "dev-master#08a798577d677436f4f4ea3d0b3c949f64655548 as 1.6.9",
         "php-amqplib/php-amqplib": "^2.0",
-        "phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.4.1",
         "predis/predis": "^1.0",
         "sensiolabs/security-checker": "^5.0 || ^6.0.3",
         "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0"
@@ -78,6 +79,6 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
     "replace": {
-        "zendframework/zenddiagnostics": "self.version"
+        "zendframework/zenddiagnostics": "^1.6.0"
     }
 }
diff --git a/php-laminas-diagnostics.spec b/php-laminas-diagnostics.spec
index 2f664f6..7bfb7df 100644
--- a/php-laminas-diagnostics.spec
+++ b/php-laminas-diagnostics.spec
@@ -1,12 +1,12 @@
 # remirepo/Fedora spec file for php-laminas-diagnostics
 #
-# Copyright (c) 2019-2020 Remi Collet
+# Copyright (c) 2019-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    9434b93ca7fc66999e0a2f01400e7f20214169c4
+%global gh_commit    e3964695d3cc11aa207d0cbf90ac0e815f519fe3
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-diagnostics
@@ -17,8 +17,8 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_project}
-Version:        1.6.0
-Release:        2%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 Summary:        A set of components for performing diagnostic tests
 
 License:        BSD
@@ -29,7 +29,7 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.6
+BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-pdo
 BuildRequires:  php-simplexml
 BuildRequires:  php-json
@@ -41,9 +41,10 @@ BuildRequires:  php-xmlreader
 #        "guzzlehttp/guzzle": "^5.3.3 || ^6.3.3",
 #        "laminas/laminas-coding-standard": "~1.0.0",
 #        "laminas/laminas-loader": "^2.0",
-#        "mikey179/vfsstream": "^1.6",
+#        "mikey179/vfsstream": "dev-master#08a798577d677436f4f4ea3d0b3c949f64655548 as 1.6.9",
 #        "php-amqplib/php-amqplib": "^2.0",
-#        "phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
+#        "phpspec/prophecy-phpunit": "^2.0",
+#        "phpunit/phpunit": "^9.4.1",
 #        "predis/predis": "^1.0",
 #        "sensiolabs/security-checker": "^5.0 || ^6.0.3",
 #        "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0"
@@ -58,7 +59,8 @@ BuildRequires: (php-composer(php-amqplib/php-amqplib)                    >= 2.0
 BuildRequires: (php-composer(predis/predis)                              >= 1.0   with php-composer(predis/predis)                              < 2)
 BuildRequires: (php-composer(sensiolabs/security-checker)                >= 5.0   with php-composer(sensiolabs/security-checker)                < 7)
 BuildRequires: (php-composer(symfony/yaml)                               >= 2.7   with php-composer(symfony/yaml)                               < 6)
-# remirepo:16
+BuildRequires: (php-composer(phpspec/prophecy-phpunit)                   >= 2.0   with php-composer(phpspec/prophecy-phpunit)                   < 3)
+# remirepo:12
 %else
 BuildRequires:  php-laminas-zendframework-bridge
 BuildRequires:  php-doctrine-migrations
@@ -69,18 +71,19 @@ BuildRequires:  php-amqplib
 BuildRequires:  php-nrk-Predis
 BuildRequires:  php-sensiolabs-security-checker
 BuildRequires:  php-symfony3-yaml
+BuildRequires:  php-phpspec-prophecy-phpunit
 %endif
-%global phpunit %{_bindir}/phpunit7
-BuildRequires:  phpunit7 >= 7.1.2
+%global phpunit %{_bindir}/phpunit9
+BuildRequires:  phpunit9 >= 9.4.1
 BuildRequires:  /bin/ps
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.6 || ^7.0",
+#        "php": "^7.3 || ~8.0.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-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
@@ -114,8 +117,8 @@ Requires:       php-spl
 Requires:       php-xmlreader
 
 # Compatibily ensure by the bridge
-Obsoletes:      php-zendframework-%{zf_name}              < 1.6.0-99
-Provides:       php-zendframework-%{zf_name}              = %{version}-99
+Obsoletes:      php-zendframework-%{zf_name}              < 1.7.0
+Provides:       php-zendframework-%{zf_name}              = %{version}
 Provides:       php-composer(%{gh_owner}/%{gh_project})   = %{version}
 Provides:       php-composer(zendframework/%{zf_name})    = %{version}
 Provides:       php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
@@ -194,6 +197,7 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
     '%{php_home}/org/bovigo/vfs/autoload.php',
     '%{php_home}/%{namespace}/Loader/autoload.php',
+    '%{php_home}/Prophecy/PhpUnit/autoload.php',
 ]);
 EOF
 
@@ -209,10 +213,10 @@ exit (class_exists("\\Zend%{library}\\Check\\IniFile") ? 0 : 1);
 
 : 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} \
       --filter '^((?!(testJitFreeSpace|testCheck)).)*$' \
       --verbose || ret=1
   fi
@@ -234,6 +238,11 @@ exit $ret
 
 
 %changelog
+* Tue Jan 26 2021 Remi Collet <remi@remirepo.net> - 1.7.0-1
+- update to 1.7.0
+- raise dependency on PHP 7.3
+- switch to phpunit9
+
 * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 1.6.0-2
 - cleanup