From 4123eddb37d4c32ece79e51ffc323590bc462a8f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Dec 2019 13:57:28 +0100 Subject: v1.10.0 --- composer.json | 8 ++++---- php-phpspec-prophecy.spec | 22 ++++++++++++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 13b6658..d54ef7a 100644 --- a/composer.json +++ b/composer.json @@ -19,14 +19,14 @@ "require": { "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", - "sebastian/comparator": "^1.1|^2.0|^3.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", + "sebastian/comparator": "^1.2.3|^2.0|^3.0", "doctrine/instantiator": "^1.0.2", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { - "phpspec/phpspec": "^2.5|^3.2", + "phpspec/phpspec": "^2.5 || ^3.2", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, @@ -44,7 +44,7 @@ "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.10.x-dev" } } } diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec index c67dc2a..ef0f77a 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 d638ebbb58daba25a6a0dc7969e1358a0e3c6682 %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.10.0 Release: 1%{?dist} Summary: Highly opinionated mocking framework for PHP @@ -43,14 +43,14 @@ BuildRequires: php-composer(fedora/autoloader) # from composer.json, "requires": { # "php": "^5.3|^7.0", -# "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", -# "sebastian/comparator": "^1.1|^2.0|^3.0", +# "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.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 @@ -135,7 +135,17 @@ exit $ret %{_datadir}/php/Prophecy +# TODO ignore phpdocumentor/reflection-docblock 5.0 +# not yet packaged + %changelog +* Thu Dec 19 2019 Remi Collet - 1.10.0-1 +- update to 1.10.0 +- raise dependency on sebastian/comparator 1.2.3 + +* 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 -- cgit