From a2a9754e40b3e91a8f80fd8cb3ecbf8bf1941abe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 07:54:20 +0000 Subject: [PATCH 01/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index 9c88736..7c75372 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -16,7 +16,7 @@ Name: php-mockery Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -124,6 +124,9 @@ exit $ret %changelog +* 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 From 4de1cf95c8eb5860b3d9311415beec35725649a2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Jul 2020 09:44:10 +0200 Subject: [PATCH 02/29] update to 1.3.2 switch to phpunit9 raise dependency on hamcrest/hamcrest-php 2.0.1 sources from git snapshot --- .gitignore | 1 + makesrc.sh | 28 ++++++++++++++++++++++++++++ php-mockery.spec | 29 ++++++++++++++++++----------- sources | 2 +- 4 files changed, 48 insertions(+), 12 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index b90a272..a167eff 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ 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 diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..87a1c0b --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/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 7c75372..73e8746 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -6,7 +6,7 @@ # # Please preserve changelog entries # -%global gh_commit f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be +%global gh_commit 9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -15,13 +15,14 @@ %global with_tests 0%{!?_without_tests:1} Name: php-mockery -Version: 1.3.1 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework 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 +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh # Use our autoloader Patch0: %{gh_project}-tests.patch @@ -30,10 +31,10 @@ 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|~8.0" -%global phpunit %{_bindir}/phpunit8 -BuildRequires: phpunit8 -BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0 with php-composer(hamcrest/hamcrest-php) < 3) +# "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0|~9.0" +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 +BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) # Autoloader %endif BuildRequires: php-fedora-autoloader-devel @@ -43,7 +44,7 @@ BuildRequires: php-fedora-autoloader-devel # "lib-pcre": ">=7.0", # "hamcrest/hamcrest-php": "~2.0" Requires: php(language) >= 5.6.0 -Requires: (php-composer(hamcrest/hamcrest-php) >= 2.0 with php-composer(hamcrest/hamcrest-php) < 3) +Requires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) # From phpcompatinfo report for version 1.0 Requires: php-pcre Requires: php-spl @@ -98,7 +99,7 @@ phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tes : Run upstream test suite ret=0 -for cmd in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do +for cmd in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do if which $cmd; then set $cmd # see .travis.yml @@ -106,7 +107,7 @@ for cmd in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do then SUITE="Mockery Test Suite PHP56" else SUITE="Mockery Test Suite" fi - $1 ${2:-%{_bindir}/phpunit8} \ + $1 ${2:-%{_bindir}/phpunit9} \ --no-coverage \ --verbose --testsuite="$SUITE" || ret=1 fi @@ -124,6 +125,12 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 7445fce..e530c30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.3.1-f69bbde.tar.gz) = c12dbdca080f1d7b63d9fd9a75ed5c1db94a33a8e469ca745903e5ab1ba87b82bc8e987a555145a34a7a4da26f47ebb64c9e3d78533a686d90507773338bb3fa +SHA512 (php-mockery-1.3.2-9b6f117.tgz) = 15f818c294fe2e57dff70e844532179d5f9eff35128a94131d10b1015dbceee629081899f42a1b001f55c04ef05c77eda821a2295fd2c1ba7d4d4c22c2fd9c52 From 1672560c56b5b0cb437f532d3604211634269e69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 21:33:02 +0000 Subject: [PATCH 03/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index 73e8746..dfd7a13 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -16,7 +16,7 @@ Name: php-mockery Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -125,6 +125,9 @@ exit $ret %changelog +* 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 From da6ff3f35f88dce2c2b7c2419ef85ea4af727c57 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Aug 2020 07:13:26 +0200 Subject: [PATCH 04/29] v1.3.3 --- .gitignore | 1 + php-mockery.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a167eff..9e312f0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index dfd7a13..bb4d2cc 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -6,7 +6,7 @@ # # Please preserve changelog entries # -%global gh_commit 9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283 +%global gh_commit 60fa2f67f6e4d3634bb4a45ff3171fa52215800d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -15,8 +15,8 @@ %global with_tests 0%{!?_without_tests:1} Name: php-mockery -Version: 1.3.2 -Release: 2%{?dist} +Version: 1.3.3 +Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -31,7 +31,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|~8.0|~9.0" +# "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3" %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) @@ -125,6 +125,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index e530c30..a73ed1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.3.2-9b6f117.tgz) = 15f818c294fe2e57dff70e844532179d5f9eff35128a94131d10b1015dbceee629081899f42a1b001f55c04ef05c77eda821a2295fd2c1ba7d4d4c22c2fd9c52 +SHA512 (php-mockery-1.3.3-60fa2f6.tgz) = 569f5a8c9d01b9e406306aca5d0085897e0a22969c5c144fb4f5960d02c4bc2f1d519d19af544a10226fbbb2b193e9689c694ca3d5d6df58c1624034aa9abfdb From bf0b297ffc588a1f0accf1d760dfe4bdac261a1a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 29 Oct 2020 14:53:57 +0100 Subject: [PATCH 05/29] 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 --- .gitignore | 1 + php-mockery.spec | 66 ++++++++++++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 9e312f0..ebc9fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index bb4d2cc..327a65f 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -6,16 +6,17 @@ # # Please preserve changelog entries # -%global gh_commit 60fa2f67f6e4d3634bb4a45ff3171fa52215800d +%bcond_without tests + +%global gh_commit 20cab678faed06fac225193be281ea0fddb43b93 %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.3.3 +Version: 1.4.2 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -28,24 +29,28 @@ Source1: makesrc.sh Patch0: %{gh_project}-tests.patch BuildArch: noarch -%if %{with_tests} -BuildRequires: php(language) >= 5.6.0 +%if %{with tests} +BuildRequires: php(language) >= 7.3 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3" +# "phpunit/phpunit": "^8.5|^9.3" +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 -BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) +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) # Autoloader %endif BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": ">=5.6.0", +# "php": "^7.3 || ^8.0", # "lib-pcre": ">=7.0", # "hamcrest/hamcrest-php": "~2.0" -Requires: php(language) >= 5.6.0 -Requires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) -# From phpcompatinfo report for version 1.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-pcre Requires: php-spl Requires: php-reflection @@ -91,7 +96,7 @@ 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} @@ -99,17 +104,28 @@ phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tes : Run upstream test suite ret=0 -for cmd in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do + +for cmd in php php73 php74 php80; do if which $cmd; then - 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" + 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 - $1 ${2:-%{_bindir}/phpunit9} \ - --no-coverage \ - --verbose --testsuite="$SUITE" || ret=1 fi done exit $ret @@ -125,6 +141,12 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index a73ed1b..6a1d6a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.3.3-60fa2f6.tgz) = 569f5a8c9d01b9e406306aca5d0085897e0a22969c5c144fb4f5960d02c4bc2f1d519d19af544a10226fbbb2b193e9689c694ca3d5d6df58c1624034aa9abfdb +SHA512 (php-mockery-1.4.2-20cab67.tgz) = c977017e7f9674877c9dad687a62019be542ed0aa66093866fb5c5dc2f767f364237a1d2a16fc965be4891ee98b3eaf9ade1d67adf227dbbe27f2699caba819e From 4ce6d321e15c034a6b9d3f17d178dc74ed8b96d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:11:12 +0000 Subject: [PATCH 06/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index 327a65f..2b41c5c 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -17,7 +17,7 @@ Name: php-mockery Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -141,6 +141,9 @@ exit $ret %changelog +* 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 From 85a56b668b6919621300bf457c5c7a1857b1c61a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Feb 2021 14:10:45 +0100 Subject: [PATCH 07/29] v1.4.3 --- .gitignore | 1 + php-mockery.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ebc9fc3..557c9bb 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 2b41c5c..eb1d571 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit 20cab678faed06fac225193be281ea0fddb43b93 +%global gh_commit d1339f64479af1bee0e82a0413813fe5345a54ea %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,8 +16,8 @@ %global major 1 Name: php-mockery -Version: 1.4.2 -Release: 2%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -141,6 +141,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 6a1d6a4..909df43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.4.2-20cab67.tgz) = c977017e7f9674877c9dad687a62019be542ed0aa66093866fb5c5dc2f767f364237a1d2a16fc965be4891ee98b3eaf9ade1d67adf227dbbe27f2699caba819e +SHA512 (php-mockery-1.4.3-d1339f6.tgz) = 6516bd9e71e47edfb22cfa574b53055ddffe3fb93232fa0671fc20279c475444e5024cfcc14b3ee7719dfd32c2767fd8560cf4dd1f89b68a44feb133ff6d609a From b2c2621eb2eaef66f428ea5b2d1cece7861063a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 02:31:12 +0000 Subject: [PATCH 08/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index eb1d571..49a8ed9 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -17,7 +17,7 @@ Name: php-mockery Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -141,6 +141,9 @@ exit $ret %changelog +* 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 From ae72483070d8057a4a1b9f1107585f7a16cd7c62 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Sep 2021 08:54:23 +0200 Subject: [PATCH 09/29] v1.4.4 --- .gitignore | 1 + php-mockery.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 557c9bb..1ddb527 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 49a8ed9..38fe447 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit d1339f64479af1bee0e82a0413813fe5345a54ea +%global gh_commit e01123a0e847d52d186c5eb4b9bf58b0c6d00346 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,8 +16,8 @@ %global major 1 Name: php-mockery -Version: 1.4.3 -Release: 2%{?dist} +Version: 1.4.4 +Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -105,7 +105,7 @@ phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tes : Run upstream test suite ret=0 -for cmd in php php73 php74 php80; do +for cmd in php php73 php74 php80 php81; do if which $cmd; then if [ $($cmd -r 'echo PHP_MAJOR_VERSION;') -lt 8 ] then @@ -141,6 +141,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 909df43..27a352c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.4.3-d1339f6.tgz) = 6516bd9e71e47edfb22cfa574b53055ddffe3fb93232fa0671fc20279c475444e5024cfcc14b3ee7719dfd32c2767fd8560cf4dd1f89b68a44feb133ff6d609a +SHA512 (php-mockery-1.4.4-e01123a.tgz) = 4a8df3102920b22b052379f421b953a16d8ab5ee8aa001f0793ca83767b4c1cc19a6e60c9bec776a0f0527298fe53e2275002b849414f93d9c473ad832118f59 From 1d6ec935c8a469add778a6a6859a000020d9b596 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Jan 2022 08:31:41 +0100 Subject: [PATCH 10/29] v1.5.0 --- .gitignore | 1 + php-mockery.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1ddb527..e72aacd 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ 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 diff --git a/php-mockery.spec b/php-mockery.spec index 38fe447..94382db 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit e01123a0e847d52d186c5eb4b9bf58b0c6d00346 +%global gh_commit c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.4.4 +Version: 1.5.0 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -105,7 +105,7 @@ phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tes : Run upstream test suite ret=0 -for cmd in php php73 php74 php80 php81; do +for cmd in php php74 php80 php81; do if which $cmd; then if [ $($cmd -r 'echo PHP_MAJOR_VERSION;') -lt 8 ] then @@ -141,6 +141,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 27a352c..97f483a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.4.4-e01123a.tgz) = 4a8df3102920b22b052379f421b953a16d8ab5ee8aa001f0793ca83767b4c1cc19a6e60c9bec776a0f0527298fe53e2275002b849414f93d9c473ad832118f59 +SHA512 (php-mockery-1.5.0-c10a5f6.tgz) = ed229041f0d5a5747e2058912f359cf3fb22eb5e98fab255691fcf3e284732dd043f8ee2b82e4918ee644cf5a7dad9a116fe82f34d84c34d33c48e933939c7f4 From b4708ff31d0a2e874fae067ec71a037f3a1140e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:47:37 +0000 Subject: [PATCH 11/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index 94382db..f3579a9 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -17,7 +17,7 @@ Name: php-mockery Version: 1.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -141,6 +141,9 @@ exit $ret %changelog +* 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 From 86104caa6e54edbda59b207c5f77b1f9d9df282a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Sep 2022 15:08:32 +0200 Subject: [PATCH 12/29] v1.5.1 --- .gitignore | 1 + php-mockery.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e72aacd..b54665d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index f3579a9..5ae12ad 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac +%global gh_commit e92dcc83d5a51851baf5f5591d32cb2b16e3684e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,8 +16,8 @@ %global major 1 Name: php-mockery -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -105,7 +105,7 @@ phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tes : Run upstream test suite ret=0 -for cmd in php php74 php80 php81; do +for cmd in php php74 php80 php81 php82; do if which $cmd; then if [ $($cmd -r 'echo PHP_MAJOR_VERSION;') -lt 8 ] then @@ -141,6 +141,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 97f483a..b546eaa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.5.0-c10a5f6.tgz) = ed229041f0d5a5747e2058912f359cf3fb22eb5e98fab255691fcf3e284732dd043f8ee2b82e4918ee644cf5a7dad9a116fe82f34d84c34d33c48e933939c7f4 +SHA512 (php-mockery-1.5.1-e92dcc8.tgz) = 913d02ebf61bde3fdbe289d183605517837c9b7a8d6fb9c9e2c33a173b572d0c76a2d4304d9813a4f43c9c2add9256dd82e3ffc71c61f215dad89e3e9e57465f From 5e08843b149f4213456c88322bf247398bc99227 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 08:49:25 +0000 Subject: [PATCH 13/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index 5ae12ad..817a7d0 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -17,7 +17,7 @@ Name: php-mockery Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD @@ -141,6 +141,9 @@ exit $ret %changelog +* 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 From c2c35a149fc48d943c3e2c5718d0fb83943172ee Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Jun 2023 08:59:47 +0200 Subject: [PATCH 14/29] v1.6.1 --- .gitignore | 1 + php-mockery.spec | 54 ++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index b54665d..14a14c7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 817a7d0..4807471 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit e92dcc83d5a51851baf5f5591d32cb2b16e3684e +%global gh_commit a8dd186f07ea667c1e3abd2176bfab0ab161ea94 %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.5.1 -Release: 2%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -30,22 +30,21 @@ Patch0: %{gh_project}-tests.patch BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5|^9.3" -%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +# "phpunit/phpunit": "^8.5|^9.3", +# "psalm/plugin-phpunit": "^0.18", +# "vimeo/psalm": "^5.9" %global phpunit %{_bindir}/phpunit9 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 || ^8.0", +# "php": "^7.4 || ^8.0", # "lib-pcre": ">=7.0", # "hamcrest/hamcrest-php": "~2.0" Requires: php(language) >= 7.3 @@ -78,10 +77,11 @@ cat << 'EOF' | tee -a library/%{ns_project}/autoload.php \Fedora\Autoloader\Dependencies::required([ '/usr/share/php/Hamcrest2/autoload.php', + __DIR__ . '/helpers.php', ]); EOF -%patch0 -p0 -b .rpm +%patch -P0 -p0 -b .rpm rm -f docs/.gitignore @@ -105,27 +105,14 @@ phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tes : Run upstream test suite ret=0 -for cmd in php php74 php80 php81 php82; do +# need investigation +rm tests/Mockery/MockeryCanMockClassesWithSemiReservedWordsTest.php + +for cmd in php php80 php81 php82; do if which $cmd; then - 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 + $cmd %{_bindir}/phpunit9 \ + --no-coverage \ + --verbose || ret=1 fi done exit $ret @@ -141,6 +128,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index b546eaa..af18e9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.5.1-e92dcc8.tgz) = 913d02ebf61bde3fdbe289d183605517837c9b7a8d6fb9c9e2c33a173b572d0c76a2d4304d9813a4f43c9c2add9256dd82e3ffc71c61f215dad89e3e9e57465f +SHA512 (php-mockery-1.6.1-a8dd186.tgz) = 2a5d77cdb18f4f0a55a22e4d59f6e05d988e04b2f62de7d9a133cbb4a33121a38b265ffeddc494e2ac898cf8919fcb515fd824f58e8ed9ac2447b327e0d547eb From 8122b36205189b3bf4e49062c39cf2c8731ccc43 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Jun 2023 08:37:15 +0200 Subject: [PATCH 15/29] v1.6.2 --- .gitignore | 1 + php-mockery.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 14a14c7..17b202b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 4807471..8920fba 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit a8dd186f07ea667c1e3abd2176bfab0ab161ea94 +%global gh_commit 13a7fa2642c76c58fa2806ef7f565344c817a191 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.1 +Version: 1.6.2 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -128,6 +128,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index af18e9e..bca3a76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.1-a8dd186.tgz) = 2a5d77cdb18f4f0a55a22e4d59f6e05d988e04b2f62de7d9a133cbb4a33121a38b265ffeddc494e2ac898cf8919fcb515fd824f58e8ed9ac2447b327e0d547eb +SHA512 (php-mockery-1.6.2-13a7fa2.tgz) = 007969a96d4e2cdd88f889e6d207c0747835bad8728a4daced7361dd91309cfc4ef8e80cf7ce5662e504d5f12be5146e8e54e3d406a5204d930749abbbf5b185 From a296fbfaa2b0ee2d42f0d1b79cdd7dc9cbb4e86d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Jul 2023 14:04:14 +0200 Subject: [PATCH 16/29] v1.6.3 --- .gitignore | 1 + php-mockery.spec | 23 +++++++++++++---------- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 17b202b..91db77d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 8920fba..dc6415b 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit 13a7fa2642c76c58fa2806ef7f565344c817a191 +%global gh_commit b1be135c1ba7632f0248e07ee5e6e412576a309d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.2 +Version: 1.6.3 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -33,8 +33,8 @@ BuildArch: noarch BuildRequires: php(language) >= 7.4 # From composer.json, "require-dev": { # "phpunit/phpunit": "^8.5|^9.3", -# "psalm/plugin-phpunit": "^0.18", -# "vimeo/psalm": "^5.9" +# "psalm/plugin-phpunit": "^0.18.4", +# "vimeo/psalm": "^5.13.1" %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.3 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) @@ -44,7 +44,7 @@ BuildRequires: php-pdo BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": "^7.4 || ^8.0", +# "php": ">=7.4,<8.3", # "lib-pcre": ">=7.0", # "hamcrest/hamcrest-php": "~2.0" Requires: php(language) >= 7.3 @@ -70,10 +70,10 @@ Autoloader: %{_datadir}/php/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -mv library/*.php library/%{ns_project}/ -phpab --template fedora --output library/%{ns_project}/autoload.php library +mv src/*.php src/%{ns_project}/ +phpab --template fedora --output src/%{ns_project}/autoload.php src -cat << 'EOF' | tee -a library/%{ns_project}/autoload.php +cat << 'EOF' | tee -a src/%{ns_project}/autoload.php \Fedora\Autoloader\Dependencies::required([ '/usr/share/php/Hamcrest2/autoload.php', @@ -92,7 +92,7 @@ rm -f docs/.gitignore %install mkdir -p %{buildroot}/%{_datadir}/php -cp -rp library/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major} +cp -rp src/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major} %check @@ -100,7 +100,7 @@ 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 +phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tests/Mockery tests/Fixture : Run upstream test suite ret=0 @@ -128,6 +128,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index bca3a76..06a0855 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.2-13a7fa2.tgz) = 007969a96d4e2cdd88f889e6d207c0747835bad8728a4daced7361dd91309cfc4ef8e80cf7ce5662e504d5f12be5146e8e54e3d406a5204d930749abbbf5b185 +SHA512 (php-mockery-1.6.3-b1be135.tgz) = b9b210774f40b50c2508f51e935b465c0db3f959dcbbdb808f52e0369d18d97a06fa116e44c4fc715c378c5fe9fe4d704ae0e57dd0e388c01f25351d91f7b674 From e9c8dfdc76c82f2d041507d0258dac9553d79ec9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 20 Jul 2023 07:34:46 +0200 Subject: [PATCH 17/29] v1.6.4 --- .gitignore | 1 + php-mockery.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 91db77d..6fba993 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index dc6415b..b4ce395 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit b1be135c1ba7632f0248e07ee5e6e412576a309d +%global gh_commit d1413755e26fe56a63455f7753221c86cbb88f66 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.3 +Version: 1.6.4 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -34,6 +34,7 @@ BuildRequires: php(language) >= 7.4 # From composer.json, "require-dev": { # "phpunit/phpunit": "^8.5|^9.3", # "psalm/plugin-phpunit": "^0.18.4", +# "symplify/easy-coding-standard": "^11.5.0", # "vimeo/psalm": "^5.13.1" %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.3 @@ -70,10 +71,10 @@ Autoloader: %{_datadir}/php/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -mv src/*.php src/%{ns_project}/ -phpab --template fedora --output src/%{ns_project}/autoload.php src +mv library/*.php library/%{ns_project}/ +phpab --template fedora --output library/%{ns_project}/autoload.php library -cat << 'EOF' | tee -a src/%{ns_project}/autoload.php +cat << 'EOF' | tee -a library/%{ns_project}/autoload.php \Fedora\Autoloader\Dependencies::required([ '/usr/share/php/Hamcrest2/autoload.php', @@ -92,7 +93,7 @@ rm -f docs/.gitignore %install mkdir -p %{buildroot}/%{_datadir}/php -cp -rp src/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major} +cp -rp library/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major} %check @@ -128,6 +129,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 06a0855..e9682ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.3-b1be135.tgz) = b9b210774f40b50c2508f51e935b465c0db3f959dcbbdb808f52e0369d18d97a06fa116e44c4fc715c378c5fe9fe4d704ae0e57dd0e388c01f25351d91f7b674 +SHA512 (php-mockery-1.6.4-d141375.tgz) = 24348d7f8b6782aa824ac4c2d00ad1fd9fed6990b87710e9bb6c8daefe1598895762b8151f36bd6e1de7400cbea78a326b1b56430f3863dbd0f4e1d2b38682f7 From 37f7a83f9c08e8f6f2f3aa9552760edfe53a485e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 24 Aug 2023 15:42:49 +0200 Subject: [PATCH 18/29] v1.6.6 --- .gitignore | 1 + php-mockery.spec | 19 +++++++++++-------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6fba993..ead16b2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index b4ce395..3ac6956 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit d1413755e26fe56a63455f7753221c86cbb88f66 +%global gh_commit b8e0bb7d8c604046539c1115994632c74dcb361e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.4 +Version: 1.6.6 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -30,14 +30,14 @@ Patch0: %{gh_project}-tests.patch BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.4 +BuildRequires: php(language) >= 7.3 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5|^9.3", +# "phpunit/phpunit": "^8.5|^9.6.10", # "psalm/plugin-phpunit": "^0.18.4", # "symplify/easy-coding-standard": "^11.5.0", -# "vimeo/psalm": "^5.13.1" +# "vimeo/psalm": "^4.30" %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.3 +BuildRequires: phpunit9 >= 9.6.10 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) BuildRequires: php-pdo # Autoloader @@ -45,7 +45,7 @@ BuildRequires: php-pdo BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": ">=7.4,<8.3", +# "php": ">=7.3", # "lib-pcre": ">=7.0", # "hamcrest/hamcrest-php": "~2.0" Requires: php(language) >= 7.3 @@ -109,7 +109,7 @@ ret=0 # need investigation rm tests/Mockery/MockeryCanMockClassesWithSemiReservedWordsTest.php -for cmd in php php80 php81 php82; do +for cmd in php php80 php81 php82 php83; do if which $cmd; then $cmd %{_bindir}/phpunit9 \ --no-coverage \ @@ -129,6 +129,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index e9682ed..36fde5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.4-d141375.tgz) = 24348d7f8b6782aa824ac4c2d00ad1fd9fed6990b87710e9bb6c8daefe1598895762b8151f36bd6e1de7400cbea78a326b1b56430f3863dbd0f4e1d2b38682f7 +SHA512 (php-mockery-1.6.6-b8e0bb7.tgz) = c592312f84f81473dd31921b09d7dc330128196164381a0a3a2924b4c23a28889a827710bd2eab4ffaa777c11bdd7e3a3376cf964a83f9427e7bda22ad738d95 From b7db5014057473a319133eda386c3439f89f62e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Dec 2023 08:48:11 +0100 Subject: [PATCH 19/29] v1.6.7 --- .gitignore | 1 + php-mockery.spec | 15 ++++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ead16b2..11c2edf 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 3ac6956..5d3a256 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit b8e0bb7d8c604046539c1115994632c74dcb361e +%global gh_commit 0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.6 +Version: 1.6.7 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -32,10 +32,8 @@ BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.3 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5|^9.6.10", -# "psalm/plugin-phpunit": "^0.18.4", -# "symplify/easy-coding-standard": "^11.5.0", -# "vimeo/psalm": "^4.30" +# "phpunit/phpunit": "^8.5 || ^9.6.10", +# "symplify/easy-coding-standard": "^12.0.8" %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.6.10 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) @@ -109,7 +107,7 @@ ret=0 # need investigation rm tests/Mockery/MockeryCanMockClassesWithSemiReservedWordsTest.php -for cmd in php php80 php81 php82 php83; do +for cmd in php php81 php82 php83; do if which $cmd; then $cmd %{_bindir}/phpunit9 \ --no-coverage \ @@ -129,6 +127,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 36fde5e..87fede3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.6-b8e0bb7.tgz) = c592312f84f81473dd31921b09d7dc330128196164381a0a3a2924b4c23a28889a827710bd2eab4ffaa777c11bdd7e3a3376cf964a83f9427e7bda22ad738d95 +SHA512 (php-mockery-1.6.7-0cc0588.tgz) = ec5b7326c55e7665810ee4a3a11522a613bb549969a92816fbb36fd29bce8e46979aef04a14649e71d72cd9d33135efba40e0de1ff7afe567a392dbb65b273d2 From 09c046c4af9909ec1cc64fe52422590c61eaabb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 20:58:40 +0000 Subject: [PATCH 20/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index 5d3a256..3d033f4 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -17,7 +17,7 @@ Name: php-mockery Version: 1.6.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD-3-Clause @@ -127,6 +127,9 @@ exit $ret %changelog +* 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 From dac8562f44fa81772d20d7a2c8ed3a17e84b6095 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:45:23 +0000 Subject: [PATCH 21/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index 3d033f4..5822d1b 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -17,7 +17,7 @@ Name: php-mockery Version: 1.6.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD-3-Clause @@ -127,6 +127,9 @@ exit $ret %changelog +* 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 From f9378f3780068a15fc8ec5f917c2788cf7e9d7b9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Mar 2024 14:58:36 +0100 Subject: [PATCH 22/29] v1.6.8 --- .gitignore | 1 + php-mockery.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 11c2edf..78cf928 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 5822d1b..997dbbd 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit 0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06 +%global gh_commit 415720b7e3052f42de05c384134387771d3e183b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,8 +16,8 @@ %global major 1 Name: php-mockery -Version: 1.6.7 -Release: 3%{?dist} +Version: 1.6.8 +Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD-3-Clause @@ -32,10 +32,10 @@ BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.3 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5 || ^9.6.10", -# "symplify/easy-coding-standard": "^12.0.8" +# "phpunit/phpunit": "^8.5 || ^9.6.17", +# "symplify/easy-coding-standard": "^12.1.14" %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.6.10 +BuildRequires: phpunit9 >= 9.6.17 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) BuildRequires: php-pdo # Autoloader @@ -127,6 +127,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 87fede3..992abb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.7-0cc0588.tgz) = ec5b7326c55e7665810ee4a3a11522a613bb549969a92816fbb36fd29bce8e46979aef04a14649e71d72cd9d33135efba40e0de1ff7afe567a392dbb65b273d2 +SHA512 (php-mockery-1.6.8-415720b.tgz) = a9a1513cd5e2eb89f3dbcdedaa1602cff103a7337869f0b5a2fc408661751ba74cd9540ff8b2d07ae78117b5221206617766672162beb04a36fccd4db6463882 From f5dc0dc92d844908a96a60034443ade2586455e5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Mar 2024 08:49:41 +0100 Subject: [PATCH 23/29] update to 1.6.9 (revert to 1.6.7 code) --- .gitignore | 1 + php-mockery.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 78cf928..eb62282 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 997dbbd..5761784 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit 415720b7e3052f42de05c384134387771d3e183b +%global gh_commit 0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.8 +Version: 1.6.9 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -32,10 +32,10 @@ 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.14" +# "phpunit/phpunit": "^8.5 || ^9.6.10", +# "symplify/easy-coding-standard": "^12.0.8" %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.6.17 +BuildRequires: phpunit9 >= 9.6.10 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) BuildRequires: php-pdo # Autoloader @@ -127,6 +127,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 992abb6..b295e20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.8-415720b.tgz) = a9a1513cd5e2eb89f3dbcdedaa1602cff103a7337869f0b5a2fc408661751ba74cd9540ff8b2d07ae78117b5221206617766672162beb04a36fccd4db6463882 +SHA512 (php-mockery-1.6.9-0cc0588.tgz) = d0790bc25eed505bd94bec8295d87e1e0730a6151153db2c5bf31a2ffee3b063c52e9aa413fca1f34f52252abf8a36b78cddc9a2ca34b96c9739f58370ad6fd6 From 5890dfe784b5dfef6bed3ad7617cd51f9550a86f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Mar 2024 09:37:55 +0100 Subject: [PATCH 24/29] v1.6.10 --- .gitignore | 1 + php-mockery.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index eb62282..791f19e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 5761784..2e9785b 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit 0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06 +%global gh_commit 47065d1be1fa05def58dc14c03cf831d3884ef0b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.9 +Version: 1.6.10 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -32,10 +32,10 @@ BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.3 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^8.5 || ^9.6.10", -# "symplify/easy-coding-standard": "^12.0.8" +# "phpunit/phpunit": "^8.5 || ^9.6.17", +# "symplify/easy-coding-standard": "^12.1.4" %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.6.10 +BuildRequires: phpunit9 >= 9.6.17 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) BuildRequires: php-pdo # Autoloader @@ -127,6 +127,9 @@ exit $ret %changelog +* 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) diff --git a/sources b/sources index b295e20..20e9c0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.9-0cc0588.tgz) = d0790bc25eed505bd94bec8295d87e1e0730a6151153db2c5bf31a2ffee3b063c52e9aa413fca1f34f52252abf8a36b78cddc9a2ca34b96c9739f58370ad6fd6 +SHA512 (php-mockery-1.6.10-47065d1.tgz) = 6e57c6438d08fd889e5fb5be122aa30af99a9d41537f9164ed6cb37457936ba88f8750ee83892691ad26215065cc2dceb930d97be07358eaf91b3d4ac3dc7f35 From 1e5cc1c7d6b8f2b2f3b51273dbee28a0eac032c4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2024 07:43:33 +0100 Subject: [PATCH 25/29] v1.6.11 --- .gitignore | 1 + php-mockery.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 791f19e..2f956b1 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /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 diff --git a/php-mockery.spec b/php-mockery.spec index 2e9785b..06d2c75 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit 47065d1be1fa05def58dc14c03cf831d3884ef0b +%global gh_commit 81a161d0b135df89951abd52296adf97deb0723d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.10 +Version: 1.6.11 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -127,6 +127,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 20e9c0e..6cdc309 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.10-47065d1.tgz) = 6e57c6438d08fd889e5fb5be122aa30af99a9d41537f9164ed6cb37457936ba88f8750ee83892691ad26215065cc2dceb930d97be07358eaf91b3d4ac3dc7f35 +SHA512 (php-mockery-1.6.11-81a161d.tgz) = 8aa3f6766b92e259aa24f177672d1c7d8c6799c7d0982c9b4d08ee7ab0f36511d08e9a7c6925a612e80ec79fe1de233a4e76dee679de3e7b9c3bec9f8104271a From 8d5df083b6d287720485c83395488088804836c5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 May 2024 07:42:25 +0200 Subject: [PATCH 26/29] v1.6.12 --- .gitignore | 1 + php-mockery.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2f956b1..094cc27 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /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 06d2c75..6dbddb9 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit 81a161d0b135df89951abd52296adf97deb0723d +%global gh_commit 1f4efdd7d3beafe9807b08156dfcb176d18f1699 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.11 +Version: 1.6.12 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -127,6 +127,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 6cdc309..dbf35b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.11-81a161d.tgz) = 8aa3f6766b92e259aa24f177672d1c7d8c6799c7d0982c9b4d08ee7ab0f36511d08e9a7c6925a612e80ec79fe1de233a4e76dee679de3e7b9c3bec9f8104271a +SHA512 (php-mockery-1.6.12-1f4efdd.tgz) = ae7279d730160e516586f56edfaf7bca63ece0b0f4e5dfd5764f1f8765242490d79a36b7486edac1f3bfd93dce214e5c2e06bb84849793c966e74c2dce418f51 From 9ecb11d8d2e6bc8e64fb28e09384c859bf7e16fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 06:59:28 +0000 Subject: [PATCH 27/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index 6dbddb9..a3f282b 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -17,7 +17,7 @@ Name: php-mockery Version: 1.6.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD-3-Clause @@ -127,6 +127,9 @@ exit $ret %changelog +* 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 From 3119377f15f62193ae82a9e46ee7269f4991cc42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:10:35 +0000 Subject: [PATCH 28/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index a3f282b..56f6f08 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -17,7 +17,7 @@ Name: php-mockery Version: 1.6.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD-3-Clause @@ -127,6 +127,9 @@ exit $ret %changelog +* 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 From 66dd7281ad58bc566771a96ff20fe3caadde5172 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:15:26 +0000 Subject: [PATCH 29/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-mockery.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mockery.spec b/php-mockery.spec index 56f6f08..f3acb25 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -17,7 +17,7 @@ Name: php-mockery Version: 1.6.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework License: BSD-3-Clause @@ -127,6 +127,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