diff --git a/.gitignore b/.gitignore index 0a7a8e9..9c2a5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ -/phpcov-4.0.0-7deaf88.tar.gz -/phpcov-4.0.1-8afb1e7.tar.gz -/phpcov-4.0.2-880a426.tar.gz -/phpcov-4.0.3-522e81f.tar.gz +clog /phpcov-4.0.4-1fc7ed3.tar.gz /phpcov-4.0.5-19b5781.tar.gz /phpcov-5.0.0-72fb974.tar.gz +/phpcov-6.0.0-20c0628.tar.gz diff --git a/phpcov.spec b/phpcov.spec index 555ecd5..2734f34 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -1,6 +1,6 @@ -# spec file for phpcov +# 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,8 +25,8 @@ Name: %{pk_project} -Version: 5.0.0 -Release: 3%{?dist} +Version: 6.0.0 +Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage License: BSD @@ -37,11 +37,11 @@ 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: (php-composer(phpunit/php-code-coverage) >= 6.0 with php-composer(phpunit/php-code-coverage) < 7) +BuildRequires: phpunit8 +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) @@ -50,16 +50,16 @@ 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-composer(phpunit/php-code-coverage) >= 6.0 with php-composer(phpunit/php-code-coverage) < 7) +Requires: php(language) >= 7.2 +Requires: phpunit8 +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) @@ -91,8 +91,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', @@ -116,21 +116,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 @@ -146,6 +141,13 @@ exit $ret; %changelog +* Wed Feb 20 2019 Remi Collet - 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 + * Sat Feb 02 2019 Fedora Release Engineering - 5.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 7a36b54..3a900d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpcov-5.0.0-72fb974.tar.gz) = afafd2581f9106e9e2a98947b910f82b46b8dc04b79e910d1fc3cc2661f67fb629159c60e829d9b8a6b4b4cd6e75650dcc3ed2bf0cbc88cd23c378058f80f3db +SHA512 (phpcov-6.0.0-20c0628.tar.gz) = dfdd2fc65a3ef9ce39bd00bd179fc2f02406e4455f97693d6c30c309c5aceae33b40b2aab91b2cd6b37f8c23a5dbdec2b724abc5cf3254672b0f65534120a869