diff options
| -rw-r--r-- | composer.json | 10 | ||||
| -rw-r--r-- | phpcov.spec | 68 |
2 files changed, 40 insertions, 38 deletions
diff --git a/composer.json b/composer.json index 9912e57..aacc8c7 100644 --- a/composer.json +++ b/composer.json @@ -15,16 +15,16 @@ }, "config": { "platform": { - "php": "7.1.0" + "php": "7.2.0" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": "^7.1", - "phpunit/phpunit": "^7.0", - "phpunit/php-code-coverage": "^6.0", + "php": "^7.2", + "phpunit/phpunit": "^8.0", + "phpunit/php-code-coverage": "^7.0", "sebastian/diff": "^3.0", "sebastian/finder-facade": "^1.1", "sebastian/version": "^2.0", @@ -40,7 +40,7 @@ ], "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "6.0-dev" } } } diff --git a/phpcov.spec b/phpcov.spec index dc63cbc..f65e15e 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -1,6 +1,6 @@ # fedora/remirepo spec file for phpcov # -# Copyright (c) 2013-2018 Remi Collet +# Copyright (c) 2013-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 72fb974e6fe9b39d7e0b0d44061d2ba4c49ee0b8 +%global gh_commit 20c0628afab1e042892d371a7159f68bce4b411b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpcov @@ -25,7 +25,7 @@ Name: %{pk_project} -Version: 5.0.0 +Version: 6.0.0 Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage @@ -37,20 +37,20 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Patch0: %{gh_project}-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.2 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} -BuildRequires: phpunit7 +BuildRequires: phpunit8 # remirepo:1 -%if 0%{?fedora} >= 27 -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 6.0 with php-composer(phpunit/php-code-coverage) < 7) +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0 with php-composer(phpunit/php-code-coverage) < 8) BuildRequires: (php-composer(sebastian/diff) >= 3 with php-composer(sebastian/diff) < 4) BuildRequires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2) BuildRequires: (php-composer(sebastian/version) >= 2.0 with php-composer(sebastian/version) < 3) BuildRequires: (php-composer(symfony/console) >= 3.0 with php-composer(symfony/console) < 5) # remirepo:7 %else -BuildRequires: php-phpunit-php-code-coverage6 +BuildRequires: php-phpunit-php-code-coverage7 BuildRequires: php-sebastian-diff3 BuildRequires: php-phpunit-FinderFacade >= 1.1 BuildRequires: php-phpunit-Version >= 2.0 @@ -60,25 +60,25 @@ BuildRequires: php-pecl(Xdebug) %endif # from composer.json -# "php": "^7.1", -# "phpunit/phpunit": "^7.0", -# "phpunit/php-code-coverage": "^6.0", +# "php": "^7.2", +# "phpunit/phpunit": "^8.0", +# "phpunit/php-code-coverage": "^7.0", # "sebastian/diff": "^3.0", # "sebastian/finder-facade": "^1.1", # "sebastian/version": "^2.0", # "symfony/console": "^3.0|^4.0" -Requires: php(language) >= 7.1 -Requires: phpunit7 +Requires: php(language) >= 7.2 +Requires: phpunit8 # remirepo:1 -%if 0%{?fedora} >= 27 -Requires: (php-composer(phpunit/php-code-coverage) >= 6.0 with php-composer(phpunit/php-code-coverage) < 7) +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(phpunit/php-code-coverage) >= 7.0 with php-composer(phpunit/php-code-coverage) < 8) Requires: (php-composer(sebastian/diff) >= 3 with php-composer(sebastian/diff) < 4) Requires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2) Requires: (php-composer(sebastian/version) >= 2.0 with php-composer(sebastian/version) < 3) Requires: (php-composer(symfony/console) >= 3.0 with php-composer(symfony/console) < 5) # remirepo:7 %else -Requires: php-phpunit-php-code-coverage6 +Requires: php-phpunit-php-code-coverage7 Requires: php-sebastian-diff3 Requires: php-phpunit-FinderFacade >= 1.1 Requires: php-phpunit-Version >= 2.0 @@ -88,7 +88,7 @@ Requires: php-symfony4-console # none # remirepo:1 -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 Obsoletes: php-phpunit-phpcov < 4 Provides: php-phpunit-phpcov = %{version} # remirepo:3 @@ -117,8 +117,8 @@ phpab \ cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/PHPUnit7/autoload.php', - '%{php_home}/%{ns_vendor}/CodeCoverage6/autoload.php', + '%{php_home}/PHPUnit8/autoload.php', + '%{php_home}/%{ns_vendor}/CodeCoverage7/autoload.php', '%{php_home}/%{ns_vendor}/Diff3/autoload.php', '%{php_home}/%{ns_vendor}/FinderFacade/autoload.php', '%{php_home}/%{ns_vendor}/Version/autoload.php', @@ -142,21 +142,16 @@ install -D -p -m 755 %{pk_project} %{buildroot}%{_bindir}/%{pk_project} mkdir vendor ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/autoload.php -ret=0 -if which phpunit6; then - for cmd in php php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit6 --verbose || ret=1 - fi - done -fi -if which phpunit7; then - for cmd in php php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit7 --verbose || ret=1 - fi - done +if ! php -v | grep Xdebug +then EXT="-d zend_extension=xdebug.so" fi + +ret=0 +for cmd in php php72 php73; do + if which $cmd; then + $cmd $EXT %{_bindir}/phpunit8 --verbose || ret=1 + fi +done exit $ret; %else : Test suite skipped @@ -174,6 +169,13 @@ exit $ret; %changelog +* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 6.0.0-1 +- update to 6.0.0 +- raise dependency on PHP 7.2 +- raise dependency on phpunit/php-code-coverage 7 +- switch from phpunit7 to phpunit8 +- ensure XDebug is enabled to run the test suite + * Tue Feb 6 2018 Remi Collet <remi@remirepo.net> - 5.0.0-1 - Update to 5.0.0 - raise dependency on PHP 7.1 |