Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Remi Collet
ed2c762d6a v1.2.2
(cherry picked from commit 3ec6e0ac3d)
2019-02-13 13:34:51 +01:00
Remi Collet
ea5ece5417 v1.2.1
(cherry picked from commit 487f0cf56e)
(cherry picked from commit 44764854ec)
2019-02-11 14:51:45 +01:00
3 changed files with 14 additions and 7 deletions

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
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

View file

@ -6,7 +6,7 @@
#
# Please preserve changelog entries
#
%global gh_commit 100633629bf76d57430b86b7098cd6beb996a35a
%global gh_commit 0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2
%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.2
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,12 @@ 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
* Wed Oct 3 2018 Remi Collet <remi@remirepo.net> - 1.2.0-1
- update to 1.2.0
- switch to phpunit7

View file

@ -1 +1 @@
SHA512 (php-mockery-1.2.0-1006336.tar.gz) = 8ea9934d2cc5a60c22ddb10fab8dc13a7fc6d4a9b93d100f46b52629057cac69a0f5a8ee6c2470dbd30f14c01544f3bca31e0b003a47296bc4dc02042b5c9330
SHA512 (php-mockery-1.2.2-0eb0b48.tar.gz) = 99c8648cd016e60ad96105d3306c549cbee83047d70510b977a70566c7282f28c5fa7c81e3eadd28b14915e9e92e0e7bf2034667cb7cbf08fae1dc7fca12d9dc