diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phpunit-php-code-coverage6.spec | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/composer.json b/composer.json index e94f788..cf24606 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "php": "^7.1", "ext-dom": "*", "ext-xmlwriter": "*", - "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-file-iterator": "^2.0", "phpunit/php-token-stream": "^3.0", "phpunit/php-text-template": "^1.2.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", diff --git a/php-phpunit-php-code-coverage6.spec b/php-phpunit-php-code-coverage6.spec index a1f529f..263583a 100644 --- a/php-phpunit-php-code-coverage6.spec +++ b/php-phpunit-php-code-coverage6.spec @@ -9,7 +9,7 @@ %global bootstrap 0 # Github -%global gh_commit 4cab20a326d14de7575a8e235c70d879b569a57a +%global gh_commit 1661926cfa5be825d4f96f89dfac46dc4a19afa8 #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -23,7 +23,7 @@ %global php_home %{_datadir}/php %global ver_major 6 %global ver_minor 0 -%global ver_patch 5 +%global ver_patch 6 %global specrel 1 %if %{bootstrap} %global with_tests 0%{?_with_tests:1} @@ -53,7 +53,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 BuildRequires: php(language) >= 7.1 # remirepo:1 %if 0%{?fedora} >= 27 -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 1.4.2 with php-composer(phpunit/php-file-iterator) < 2) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0 with php-composer(phpunit/php-file-iterator) < 3) BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.0 with php-composer(phpunit/php-token-stream) < 4) BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) @@ -62,7 +62,7 @@ BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with BuildRequires: (php-composer(theseer/tokenizer) >= 1.1 with php-composer(theseer/tokenizer) < 2) # remirepo:9 %else -BuildRequires: php-phpunit-File-Iterator >= 1.4.2 +BuildRequires: php-phpunit-php-file-iterator2 BuildRequires: php-phpunit-php-token-stream3 BuildRequires: php-phpunit-Text-Template >= 1.2.1 BuildRequires: php-sebastian-code-unit-reverse-lookup >= 1.0.1 @@ -80,7 +80,7 @@ BuildRequires: php-pecl-xdebug >= 2.6.0 # "php": "^7.1", # "ext-dom": "*", # "ext-xmlwriter": "*", -# "phpunit/php-file-iterator": "^1.4.2", +# "phpunit/php-file-iterator": "^2.0", # "phpunit/php-token-stream": "^3.0", # "phpunit/php-text-template": "^1.2.1", # "sebastian/code-unit-reverse-lookup": "^1.0.1", @@ -92,7 +92,7 @@ Requires: php-dom Requires: php-xmlwriter # remirepo:1 %if 0%{?fedora} >= 27 -Requires: (php-composer(phpunit/php-file-iterator) >= 1.4.2 with php-composer(phpunit/php-file-iterator) < 2) +Requires: (php-composer(phpunit/php-file-iterator) >= 2.0 with php-composer(phpunit/php-file-iterator) < 3) Requires: (php-composer(phpunit/php-token-stream) >= 3.0 with php-composer(phpunit/php-token-stream) < 4) Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) < 2) @@ -101,7 +101,7 @@ Requires: (php-composer(sebastian/version) >= 2.0.1 with Requires: (php-composer(theseer/tokenizer) >= 1.1 with php-composer(theseer/tokenizer) < 2) # remirepo:9 %else -Requires: php-phpunit-File-Iterator >= 1.4.2 +Requires: php-phpunit-php-file-iterator2 Requires: php-phpunit-php-token-stream3 Requires: php-phpunit-Text-Template >= 1.2.1 Requires: php-sebastian-code-unit-reverse-lookup >= 1.0.1 @@ -167,7 +167,7 @@ rm src/Report/Html/Renderer/Template/fonts/glyphicons-halflings-regular.ttf # Temporarily keep fallback on old phpunit/php-token-stream cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/File/Iterator/Autoload.php', + '%{php_home}/SebastianBergmann/FileIterator2/autoload.php', '%{php_home}/%{ns_vendor}/PhpTokenStream3/autoload.php', '%{php_home}/Text/Template/Autoload.php', '%{php_home}/%{ns_vendor}/CodeUnitReverseLookup/autoload.php', @@ -220,6 +220,10 @@ exit $ret %changelog +* Fri Jun 1 2018 Remi Collet <remi@remirepo.net> - 6.0.6-1 +- update to 6.0.6 +- raise dependency on phpunit/php-file-iterator 2.0 + * Mon May 28 2018 Remi Collet <remi@remirepo.net> - 6.0.5-1 - update to 6.0.5 |