diff options
| -rw-r--r-- | composer.json | 12 | ||||
| -rw-r--r-- | phpcov.spec | 74 |
2 files changed, 36 insertions, 50 deletions
diff --git a/composer.json b/composer.json index d9030df..9912e57 100644 --- a/composer.json +++ b/composer.json @@ -15,17 +15,17 @@ }, "config": { "platform": { - "php": "7.0.0" + "php": "7.1.0" }, "optimize-autoloader": true, "sort-packages": true }, "prefer-stable": true, "require": { - "php": "^7.0", - "phpunit/phpunit": "^6.0 || ^7.0", - "phpunit/php-code-coverage": "^5.2.1 || ^6.0", - "sebastian/diff": "^1.1 || ^2.0", + "php": "^7.1", + "phpunit/phpunit": "^7.0", + "phpunit/php-code-coverage": "^6.0", + "sebastian/diff": "^3.0", "sebastian/finder-facade": "^1.1", "sebastian/version": "^2.0", "symfony/console": "^3.0 || ^4.0" @@ -40,7 +40,7 @@ ], "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0-dev" } } } diff --git a/phpcov.spec b/phpcov.spec index 59a0f00..d8279fc 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 19b5781ddfb0be9d6fec6ac515f3f2da27dcfbb5 +%global gh_commit 72fb974e6fe9b39d7e0b0d44061d2ba4c49ee0b8 %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: 4.0.5 +Version: 5.0.0 Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage @@ -38,50 +38,48 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Patch0: %{gh_project}-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 7.0 +BuildRequires: php(language) >= 7.1 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} +BuildRequires: phpunit7 %if 0%{?fedora} >= 27 -BuildRequires: (phpunit6 or phpunit7) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 5.2.1 with php-composer(phpunit/php-code-coverage) < 7) -BuildRequires: (php-composer(sebastian/diff) >= 2 with php-composer(sebastian/diff) < 3) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 6.0 with php-composer(phpunit/php-code-coverage) < 7) +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) %else -BuildRequires: phpunit6 -BuildRequires: php-phpunit-php-code-coverage5 >= 5.2.1 -BuildRequires: php-sebastian-diff2 +BuildRequires: php-phpunit-php-code-coverage6 +BuildRequires: php-sebastian-diff3 BuildRequires: php-phpunit-FinderFacade >= 1.1 BuildRequires: php-phpunit-Version >= 2.0 -BuildRequires: php-symfony3-console +BuildRequires: php-symfony4-console %endif BuildRequires: php-pecl(Xdebug) %endif # from composer.json -# "php": "^7.0", -# "phpunit/phpunit": "^6.0 || ^7.0", -# "phpunit/php-code-coverage": "^5.2.1 || ^6.0", -# "sebastian/diff": "^1.1 || ^2.0", +# "php": "^7.1", +# "phpunit/phpunit": "^7.0", +# "phpunit/php-code-coverage": "^6.0", +# "sebastian/diff": "^3.0", # "sebastian/finder-facade": "^1.1", # "sebastian/version": "^2.0", # "symfony/console": "^3.0|^4.0" -Requires: php(language) >= 7.0 +Requires: php(language) >= 7.1 +Requires: phpunit7 %if 0%{?fedora} >= 27 -Requires: (phpunit6 or phpunit7) -Requires: (php-composer(phpunit/php-code-coverage) >= 5.2.1 with php-composer(phpunit/php-code-coverage) < 7) -Requires: (php-composer(sebastian/diff) >= 2 with php-composer(sebastian/diff) < 3) +Requires: (php-composer(phpunit/php-code-coverage) >= 6.0 with php-composer(phpunit/php-code-coverage) < 7) +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) %else -Requires: phpunit6 -Requires: php-phpunit-php-code-coverage5 >= 5.2.1 -Requires: php-sebastian-diff2 +Requires: php-phpunit-php-code-coverage6 +Requires: php-sebastian-diff3 Requires: php-phpunit-FinderFacade >= 1.1 Requires: php-phpunit-Version >= 2.0 -Requires: php-symfony3-console +Requires: php-symfony4-console %endif # from phpcompatinfo report for version 4.0.0 # none @@ -113,28 +111,10 @@ phpab \ cat << 'EOF' | tee -a src/autoload.php // Dependencies -if (version_compare(PHP_VERSION, '7.1', '>')) { - \Fedora\Autoloader\Dependencies::required([ - [ - '%{php_home}/PHPUnit7/autoload.php', - '%{php_home}/PHPUnit6/autoload.php', - ], [ - '%{php_home}/%{ns_vendor}/CodeCoverage6/autoload.php', - '%{php_home}/%{ns_vendor}/CodeCoverage5/autoload.php', - ], - '%{php_home}/%{ns_vendor}/Diff2/autoload.php', - '%{php_home}/%{ns_vendor}/FinderFacade/autoload.php', - '%{php_home}/%{ns_vendor}/Version/autoload.php', - [ - '%{php_home}/Symfony4/Component/Console/autoload.php', - '%{php_home}/Symfony3/Component/Console/autoload.php', - ] -]); -} else { - \Fedora\Autoloader\Dependencies::required([ +\Fedora\Autoloader\Dependencies::required([ '%{php_home}/PHPUnit6/autoload.php', - '%{php_home}/%{ns_vendor}/CodeCoverage5/autoload.php', - '%{php_home}/%{ns_vendor}/Diff2/autoload.php', + '%{php_home}/%{ns_vendor}/CodeCoverage6/autoload.php', + '%{php_home}/%{ns_vendor}/Diff3/autoload.php', '%{php_home}/%{ns_vendor}/FinderFacade/autoload.php', '%{php_home}/%{ns_vendor}/Version/autoload.php', [ @@ -142,7 +122,6 @@ if (version_compare(PHP_VERSION, '7.1', '>')) { '%{php_home}/Symfony3/Component/Console/autoload.php', ] ]); -} EOF @@ -189,6 +168,13 @@ exit $ret; %changelog +* Tue Feb 6 2018 Remi Collet <remi@remirepo.net> - 5.0.0-1 +- Update to 5.0.0 +- raise dependency on PHP 7.1 +- only for phpunit7 +- raise dependency on phpunit/php-code-coverage 6 +- raise dependency on sebastian/diff 3 + * Fri Feb 2 2018 Remi Collet <remi@remirepo.net> - 4.0.5-1 - Update to 4.0.5 - allow phpunit7 |