From f1da7559432bbc085287c04c3aaa852154372dac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Oct 2019 10:03:01 +0200 Subject: [PATCH 1/4] v1.9.0 (cherry picked from commit 31d371b4cc3467167cf9b71a4ace9259fb1e7164) --- .gitignore | 1 + php-phpspec-prophecy.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c9eb47c..d63d945 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /php-phpspec-prophecy-1.7.6-33a7e3c.tgz /php-phpspec-prophecy-1.8.0-4ba436b.tgz /php-phpspec-prophecy-1.8.1-1927e75.tgz +/php-phpspec-prophecy-1.9.0-f6811d9.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 712cbe9..6974f53 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 1927e75f4ed19131ec9bcc3b002e07fb1173ee76 +%global gh_commit f6811d96d97bdf400077a0cc100ae56aa32b9203 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -19,7 +19,7 @@ %endif Name: php-phpspec-prophecy -Version: 1.8.1 +Version: 1.9.0 Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -43,7 +43,7 @@ BuildRequires: php-composer(fedora/autoloader) # from composer.json, "requires": { # "php": "^5.3|^7.0", -# "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", +# "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", # "sebastian/comparator": "^1.1|^2.0|^3.0", # "doctrine/instantiator": "^1.0.2", # "sebastian/recursion-context": "^1.0|^2.0|^3.0" @@ -135,7 +135,13 @@ exit $ret %{_datadir}/php/Prophecy +# TODO ignore phpdocumentor/reflection-docblock 5.0 +# not yet packaged + %changelog +* Fri Oct 4 2019 Remi Collet - 1.9.0-1 +- update to 1.9.0 + * Thu Jun 13 2019 Remi Collet - 1.8.1-1 - update to 1.8.1 diff --git a/sources b/sources index 07caa71..9a9aa36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.8.1-1927e75.tgz) = af79e9075c138fdc7cb3f316db7b5de0141ec9d2c02ea7fe891c0cfa5e52c939303aa387e40dc03f88fd794009c729ba7dc59ac79d1dec9d22c678594c549731 +SHA512 (php-phpspec-prophecy-1.9.0-f6811d9.tgz) = 6062c5c65309f8bd11fdc10873d149356d6f3db3df55f9d2ace629dd0c8189b699eabe5f18e91331f5f636d747aef8082016e39f01fb344033faa13e85828e82 From 009afa37a4f05c7fc125b651cfc3a6a9f5380665 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Jan 2020 13:06:02 +0100 Subject: [PATCH 2/4] v1.10.1 (cherry picked from commit bc8449cee3612e200c9a74cc01400c1c14ac5c0c) --- .gitignore | 1 + php-phpspec-prophecy.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d63d945..c01aca2 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /php-phpspec-prophecy-1.8.0-4ba436b.tgz /php-phpspec-prophecy-1.8.1-1927e75.tgz /php-phpspec-prophecy-1.9.0-f6811d9.tgz +/php-phpspec-prophecy-1.10.1-cbe1df6.tgz diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 6974f53..265b3d9 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit f6811d96d97bdf400077a0cc100ae56aa32b9203 +%global gh_commit cbe1df668b3fe136bcc909126a0f529a78d4cbbc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -19,7 +19,7 @@ %endif Name: php-phpspec-prophecy -Version: 1.9.0 +Version: 1.10.1 Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -44,13 +44,13 @@ BuildRequires: php-composer(fedora/autoloader) # from composer.json, "requires": { # "php": "^5.3|^7.0", # "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", -# "sebastian/comparator": "^1.1|^2.0|^3.0", +# "sebastian/comparator": "^1.2.3|^2.0|^3.0", # "doctrine/instantiator": "^1.0.2", # "sebastian/recursion-context": "^1.0|^2.0|^3.0" Requires: php(language) >= 5.3 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(phpdocumentor/reflection-docblock) >= 2.0 with php-composer(phpdocumentor/reflection-docblock) < 5) -Requires: (php-composer(sebastian/comparator) >= 1.1 with php-composer(sebastian/comparator) < 4) +Requires: (php-composer(sebastian/comparator) >= 1.2.3 with php-composer(sebastian/comparator) < 4) # recursion-context will be pulled by phpspec or phpunit or phpunit6 #Requires: (php-composer(sebastian/recursion-context) >= 1.0 with php-composer(sebastian/recursion-context) < 4) # use 1.0.4 to ensure we have the autoloader @@ -59,7 +59,7 @@ Requires: (php-composer(doctrine/instantiator) >= 1.0.4 with p Requires: php-composer(phpdocumentor/reflection-docblock) >= 2.0 # ignore v4 for now Requires: php-composer(phpdocumentor/reflection-docblock) < 4 -Requires: php-composer(sebastian/comparator) >= 1.1 +Requires: php-composer(sebastian/comparator) >= 1.2.3 Requires: php-composer(sebastian/comparator) < 3 # recursion-context will be pulled by phpspec or phpunit or phpunit6 #Requires: php-composer(sebastian/recursion-context) >= 1.0 @@ -139,6 +139,9 @@ exit $ret # not yet packaged %changelog +* Fri Jan 3 2020 Remi Collet - 1.10.1-1 +- update to 1.10.1 + * Fri Oct 4 2019 Remi Collet - 1.9.0-1 - update to 1.9.0 diff --git a/sources b/sources index 9a9aa36..b5760d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.9.0-f6811d9.tgz) = 6062c5c65309f8bd11fdc10873d149356d6f3db3df55f9d2ace629dd0c8189b699eabe5f18e91331f5f636d747aef8082016e39f01fb344033faa13e85828e82 +SHA512 (php-phpspec-prophecy-1.10.1-cbe1df6.tgz) = 3b5522c5c2e23be777b3198295bffc92043baca15f7bcf768781d88f27df151bc592fdfe19aa108bb8586c6b641c5de19e6e76476b6124fddc0677f89ab0df63 From 8839fc7ebd4be04b9538d38fe73fa3a274f3933a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Jan 2020 11:07:18 +0100 Subject: [PATCH 3/4] update to 1.10.2 allow sebastian/comparator 4 and sebastian/recursion-context 4 (cherry picked from commit 79da8220b26467eb4768cfe3a73393198fe0fbd5) --- .gitignore | 1 + php-phpspec-prophecy-autoload.php | 9 ++++++--- php-phpspec-prophecy.spec | 14 +++++++++----- sources | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c01aca2..2ff767e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /php-phpspec-prophecy-1.8.1-1927e75.tgz /php-phpspec-prophecy-1.9.0-f6811d9.tgz /php-phpspec-prophecy-1.10.1-cbe1df6.tgz +/php-phpspec-prophecy-1.10.2-b4400ef.tgz diff --git a/php-phpspec-prophecy-autoload.php b/php-phpspec-prophecy-autoload.php index 3a2b120..b844b2a 100644 --- a/php-phpspec-prophecy-autoload.php +++ b/php-phpspec-prophecy-autoload.php @@ -22,10 +22,13 @@ if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock4/autol unset($dep); if (!class_exists('SebastianBergmann\\Comparator\\Comparator')) { // v2 from phpunit, v1 from phpspec - require_once (stream_resolve_include_path('SebastianBergmann/Comparator3/autoload.php') ?: + require_once (stream_resolve_include_path('SebastianBergmann/Comparator4/autoload.php') ?: + (stream_resolve_include_path('SebastianBergmann/Comparator3/autoload.php') ?: (stream_resolve_include_path('SebastianBergmann/Comparator2/autoload.php') ?: - 'SebastianBergmann/Comparator/autoload.php')); + 'SebastianBergmann/Comparator/autoload.php'))); } if (!class_exists('SebastianBergmann\\RecursionContext\\Context')) { // v3 from phpunit, v2 from phpspec (via exporter) - require_once (stream_resolve_include_path('SebastianBergmann/RecursionContext3/autoload.php') ?: 'SebastianBergmann/RecursionContext/autoload.php'); + require_once (stream_resolve_include_path('SebastianBergmann/RecursionContext4/autoload.php') ?: + (stream_resolve_include_path('SebastianBergmann/RecursionContext3/autoload.php') ?: + 'SebastianBergmann/RecursionContext/autoload.php')); } diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 265b3d9..5fa6ca7 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit cbe1df668b3fe136bcc909126a0f529a78d4cbbc +%global gh_commit b4400efc9d206e83138e2bb97ed7f5b14b831cd9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -19,7 +19,7 @@ %endif Name: php-phpspec-prophecy -Version: 1.10.1 +Version: 1.10.2 Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -44,13 +44,13 @@ BuildRequires: php-composer(fedora/autoloader) # from composer.json, "requires": { # "php": "^5.3|^7.0", # "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", -# "sebastian/comparator": "^1.2.3|^2.0|^3.0", +# "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", # "doctrine/instantiator": "^1.0.2", -# "sebastian/recursion-context": "^1.0|^2.0|^3.0" +# "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" Requires: php(language) >= 5.3 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(phpdocumentor/reflection-docblock) >= 2.0 with php-composer(phpdocumentor/reflection-docblock) < 5) -Requires: (php-composer(sebastian/comparator) >= 1.2.3 with php-composer(sebastian/comparator) < 4) +Requires: (php-composer(sebastian/comparator) >= 1.2.3 with php-composer(sebastian/comparator) < 5) # recursion-context will be pulled by phpspec or phpunit or phpunit6 #Requires: (php-composer(sebastian/recursion-context) >= 1.0 with php-composer(sebastian/recursion-context) < 4) # use 1.0.4 to ensure we have the autoloader @@ -139,6 +139,10 @@ exit $ret # not yet packaged %changelog +* Tue Jan 21 2020 Remi Collet - 1.10.2-1 +- update to 1.10.2 +- allow sebastian/comparator 4 and sebastian/recursion-context 4 + * Fri Jan 3 2020 Remi Collet - 1.10.1-1 - update to 1.10.1 diff --git a/sources b/sources index b5760d5..ff702b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.10.1-cbe1df6.tgz) = 3b5522c5c2e23be777b3198295bffc92043baca15f7bcf768781d88f27df151bc592fdfe19aa108bb8586c6b641c5de19e6e76476b6124fddc0677f89ab0df63 +SHA512 (php-phpspec-prophecy-1.10.2-b4400ef.tgz) = a3dfe41b5906de30311d93c2b3163d8a982c9a08f7d76144b0912a1ddb1943e032b276c546fb3043acdfab8925c23f426a0a42c33ddff8e21cc78efe8c59b9eb From 6a2f90e68a1ea24564f4b8a85d135fad4ce9e4db Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Mar 2020 08:12:20 +0100 Subject: [PATCH 4/4] update to 1.10.3 allow phpdocumentor/reflection-docblock 5.0 (cherry picked from commit 16349df7fe1ba0d6e7cc9263d7d7541441106c30) (cherry picked from commit 856441cc7d8e90d5d9bfa1324924e0e87e1d74bd) --- .gitignore | 1 + php-phpspec-prophecy-autoload.php | 4 +++- php-phpspec-prophecy.spec | 10 +++++++--- sources | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2ff767e..f758128 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /php-phpspec-prophecy-1.9.0-f6811d9.tgz /php-phpspec-prophecy-1.10.1-cbe1df6.tgz /php-phpspec-prophecy-1.10.2-b4400ef.tgz +/php-phpspec-prophecy-1.10.3-451c3cd.tgz diff --git a/php-phpspec-prophecy-autoload.php b/php-phpspec-prophecy-autoload.php index b844b2a..f4b72b2 100644 --- a/php-phpspec-prophecy-autoload.php +++ b/php-phpspec-prophecy-autoload.php @@ -9,7 +9,9 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; // Dependencies require_once 'Doctrine/Instantiator/autoload.php'; -if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock4/autoload.php')) { +if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock5/autoload.php')) { + require_once $dep; +} else if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock4/autoload.php')) { require_once $dep; } else if ($dep = stream_resolve_include_path('phpDocumentor/Reflection/DocBlock/autoload.php')) { require_once $dep; diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 5fa6ca7..6ad70e7 100644 --- a/php-phpspec-prophecy.spec +++ b/php-phpspec-prophecy.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit b4400efc9d206e83138e2bb97ed7f5b14b831cd9 +%global gh_commit 451c3cd1418cf640de218914901e51b064abb093 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project prophecy @@ -19,7 +19,7 @@ %endif Name: php-phpspec-prophecy -Version: 1.10.2 +Version: 1.10.3 Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -49,7 +49,7 @@ BuildRequires: php-composer(fedora/autoloader) # "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" Requires: php(language) >= 5.3 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(phpdocumentor/reflection-docblock) >= 2.0 with php-composer(phpdocumentor/reflection-docblock) < 5) +Requires: (php-composer(phpdocumentor/reflection-docblock) >= 2.0 with php-composer(phpdocumentor/reflection-docblock) < 6) Requires: (php-composer(sebastian/comparator) >= 1.2.3 with php-composer(sebastian/comparator) < 5) # recursion-context will be pulled by phpspec or phpunit or phpunit6 #Requires: (php-composer(sebastian/recursion-context) >= 1.0 with php-composer(sebastian/recursion-context) < 4) @@ -139,6 +139,10 @@ exit $ret # not yet packaged %changelog +* Fri Mar 6 2020 Remi Collet - 1.10.3-1 +- update to 1.10.3 +- allow phpdocumentor/reflection-docblock 5.0 + * Tue Jan 21 2020 Remi Collet - 1.10.2-1 - update to 1.10.2 - allow sebastian/comparator 4 and sebastian/recursion-context 4 diff --git a/sources b/sources index ff702b1..0b338a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpspec-prophecy-1.10.2-b4400ef.tgz) = a3dfe41b5906de30311d93c2b3163d8a982c9a08f7d76144b0912a1ddb1943e032b276c546fb3043acdfab8925c23f426a0a42c33ddff8e21cc78efe8c59b9eb +SHA512 (php-phpspec-prophecy-1.10.3-451c3cd.tgz) = 5808e2cc28effdca81e0907fae0be4faa9d9daad533b6d4c641375c3acfd72b14bd508daf4e6e47047377a0565642d03556eea7914c2cf48cba0f6dcf0fadcfe