diff options
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | phpunit6.spec | 70 |
2 files changed, 50 insertions, 26 deletions
diff --git a/composer.json b/composer.json index 5b7ff8d..7251f83 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,8 @@ "ext-mbstring": "*", "ext-xml": "*", "myclabs/deep-copy": "^1.3", + "phar-io/manifest": "^1.0.1", + "phar-io/version": "^1.0", "phpspec/prophecy": "^1.7", "phpunit/php-code-coverage": "^5.0", "phpunit/php-file-iterator": "^1.4", @@ -36,7 +38,7 @@ "sebastian/comparator": "^2.0", "sebastian/diff": "^1.2", "sebastian/environment": "^2.0", - "sebastian/exporter": "^3.0", + "sebastian/exporter": "^3.1", "sebastian/global-state": "^1.1 || ^2.0", "sebastian/object-enumerator": "^3.0.2", "sebastian/resource-operations": "^1.0", @@ -78,7 +80,7 @@ }, "extra": { "branch-alias": { - "dev-master": "6.0.x-dev" + "dev-master": "6.1.x-dev" } } } diff --git a/phpunit6.spec b/phpunit6.spec index 9faccc8..cb6d26d 100644 --- a/phpunit6.spec +++ b/phpunit6.spec @@ -7,7 +7,7 @@ # # Please, preserve the changelog entries # -%global gh_commit df38633f62b45fbb9612275274b4553c34a863b2 +%global gh_commit 2aa57c530381662b01c2cf705b03e8c12e918f1d #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -19,8 +19,8 @@ %global ns_vendor PHPUnit6 %global php_home %{_datadir}/php %global ver_major 6 -%global ver_minor 0 -%global ver_patch 13 +%global ver_minor 1 +%global ver_patch 0 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -40,6 +40,10 @@ BuildArch: noarch BuildRequires: php(language) >= 7.0 BuildRequires: php-composer(myclabs/deep-copy) < 2 BuildRequires: php-composer(myclabs/deep-copy) >= 1.3 +BuildRequires: php-composer(phar-io/manifest) < 2 +BuildRequires: php-composer(phar-io/manifest) >= 1.0.1 +BuildRequires: php-composer(phar-io/version) < 2 +BuildRequires: php-composer(phar-io/version) >= 1.0 BuildRequires: php-composer(phpspec/prophecy) < 2 BuildRequires: php-composer(phpspec/prophecy) >= 1.7 BuildRequires: php-composer(phpunit/php-code-coverage) < 6 @@ -59,7 +63,7 @@ BuildRequires: php-composer(sebastian/diff) >= 1.2 BuildRequires: php-composer(sebastian/environment) < 3 BuildRequires: php-composer(sebastian/environment) >= 2.0 BuildRequires: php-composer(sebastian/exporter) < 4 -BuildRequires: php-composer(sebastian/exporter) >= 3.0 +BuildRequires: php-composer(sebastian/exporter) >= 3.1 BuildRequires: php-composer(sebastian/global-state) < 3 BuildRequires: php-composer(sebastian/global-state) >= 1.1 BuildRequires: php-composer(sebastian/object-enumerator) < 4 @@ -85,6 +89,8 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "myclabs/deep-copy": "^1.3", +# "phar-io/manifest": "^1.0.1", +# "phar-io/version": "^1.0", # "phpspec/prophecy": "^1.7", # "phpunit/php-code-coverage": "^5.0", # "phpunit/php-file-iterator": "^1.4", @@ -94,7 +100,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "sebastian/comparator": "^2.0", # "sebastian/diff": "^1.2", # "sebastian/environment": "^2.0", -# "sebastian/exporter": "^3.0", +# "sebastian/exporter": "^3.1", # "sebastian/global-state": "^1.1 || ^2.0", # "sebastian/object-enumerator": "^3.0.2", # "sebastian/resource-operations": "^1.0", @@ -108,6 +114,10 @@ Requires: php-mbstring Requires: php-xml Requires: php-composer(myclabs/deep-copy) < 2 Requires: php-composer(myclabs/deep-copy) >= 1.3 +Requires: php-composer(phar-io/manifest) < 2 +Requires: php-composer(phar-io/manifest) >= 1.0.1 +Requires: php-composer(phar-io/version) < 2 +Requires: php-composer(phar-io/version) >= 1.0 Requires: php-composer(phpspec/prophecy) < 2 Requires: php-composer(phpspec/prophecy) >= 1.7 Requires: php-composer(phpunit/php-code-coverage) < 6 @@ -127,7 +137,7 @@ Requires: php-composer(sebastian/diff) >= 1.2 Requires: php-composer(sebastian/environment) >= 2.0 Requires: php-composer(sebastian/environment) < 3 Requires: php-composer(sebastian/exporter) < 4 -Requires: php-composer(sebastian/exporter) >= 3.0 +Requires: php-composer(sebastian/exporter) >= 3.1 Requires: php-composer(sebastian/global-state) < 3 Requires: php-composer(sebastian/global-state) >= 1.1 Requires: php-composer(sebastian/object-enumerator) < 4 @@ -181,24 +191,30 @@ It is an instance of the xUnit architecture for unit testing frameworks. src cat << 'EOF' | tee -a src/autoload.php -/* dependencies */ -require_once 'File/Iterator/Autoload.php'; -require_once 'Text/Template/Autoload.php'; -require_once 'SebastianBergmann/CodeCoverage5/autoload.php'; -require_once 'PHP/Timer/Autoload.php'; -require_once '%{ns_vendor}/Framework/MockObject/autoload.php'; -require_once 'Prophecy/autoload.php'; -require_once 'SebastianBergmann/Comparator2/autoload.php'; -require_once 'SebastianBergmann/Diff/autoload.php'; -require_once 'SebastianBergmann/Environment/autoload.php'; -require_once 'SebastianBergmann/Exporter3/autoload.php'; -require_once (stream_resolve_include_path('SebastianBergmann/GlobalState2/autoload.php') ?: 'SebastianBergmann/GlobalState/autoload.php'); -require_once 'SebastianBergmann/ObjectEnumerator3/autoload.php'; -require_once 'SebastianBergmann/ResourceOperations/autoload.php'; -require_once 'SebastianBergmann/Version/autoload.php'; -require_once 'DeepCopy/autoload.php'; -require_once 'PHP/Invoker/Autoload.php'; - +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + 'File/Iterator/Autoload.php', + 'Text/Template/Autoload.php', + 'SebastianBergmann/CodeCoverage5/autoload.php', + 'PHP/Timer/Autoload.php', + '%{ns_vendor}/Framework/MockObject/autoload.php', + 'Prophecy/autoload.php', + 'SebastianBergmann/Comparator2/autoload.php', + 'SebastianBergmann/Diff/autoload.php', + 'SebastianBergmann/Environment/autoload.php', + 'SebastianBergmann/Exporter3/autoload.php', + [ + 'SebastianBergmann/GlobalState2/autoload.php', + 'SebastianBergmann/GlobalState/autoload.php', + ], + 'SebastianBergmann/ObjectEnumerator3/autoload.php', + 'SebastianBergmann/ResourceOperations/autoload.php', + 'SebastianBergmann/Version/autoload.php', + 'DeepCopy/autoload.php', + 'PHP/Invoker/Autoload.php', + 'PharIo/Manifest/autoload.php', + 'PharIo/Version/autoload.php', +]); // Extensions \Fedora\Autoloader\Dependencies::optional([ '%{php_home}/%{ns_vendor}/DbUnit/autoload.php', @@ -249,6 +265,12 @@ exit $ret %changelog +* Fri Apr 7 2017 Remi Collet <remi@remirepo.net> - 6.1.0-1 +- Update to 6.1.0 +- add dependency on phar-io/manifest +- add dependency on phar-io/version +- raise dependency on sebastian/exporter 3.1 + * Mon Apr 3 2017 Remi Collet <remi@remirepo.net> - 6.0.13-1 - Update to 6.0.13 |