From ad3ff5ced5caed45ac99031a310623e83d0ddf55 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 21 Oct 2019 09:49:02 +0200
Subject: - update to 2.8.3 - switch to phpunit7

---
 composer.json                             | 14 ++++++--------
 php-zendframework-zend-modulemanager.spec | 18 +++++++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 4dd8a04..7996142 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "issues": "https://github.com/zendframework/zend-modulemanager/issues",
         "source": "https://github.com/zendframework/zend-modulemanager",
         "rss": "https://github.com/zendframework/zend-modulemanager/releases.atom",
-        "slack": "https://zendframework-slack.herokuapp.com",
+        "chat": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
@@ -27,7 +27,7 @@
         "zendframework/zend-loader": "^2.5",
         "zendframework/zend-mvc": "^3.0 || ^2.7",
         "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5",
-        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {
@@ -57,8 +57,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev",
-            "dev-develop": "2.8-dev"
+            "dev-master": "2.8.x-dev",
+            "dev-develop": "2.9.x-dev"
         }
     },
     "scripts": {
@@ -69,8 +69,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
-    },
-    "homepage": "https://github.com/zendframework/zend-modulemanager"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+    }
 }
diff --git a/php-zendframework-zend-modulemanager.spec b/php-zendframework-zend-modulemanager.spec
index b31c379..49598bb 100644
--- a/php-zendframework-zend-modulemanager.spec
+++ b/php-zendframework-zend-modulemanager.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    394df6e12248ac430a312d4693f793ee7120baa6
+%global gh_commit    aaba206a955b5f43f29e17d09d19fc342a989b24
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-modulemanager
@@ -20,8 +20,8 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.8.2
-Release:        6%{?dist}
+Version:        2.8.3
+Release:        2%{?dist}
 Summary:        Zend Framework %{library} component
 
 License:        BSD
@@ -45,7 +45,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)         >= 3.1   with ph
 #        "zendframework/zend-loader": "^2.5",
 #        "zendframework/zend-mvc": "^3.0 || ^2.7",
 #        "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5",
-#        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+#        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16",
 #        "zendframework/zend-coding-standard": "~1.0.0"
 BuildRequires: (php-composer(%{gh_owner}/zend-console)          >= 2.6   with php-composer(%{gh_owner}/zend-console)          < 3)
 BuildRequires: (php-composer(%{gh_owner}/zend-di)               >= 2.6   with php-composer(%{gh_owner}/zend-di)               < 3)
@@ -53,7 +53,7 @@ BuildRequires: (php-composer(%{gh_owner}/zend-loader)           >= 2.5   with ph
 # ignore max version, test suite pass with 3.1
 BuildRequires:  php-composer(%{gh_owner}/zend-mvc)              >= 2.7
 BuildRequires: (php-composer(%{gh_owner}/zend-servicemanager)   >= 3.0.3 with php-composer(%{gh_owner}/zend-servicemanager)   < 4)
-%global phpunit %{_bindir}/phpunit6
+%global phpunit %{_bindir}/phpunit7
 # remirepo:11
 %else
 BuildRequires:  php-autoloader(%{gh_owner}/zend-config)         >= 2.6
@@ -181,10 +181,10 @@ require_once __DIR__ . '/../test/TestAsset/ModuleAsClass.php';
 EOF
 
 ret=0
-for cmdarg in "php %{phpunit}" php70 php71 php72 php73; do
+for cmdarg in "php %{phpunit}" php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
+    $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
   fi
 done
 exit $ret
@@ -203,6 +203,10 @@ exit $ret
 
 
 %changelog
+* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 2.8.3-2
+- update to 2.8.3
+- switch to phpunit7
+
 * Thu Feb 28 2019 Remi Collet <remi@remirepo.net> - 2.8.2-6
 - use range dependencies
 
-- 
cgit