diff --git a/.gitignore b/.gitignore index 80a7d32..1f5083a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ 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 +/php-mockery-1.2.3-4eff936.tar.gz +/php-mockery-1.2.4-b3453f7.tar.gz diff --git a/php-mockery.spec b/php-mockery.spec index 71c8615..bb3c958 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -6,7 +6,7 @@ # # Please preserve changelog entries # -%global gh_commit 100633629bf76d57430b86b7098cd6beb996a35a +%global gh_commit b3453f75fd23d9fd41685f2148f4abeacabc6405 %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.4 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}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do if which $cmd; then set $cmd # see .travis.yml @@ -107,9 +106,9 @@ 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" + --verbose --testsuite="$SUITE" || ret=1 fi done exit $ret @@ -125,6 +124,21 @@ exit $ret %changelog +* Mon Sep 30 2019 Remi Collet - 1.2.4-1 +- update to 1.2.4 +- drop patch merged upstream + +* Mon Aug 19 2019 Remi Collet - 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 - 1.2.2-1 +- update to 1.2.2 + +* Mon Feb 11 2019 Remi Collet - 1.2.1-1 +- update to 1.2.1 + * Wed Oct 3 2018 Remi Collet - 1.2.0-1 - update to 1.2.0 - switch to phpunit7 diff --git a/sources b/sources index c9e07af..871af22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.2.0-1006336.tar.gz) = 8ea9934d2cc5a60c22ddb10fab8dc13a7fc6d4a9b93d100f46b52629057cac69a0f5a8ee6c2470dbd30f14c01544f3bca31e0b003a47296bc4dc02042b5c9330 +SHA512 (php-mockery-1.2.4-b3453f7.tar.gz) = b22f4727e404a874849e5fbff270cd786b4a9dc813a5c2d43d789d83ba7957ee8b9adeb44c62639219929c63170349d784293011f7a421941f7613e255d0b71a