diff options
| -rw-r--r-- | composer.json | 9 | ||||
| -rw-r--r-- | php-phpunit-php-code-coverage5.spec | 65 |
2 files changed, 46 insertions, 28 deletions
diff --git a/composer.json b/composer.json index 6527ed2..f9bd51b 100644 --- a/composer.json +++ b/composer.json @@ -28,15 +28,16 @@ "phpunit/php-token-stream": "^1.4.11 || ^2.0", "phpunit/php-text-template": "^1.2", "sebastian/code-unit-reverse-lookup": "^1.0", - "sebastian/environment": "^2.0", - "sebastian/version": "^2.0" + "sebastian/environment": "^3.0", + "sebastian/version": "^2.0", + "theseer/tokenizer": "^1.1" }, "require-dev": { "phpunit/phpunit": "^6.0", "ext-xdebug": "^2.5" }, "suggest": { - "ext-xdebug": "^2.5.1" + "ext-xdebug": "^2.5.3" }, "autoload": { "classmap": [ @@ -45,7 +46,7 @@ }, "extra": { "branch-alias": { - "dev-master": "5.1.x-dev" + "dev-master": "5.2.x-dev" } } } diff --git a/php-phpunit-php-code-coverage5.spec b/php-phpunit-php-code-coverage5.spec index 0b5e1f4..118d239 100644 --- a/php-phpunit-php-code-coverage5.spec +++ b/php-phpunit-php-code-coverage5.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit bc433b7af27e0ab9b6b4c6d8ec918a493875f6bc +%global gh_commit dc421f9ca5082a0c0cb04afb171c765f79add85b #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -22,7 +22,7 @@ %global ns_project CodeCoverage %global php_home %{_datadir}/php %global ver_major 5 -%global ver_minor 1 +%global ver_minor 2 %global ver_patch 1 %global specrel 1 %if %{bootstrap} @@ -52,19 +52,25 @@ BuildArch: noarch BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} BuildRequires: php(language) >= 7.0 +BuildRequires: php-composer(phpunit/php-file-iterator) < 2 BuildRequires: php-composer(phpunit/php-file-iterator) >= 1.3 -BuildRequires: php-composer(phpunit/php-token-stream) >= 1.4.11 BuildRequires: php-composer(phpunit/php-token-stream) < 2 -BuildRequires: php-composer(phpunit/php-text-template) >= 1.2 +BuildRequires: php-composer(phpunit/php-token-stream) >= 1.4.11 BuildRequires: php-composer(phpunit/php-text-template) < 2 +BuildRequires: php-composer(phpunit/php-text-template) >= 1.2 +BuildRequires: php-composer(sebastian/code-unit-reverse-lookup) < 2 BuildRequires: php-composer(sebastian/code-unit-reverse-lookup) >= 1.0 -BuildRequires: php-composer(sebastian/environment) >= 2.0 +BuildRequires: php-composer(sebastian/environment) < 4 +BuildRequires: php-composer(sebastian/environment) >= 3.0 +BuildRequires: php-composer(sebastian/version) < 3 BuildRequires: php-composer(sebastian/version) >= 2.0 +BuildRequires: php-composer(theseer/tokenizer) < 2 +BuildRequires: php-composer(theseer/tokenizer) >= 1.1 # From composer.json, "require-dev": { # "phpunit/phpunit": "^6.0", -# "ext-xdebug": "^2.5" +# "ext-xdebug": "^2.5.3" BuildRequires: phpunit6 -BuildRequires: php-pecl-xdebug >= 2.5.0 +BuildRequires: php-pecl-xdebug >= 2.5.3 %endif # From composer.json, require @@ -75,23 +81,26 @@ BuildRequires: php-pecl-xdebug >= 2.5.0 # "phpunit/php-token-stream": "^1.4.11 || ^2.0", # "phpunit/php-text-template": "^1.2", # "sebastian/code-unit-reverse-lookup": "^1.0", -# "sebastian/environment": "^2.0", -# "sebastian/version": "^2.0" +# "sebastian/environment": "^3.0", +# "sebastian/version": "^2.0", +# "theseer/tokenizer": "^1.1" Requires: php(language) >= 7.0 Requires: php-dom Requires: php-xmlwriter -Requires: php-composer(phpunit/php-file-iterator) >= 1.3 Requires: php-composer(phpunit/php-file-iterator) < 2 +Requires: php-composer(phpunit/php-file-iterator) >= 1.3 +Requires: php-composer(phpunit/php-token-stream) < 2 Requires: php-composer(phpunit/php-token-stream) >= 1.4.11 -Requires: php-composer(phpunit/php-token-stream) < 3 -Requires: php-composer(phpunit/php-text-template) >= 1.2 Requires: php-composer(phpunit/php-text-template) < 2 -Requires: php-composer(sebastian/code-unit-reverse-lookup) >= 1.0 +Requires: php-composer(phpunit/php-text-template) >= 1.2 Requires: php-composer(sebastian/code-unit-reverse-lookup) < 2 -Requires: php-composer(sebastian/environment) >= 2.0 +Requires: php-composer(sebastian/code-unit-reverse-lookup) >= 1.0 Requires: php-composer(sebastian/environment) < 3 -Requires: php-composer(sebastian/version) >= 2.0 -Requires: php-composer(sebastian/version) < 3 +Requires: php-composer(sebastian/environment) >= 2.0 +Requires: php-composer(sebastian/version) < 4 +Requires: php-composer(sebastian/version) >= 3.0 +Requires: php-composer(theseer/tokenizer) < 2 +Requires: php-composer(theseer/tokenizer) >= 1.1 # From composer.json, suggest # "ext-xdebug": ">=2.4.0", # From phpcompatinfo report for version 5.0.0 @@ -146,13 +155,15 @@ rm src/Report/Html/Renderer/Template/fonts/glyphicons-halflings-regular.ttf src cat << 'EOF' | tee -a src/autoload.php -// Dependencies -require_once 'File/Iterator/Autoload.php'; -require_once 'PHP/Token/Stream/Autoload.php'; -require_once 'Text/Template/Autoload.php'; -require_once '%{ns_vendor}/CodeUnitReverseLookup/autoload.php'; -require_once '%{ns_vendor}/Environment/autoload.php'; -require_once '%{ns_vendor}/Version/autoload.php'; +\Fedora\Autoloader\Dependencies::required([ + 'File/Iterator/Autoload.php', + 'PHP/Token/Stream/Autoload.php', + 'Text/Template/Autoload.php', + '%{ns_vendor}/CodeUnitReverseLookup/autoload.php', + '%{ns_vendor}/Environment3/autoload.php', + '%{ns_vendor}/Version/autoload.php', + 'TheSeer/Tokenizer/autoload.php', +]); EOF @@ -179,9 +190,10 @@ ret=0 for cmd in php70 php71 php; do if which $cmd; then $cmd $EXT -d include_path=.:%{buildroot}%{php_home}:%{php_home} \ - %{_bindir}/phpunit6 --no-coverage --verbose + %{_bindir}/phpunit6 --no-coverage --verbose || ret=1 fi done +exit $ret %endif @@ -195,6 +207,11 @@ done %changelog +* Sun Apr 23 2017 Remi Collet <remi@remirepo.net> - 5.2.1-1 +- Update to 5.2.1 +- raise dependency on sebastian/environment >= 3.0 +- add dependency on theseer/tokenizer + * Wed Apr 12 2017 Remi Collet <remi@remirepo.net> - 5.1.1-1 - Update to 5.1.1 |