diff options
| -rw-r--r-- | composer.json | 12 | ||||
| -rw-r--r-- | phpcov.spec | 38 |
2 files changed, 33 insertions, 17 deletions
diff --git a/composer.json b/composer.json index b905584..43df529 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "phpunit/phpcov", - "description": "CLI frontend for PHP_CodeCoverage", + "description": "CLI frontend for php-code-coverage", "homepage": "https://github.com/sebastianbergmann/phpcov", "license": "BSD-3-Clause", "authors": [ @@ -13,6 +13,14 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpcov/issues" }, + "config": { + "platform": { + "php": "7.0.0" + }, + "optimize-autoloader": true, + "sort-packages": true + }, + "prefer-stable": true, "require": { "php": "^7.0", "phpunit/phpunit": "^6.0", @@ -20,7 +28,7 @@ "sebastian/diff": "^1.1 || ^2.0", "sebastian/finder-facade": "^1.1", "sebastian/version": "^2.0", - "symfony/console": "^3.0|^4.0" + "symfony/console": "^3.0 || ^4.0" }, "autoload": { "classmap": [ diff --git a/phpcov.spec b/phpcov.spec index 4423007..859704b 100644 --- a/phpcov.spec +++ b/phpcov.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 522e81f50964c13d7ca621fdfff8accbf0f289e3 +%global gh_commit 1fc7ed3179a3ed27a386cd2336e91d8e747a3d71 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpcov @@ -21,7 +21,7 @@ Name: %{pk_project} -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Summary: CLI frontend for PHP_CodeCoverage @@ -38,6 +38,13 @@ BuildRequires: php(language) >= 7.0 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} BuildRequires: phpunit6 +%if 0%{?fedora} >= 27 +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 5.2.1 with php-composer(phpunit/php-code-coverage) < 6) +BuildRequires: (php-composer(sebastian/diff) >= 2 with php-composer(sebastian/diff) < 3) +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: php-composer(phpunit/php-code-coverage) < 6 BuildRequires: php-composer(phpunit/php-code-coverage) >= 5.2.1 BuildRequires: php-composer(sebastian/diff) < 3 @@ -46,13 +53,8 @@ BuildRequires: php-composer(sebastian/finder-facade) < 2 BuildRequires: php-composer(sebastian/finder-facade) >= 1.1 BuildRequires: php-composer(sebastian/version) < 3 BuildRequires: php-composer(sebastian/version) >= 2.0 -%if 0%{?fedora} >= 26 -BuildRequires: php-composer(symfony/console) < 5 -%else -BuildRequires: php-composer(symfony/console) < 4 +BuildRequires: php-symfony3-console %endif -# temporarily ignore min version -BuildRequires: php-composer(symfony/console) >= 2.8 BuildRequires: php-pecl(Xdebug) %endif @@ -66,6 +68,13 @@ BuildRequires: php-pecl(Xdebug) # "symfony/console": "^3.0|^4.0" Requires: php(language) >= 7.0 Requires: phpunit6 +%if 0%{?fedora} >= 27 +Requires: (php-composer(phpunit/php-code-coverage) >= 5.2.1 with php-composer(phpunit/php-code-coverage) < 6) +Requires: (php-composer(sebastian/diff) >= 2 with php-composer(sebastian/diff) < 3) +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: php-composer(phpunit/php-code-coverage) < 6 Requires: php-composer(phpunit/php-code-coverage) >= 5.2.1 Requires: php-composer(sebastian/diff) < 3 @@ -74,13 +83,8 @@ Requires: php-composer(sebastian/finder-facade) < 2 Requires: php-composer(sebastian/finder-facade) >= 1.1 Requires: php-composer(sebastian/version) < 3 Requires: php-composer(sebastian/version) >= 2.0 -%if 0%{?fedora} >= 26 -Requires: php-composer(symfony/console) < 5 -%else -Requires: php-composer(symfony/console) < 4 +Requires: php-symfony3-console %endif -# temporarily ignore min version -Requires: php-composer(symfony/console) >= 2.8 # from phpcompatinfo report for version 4.0.0 # none @@ -120,7 +124,6 @@ cat << 'EOF' | tee -a src/autoload.php [ '%{php_home}/Symfony4/Component/Console/autoload.php', '%{php_home}/Symfony3/Component/Console/autoload.php', - '%{php_home}/Symfony/Component/Console/autoload.php', ] ]); EOF @@ -158,6 +161,11 @@ done %changelog +* Thu Jan 18 2018 Remi Collet <remi@remirepo.net> - 4.0.4-1 +- Update to 4.0.4 (no change) +- raise dependency on symfony/console 3 +- use range dependency on F27 + * Sun Nov 19 2017 Remi Collet <remi@remirepo.net> - 4.0.3-1 - Update to 4.0.3 - Allow Symfony 4 |