update to 8.0.0

raise depdendency on PHP 7.3
raise depdendency on phpunit/php-file-iterator 3
raise depdendency on phpunit/php-token-stream 4
raise depdendency on phpunit/php-text-template 2
raise depdendency on sebastian/code-unit-reverse-lookup 2
raise depdendency on sebastian/environment 5
raise depdendency on sebastian/version 3
rename to php-phpunit-php-code-coverage8
move to /usr/share/php/SebastianBergmann/CodeCoverage8

2 files changed, 81 insertions, 66 deletions

diff --git a/composer.json b/composer.json
index 19f8586..1c8abd0 100644
--- a/composer.json
+++ b/composer.json
@@ -20,27 +20,31 @@
         "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues"
     },
     "config": {
+        "platform": {
+            "php": "7.3.0"
+        },
         "optimize-autoloader": true,
         "sort-packages": true
     },
     "prefer-stable": true,
     "require": {
-        "php": "^7.2",
+        "php": "^7.3",
         "ext-dom": "*",
         "ext-xmlwriter": "*",
-        "phpunit/php-file-iterator": "^2.0.2",
-        "phpunit/php-token-stream": "^3.1.1",
-        "phpunit/php-text-template": "^1.2.1",
-        "sebastian/code-unit-reverse-lookup": "^1.0.1",
-        "sebastian/environment": "^4.2.2",
-        "sebastian/version": "^2.0.1",
+        "phpunit/php-file-iterator": "^3.0",
+        "phpunit/php-token-stream": "^4.0",
+        "phpunit/php-text-template": "^2.0",
+        "sebastian/code-unit-reverse-lookup": "^2.0",
+        "sebastian/environment": "^5.0",
+        "sebastian/version": "^3.0",
         "theseer/tokenizer": "^1.1.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.2.2"
+        "phpunit/phpunit": "^9.0"
     },
     "suggest": {
-        "ext-xdebug": "^2.7.2"
+        "ext-pcov": "*",
+        "ext-xdebug": "*"
     },
     "autoload": {
         "classmap": [
@@ -55,7 +59,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "7.0-dev"
+            "dev-master": "8.0-dev"
         }
     }
 }
diff --git a/php-phpunit-php-code-coverage8.spec b/php-phpunit-php-code-coverage8.spec
index 73b1c5f..9a92ad0 100644
--- a/php-phpunit-php-code-coverage8.spec
+++ b/php-phpunit-php-code-coverage8.spec
@@ -1,6 +1,6 @@
-# remirepo/fedora spec file for php-phpunit-php-code-coverage7
+# remirepo/fedora spec file for php-phpunit-php-code-coverage8
 #
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -9,7 +9,7 @@
 
 %global bootstrap    0
 # Github
-%global gh_commit    f1884187926fbb755a9aaf0b3836ad3165b478bf
+%global gh_commit    278b6e876467da2e6b5e5390a2310391618ebc10
 #global gh_date      20150924
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
@@ -21,7 +21,7 @@
 %global ns_vendor    SebastianBergmann
 %global ns_project   CodeCoverage
 %global php_home     %{_datadir}/php
-%global ver_major    7
+%global ver_major    8
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
 %else
@@ -29,7 +29,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{ver_major}
-Version:        7.0.10
+Version:        8.0.0
 Release:        1%{?dist}
 Summary:        PHP code coverage information
 
@@ -44,71 +44,72 @@ Source0:        https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commi
 BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 %if %{with_tests}
