From a5217828e983f4fa8da34c72df119ddeadcb14e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Sep 2020 15:08:31 +0200 Subject: update to 8.1.2 (no change) raise dependency on phpunit/php-code-coverage 9.1.11 --- composer.json | 2 +- phpcov.spec | 33 +++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 44dde1b..63bd210 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require": { "php": "^7.3", "phpunit/phpunit": "^9.3", - "phpunit/php-code-coverage": "^9.1", + "phpunit/php-code-coverage": "^9.1.11", "phpunit/php-file-iterator": "^3.0", "sebastian/cli-parser": "^1.0", "sebastian/diff": "^4.0", diff --git a/phpcov.spec b/phpcov.spec index 8f82b13..e48c50f 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit c75b265c1e0e753424607369ca91437293b85fbe +%global gh_commit 6983b308deef400c747d8d04b055a7a9caff1c6c %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.1 +Version: 8.1.2 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 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) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.1.11 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 +BuildRequires: php-phpunit-php-code-coverage9 >= 9.1.11 BuildRequires: php-phpunit-php-file-iterator3 BuildRequires: php-sebastian-cli-parser BuildRequires: php-sebastian-diff4 @@ -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 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) +Requires: (php-composer(phpunit/php-code-coverage) >= 9.1.11 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 +Requires: php-phpunit-php-code-coverage9 >= 9.1.11 Requires: php-phpunit-php-file-iterator3 Requires: php-sebastian-cli-parser Requires: php-sebastian-diff4 @@ -148,6 +148,7 @@ fi # test with hardcoded path in data 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 # TODO php80 when xdebug will be available ret=0 @@ -173,6 +174,10 @@ exit $ret; %changelog +* Wed Sep 23 2020 Remi Collet - 8.1.2-1 +- update to 8.1.2 (no change) +- raise dependency on phpunit/php-code-coverage 9.1.11 + * Fri Sep 11 2020 Remi Collet - 8.1.1-1 - update to 8.1.1 (no change) -- cgit