diff --git a/.gitignore b/.gitignore index 094cc27..1ddb527 100644 --- a/.gitignore +++ b/.gitignore @@ -12,16 +12,3 @@ clog /php-mockery-1.4.2-20cab67.tgz /php-mockery-1.4.3-d1339f6.tgz /php-mockery-1.4.4-e01123a.tgz -/php-mockery-1.5.0-c10a5f6.tgz -/php-mockery-1.5.1-e92dcc8.tgz -/php-mockery-1.6.1-a8dd186.tgz -/php-mockery-1.6.2-13a7fa2.tgz -/php-mockery-1.6.3-b1be135.tgz -/php-mockery-1.6.4-d141375.tgz -/php-mockery-1.6.6-b8e0bb7.tgz -/php-mockery-1.6.7-0cc0588.tgz -/php-mockery-1.6.8-415720b.tgz -/php-mockery-1.6.9-0cc0588.tgz -/php-mockery-1.6.10-47065d1.tgz -/php-mockery-1.6.11-81a161d.tgz -/php-mockery-1.6.12-1f4efdd.tgz diff --git a/php-mockery.spec b/php-mockery.spec index f3acb25..cd81b48 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit 1f4efdd7d3beafe9807b08156dfcb176d18f1699 +%global gh_commit e01123a0e847d52d186c5eb4b9bf58b0c6d00346 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,11 +16,11 @@ %global major 1 Name: php-mockery -Version: 1.6.12 -Release: 4%{?dist} +Version: 1.4.4 +Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework -License: BSD-3-Clause +License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -32,18 +32,20 @@ BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.3 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5 || ^9.6.17", -# "symplify/easy-coding-standard": "^12.1.4" +# "phpunit/phpunit": "^8.5|^9.3" +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.6.17 +BuildRequires: phpunit9 >= 9.3 +%endif +%global phpunit %{_bindir}/phpunit8 +BuildRequires: phpunit8 >= 8.5 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) -BuildRequires: php-pdo # Autoloader %endif BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": ">=7.3", +# "php": "^7.3 || ^8.0", # "lib-pcre": ">=7.0", # "hamcrest/hamcrest-php": "~2.0" Requires: php(language) >= 7.3 @@ -76,11 +78,10 @@ cat << 'EOF' | tee -a library/%{ns_project}/autoload.php \Fedora\Autoloader\Dependencies::required([ '/usr/share/php/Hamcrest2/autoload.php', - __DIR__ . '/helpers.php', ]); EOF -%patch -P0 -p0 -b .rpm +%patch0 -p0 -b .rpm rm -f docs/.gitignore @@ -99,19 +100,32 @@ cp -rp library/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major} : Use installed tree and our autoloader export COMPOSER_VENDOR_DIR=%{buildroot}%{_datadir}/php/%{ns_project}%{major} -phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tests/Mockery tests/Fixture +phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tests/Mockery : Run upstream test suite ret=0 -# need investigation -rm tests/Mockery/MockeryCanMockClassesWithSemiReservedWordsTest.php - -for cmd in php php81 php82 php83; do +for cmd in php php73 php74 php80 php81; do if which $cmd; then - $cmd %{_bindir}/phpunit9 \ - --no-coverage \ - --verbose || ret=1 + if [ $($cmd -r 'echo PHP_MAJOR_VERSION;') -lt 8 ] + then + # see .travis.yml + SUITE="Mockery Test Suite PHP7" + + if [ -x %{_bindir}/phpunit8 ] ; then + $cmd %{_bindir}/phpunit8 \ + --no-coverage \ + --verbose --testsuite="$SUITE" || ret=1 + fi + else + SUITE="Mockery Test Suite PHP8" + fi + + if [ -x %{_bindir}/phpunit9 ] ; then + $cmd %{_bindir}/phpunit9 \ + --no-coverage \ + --verbose --testsuite="$SUITE" || ret=1 + fi fi done exit $ret @@ -127,72 +141,9 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.6.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.6.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 1.6.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu May 16 2024 Remi Collet - 1.6.12-1 -- update to 1.6.12 - -* Fri Mar 22 2024 Remi Collet - 1.6.11-1 -- update to 1.6.11 - -* Wed Mar 20 2024 Remi Collet - 1.6.10-1 -- update to 1.6.10 - -* Wed Mar 13 2024 Remi Collet - 1.6.9-1 -- update to 1.6.9 (revert to 1.6.7 code) - -* Tue Mar 12 2024 Remi Collet - 1.6.8-1 -- update to 1.6.8 - -* Thu Jan 25 2024 Fedora Release Engineering - 1.6.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.6.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 11 2023 Remi Collet - 1.6.7-1 -- update to 1.6.7 - -* Thu Aug 24 2023 Remi Collet - 1.6.6-1 -- update to 1.6.6 - -* Thu Jul 20 2023 Remi Collet - 1.6.4-1 -- update to 1.6.4 - -* Wed Jul 19 2023 Remi Collet - 1.6.3-1 -- update to 1.6.3 - -* Thu Jun 8 2023 Remi Collet - 1.6.2-1 -- update to 1.6.2 - -* Tue Jun 6 2023 Remi Collet - 1.6.1-1 -- update to 1.6.1 - -* Fri Jan 20 2023 Fedora Release Engineering - 1.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Sep 12 2022 Remi Collet - 1.5.1-1 -- update to 1.5.1 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Remi Collet - 1.5.0-1 -- update to 1.5.0 - * Tue Sep 14 2021 Remi Collet - 1.4.4-1 - update to 1.4.4 -* Fri Jul 23 2021 Fedora Release Engineering - 1.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Wed Feb 24 2021 Remi Collet - 1.4.3-1 - update to 1.4.3 diff --git a/sources b/sources index dbf35b7..27a352c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.12-1f4efdd.tgz) = ae7279d730160e516586f56edfaf7bca63ece0b0f4e5dfd5764f1f8765242490d79a36b7486edac1f3bfd93dce214e5c2e06bb84849793c966e74c2dce418f51 +SHA512 (php-mockery-1.4.4-e01123a.tgz) = 4a8df3102920b22b052379f421b953a16d8ab5ee8aa001f0793ca83767b4c1cc19a6e60c9bec776a0f0527298fe53e2275002b849414f93d9c473ad832118f59