diff --git a/.gitignore b/.gitignore index 094cc27..b90a272 100644 --- a/.gitignore +++ b/.gitignore @@ -7,21 +7,3 @@ clog /php-mockery-1.2.4-b3453f7.tar.gz /php-mockery-1.3.0-5571962.tar.gz /php-mockery-1.3.1-f69bbde.tar.gz -/php-mockery-1.3.2-9b6f117.tgz -/php-mockery-1.3.3-60fa2f6.tgz -/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/makesrc.sh b/makesrc.sh deleted file mode 100755 index 87a1c0b..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} - -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n" - -echo "Cloning..." -git clone --recursive https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT - -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd - -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." - diff --git a/php-mockery.spec b/php-mockery.spec index f3acb25..9c88736 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -6,49 +6,45 @@ # # Please preserve changelog entries # -%bcond_without tests - -%global gh_commit 1f4efdd7d3beafe9807b08156dfcb176d18f1699 +%global gh_commit f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery %global ns_project Mockery %global major 1 +%global with_tests 0%{!?_without_tests:1} Name: php-mockery -Version: 1.6.12 -Release: 4%{?dist} +Version: 1.3.1 +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 +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz # Use our autoloader Patch0: %{gh_project}-tests.patch BuildArch: noarch -%if %{with tests} -BuildRequires: php(language) >= 7.3 +%if %{with_tests} +BuildRequires: php(language) >= 5.6.0 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5 || ^9.6.17", -# "symplify/easy-coding-standard": "^12.1.4" -%global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.6.17 -BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) -BuildRequires: php-pdo +# "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" +%global phpunit %{_bindir}/phpunit8 +BuildRequires: phpunit8 +BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0 with php-composer(hamcrest/hamcrest-php) < 3) # Autoloader %endif BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": ">=7.3", +# "php": ">=5.6.0", # "lib-pcre": ">=7.0", # "hamcrest/hamcrest-php": "~2.0" -Requires: php(language) >= 7.3 -Requires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) -# From phpcompatinfo report for version 1.4.2 +Requires: php(language) >= 5.6.0 +Requires: (php-composer(hamcrest/hamcrest-php) >= 2.0 with php-composer(hamcrest/hamcrest-php) < 3) +# From phpcompatinfo report for version 1.0 Requires: php-pcre Requires: php-spl Requires: php-reflection @@ -76,11 +72,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 @@ -95,23 +90,25 @@ cp -rp library/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major} %check -%if %{with tests} +%if %{with_tests} : 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 %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit9 \ + set $cmd + # see .travis.yml + if [ $($1 -r 'echo PHP_MAJOR_VERSION;') -lt 7 ] + then SUITE="Mockery Test Suite PHP56" + else SUITE="Mockery Test Suite" + fi + $1 ${2:-%{_bindir}/phpunit8} \ --no-coverage \ - --verbose || ret=1 + --verbose --testsuite="$SUITE" || ret=1 fi done exit $ret @@ -127,99 +124,6 @@ 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 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Oct 12 2020 Remi Collet - 1.4.2-1 -- update to 1.4.2 -- raise dependency on PHP 7.3 -- drop compatibility with old phpunit 5, 6 and 7 -- run test suite with both phpunit 8 and 9 - -* Mon Aug 17 2020 Remi Collet - 1.3.3-1 -- update to 1.3.3 - -* Tue Jul 28 2020 Fedora Release Engineering - 1.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 21 2020 Remi Collet - 1.3.2-1 -- update to 1.3.2 -- switch to phpunit9 -- raise dependency on hamcrest/hamcrest-php 2.0.1 -- sources from git snapshot - -* Thu Jan 30 2020 Fedora Release Engineering - 1.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Fri Jan 3 2020 Remi Collet - 1.3.1-1 - update to 1.3.1 diff --git a/sources b/sources index dbf35b7..7445fce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.12-1f4efdd.tgz) = ae7279d730160e516586f56edfaf7bca63ece0b0f4e5dfd5764f1f8765242490d79a36b7486edac1f3bfd93dce214e5c2e06bb84849793c966e74c2dce418f51 +SHA512 (php-mockery-1.3.1-f69bbde.tar.gz) = c12dbdca080f1d7b63d9fd9a75ed5c1db94a33a8e469ca745903e5ab1ba87b82bc8e987a555145a34a7a4da26f47ebb64c9e3d78533a686d90507773338bb3fa