summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--phpunit6.spec13
2 files changed, 11 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index f75e0e2..bd89b55 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues"
},
+ "prefer-stable": true,
"require": {
"php": "^7.0",
"ext-dom": "*",
@@ -36,7 +37,7 @@
"phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "^4.0",
"sebastian/comparator": "^2.0",
- "sebastian/diff": "^1.4.3 || ^2.0",
+ "sebastian/diff": "^1.4.3",
"sebastian/environment": "^3.0.2",
"sebastian/exporter": "^3.1",
"sebastian/global-state": "^1.1 || ^2.0",
@@ -55,6 +56,7 @@
"platform": {
"php": "7.0.0"
},
+ "optimize-autoloader": true,
"sort-packages": true
},
"suggest": {
diff --git a/phpunit6.spec b/phpunit6.spec
index faa5880..d1ee2bb 100644
--- a/phpunit6.spec
+++ b/phpunit6.spec
@@ -7,7 +7,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit fa5711d0559fc4b64deba0702be52d41434cbcb7
+%global gh_commit ff3a76a58ac293657808aefd58c8aaf05945f4d9
#global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
@@ -20,7 +20,7 @@
%global php_home %{_datadir}/php
%global ver_major 6
%global ver_minor 2
-%global ver_patch 3
+%global ver_patch 4
%global specrel 1
Name: %{pk_project}%{ver_major}
@@ -58,7 +58,7 @@ BuildRequires: php-composer(phpunit/phpunit-mock-objects) < 5
BuildRequires: php-composer(phpunit/phpunit-mock-objects) >= 4
BuildRequires: php-composer(sebastian/comparator) < 3
BuildRequires: php-composer(sebastian/comparator) >= 2.0
-BuildRequires: php-composer(sebastian/diff) < 3
+BuildRequires: php-composer(sebastian/diff) < 2
BuildRequires: php-composer(sebastian/diff) >= 1.4.3
BuildRequires: php-composer(sebastian/environment) < 4
BuildRequires: php-composer(sebastian/environment) >= 3.0.2
@@ -98,7 +98,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "phpunit/php-timer": "^1.0.6",
# "phpunit/phpunit-mock-objects": "^4.0",
# "sebastian/comparator": "^2.0",
-# "sebastian/diff": "^1.4.3 || ^2.0",
+# "sebastian/diff": "^1.4.3",
# "sebastian/environment": "^3.0.2",
# "sebastian/exporter": "^3.1",
# "sebastian/global-state": "^1.1 || ^2.0",
@@ -132,7 +132,7 @@ Requires: php-composer(phpunit/phpunit-mock-objects) < 5
Requires: php-composer(phpunit/phpunit-mock-objects) >= 4.0
Requires: php-composer(sebastian/comparator) < 3
Requires: php-composer(sebastian/comparator) >= 2.0
-Requires: php-composer(sebastian/diff) < 3
+Requires: php-composer(sebastian/diff) < 2
Requires: php-composer(sebastian/diff) >= 1.4.3
Requires: php-composer(sebastian/environment) < 4
Requires: php-composer(sebastian/environment) >= 3.0.2
@@ -265,6 +265,9 @@ exit $ret
%changelog
+* Fri Aug 4 2017 Remi Collet <remi@remirepo.net> - 6.2.4-1
+- Update to 6.2.4
+
* Tue Jul 4 2017 Remi Collet <remi@remirepo.net> - 6.2.3-1
- Update to 6.2.3