From 3af3a8a065981db664e916ebe3f4571d411fed32 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 16:04:45 +0200 Subject: update to 1.12.0 raise dependency on phpdocumentor/reflection-docblock 5.2 --- composer.json | 6 +++--- php-phpspec-prophecy.spec | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index dbb2e55..3bde881 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ ], "require": { - "php": "^7.2", - "phpdocumentor/reflection-docblock": "^5.0", + "php": "^7.2 || ~8.0, <8.1", + "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0", "doctrine/instantiator": "^1.2", "sebastian/recursion-context": "^3.0 || ^4.0" @@ -27,7 +27,7 @@ "require-dev": { "phpspec/phpspec": "^6.0", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^8.0 || ^9.0 <9.3" }, "autoload": { diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index 3831cb1..89640e4 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 b20034be5efcdab4fb60ca3a29cba2949aead160 +%global gh_commit 765cd5d5d237525f8bbadaec5dc161c83a369119 %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.11.1 +Version: 1.12.0 Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -36,20 +36,20 @@ BuildRequires: php(language) >= 7.2 %if %{with tests} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 5.0 with php-composer(phpdocumentor/reflection-docblock) < 6) +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) < 5) BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 5) BuildRequires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 2) # remirepo:6 %else -BuildRequires: php-phpdocumentor-reflection-docblock5 +BuildRequires: php-phpdocumentor-reflection-docblock5 >= 5.2 BuildRequires: php-sebastian-comparator3 BuildRequires: php-sebastian-recursion-context3 BuildRequires: php-doctrine-instantiator >= 1.2 %endif # from composer.json, "require-dev": { # "phpspec/phpspec": "^6.0" -# "phpunit/phpunit": "^8.0" +# "phpunit/phpunit": "^8.0 || ^9.0 <9.3" BuildRequires: php-composer(phpspec/phpspec) >= 6.0 BuildRequires: phpunit8 %endif @@ -57,21 +57,21 @@ BuildRequires: phpunit8 BuildRequires: php-fedora-autoloader-devel # from composer.json, "requires": { -# "php": "^5.3|^7.0", -# "phpdocumentor/reflection-docblock": "^5.0", +# "php": "^7.2 || ~8.0, <8.1", +# "phpdocumentor/reflection-docblock": "^5.2", # "sebastian/comparator": "^3.0|^4.0", # "doctrine/instantiator": "^1.2", # "sebastian/recursion-context": "^3.0|^4.0" Requires: php(language) >= 7.2 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(phpdocumentor/reflection-docblock) >= 5.0 with php-composer(phpdocumentor/reflection-docblock) < 6) +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) < 5) Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 5) Requires: (php-composer(doctrine/instantiator) >= 1.2 with php-composer(doctrine/instantiator) < 2) # remirepo:6 %else -Requires: php-phpdocumentor-reflection-docblock5 +Requires: php-phpdocumentor-reflection-docblock5 >= 5.2 Requires: php-sebastian-comparator3 Requires: php-sebastian-recursion-context3 Requires: php-doctrine-instantiator >= 1.2 @@ -153,6 +153,10 @@ exit $ret %changelog +* Mon Sep 28 2020 Remi Collet - 1.12.0-1 +- update to 1.12.0 +- raise dependency on phpdocumentor/reflection-docblock 5.2 + * Wed Jul 8 2020 Remi Collet - 1.11.1-1 - update to 1.11.1 -- cgit