From 4707e0f6aad7cd0c5d301185b16300069bc22b74 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 29 Feb 2024 15:21:31 +0100 Subject: [PATCH] v1.19.0 (cherry picked from commit ddfae1a5a8e24b367a75e8d43423a99993ec205b) --- .gitignore | 1 + php-phpspec-prophecy.spec | 61 ++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 468a35c..d7a8140 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ clog /php-phpspec-prophecy-1.16.0-be8cac5.tgz /php-phpspec-prophecy-1.17.0-15873c6.tgz /php-phpspec-prophecy-1.18.0-d4f454f.tgz +/php-phpspec-prophecy-1.19.0-67a759e.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 6b55cbc..dda7ae1 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit d4f454f7e1193933f04e6500de3e79191648ed0c +%global gh_commit 67a759e7d8746d501c41536ba40cd9c0a07d6a87 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -15,7 +15,7 @@ %bcond_with phpspec Name: php-phpspec-prophecy -Version: 1.18.0 +Version: 1.19.0 Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -28,8 +28,8 @@ BuildArch: noarch BuildRequires: php(language) >= 7.2 %if %{with tests} BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) -BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 6) -BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 6) +BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 7) +BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 7) BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # from composer.json, "require-dev": { # "phpspec/phpspec": "^6.0 || ^7.0" @@ -48,13 +48,13 @@ BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { # "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", # "phpdocumentor/reflection-docblock": "^5.2", -# "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", +# "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", # "doctrine/instantiator": "^1.2 || ^2.0", -# "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" +# "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" Requires: php(language) >= 7.2 Requires: (php-composer(phpdocumentor/reflection-docblock) >= 5.2 with php-composer(phpdocumentor/reflection-docblock) < 6) -Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 6) -Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 6) +Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 7) +Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 7) Requires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 3) # From phpcompatinfo report for version 1.11.0 Requires: php-pcre @@ -82,35 +82,39 @@ to be used inside any testing framework out there with minimal effort. phpab --template fedora --output src/Prophecy/autoload.php src cat << 'EOF' | tee -a src/Prophecy/autoload.php +$inst = ['%{_datadir}/php/Doctrine/Instantiator/autoload.php']; if (PHP_VERSION_ID > 80100) { - $inst = [ - '%{_datadir}/php/Doctrine/Instantiator2/autoload.php', - '%{_datadir}/php/Doctrine/Instantiator/autoload.php', - ]; -} else { - $inst = '%{_datadir}/php/Doctrine/Instantiator/autoload.php'; + array_unshift($inst, '%{_datadir}/php/Doctrine/Instantiator2/autoload.php'); } \Fedora\Autoloader\Dependencies::required([ $inst, '%{_datadir}/php/phpDocumentor/Reflection/DocBlock5/autoload.php', ]); if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from phpunit, v1 from phpspec - \Fedora\Autoloader\Dependencies::required([ - [ - '%{_datadir}/php/SebastianBergmann/Comparator5/autoload.php', - '%{_datadir}/php/SebastianBergmann/Comparator4/autoload.php', - '%{_datadir}/php/SebastianBergmann/Comparator3/autoload.php', - ], - ]); + $inst = [ + '%{_datadir}/php/SebastianBergmann/Comparator4/autoload.php', + '%{_datadir}/php/SebastianBergmann/Comparator3/autoload.php', + ]; + if (PHP_VERSION_ID > 80100) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/Comparator5/autoload.php'); + } + if (PHP_VERSION_ID > 80200) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/Comparator6/autoload.php'); + } + \Fedora\Autoloader\Dependencies::required([$inst]); } if (!class_exists('SebastianBergmann\\RecursionContext\\Context')) { // v2 from phpunit, v1 from phpspec - \Fedora\Autoloader\Dependencies::required([ - [ - '%{_datadir}/php/SebastianBergmann/RecursionContext5/autoload.php', + $inst = [ '%{_datadir}/php/SebastianBergmann/RecursionContext4/autoload.php', '%{_datadir}/php/SebastianBergmann/RecursionContext3/autoload.php', - ], - ]); + ]; + if (PHP_VERSION_ID > 80100) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/RecursionContext5/autoload.php'); + } + if (PHP_VERSION_ID > 80200) { + array_unshift($inst, '%{_datadir}/php/SebastianBergmann/RecursionContext6/autoload.php'); + } + \Fedora\Autoloader\Dependencies::required([$inst]); } EOF @@ -171,6 +175,11 @@ exit $ret %changelog +* Thu Feb 29 2024 Remi Collet - 1.19.0-1 +- update to 1.19.0 +- allow doctrine/instantiator 6 +- allow sebastian/recursion-context 6 + * Fri Dec 8 2023 Remi Collet - 1.18.0-1 - update to 1.18.0 - run test suite with phpunit8, phpunit9 and phpunit10 diff --git a/sources b/sources index c9bb8ae..1e400d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.18.0-d4f454f.tgz) = 17445b49b7c3177d367d4ccfdddcf66b888d203e08b46eeeadf84d8cd5c3eb5aa4a845575e3670b72cdc951e16614bddb539f12f799113f1b8f3a14c256a8b90 +SHA512 (php-phpspec-prophecy-1.19.0-67a759e.tgz) = 4eccf41d3135c2be26223dea0ae72921fc5a2af01941cad9617579fa93d320f702b40c9f116080dd9ce7c7b9f696e2e823e9fa6e36d9249d359a1a41bb81e38f