diff options
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | phpcov.spec | 32 |
2 files changed, 25 insertions, 12 deletions
diff --git a/composer.json b/composer.json index 475b30a..44dde1b 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,9 @@ "php": "^7.3", "phpunit/phpunit": "^9.3", "phpunit/php-code-coverage": "^9.1", + "phpunit/php-file-iterator": "^3.0", + "sebastian/cli-parser": "^1.0", "sebastian/diff": "^4.0", - "sebastian/finder-facade": "^2.0", "sebastian/version": "^3.0" }, "autoload": { @@ -39,7 +40,7 @@ ], "extra": { "branch-alias": { - "dev-master": "8.0-dev" + "dev-master": "8.1-dev" } } } diff --git a/phpcov.spec b/phpcov.spec index 25a627c..16fa772 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 0dc4b3f17f72402d1cbcb979520de80acf8ab094 +%global gh_commit 9bd7e2d81500952551ea784ed73195afbaaa9dc7 %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.0.0 +Version: 8.1.0 Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage @@ -46,14 +46,16 @@ 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/finder-facade) >= 2.0 with php-composer(sebastian/finder-facade) < 3) BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) -# remirepo:6 +# remirepo:7 %else BuildRequires: php-phpunit-php-code-coverage9 >= 9.1 +BuildRequires: php-phpunit-php-file-iterator3 +BuildRequires: php-sebastian-cli-parser BuildRequires: php-sebastian-diff4 -BuildRequires: php-sebastian-finder-facade2 BuildRequires: php-sebastian-version3 %endif BuildRequires: php-pecl(Xdebug) @@ -63,22 +65,25 @@ BuildRequires: php-pecl(Xdebug) # "php": "^7.3", # "phpunit/phpunit": "^9.0", # "phpunit/php-code-coverage": "^8.0", +# "phpunit/php-file-iterator": "^3.0", +# "sebastian/cli-parser": "^1.0", # "sebastian/diff": "^4.0", -# "sebastian/finder-facade": "^2.0", # "sebastian/version": "^3.0" 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/finder-facade) >= 2.0 with php-composer(sebastian/finder-facade) < 3) Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) -# remirepo:6 +# remirepo:7 %else Requires: php-phpunit-php-code-coverage9 >= 9.1 +Requires: php-phpunit-php-file-iterator3 +Requires: php-sebastian-cli-parser Requires: php-sebastian-diff4 -Requires: php-sebastian-finder-facade2 Requires: php-sebastian-version3 %endif # from phpcompatinfo report for version 4.0.0 @@ -116,8 +121,9 @@ cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{php_home}/PHPUnit9/autoload.php', '%{php_home}/%{ns_vendor}/CodeCoverage9/autoload.php', + '%{php_home}/%{ns_vendor}/FileIterator3/autoload.php', + '%{php_home}/%{ns_vendor}/CliParser/autoload.php', '%{php_home}/%{ns_vendor}/Diff4/autoload.php', - '%{php_home}/%{ns_vendor}/FinderFacade2/autoload.php', '%{php_home}/%{ns_vendor}/Version3/autoload.php', ]); EOF @@ -167,6 +173,12 @@ exit $ret; %changelog +* Thu Aug 13 2020 Remi Collet <remi@remirepo.net> - 8.1.0-1 +- update to 8.1.0 +- add dependency on phpunit/php-file-iterator +- add dependency on sebastian/cli-parser +- drop depency on sebastian/finder-facade + * Wed Aug 12 2020 Remi Collet <remi@remirepo.net> - 8.0.0-1 - update to 8.0.0 - sources from git snapshot |