-BuildRequires:  php(language) >= 7.2
+BuildRequires:  php(language) >= 7.3
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 2.0.2          with php-composer(phpunit/php-file-iterator) <  3)
-BuildRequires:  (php-composer(phpunit/php-token-stream) >= 3.1.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) >= 4.2.2              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.3                  with php-composer(theseer/tokenizer) <  2)
+BuildRequires:  (php-composer(phpunit/php-file-iterator)          >= 3.0   with php-composer(phpunit/php-file-iterator)          < 4)
+BuildRequires:  (php-composer(phpunit/php-token-stream)           >= 4.0   with php-composer(phpunit/php-token-stream)           < 5)
+BuildRequires:  (php-composer(phpunit/php-text-template)          >= 2.0   with php-composer(phpunit/php-text-template)          < 3)
+BuildRequires:  (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0   with php-composer(sebastian/code-unit-reverse-lookup) < 3)
+BuildRequires:  (php-composer(sebastian/environment)              >= 5.0   with php-composer(sebastian/environment)              < 6)
+BuildRequires:  (php-composer(sebastian/version)                  >= 3.0   with php-composer(sebastian/version)                  < 4)
+BuildRequires:  (php-composer(theseer/tokenizer)                  >= 1.1.3 with php-composer(theseer/tokenizer)                  < 2)
 # remirepo:9
 %else
-BuildRequires:  php-phpunit-php-file-iterator2         >= 2.0.2
-BuildRequires:  php-phpunit-php-token-stream3          >= 3.1.0
-BuildRequires:  php-phpunit-Text-Template              >= 1.2.1
-BuildRequires:  php-sebastian-code-unit-reverse-lookup >= 1.0.1
-BuildRequires:  php-sebastian-environment4             >= 4.2.2
-BuildRequires:  php-phpunit-Version                    >= 2.0.1
+BuildRequires:  php-phpunit-php-file-iterator3
+BuildRequires:  php-phpunit-php-token-stream4
+BuildRequires:  php-phpunit-php-text-template2
+BuildRequires:  php-sebastian-code-unit-reverse-lookup2
+BuildRequires:  php-sebastian-environment5
+BuildRequires:  php-sebastian-version3
 BuildRequires:  php-theseer-tokenizer                  >= 1.1.3
 %endif
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^8.2.2"
-# 7.2 because of tests
-BuildRequires:  phpunit8 >= 8.2.2
-BuildRequires:  php-pecl-xdebug  >= 2.6.1
+#        "phpunit/phpunit": "^9.0"
+# TODO test suite passes with v8, switch to v9 when available
+BuildRequires:  phpunit8
+BuildRequires:  php-pecl-xdebug
 %endif
 
 # From composer.json, require
-#        "php": "^7.2",
+#        "php": "^7.3",
 #        "ext-dom": "*",
 #        "ext-xmlwriter": "*",
-#        "phpunit/php-file-iterator": "^2.0.2",
-#        "phpunit/php-token-stream": "^3.1.0",
-#        "phpunit/php-text-template": "^1.2.1",
-#        "sebastian/code-unit-reverse-lookup": "^1.0.1",
-#        "sebastian/environment": "^4.2.2",
-#        "sebastian/version": "^2.0.1",
+#        "phpunit/php-file-iterator": "^3.0",
+#        "phpunit/php-token-stream": "^4.0",
+#        "phpunit/php-text-template": "^2.0",
+#        "sebastian/code-unit-reverse-lookup": "^2.0",
+#        "sebastian/environment": "^5.0",
+#        "sebastian/version": "^3.0",
 #        "theseer/tokenizer": "^1.1.3"
-Requires:       php(language) >= 7.1
+Requires:       php(language) >= 7.3
 Requires:       php-dom
 Requires:       php-xmlwriter
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(phpunit/php-file-iterator) >= 2.0.2          with php-composer(phpunit/php-file-iterator) <  3)
-Requires:       (php-composer(phpunit/php-token-stream) >= 3.1.1           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) >= 4.2.2              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.3                  with php-composer(theseer/tokenizer) <  2)
+Requires:       (php-composer(phpunit/php-file-iterator)          >= 3.0   with php-composer(phpunit/php-file-iterator)          < 4)
+Requires:       (php-composer(phpunit/php-token-stream)           >= 4.0   with php-composer(phpunit/php-token-stream)           < 5)
+Requires:       (php-composer(phpunit/php-text-template)          >= 2.0   with php-composer(phpunit/php-text-template)          < 3)
+Requires:       (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0   with php-composer(sebastian/code-unit-reverse-lookup) < 3)
+Requires:       (php-composer(sebastian/environment)              >= 5.0   with php-composer(sebastian/environment)              < 6)
+Requires:       (php-composer(sebastian/version)                  >= 3.0   with php-composer(sebastian/version)                  < 4)
+Requires:       (php-composer(theseer/tokenizer)                  >= 1.1.3 with php-composer(theseer/tokenizer)                  < 2)
 # From composer.json, suggest
