From ea5ece54171c5b5255e4c447d8cb44713d0c4fea Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 11 Feb 2019 14:50:03 +0100
Subject: [PATCH 1/2] v1.2.1

(cherry picked from commit 487f0cf56e88f254391b24532edeee1f2630b2e1)
(cherry picked from commit 44764854eccf64c163b5de16a6eea0ddb00adfb7)
---
 .gitignore       |  1 +
 php-mockery.spec | 14 ++++++++------
 sources          |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 80a7d32..c830540 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 clog
 /php-mockery-1.1.0-99e29d3.tar.gz
 /php-mockery-1.2.0-1006336.tar.gz
+/php-mockery-1.2.1-dc4f10b.tar.gz
diff --git a/php-mockery.spec b/php-mockery.spec
index 71c8615..abdedd7 100644
--- a/php-mockery.spec
+++ b/php-mockery.spec
@@ -6,7 +6,7 @@
 #
 # Please preserve changelog entries
 #
-%global gh_commit    100633629bf76d57430b86b7098cd6beb996a35a
+%global gh_commit    dc4f10b6b1148744facb784015e4b339d7feec23
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     mockery
 %global gh_project   mockery
@@ -15,11 +15,10 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-mockery
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        Mockery is a simple but flexible PHP mock object framework
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
@@ -31,7 +30,7 @@ BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 5.6.0
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
+#        "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
 %global phpunit %{_bindir}/phpunit7
 BuildRequires: phpunit7
 BuildRequires:  (php-composer(hamcrest/hamcrest-php) >= 2.0 with php-composer(hamcrest/hamcrest-php) < 3)
@@ -99,7 +98,7 @@ phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tes
 
 : Run upstream test suite
 ret=0
-for cmd in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do
+for cmd in "php %{phpunit}" "php70 %{_bindir}/phpunit6" "php71 %{_bindir}/phpunit7" php72 php73; do
   if which $cmd; then
     set $cmd
     # see .travis.yml
@@ -107,7 +106,7 @@ for cmd in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do
     then SUITE="Mockery Test Suite PHP56"
     else SUITE="Mockery Test Suite"
     fi
-    $1 ${2:-%{_bindir}/phpunit7} \
+    $1 ${2:-%{_bindir}/phpunit8} \
       --no-coverage \
       --verbose --testsuite="$SUITE"
   fi
@@ -125,6 +124,9 @@ exit $ret
 
 
 %changelog
+* Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 1.2.1-1
+- update to 1.2.1
+
 * Wed Oct  3 2018 Remi Collet <remi@remirepo.net> - 1.2.0-1
 - update to 1.2.0
 - switch to phpunit7
diff --git a/sources b/sources
index c9e07af..72315bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-mockery-1.2.0-1006336.tar.gz) = 8ea9934d2cc5a60c22ddb10fab8dc13a7fc6d4a9b93d100f46b52629057cac69a0f5a8ee6c2470dbd30f14c01544f3bca31e0b003a47296bc4dc02042b5c9330
+SHA512 (php-mockery-1.2.1-dc4f10b.tar.gz) = 8e1e887008a3bff4e0c376fcc1303de3ab91ff9bb4ef51393c7a1dfa46a4f3b256e531b94b48b1d55bae29406b49eebfe6d94574b04b8b9e1ca50ad7347518c4

From ed2c762d6a5b16b795fb22da1590d7af1210ef7c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 13 Feb 2019 13:33:26 +0100
Subject: [PATCH 2/2] v1.2.2

(cherry picked from commit 3ec6e0ac3d1ddb66cc229b89c2d680ba89d5e2bf)
---
 .gitignore       | 1 +
 php-mockery.spec | 7 +++++--
 sources          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c830540..24e9725 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ clog
 /php-mockery-1.1.0-99e29d3.tar.gz
 /php-mockery-1.2.0-1006336.tar.gz
 /php-mockery-1.2.1-dc4f10b.tar.gz
+/php-mockery-1.2.2-0eb0b48.tar.gz
diff --git a/php-mockery.spec b/php-mockery.spec
index abdedd7..beed64e 100644
--- a/php-mockery.spec
+++ b/php-mockery.spec
@@ -6,7 +6,7 @@
 #
 # Please preserve changelog entries
 #
-%global gh_commit    dc4f10b6b1148744facb784015e4b339d7feec23
+%global gh_commit    0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     mockery
 %global gh_project   mockery
@@ -15,7 +15,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-mockery
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Mockery is a simple but flexible PHP mock object framework
 
@@ -124,6 +124,9 @@ exit $ret
 
 
 %changelog
+* Wed Feb 13 2019 Remi Collet <remi@remirepo.net> - 1.2.2-1
+- update to 1.2.2
+
 * Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 1.2.1-1
 - update to 1.2.1
 
diff --git a/sources b/sources
index 72315bf..0868798 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-mockery-1.2.1-dc4f10b.tar.gz) = 8e1e887008a3bff4e0c376fcc1303de3ab91ff9bb4ef51393c7a1dfa46a4f3b256e531b94b48b1d55bae29406b49eebfe6d94574b04b8b9e1ca50ad7347518c4
+SHA512 (php-mockery-1.2.2-0eb0b48.tar.gz) = 99c8648cd016e60ad96105d3306c549cbee83047d70510b977a70566c7282f28c5fa7c81e3eadd28b14915e9e92e0e7bf2034667cb7cbf08fae1dc7fca12d9dc