v7.1.5

2 files changed, 13 insertions, 12 deletions

diff --git a/composer.json b/composer.json
index b13338c..48b15a6 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
         "phpunit/php-text-template": "^1.2.1",
         "phpunit/php-timer": "^2.0",
         "phpunit/phpunit-mock-objects": "^6.1.1",
-        "sebastian/comparator": "^2.1 || ^3.0",
+        "sebastian/comparator": "^3.0",
         "sebastian/diff": "^3.0",
         "sebastian/environment": "^3.1",
         "sebastian/exporter": "^3.1",
diff --git a/phpunit7.spec b/phpunit7.spec
index 6c6a136..f0bd67c 100644
--- a/phpunit7.spec
+++ b/phpunit7.spec
@@ -11,7 +11,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    6d51299e307dc510149e0b7cd1931dd11770e1cb
+%global gh_commit    ca64dba53b88aba6af32aebc6b388068db95c435
 #global gh_date      20150927
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
@@ -24,7 +24,7 @@
 %global php_home     %{_datadir}/php
 %global ver_major    7
 %global ver_minor    1
-%global ver_patch    4
+%global ver_patch    5
 %global specrel      1
 
 Name:           %{pk_project}%{ver_major}
@@ -52,7 +52,7 @@ BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 1.4.3    with php-co
 BuildRequires:  (php-composer(phpunit/php-text-template) >= 1.2.1    with php-composer(phpunit/php-text-template) <  2)
 BuildRequires:  (php-composer(phpunit/php-timer) >= 2.0              with php-composer(phpunit/php-timer) <  3)
 BuildRequires:  (php-composer(phpunit/phpunit-mock-objects) >= 6.1.1 with php-composer(phpunit/phpunit-mock-objects) <  7)
-BuildRequires:  (php-composer(sebastian/comparator) >= 2.1           with php-composer(sebastian/comparator) <  4)
+BuildRequires:  (php-composer(sebastian/comparator) >= 3.0           with php-composer(sebastian/comparator) <  4)
 BuildRequires:  (php-composer(sebastian/diff) >= 3.0                 with php-composer(sebastian/diff) <  4)
 BuildRequires:  (php-composer(sebastian/environment) >= 3.1          with php-composer(sebastian/environment) <  4)
 BuildRequires:  (php-composer(sebastian/exporter) >= 3.1             with php-composer(sebastian/exporter) <  4)
@@ -72,7 +72,7 @@ BuildRequires:  php-phpunit-File-Iterator                   >= 1.4.3
 BuildRequires:  php-phpunit-Text-Template                   >= 1.2.1
 BuildRequires:  php-phpunit-php-timer2
 BuildRequires:  php-phpunit-mock-objects6                   >= 6.1.1
-BuildRequires:  php-sebastian-comparator2                   >= 2.1
+BuildRequires:  php-sebastian-comparator3
 BuildRequires:  php-sebastian-diff3
 BuildRequires:  php-sebastian-environment3                  >= 3.1
 BuildRequires:  php-sebastian-exporter3                     >= 3.1
@@ -106,7 +106,7 @@ BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 #        "phpunit/php-text-template": "^1.2.1",
 #        "phpunit/php-timer": "^2.0",
 #        "phpunit/phpunit-mock-objects": "^6.1.1",
-#        "sebastian/comparator": "^2.1 || ^3.0",
+#        "sebastian/comparator": "^3.0",
 #        "sebastian/diff": "^3.0",
 #        "sebastian/environment": "^3.1",
 #        "sebastian/exporter": "^3.1",
@@ -132,7 +132,7 @@ Requires:       (php-composer(phpunit/php-file-iterator) >= 1.4.3    with php-co
 Requires:       (php-composer(phpunit/php-text-template) >= 1.2.1    with php-composer(phpunit/php-text-template) <  2)
 Requires:       (php-composer(phpunit/php-timer) >= 2.0              with php-composer(phpunit/php-timer) <  3)
 Requires:       (php-composer(phpunit/phpunit-mock-objects) >= 6.1.1 with php-composer(phpunit/phpunit-mock-objects) <  7)
-Requires:       (php-composer(sebastian/comparator) >= 2.1           with php-composer(sebastian/comparator) <  4)
+Requires:       (php-composer(sebastian/comparator) >= 3.0           with php-composer(sebastian/comparator) <  4)
 Requires:       (php-composer(sebastian/diff) >= 3.0                 with php-composer(sebastian/diff) <  4)
 Requires:       (php-composer(sebastian/environment) >= 3.1          with php-composer(sebastian/environment) <  4)
 Requires:       (php-composer(sebastian/exporter) >= 3.1             with php-composer(sebastian/exporter) <  4)
@@ -155,7 +155,7 @@ Requires:       php-phpunit-File-Iterator                   >= 1.4.3
 Requires:       php-phpunit-Text-Template                   >= 1.2.1
 Requires:       php-phpunit-php-timer2
 Requires:       php-phpunit-mock-objects6                   >= 6.1.1
-Requires:       php-sebastian-comparator2                   >= 2.1
+Requires:       php-sebastian-comparator3
 Requires:       php-sebastian-diff3
 Requires:       php-sebastian-environment3                  >= 3.1
 Requires:       php-sebastian-exporter3                     >= 3.1
@@ -208,10 +208,7 @@ cat << 'EOF' | tee -a src/autoload.php
     '%{ns_vendor}/Framework/MockObject6/autoload.php',
     '%{php_home}/Prophecy/autoload.php',
     '%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2
-    [
-       '%{php_home}/SebastianBergmann/Comparator3/autoload.php',
-       '%{php_home}/SebastianBergmann/Comparator2/autoload.php',
-    ],
+    '%{php_home}/SebastianBergmann/Comparator3/autoload.php',
     '%{php_home}/SebastianBergmann/Environment3/autoload.php',
     '%{php_home}/SebastianBergmann/Exporter3/autoload.php',
     '%{php_home}/SebastianBergmann/GlobalState2/autoload.php',
@@ -269,6 +266,10 @@ exit $ret
 
 
 %changelog
+* Wed May  2 2018 Remi Collet <remi@remirepo.net> - 7.1.5-1
+- update to 7.1.5
+- raise dependency on sebastian/comparator 3.0
+
 * Wed Apr 18 2018 Remi Collet <remi@remirepo.net> - 7.1.4-1
 - update to 7.1.4
 - allow sebastian/comparator 3.0