update to 1.2.4

drop patch merged upstream

(cherry picked from commit 71076982f2)

.gitignore

@@ -3,3 +3,5 @@ clog
 /php-mockery-1.2.0-1006336.tar.gz
 /php-mockery-1.2.1-dc4f10b.tar.gz
 /php-mockery-1.2.2-0eb0b48.tar.gz
+/php-mockery-1.2.3-4eff936.tar.gz
+/php-mockery-1.2.4-b3453f7.tar.gz

php-mockery.spec

@@ -6,7 +6,7 @@
 #
 # Please preserve changelog entries
 #
-%global gh_commit    0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2
+%global gh_commit    b3453f75fd23d9fd41685f2148f4abeacabc6405
 %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.2
+Version:        1.2.4
 Release:        1%{?dist}
 Summary:        Mockery is a simple but flexible PHP mock object framework
 
@@ -98,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 %{_bindir}/phpunit7" php72 php73; do
+for cmd in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
   if which $cmd; then
     set $cmd
     # see .travis.yml
@@ -108,7 +108,7 @@ for cmd in "php %{phpunit}" "php70 %{_bindir}/phpunit6" "php71 %{_bindir}/phpuni
     fi
     $1 ${2:-%{_bindir}/phpunit8} \
       --no-coverage \
-      --verbose --testsuite="$SUITE"
+      --verbose --testsuite="$SUITE" || ret=1
   fi
 done
 exit $ret
@@ -124,6 +124,15 @@ exit $ret
 
 
 %changelog
+* Mon Sep 30 2019 Remi Collet <remi@remirepo.net> - 1.2.4-1
+- update to 1.2.4
+- drop patch merged upstream
+
+* Mon Aug 19 2019 Remi Collet <remi@remirepo.net> - 1.2.3-1
+- update to 1.2.3
+- add patch for PHP 7.4 from
+  https://github.com/mockery/mockery/pull/993
+
 * Wed Feb 13 2019 Remi Collet <remi@remirepo.net> - 1.2.2-1
 - update to 1.2.2
 

sources

@@ -1 +1 @@
-SHA512 (php-mockery-1.2.2-0eb0b48.tar.gz) = 99c8648cd016e60ad96105d3306c549cbee83047d70510b977a70566c7282f28c5fa7c81e3eadd28b14915e9e92e0e7bf2034667cb7cbf08fae1dc7fca12d9dc
+SHA512 (php-mockery-1.2.4-b3453f7.tar.gz) = b22f4727e404a874849e5fbff270cd786b4a9dc813a5c2d43d789d83ba7957ee8b9adeb44c62639219929c63170349d784293011f7a421941f7613e255d0b71a