summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json6
-rw-r--r--php-phpspec-prophecy.spec22
2 files changed, 14 insertions, 14 deletions
diff --git a/composer.json b/composer.json
index f10958f..7918065 100644
--- a/composer.json
+++ b/composer.json
@@ -20,13 +20,13 @@
"require": {
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
- "sebastian/comparator": "^1.1",
+ "sebastian/comparator": "^1.1|^2.0",
"doctrine/instantiator": "^1.0.2",
- "sebastian/recursion-context": "^1.0|^2.0"
+ "sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
- "phpspec/phpspec": "^2.0",
+ "phpspec/phpspec": "^2.5|^3.2",
"phpunit/phpunit": "^4.8 || ^5.6.5"
},
diff --git a/php-phpspec-prophecy.spec b/php-phpspec-prophecy.spec
index ba83127..28434fa 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 6c52c2722f8460122f96f86346600e1077ce22cb
+%global gh_commit 93d39f1f7f9326d746203c7c056f300f7f126073
%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.6.2
+Version: 1.7.0
Release: 1%{?dist}
Summary: Highly opinionated mocking framework for PHP
@@ -35,9 +35,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if %{with_tests}
# from composer.json, "require-dev": {
-# "phpspec/phpspec": "^2.0"
+# "phpspec/phpspec": "^2.5|^3.2"
# "phpunit/phpunit": "^4.8 || ^5.6.5"
-BuildRequires: php-composer(phpspec/phpspec) >= 2.0
+BuildRequires: php-composer(phpspec/phpspec) >= 2.5
# Autoloader
BuildRequires: php-composer(fedora/autoloader)
%endif
@@ -45,16 +45,16 @@ BuildRequires: php-composer(fedora/autoloader)
# from composer.json, "requires": {
# "php": "^5.3|^7.0",
# "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-# "sebastian/comparator": "^1.1",
+# "sebastian/comparator": "^1.1|^2.0",
# "doctrine/instantiator": "^1.0.2",
-# "sebastian/recursion-context": "^1.0|^2.0"
+# "sebastian/recursion-context": "^1.0|^2.0|^3.0"
Requires: php(language) >= 5.3
Requires: php-composer(phpdocumentor/reflection-docblock) >= 2.0
Requires: php-composer(phpdocumentor/reflection-docblock) < 4
Requires: php-composer(sebastian/comparator) >= 1.1
-Requires: php-composer(sebastian/comparator) < 2
+Requires: php-composer(sebastian/comparator) < 3
Requires: php-composer(sebastian/recursion-context) >= 1.0
-Requires: php-composer(sebastian/recursion-context) < 3
+Requires: php-composer(sebastian/recursion-context) < 4
# use 1.0.4 to ensure we have the autoloader
Requires: php-composer(doctrine/instantiator) >= 1.0.4
Requires: php-composer(doctrine/instantiator) < 2
@@ -94,9 +94,6 @@ cp -pr src/* %{buildroot}%{_datadir}/php
%check
%if %{with_tests}
-: ignore failed tests with phpspec 3.0
-rm spec/Prophecy/Doubler/ClassPatch/MagicCallPatchSpec.php
-
# remirepo:13
run=0
ret=0
@@ -137,6 +134,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Mar 3 2017 Remi Collet <remi@remirepo.net> - 1.7.0-1
+- Update to 1.7.0
+
* Tue Nov 22 2016 Remi Collet <remi@fedoraproject.org> - 1.6.2-1
- update to 1.6.2
- allow sebastian/recursion-context 2.0