update to 6.1.1

allow sebastian/environment 4

2 files changed, 16 insertions, 9 deletions

diff --git a/composer.json b/composer.json
index 6fad054..bb27256 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "phpunit/php-token-stream": "^3.0",
         "phpunit/php-text-template": "^1.2.1",
         "sebastian/code-unit-reverse-lookup": "^1.0.1",
-        "sebastian/environment": "^3.1",
+        "sebastian/environment": "^3.1 || ^4.0",
         "sebastian/version": "^2.0.1",
         "theseer/tokenizer": "^1.1"
     },
diff --git a/php-phpunit-php-code-coverage6.spec b/php-phpunit-php-code-coverage6.spec
index 1655886..ae74ca0 100644
--- a/php-phpunit-php-code-coverage6.spec
+++ b/php-phpunit-php-code-coverage6.spec
@@ -9,7 +9,7 @@
 
 %global bootstrap    0
 # Github
-%global gh_commit    0685fb6a43aed1b2e09804d1aaf17144c82861f8
+%global gh_commit    b097681a19a48e52706f57e47a09594bac4f7cab
 #global gh_date      20150924
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
@@ -23,7 +23,7 @@
 %global php_home     %{_datadir}/php
 %global ver_major    6
 %global ver_minor    1
-%global ver_patch    0
+%global ver_patch    1
 %global specrel      1
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
@@ -49,12 +49,12 @@ BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 %if %{with_tests}
 BuildRequires:  php(language) >= 7.1
 # remirepo:1
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 2.0            with php-composer(phpunit/php-file-iterator) <  3)
 BuildRequires:  (php-composer(phpunit/php-token-stream) >= 3.0             with php-composer(phpunit/php-token-stream) <  4)
 BuildRequires:  (php-composer(phpunit/php-text-template) >= 1.2.1          with php-composer(phpunit/php-text-template) <  2)
 BuildRequires:  (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) <  2)
-BuildRequires:  (php-composer(sebastian/environment) >= 3.1                with php-composer(sebastian/environment) <  4)
+BuildRequires:  (php-composer(sebastian/environment) >= 3.1                with php-composer(sebastian/environment) <  5)
 BuildRequires:  (php-composer(sebastian/version) >= 2.0.1                  with php-composer(sebastian/version) <  3)
 BuildRequires:  (php-composer(theseer/tokenizer) >= 1.1                    with php-composer(theseer/tokenizer) <  2)
 # remirepo:9
@@ -82,19 +82,19 @@ BuildRequires:  php-pecl-xdebug  >= 2.6.0
 #        "phpunit/php-token-stream": "^3.0",
 #        "phpunit/php-text-template": "^1.2.1",
 #        "sebastian/code-unit-reverse-lookup": "^1.0.1",
-#        "sebastian/environment": "^3.1",
+#        "sebastian/environment": "^3.1 || ^4.0",
 #        "sebastian/version": "^2.0.1",
 #        "theseer/tokenizer": "^1.1"
 Requires:       php(language) >= 7.1
 Requires:       php-dom
 Requires:       php-xmlwriter
 # remirepo:1
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:       (php-composer(phpunit/php-file-iterator) >= 2.0            with php-composer(phpunit/php-file-iterator) <  3)
 Requires:       (php-composer(phpunit/php-token-stream) >= 3.0             with php-composer(phpunit/php-token-stream) <  4)
 Requires:       (php-composer(phpunit/php-text-template) >= 1.2.1          with php-composer(phpunit/php-text-template) <  2)
 Requires:       (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) <  2)
-Requires:       (php-composer(sebastian/environment) >= 3.1                with php-composer(sebastian/environment) <  4)
+Requires:       (php-composer(sebastian/environment) >= 3.1                with php-composer(sebastian/environment) <  5)
 Requires:       (php-composer(sebastian/version) >= 2.0.1                  with php-composer(sebastian/version) <  3)
 Requires:       (php-composer(theseer/tokenizer) >= 1.1                    with php-composer(theseer/tokenizer) <  2)
 # remirepo:9
@@ -154,7 +154,10 @@ cat << 'EOF' | tee -a src/autoload.php
     '%{php_home}/%{ns_vendor}/PhpTokenStream3/autoload.php',
     '%{php_home}/Text/Template/Autoload.php',
     '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup/autoload.php',
-    '%{php_home}/%{ns_vendor}/Environment3/autoload.php',
+    [
+        '%{php_home}/%{ns_vendor}/Environment4/autoload.php',
+        '%{php_home}/%{ns_vendor}/Environment3/autoload.php',
+    ],
     '%{php_home}/%{ns_vendor}/Version/autoload.php',
     '%{php_home}/TheSeer/Tokenizer/autoload.php',
 ]);
@@ -203,6 +206,10 @@ exit $ret
 
 
 %changelog
+* Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 6.1.1-1
+- update to 6.1.1
+- allow sebastian/environment 4
+
 * Tue Oct 16 2018 Remi Collet <remi@remirepo.net> - 6.1.0-1
 - update to 6.1.0
 - drop dependency on glyphicons-halflings-fonts