From 11ec3dbbd777cdc4307d8f1e06055052cc02700a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Feb 2019 09:11:47 +0100 Subject: boostrap build rename to php-phpunit-php-code-coverage7 update to 7.0.0 raise dependency on PHP 7.2 raise dependency on phpunit/php-file-iterator 2.0.2 raise dependency on phpunit/php-token-stream 3.0.1 raise dependency on sebastian/environment 4.1 --- composer.json | 20 ++++++---- php-phpunit-php-code-coverage7.spec | 79 +++++++++++++++++++------------------ 2 files changed, 54 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index bb27256..6bfb0a2 100644 --- a/composer.json +++ b/composer.json @@ -25,31 +25,37 @@ }, "prefer-stable": true, "require": { - "php": "^7.1", + "php": "^7.2", "ext-dom": "*", "ext-xmlwriter": "*", - "phpunit/php-file-iterator": "^2.0", - "phpunit/php-token-stream": "^3.0", + "phpunit/php-file-iterator": "^2.0.2", + "phpunit/php-token-stream": "^3.0.1", "phpunit/php-text-template": "^1.2.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1 || ^4.0", + "sebastian/environment": "^4.1", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^8.0" }, "suggest": { - "ext-xdebug": "^2.6.0" + "ext-xdebug": "^2.6.1" }, "autoload": { "classmap": [ "src/" ] }, + "autoload-dev": { + "files": [ + "tests/TestCase.php", + "tests/_files/BankAccountTest.php" + ] + }, "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "7.0-dev" } } } diff --git a/php-phpunit-php-code-coverage7.spec b/php-phpunit-php-code-coverage7.spec index b4a3b9f..e5cd7e2 100644 --- a/php-phpunit-php-code-coverage7.spec +++ b/php-phpunit-php-code-coverage7.spec @@ -1,15 +1,15 @@ -# remirepo/fedora spec file for php-phpunit-php-code-coverage6 +# remirepo/fedora spec file for php-phpunit-php-code-coverage7 # -# Copyright (c) 2013-2018 Remi Collet +# Copyright (c) 2013-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global bootstrap 0 +%global bootstrap 1 # Github -%global gh_commit 807e6013b00af69b6c5d9ceb4282d0393dbb9d8d +%global gh_commit 2b0142ca3407ecabecd1772b37184eb1e61b3cca #global gh_date 20150924 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -21,10 +21,7 @@ %global ns_vendor SebastianBergmann %global ns_project CodeCoverage %global php_home %{_datadir}/php -%global ver_major 6 -%global ver_minor 1 -%global ver_patch 4 -%global specrel 1 +%global ver_major 7 %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else @@ -32,8 +29,8 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{ver_major} -Version: %{ver_major}.%{ver_minor}.%{ver_patch} -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}.%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Version: 7.0.0 +Release: 0%{?dist} Summary: PHP code coverage information # Main license is BSD @@ -47,42 +44,42 @@ Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commi BuildArch: noarch BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.2 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) +BuildRequires: (php-composer(phpunit/php-token-stream) >= 3.0.1 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) -BuildRequires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 5) +BuildRequires: (php-composer(sebastian/environment) >= 4.1 with php-composer(sebastian/environment) < 5) BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) BuildRequires: (php-composer(theseer/tokenizer) >= 1.1 with php-composer(theseer/tokenizer) < 2) # remirepo:9 %else -BuildRequires: php-phpunit-php-file-iterator2 -BuildRequires: php-phpunit-php-token-stream3 +BuildRequires: php-phpunit-php-file-iterator2 >= 2.0.2 +BuildRequires: php-phpunit-php-token-stream3 >= 3.0.1 BuildRequires: php-phpunit-Text-Template >= 1.2.1 BuildRequires: php-sebastian-code-unit-reverse-lookup >= 1.0.1 -BuildRequires: php-sebastian-environment3 >= 3.1 +BuildRequires: php-sebastian-environment4 >= 4.1 BuildRequires: php-phpunit-Version >= 2.0.1 BuildRequires: php-theseer-tokenizer >= 1.1 %endif # From composer.json, "require-dev": { -# "phpunit/phpunit": "^7.0" +# "phpunit/phpunit": "^8.0" # 7.2 because of tests -BuildRequires: phpunit7 >= 7.2 -BuildRequires: php-pecl-xdebug >= 2.6.0 +BuildRequires: phpunit8 +BuildRequires: php-pecl-xdebug >= 2.6.1 %endif # From composer.json, require -# "php": "^7.1", +# "php": "^7.2", # "ext-dom": "*", # "ext-xmlwriter": "*", -# "phpunit/php-file-iterator": "^2.0", -# "phpunit/php-token-stream": "^3.0", +# "phpunit/php-file-iterator": "^2.0.2", +# "phpunit/php-token-stream": "^3.0.1", # "phpunit/php-text-template": "^1.2.1", # "sebastian/code-unit-reverse-lookup": "^1.0.1", -# "sebastian/environment": "^3.1 || ^4.0", +# "sebastian/environment": "^4.1", # "sebastian/version": "^2.0.1", # "theseer/tokenizer": "^1.1" Requires: php(language) >= 7.1 @@ -90,25 +87,25 @@ Requires: php-dom Requires: php-xmlwriter # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) +Requires: (php-composer(phpunit/php-token-stream) >= 3.0.1 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) -Requires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 5) +Requires: (php-composer(sebastian/environment) >= 4.1 with php-composer(sebastian/environment) < 5) Requires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3) Requires: (php-composer(theseer/tokenizer) >= 1.1 with php-composer(theseer/tokenizer) < 2) # remirepo:9 %else -Requires: php-phpunit-php-file-iterator2 -Requires: php-phpunit-php-token-stream3 +Requires: php-phpunit-php-file-iterator2 >= 2.0.2 +Requires: php-phpunit-php-token-stream3 >= 3.0.1 Requires: php-phpunit-Text-Template >= 1.2.1 Requires: php-sebastian-code-unit-reverse-lookup >= 1.0.1 -Requires: php-sebastian-environment3 >= 3.1 +Requires: php-sebastian-environment4 >= 4.1 Requires: php-phpunit-Version >= 2.0.1 Requires: php-theseer-tokenizer >= 1.1 %endif # From composer.json, suggest -# "ext-xdebug": ">=2.5.5", +# "ext-xdebug": ">=2.6.1", # From phpcompatinfo report for version 5.0.0 Requires: php-reflection Requires: php-date @@ -147,17 +144,13 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php --output src/autoload.php \ src -# Temporarily keep fallback on old phpunit/php-token-stream cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{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', - [ - '%{php_home}/%{ns_vendor}/Environment4/autoload.php', - '%{php_home}/%{ns_vendor}/Environment3/autoload.php', - ], + '%{php_home}/%{ns_vendor}/Environment4/autoload.php', '%{php_home}/%{ns_vendor}/Version/autoload.php', '%{php_home}/TheSeer/Tokenizer/autoload.php', ]); @@ -179,11 +172,12 @@ fi cat << 'EOF' | tee tests/bootstrap.php - 7.0.0-0 +- boostrap build +- rename to php-phpunit-php-code-coverage7 +- update to 7.0.0 +- raise dependency on PHP 7.2 +- raise dependency on phpunit/php-file-iterator 2.0.2 +- raise dependency on phpunit/php-token-stream 3.0.1 +- raise dependency on sebastian/environment 4.1 + * Wed Oct 31 2018 Remi Collet - 6.1.4-1 - update to 6.1.4 -- cgit