From 1351262d7cf23a2eb8775e31961b5ee011e005eb Mon Sep 17 00:00:00 2001 From: Ondrej Esler Date: Mon, 13 Feb 2017 18:34:58 +0100 Subject: [PATCH] switch to PHPUnit 6.0 --- composer.json | 4 +- composer.lock | 152 ++++++------------ .../Listener/GracefulInterruptListener.php | 12 +- .../GracefulInterruptListenerTest.php | 4 +- 4 files changed, 59 insertions(+), 113 deletions(-) diff --git a/composer.json b/composer.json index 68e0940..a014e76 100644 --- a/composer.json +++ b/composer.json @@ -12,9 +12,9 @@ } ], "require": { - "php": ">=5.3.0", + "php": "^7.0", "ext-pcntl": "*", - "phpunit/phpunit": ">=4.8 <6.0" + "phpunit/phpunit": "^6.0" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index 39b0e91..9a6371b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "206a8758311a192f7dcfa2703e00020a", - "content-hash": "1b9b2e5af21012809c8220128efdca96", + "hash": "c3972f8bf93928d11ed50155d011f9ed", + "content-hash": "0eed418e21fff81b1b3afa1138d5d250", "packages": [ { "name": "doctrine/instantiator", @@ -314,40 +314,39 @@ }, { "name": "phpunit/php-code-coverage", - "version": "4.0.5", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971" + "reference": "e7d7a4acca58e45bdfd00221563d131cfb04ba96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c19cfc7cbb0e9338d8c469c7eedecc2a428b0971", - "reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e7d7a4acca58e45bdfd00221563d131cfb04ba96", + "reference": "e7d7a4acca58e45bdfd00221563d131cfb04ba96", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", + "php": "^7.0", + "phpunit/php-file-iterator": "^1.3", + "phpunit/php-text-template": "^1.2", "phpunit/php-token-stream": "^1.4.2", - "sebastian/code-unit-reverse-lookup": "~1.0", - "sebastian/environment": "^1.3.2 || ^2.0", - "sebastian/version": "~1.0|~2.0" + "sebastian/code-unit-reverse-lookup": "^1.0", + "sebastian/environment": "^2.0", + "sebastian/version": "^2.0" }, "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "^5.4" + "ext-xdebug": "^2.5", + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-dom": "*", - "ext-xdebug": ">=2.4.0", "ext-xmlwriter": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { @@ -373,7 +372,7 @@ "testing", "xunit" ], - "time": "2017-01-20 15:06:43" + "time": "2017-02-02 10:35:41" }, { "name": "phpunit/php-file-iterator", @@ -558,16 +557,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.7.13", + "version": "6.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34" + "reference": "e702506af102d0dc5312dd24b8e97fd6e58ce3ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60ebeed87a35ea46fd7f7d8029df2d6f013ebb34", - "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e702506af102d0dc5312dd24b8e97fd6e58ce3ba", + "reference": "e702506af102d0dc5312dd24b8e97fd6e58ce3ba", "shasum": "" }, "require": { @@ -576,33 +575,33 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "~1.3", - "php": "^5.6 || ^7.0", + "myclabs/deep-copy": "^1.3", + "php": "^7.0", "phpspec/prophecy": "^1.6.2", - "phpunit/php-code-coverage": "^4.0.4", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", + "phpunit/php-code-coverage": "^5.0", + "phpunit/php-file-iterator": "^1.4", + "phpunit/php-text-template": "^1.2", "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.2", + "phpunit/phpunit-mock-objects": "^4.0", "sebastian/comparator": "^1.2.4", - "sebastian/diff": "~1.2", - "sebastian/environment": "^1.3.4 || ^2.0", - "sebastian/exporter": "~2.0", + "sebastian/diff": "^1.2", + "sebastian/environment": "^2.0", + "sebastian/exporter": "^2.0", "sebastian/global-state": "^1.1", - "sebastian/object-enumerator": "~2.0", - "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0|~2.0", - "symfony/yaml": "~2.1|~3.0" + "sebastian/object-enumerator": "^2.0", + "sebastian/resource-operations": "^1.0", + "sebastian/version": "^2.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" + "phpdocumentor/reflection-docblock": "3.0.2", + "phpunit/dbunit": "<3.0" }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-xdebug": "*", - "phpunit/php-invoker": "~1.1" + "phpunit/php-invoker": "^1.1" }, "bin": [ "phpunit" @@ -610,7 +609,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7.x-dev" + "dev-master": "6.0.x-dev" } }, "autoload": { @@ -636,33 +635,33 @@ "testing", "xunit" ], - "time": "2017-02-10 09:05:10" + "time": "2017-02-08 05:57:26" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.4.3", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24" + "reference": "3819745c44f3aff9518fd655f320c4535d541af7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3819745c44f3aff9518fd655f320c4535d541af7", + "reference": "3819745c44f3aff9518fd655f320c4535d541af7", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", + "php": "^7.0", "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" + "sebastian/exporter": "^2.0" }, "conflict": { - "phpunit/phpunit": "<5.4.0" + "phpunit/phpunit": "<6.0" }, "require-dev": { - "phpunit/phpunit": "^5.4" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-soap": "*" @@ -670,7 +669,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -695,7 +694,7 @@ "mock", "xunit" ], - "time": "2016-12-08 20:27:08" + "time": "2017-02-02 10:36:38" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -1210,61 +1209,6 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03 07:35:21" }, - { - "name": "symfony/yaml", - "version": "v3.2.3", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e1718c6bf57e1efbb8793ada951584b2ab27775b", - "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "require-dev": { - "symfony/console": "~2.8|~3.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2017-01-21 17:06:35" - }, { "name": "webmozart/assert", "version": "1.2.0", @@ -1323,7 +1267,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.3.0", + "php": "^7.0", "ext-pcntl": "*" }, "platform-dev": [] diff --git a/src/PHPUnit/Listener/GracefulInterruptListener.php b/src/PHPUnit/Listener/GracefulInterruptListener.php index e4186c5..87bc7b0 100644 --- a/src/PHPUnit/Listener/GracefulInterruptListener.php +++ b/src/PHPUnit/Listener/GracefulInterruptListener.php @@ -2,8 +2,8 @@ namespace Esler\PHPUnit\Listener; use BadMethodCallException; -use PHPUnit_Framework_BaseTestListener; -use PHPUnit_Framework_Test; +use PHPUnit\Framework\BaseTestListener; +use PHPUnit\Framework\Test; /** * This class defines an extension for PHPUnit. @@ -14,7 +14,7 @@ * @author Ondrej Esler * @license MIT */ -class GracefulInterruptListener extends PHPUnit_Framework_BaseTestListener +class GracefulInterruptListener extends BaseTestListener { /** @@ -33,10 +33,10 @@ public function __construct() { /** * A test ended. * - * @param PHPUnit_Framework_Test $test - * @param float $time + * @param Test $test + * @param float $time */ - public function endTest(PHPUnit_Framework_Test $test, $time) { + public function endTest(Test $test, $time) { $this->test = $test; pcntl_signal_dispatch(); } diff --git a/tests/unit/PHPUnit/Listener/GracefulInterruptListenerTest.php b/tests/unit/PHPUnit/Listener/GracefulInterruptListenerTest.php index 1d5693c..2f95a74 100644 --- a/tests/unit/PHPUnit/Listener/GracefulInterruptListenerTest.php +++ b/tests/unit/PHPUnit/Listener/GracefulInterruptListenerTest.php @@ -1,6 +1,8 @@ * @license MIT */ -class GracefulInterruptListenerTest extends \PHPUnit_Framework_TestCase +class GracefulInterruptListenerTest extends TestCase { /**