From 4c8f7f86461c38c4023d26539fb77d8ff214e833 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Jun 2016 08:48:41 +0200 Subject: php-phpunit-PHPUnit: 5.4.0 (WIP, blocked by dependent packages) --- composer-dev.json | 6 ++-- php-phpunit-PHPUnit-dev.spec | 30 +++++++++++-------- phpunit-5.3.0-Autoload.php.in | 67 ------------------------------------------- phpunit-5.4.0-Autoload.php.in | 67 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 82 deletions(-) delete mode 100644 phpunit-5.3.0-Autoload.php.in create mode 100644 phpunit-5.4.0-Autoload.php.in diff --git a/composer-dev.json b/composer-dev.json index d1a66c6..142b29b 100644 --- a/composer-dev.json +++ b/composer-dev.json @@ -23,9 +23,9 @@ "php": "^5.6 || ^7.0", "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", - "phpunit/php-code-coverage": "^3.3.0", + "phpunit/php-code-coverage": "^4.0", "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.1", + "phpunit/phpunit-mock-objects": "^3.2", "phpspec/prophecy": "^1.3.1", "symfony/yaml": "~2.1|~3.0", "sebastian/comparator": "~1.1", @@ -70,7 +70,7 @@ }, "extra": { "branch-alias": { - "dev-master": "5.3.x-dev" + "dev-master": "5.4.x-dev" } } } diff --git a/php-phpunit-PHPUnit-dev.spec b/php-phpunit-PHPUnit-dev.spec index 464a97d..191494c 100644 --- a/php-phpunit-PHPUnit-dev.spec +++ b/php-phpunit-PHPUnit-dev.spec @@ -8,7 +8,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 00dd95ffb48805503817ced06399017df315fe5c +%global gh_commit 32428748cee28724d24e7d3b5fb3151170a1aed2 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -16,8 +16,8 @@ %global php_home %{_datadir}/php %global pear_name PHPUnit %global pear_channel pear.phpunit.de -%global major 5.3 -%global minor 4 +%global major 5.4 +%global minor 0 %global specrel 1 Name: php-phpunit-PHPUnit @@ -31,7 +31,7 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz # Autoload template, from version 3.7 -Source1: %{gh_project}-5.3.0-Autoload.php.in +Source1: %{gh_project}-5.4.0-Autoload.php.in # Fix command for autoload Patch0: %{gh_project}-rpm.patch @@ -42,9 +42,9 @@ BuildRequires: php(language) >= 5.6 BuildRequires: %{_bindir}/phpab BuildRequires: php-composer(phpunit/php-file-iterator) >= 1.4 BuildRequires: php-composer(phpunit/php-text-template) >= 1.2 -BuildRequires: php-composer(phpunit/php-code-coverage) >= 3.3.0 +BuildRequires: php-composer(phpunit/php-code-coverage) >= 4.0 BuildRequires: php-composer(phpunit/php-timer) >= 1.0.6 -BuildRequires: php-composer(phpunit/phpunit-mock-objects) >= 3.0 +BuildRequires: php-composer(phpunit/phpunit-mock-objects) >= 3.2 BuildRequires: php-composer(phpspec/prophecy) >= 1.3.1 BuildRequires: php-composer(sebastian/comparator) >= 1.1 BuildRequires: php-composer(sebastian/diff) >= 1.2 @@ -64,9 +64,9 @@ BuildRequires: php-composer(phpunit/php-invoker) >= 1.1.0 # "php": "^5.6 || ^7.0", # "phpunit/php-file-iterator": "~1.4", # "phpunit/php-text-template": "~1.2", -# "phpunit/php-code-coverage": "^3.3.0", +# "phpunit/php-code-coverage": "^4.0", # "phpunit/php-timer": "^1.0.6", -# "phpunit/phpunit-mock-objects": "^3.1", +# "phpunit/phpunit-mock-objects": "^3.2", # "phpspec/prophecy": "^1.3.1", # "symfony/yaml": "~2.1|~3.0", # "sebastian/comparator": "~1.0", @@ -90,11 +90,11 @@ Requires: php-composer(phpunit/php-file-iterator) >= 1.4 Requires: php-composer(phpunit/php-file-iterator) < 2 Requires: php-composer(phpunit/php-text-template) >= 1.2 Requires: php-composer(phpunit/php-text-template) < 2 -Requires: php-composer(phpunit/php-code-coverage) >= 3.3.0 -Requires: php-composer(phpunit/php-code-coverage) < 4 +Requires: php-composer(phpunit/php-code-coverage) >= 4.0 +Requires: php-composer(phpunit/php-code-coverage) < 5 Requires: php-composer(phpunit/php-timer) >= 1.0.6 Requires: php-composer(phpunit/php-timer) < 2 -Requires: php-composer(phpunit/phpunit-mock-objects) >= 3.1 +Requires: php-composer(phpunit/phpunit-mock-objects) >= 3.2 Requires: php-composer(phpunit/phpunit-mock-objects) < 4 Requires: php-composer(phpspec/prophecy) >= 1.3.1 Requires: php-composer(phpspec/prophecy) < 2 @@ -133,7 +133,7 @@ Requires: php-composer(doctrine/instantiator) < 2 Requires: php-composer(symfony/class-loader) >= 2.0 Requires: php-composer(symfony/class-loader) < 3 Requires: php-composer(sebastian/recursion-context) >= 1.0 -# From phpcompatinfo report for version 5.2.9 +# From phpcompatinfo report for version 5.4.0 Requires: php-libxml Requires: php-mbstring Requires: php-openssl @@ -178,6 +178,7 @@ mv src PHPUnit %{_bindir}/phpab \ --output tests/autoload.php \ + --exclude '*/BankAccountTest2.php' \ tests @@ -219,6 +220,11 @@ fi %changelog +* Fri Jun 3 2016 Remi Collet - 5.4.0-1 +- Update to 5.4.0 +- raise dependency on phpunit/php-code-coverage >= 4.0 +- raise dependency on phpunit/phpunit-mock-objects >= 3.2 + * Wed May 11 2016 Remi Collet - 5.3.4-1 - Update to 5.3.4 diff --git a/phpunit-5.3.0-Autoload.php.in b/phpunit-5.3.0-Autoload.php.in deleted file mode 100644 index 5eba070..0000000 --- a/phpunit-5.3.0-Autoload.php.in +++ /dev/null @@ -1,67 +0,0 @@ -register(); -} - -/* for symfony/yaml */ -$fedoraClassLoader->addPrefix('Symfony\\Component\\', $vendorDir); - -spl_autoload_register( - function ($class) - { - static $classes = NULL; - - if ($classes === NULL) { - $classes = array( - ___CLASSLIST___ - ); - } - - $cn = strtolower($class); - - if (isset($classes[$cn])) { - require __DIR__ . $classes[$cn]; - } - } -); - -/* Required */ -require_once 'File/Iterator/Autoload.php'; -require_once 'PHP/CodeCoverage/Autoload.php'; -require_once 'PHP/Timer/Autoload.php'; -require_once 'PHPUnit/Framework/MockObject/Autoload.php'; -require_once 'Text/Template/Autoload.php'; -require_once 'PHP/Invoker/Autoload.php'; -require_once 'SebastianBergmann/Diff/autoload.php'; -require_once 'SebastianBergmann/Environment/autoload.php'; -require_once 'SebastianBergmann/Exporter/autoload.php'; -require_once 'SebastianBergmann/Version/autoload.php'; -require_once 'SebastianBergmann/Comparator/autoload.php'; -require_once 'SebastianBergmann/GlobalState/autoload.php'; -require_once 'SebastianBergmann/ObjectEnumerator/autoload.php'; -require_once 'Doctrine/Instantiator/autoload.php'; -require_once 'Prophecy/autoload.php'; -require_once 'SebastianBergmann/ResourceOperations/autoload.php'; -require_once 'DeepCopy/autoload.php'; - -/* Optional */ -foreach(array( - 'PHPUnit/Extensions/Database/Autoload.php', - 'PHPUnit/Extensions/SeleniumCommon/Autoload.php', - 'PHPUnit/Extensions/SeleniumTestCase/Autoload.php', - 'PHPUnit/Extensions/Story/Autoload.php' - ) as $opt) { - if ($fic = stream_resolve_include_path($opt)) { - require_once $fic; - } -} diff --git a/phpunit-5.4.0-Autoload.php.in b/phpunit-5.4.0-Autoload.php.in new file mode 100644 index 0000000..c295c8f --- /dev/null +++ b/phpunit-5.4.0-Autoload.php.in @@ -0,0 +1,67 @@ +register(); +} + +/* for symfony/yaml */ +$fedoraClassLoader->addPrefix('Symfony\\Component\\', $vendorDir); + +spl_autoload_register( + function ($class) + { + static $classes = NULL; + + if ($classes === NULL) { + $classes = array( + ___CLASSLIST___ + ); + } + + $cn = strtolower($class); + + if (isset($classes[$cn])) { + require __DIR__ . $classes[$cn]; + } + } +); + +/* Required */ +require_once 'File/Iterator/Autoload.php'; +require_once 'SebastianBergmann/CodeCoverage/autoload.php'; +require_once 'PHP/Timer/Autoload.php'; +require_once 'PHPUnit/Framework/MockObject/Autoload.php'; +require_once 'Text/Template/Autoload.php'; +require_once 'PHP/Invoker/Autoload.php'; +require_once 'SebastianBergmann/Diff/autoload.php'; +require_once 'SebastianBergmann/Environment/autoload.php'; +require_once 'SebastianBergmann/Exporter/autoload.php'; +require_once 'SebastianBergmann/Version/autoload.php'; +require_once 'SebastianBergmann/Comparator/autoload.php'; +require_once 'SebastianBergmann/GlobalState/autoload.php'; +require_once 'SebastianBergmann/ObjectEnumerator/autoload.php'; +require_once 'Doctrine/Instantiator/autoload.php'; +require_once 'Prophecy/autoload.php'; +require_once 'SebastianBergmann/ResourceOperations/autoload.php'; +require_once 'DeepCopy/autoload.php'; + +/* Optional */ +foreach([ + 'PHPUnit/Extensions/Database/Autoload.php', + 'PHPUnit/Extensions/SeleniumCommon/Autoload.php', + 'PHPUnit/Extensions/SeleniumTestCase/Autoload.php', + 'PHPUnit/Extensions/Story/Autoload.php' + ] as $opt) { + if ($fic = stream_resolve_include_path($opt)) { + require_once $fic; + } +} -- cgit