From 5118ea67e0defe44918c8523a3f7c9ac7a48e937 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 6 Mar 2019 11:10:17 +0100
Subject: update to 2.2.0 add dependency on php-mock2 for phpunit8
 compatibility allow phpunit8

---
 php-mock-phpunit2.spec | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'php-mock-phpunit2.spec')

diff --git a/php-mock-phpunit2.spec b/php-mock-phpunit2.spec
index d0ee562..1a4f1fc 100644
--- a/php-mock-phpunit2.spec
+++ b/php-mock-phpunit2.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for php-mock-phpunit2
 #
-# Copyright (c) 2016-2018 Remi Collet
+# Copyright (c) 2016-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    57b92e621f14c2c07a4567cd29ed4e87de0d2912
+%global gh_commit    c3cee2c13cd3e7ae78655ec828fdef409f78e292
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     php-mock
 %global gh_project   php-mock-phpunit
@@ -14,7 +14,7 @@
 %global major        2
 
 Name:           php-mock-phpunit%{major}
-Version:        2.1.2
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Mock built-in PHP functions with PHPUnit.
 
@@ -28,6 +28,7 @@ BuildRequires:  php(language) >= 7
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(php-mock/php-mock-integration) >= 2   with php-composer(php-mock/php-mock-integration) < 3)
+BuildRequires: (php-composer(php-mock/php-mock)             >= 2.1 with php-composer(php-mock/php-mock)             < 3)
 # remirepo:3
 %else
 BuildRequires:  php-mock-integration2
@@ -36,21 +37,25 @@ BuildRequires:  phpunit6
 %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 BuildRequires:  phpunit7
 %endif
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+BuildRequires:  phpunit8
+%endif
 # For autoloader
 BuildRequires: php-composer(fedora/autoloader)
 %endif
 
 # from composer.json, "require": {
 #        "php": ">=7",
-#        "phpunit/phpunit": "^6 || ^7",
+#        "phpunit/phpunit": "^6 || ^7 || ^8",
 #        "php-mock/php-mock-integration": "^2"
 #    "conflict": {
 #        "phpunit/phpunit-mock-objects": "3.2.0"
 Requires:       php(language) >= 7
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (phpunit6 or phpunit7)
+Requires:      (phpunit6 or phpunit7 or phpunit8)
 Requires:      (php-composer(php-mock/php-mock-integration) >= 2   with php-composer(php-mock/php-mock-integration) < 3)
+Requires:      (php-composer(php-mock/php-mock)             >= 2.1 with php-composer(php-mock/php-mock)             < 3)
 # remirepo:4
 %else
 Requires:       phpunit6
@@ -123,6 +128,15 @@ for cmd in php php71 php72 php73; do
   fi
 done
 fi
+
+if [ -x %{_bindir}/phpunit8 ]; then
+: Run upstream test suite with phpunit8
+for cmd in php php72 php73; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit8 --verbose || ret=1
+  fi
+done
+fi
 exit $ret
 %else
 : bootstrap build with test suite disabled
@@ -138,6 +152,11 @@ exit $ret
 
 
 %changelog
+* Wed Mar  6 2019 Remi Collet <remi@remirepo.net> - 2.2.0-1
+- update to 2.2.0
+- add dependency on php-mock2 for phpunit8 compatibility
+- allow phpunit8
+
 * Mon Oct  8 2018 Remi Collet <remi@remirepo.net> - 2.1.2-1
 - update to 2.1.2
 
-- 
cgit