From 6de2ae088aabcfcb249ccb83c7315190d355b5d7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 24 Aug 2023 15:42:49 +0200 Subject: [PATCH 1/6] v1.6.6 (cherry picked from commit 37f7a83f9c08e8f6f2f3aa9552760edfe53a485e) --- .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 f561c8bd6723ac25d438b352b68bdca9d261269b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Dec 2023 08:48:11 +0100 Subject: [PATCH 2/6] v1.6.7 (cherry picked from commit b7db5014057473a319133eda386c3439f89f62e4) --- .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 00f1deb7c316ae80516ae413914d86a111cfef7f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Mar 2024 14:58:36 +0100 Subject: [PATCH 3/6] v1.6.8 (cherry picked from commit f9378f3780068a15fc8ec5f917c2788cf7e9d7b9) (cherry picked from commit 648e5ea044331cc334f723b7403ebaed7dab3ba8) --- .gitignore | 1 + php-mockery.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 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 5d3a256..c58b349 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,7 +16,7 @@ %global major 1 Name: php-mockery -Version: 1.6.7 +Version: 1.6.8 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.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 + * Mon Dec 11 2023 Remi Collet - 1.6.7-1 - update to 1.6.7 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 9a71ff92ab0c6cade866b70d8ee74ebafbab642c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Mar 2024 08:49:41 +0100 Subject: [PATCH 4/6] update to 1.6.9 (revert to 1.6.7 code) (cherry picked from commit f5dc0dc92d844908a96a60034443ade2586455e5) --- .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 c58b349..8b01566 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 c03c67e0588e633c244461fd3c55e6fa84fd3131 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Mar 2024 09:37:55 +0100 Subject: [PATCH 5/6] v1.6.10 (cherry picked from commit 5890dfe784b5dfef6bed3ad7617cd51f9550a86f) --- .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 8b01566..4b6a52d 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 62b7238025a1cf0f2c47adefa23df30cb24fd488 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2024 07:43:33 +0100 Subject: [PATCH 6/6] v1.6.11 (cherry picked from commit 1e5cc1c7d6b8f2b2f3b51273dbee28a0eac032c4) --- .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 4b6a52d..df0288a 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