-#        "ext-xdebug": ">=2.6.1",
+#        "ext-pcov": "*",
+#        "ext-xdebug": "*"
 Suggests:       php-xdebug
 Recommends:     php-pcov
 # remirepo:9
 %else
-Requires:       php-phpunit-php-file-iterator2         >= 2.0.2
-Requires:       php-phpunit-php-token-stream3          >= 3.1.1
-Requires:       php-phpunit-Text-Template              >= 1.2.1
-Requires:       php-sebastian-code-unit-reverse-lookup >= 1.0.1
-Requires:       php-sebastian-environment4             >= 4.2.2
-Requires:       php-phpunit-Version                    >= 2.0.1
+Requires:       php-phpunit-php-file-iterator3
+Requires:       php-phpunit-php-token-stream4
+Requires:       php-phpunit-php-text-template2
+Requires:       php-sebastian-code-unit-reverse-lookup2
+Requires:       php-sebastian-environment5
+Requires:       php-sebastian-version3
 Requires:       php-theseer-tokenizer                  >= 1.1.3
 %endif
-# From phpcompatinfo report for version 5.0.0
+# From phpcompatinfo report for version 8.0.0
 Requires:       php-reflection
 Requires:       php-date
 Requires:       php-json
@@ -122,11 +123,9 @@ Provides:       php-composer(%{pk_vendor}/%{pk_project}) = %{version}
 # Bundled assets in HTML template
 Provides:       bundled(js-bootstrap) = 4.3.1
 Provides:       bundled(js-d3)        = 3.5.17
-Provides:       bundled(js-holder)    = 2.7.1
-Provides:       bundled(js-html5shiv) = 3.7.3
 Provides:       bundled(js-jquery)    = 3.4.1
 Provides:       bundled(js-nvd3)      = 1.8.1
-Provides:       bundled(js-respond)   = 1.1.2
+Provides:       bundled(js-popper)
 
 
 %description
@@ -148,12 +147,12 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php
 
 cat << 'EOF' | tee -a src/autoload.php
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/SebastianBergmann/FileIterator2/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}/Environment4/autoload.php',
-    '%{php_home}/%{ns_vendor}/Version/autoload.php',
+    '%{php_home}/%{ns_vendor}/FileIterator3/autoload.php',
+    '%{php_home}/%{ns_vendor}/PhpTokenStream4/autoload.php',
+    '%{php_home}/%{ns_vendor}/Template2/autoload.php',
+    '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup2/autoload.php',
+    '%{php_home}/%{ns_vendor}/Environment5/autoload.php',
+    '%{php_home}/%{ns_vendor}/Version3/autoload.php',
     '%{php_home}/TheSeer/Tokenizer/autoload.php',
 ]);
 EOF
@@ -179,7 +178,7 @@ define('TEST_FILES_PATH', __DIR__ . '/_files/');
 EOF
 
 ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php73 php74; do
   if which $cmd; then
     $cmd $EXT \
       -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \
@@ -202,6 +201,18 @@ exit $ret
 
 
 %changelog
+* Fri Feb  7 2020 Remi Collet <remi@remirepo.net> - 8.0.0-1
+- update to 8.0.0
+- raise depdendency on PHP 7.3
+- raise depdendency on phpunit/php-file-iterator 3
+- raise depdendency on phpunit/php-token-stream 4
+- raise depdendency on phpunit/php-text-template 2
+- raise depdendency on sebastian/code-unit-reverse-lookup 2
+- raise depdendency on sebastian/environment 5
+- raise depdendency on sebastian/version 3
+- rename to php-phpunit-php-code-coverage8
+- move to /usr/share/php/SebastianBergmann/CodeCoverage8
+
 * Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 7.0.10-1
 - update to 7.0.10