update to 8.2.0

raise dependency on phpunit/php-code-coverage 9.2

2 files changed, 19 insertions, 11 deletions

diff --git a/composer.json b/composer.json
index 63bd210..f124802 100644
--- a/composer.json
+++ b/composer.json
@@ -22,9 +22,9 @@
     },
     "prefer-stable": true,
     "require": {
-        "php": "^7.3",
+        "php": ">=7.3",
         "phpunit/phpunit": "^9.3",
-        "phpunit/php-code-coverage": "^9.1.11",
+        "phpunit/php-code-coverage": "^9.2",
         "phpunit/php-file-iterator": "^3.0",
         "sebastian/cli-parser": "^1.0",
         "sebastian/diff": "^4.0",
@@ -40,7 +40,7 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "8.1-dev"
+            "dev-master": "8.2-dev"
         }
     }
 }
diff --git a/phpcov.spec b/phpcov.spec
index e48c50f..542d041 100644
--- a/phpcov.spec
+++ b/phpcov.spec
@@ -12,7 +12,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    6983b308deef400c747d8d04b055a7a9caff1c6c
+%global gh_commit    742d0608238c7f045fe3115241d7ec3ec2587442
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phpcov
@@ -26,7 +26,7 @@
 
 
 Name:           %{pk_project}
-Version:        8.1.2
+Version:        8.2.0
 Release:        1%{?dist}
 Summary:        CLI frontend for PHP_CodeCoverage
 
@@ -45,14 +45,14 @@ BuildRequires:  php-fedora-autoloader-devel
 BuildRequires:  phpunit9 >= 9.3
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(phpunit/php-code-coverage) >= 9.1.11 with php-composer(phpunit/php-code-coverage) < 10)
+BuildRequires:  (php-composer(phpunit/php-code-coverage) >= 9.2    with php-composer(phpunit/php-code-coverage) < 10)
 BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 3.0    with php-composer(phpunit/php-file-iterator) < 4)
 BuildRequires:  (php-composer(sebastian/cli-parser)      >= 1.0    with php-composer(sebastian/cli-parser)      < 2)
 BuildRequires:  (php-composer(sebastian/diff)            >= 4      with php-composer(sebastian/diff)            < 5)
 BuildRequires:  (php-composer(sebastian/version)         >= 3.0    with php-composer(sebastian/version)         < 4)
 # remirepo:7
 %else
-BuildRequires:  php-phpunit-php-code-coverage9          >= 9.1.11
+BuildRequires:  php-phpunit-php-code-coverage9          >= 9.2
 BuildRequires:  php-phpunit-php-file-iterator3
 BuildRequires:  php-sebastian-cli-parser
 BuildRequires:  php-sebastian-diff4
@@ -62,9 +62,9 @@ BuildRequires:  php-pecl(Xdebug)
 %endif
 
 # from composer.json
-#        "php": "^7.3",
+#        "php": ">=7.3",
 #        "phpunit/phpunit": "^9.0",
-#        "phpunit/php-code-coverage": "^8.0",
+#        "phpunit/php-code-coverage": "^9.2",
 #        "phpunit/php-file-iterator": "^3.0",
 #        "sebastian/cli-parser": "^1.0",
 #        "sebastian/diff": "^4.0",
@@ -73,14 +73,14 @@ Requires:       php(language) >= 7.3
 Requires:       phpunit9 >= 9.3
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(phpunit/php-code-coverage) >= 9.1.11 with php-composer(phpunit/php-code-coverage) < 10)
+Requires:       (php-composer(phpunit/php-code-coverage) >= 9.2    with php-composer(phpunit/php-code-coverage) < 10)
 Requires:       (php-composer(phpunit/php-file-iterator) >= 3.0    with php-composer(phpunit/php-file-iterator) < 4)
 Requires:       (php-composer(sebastian/cli-parser)      >= 1.0    with php-composer(sebastian/cli-parser)      < 2)
 Requires:       (php-composer(sebastian/diff)            >= 4      with php-composer(sebastian/diff)            < 5)
 Requires:       (php-composer(sebastian/version)         >= 3.0    with php-composer(sebastian/version)         < 4)
 # remirepo:7
 %else
-Requires:       php-phpunit-php-code-coverage9           >= 9.1.11
+Requires:       php-phpunit-php-code-coverage9           >= 9.2
 Requires:       php-phpunit-php-file-iterator3
 Requires:       php-sebastian-cli-parser
 Requires:       php-sebastian-diff4
@@ -149,6 +149,10 @@ fi
 rm tests/end-to-end/execute/valid-script-argument-with-cli-include-with-text-report.phpt
 rm tests/end-to-end/merge/valid-directory-with-text-report.phpt
 rm tests/end-to-end/merge/valid-directory-with-text-report-stdout.phpt
+# test incompatible with coverage 9.2 (--cobertura)
+# https://github.com/sebastianbergmann/phpcov/issues/108
+rm tests/end-to-end/help/help.phpt
+rm tests/end-to-end/help/help2.phpt
 
 # TODO php80 when xdebug will be available
 ret=0
@@ -174,6 +178,10 @@ exit $ret;
 
 
 %changelog
+* Fri Oct  2 2020 Remi Collet <remi@remirepo.net> - 8.2.0-1
+- update to 8.2.0
+- raise dependency on phpunit/php-code-coverage 9.2
+
 * Wed Sep 23 2020 Remi Collet <remi@remirepo.net> - 8.1.2-1
 - update to 8.1.2 (no change)
 - raise dependency on phpunit/php-code-coverage 9.1.11