From a085a0e818485ee8c1b6aba36cd924fde528a5eb Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 4 Jan 2017 12:26:43 +0100 Subject: [PATCH 01/11] Implement compat classes to have cross-compat between PHPUnit 5 & 6 for the PHPUnit Bridge --- .../Compat/Framework/AssertionFailedError.php | 20 ++++++++ .../Compat/Framework/BaseTestListener.php | 20 ++++++++ .../PhpUnit/Compat/Framework/TestCase.php | 20 ++++++++ .../PhpUnit/Compat/Framework/TestSuite.php | 20 ++++++++ .../PhpUnit/Compat/Runner/BaseTestRunner.php | 20 ++++++++ .../Bridge/PhpUnit/Compat/TextUI/Command.php | 20 ++++++++ .../PhpUnit/Compat/TextUI/TestRunner.php | 20 ++++++++ .../Bridge/PhpUnit/Compat/Util/Blacklist.php | 20 ++++++++ .../PhpUnit/Compat/Util/ErrorHandler.php | 20 ++++++++ .../Bridge/PhpUnit/Compat/Util/Test.php | 20 ++++++++ .../PhpUnit/DeprecationErrorHandler.php | 11 +++-- .../Bridge/PhpUnit/SymfonyTestsListener.php | 47 ++++++++++++++----- .../Bridge/PhpUnit/Tests/DnsMockTest.php | 3 +- src/Symfony/Bridge/PhpUnit/TextUI/Command.php | 2 +- .../Bridge/PhpUnit/TextUI/TestRunner.php | 2 +- src/Symfony/Bridge/PhpUnit/bootstrap.php | 2 +- 16 files changed, 246 insertions(+), 21 deletions(-) create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php create mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php new file mode 100644 index 0000000000000..cf849375c4310 --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\Framework; + +if (class_exists(PHPUnit\Framework\AssertionFailedError::class)) { + class AssertionFailedError extends PHPUnit\Framework\AssertionFailedError + {} +} else { + class AssertionFailedError extends \PHPUnit_Framework_AssertionFailedError + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php new file mode 100644 index 0000000000000..abe6050d15dce --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\Framework; + +if (class_exists(PHPUnit\Framework\BaseTestListener::class)) { + abstract class BaseTestListener extends PHPUnit\Framework\BaseTestListener + {} +} else { + abstract class BaseTestListener extends \PHPUnit_Framework_BaseTestListener + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php new file mode 100644 index 0000000000000..202ca11548de0 --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\Framework; + +if (class_exists(PHPUnit\Framework\TestCase::class)) { + class TestCase extends PHPUnit\Framework\TestCase + {} +} else { + class TestCase extends \PHPUnit_Framework_TestCase + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php new file mode 100644 index 0000000000000..ee58dd50fc9ca --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\Framework; + +if (class_exists(PHPUnit\Framework\TestSuite::class)) { + class TestSuite extends PHPUnit\Framework\TestSuite + {} +} else { + class TestSuite extends \PHPUnit_Framework_TestSuite + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php new file mode 100644 index 0000000000000..f1cf54196c440 --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\Runner; + +if (class_exists(PHPUnit\Runner\BaseTestRunner::class)) { + abstract class BaseTestRunner extends PHPUnit\Runner\BaseTestRunner + {} +} else { + abstract class BaseTestRunner extends \PHPUnit_Runner_BaseTestRunner + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php new file mode 100644 index 0000000000000..0f56cd42beae9 --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\TextUI; + +if (class_exists(PHPUnit\TextUI\Command::class)) { + class Command extends PHPUnit\TextUI\Command + {} +} else { + class Command extends \PHPUnit_TextUI_Command + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php new file mode 100644 index 0000000000000..8fcd52adba072 --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\TextUI; + +if (class_exists(PHPUnit\TextUI\TestRunner::class)) { + class TestRunner extends PHPUnit\TextUI\TestRunner + {} +} else { + class TestRunner extends \PHPUnit_TextUI_TestRunner + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php new file mode 100644 index 0000000000000..39acc9d17756c --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\Util; + +if (class_exists(PHPUnit\Util\Blacklist::class)) { + class Blacklist extends PHPUnit\Util\Blacklist + {} +} else { + class Blacklist extends \PHPUnit_Util_Blacklist + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php new file mode 100644 index 0000000000000..a197a81c2a71d --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\Util; + +if (class_exists(PHPUnit\Util\ErrorHandler::class)) { + class ErrorHandler extends PHPUnit\Util\ErrorHandler + {} +} else { + class ErrorHandler extends \PHPUnit_Util_ErrorHandler + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php new file mode 100644 index 0000000000000..8cdb28b848210 --- /dev/null +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php @@ -0,0 +1,20 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\PhpUnit\Compat\Util; + +if (class_exists(PHPUnit\Util\Test::class)) { + class Test extends PHPUnit\Util\Test + {} +} else { + class Test extends \PHPUnit_Util_Test + {} +} diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php index ca85d8aba5994..0171ff234b5e0 100644 --- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php +++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php @@ -11,6 +11,9 @@ namespace Symfony\Bridge\PhpUnit; +use Symfony\Bridge\PhpUnit\Compat\Util\ErrorHandler; +use Symfony\Bridge\PhpUnit\Compat\Util\Test; + /** * Catch deprecation notices and print a summary report at the end of the test suite. * @@ -70,14 +73,14 @@ public static function register($mode = 0) $deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $getMode) { $mode = $getMode(); if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode) { - return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context); + return ErrorHandler::handleError($type, $msg, $file, $line, $context); } $trace = debug_backtrace(true); $group = 'other'; $i = count($trace); - while (1 < $i && (!isset($trace[--$i]['class']) || ('ReflectionMethod' === $trace[$i]['class'] || 0 === strpos($trace[$i]['class'], 'PHPUnit_')))) { + while (1 < $i && (!isset($trace[--$i]['class']) || ('ReflectionMethod' === $trace[$i]['class'] || 0 === strpos($trace[$i]['class'], 'PHPUnit_') || 0 === strpos($trace[$i]['class'], 'PHPUnit\\')))) { // No-op } @@ -91,7 +94,7 @@ public static function register($mode = 0) || 0 === strpos($method, 'provideLegacy') || 0 === strpos($method, 'getLegacy') || strpos($class, '\Legacy') - || in_array('legacy', \PHPUnit_Util_Test::getGroups($class, $method), true) + || in_array('legacy', Test::getGroups($class, $method), true) ) { $group = 'legacy'; } else { @@ -128,7 +131,7 @@ public static function register($mode = 0) if (null !== $oldErrorHandler) { restore_error_handler(); - if (array('PHPUnit_Util_ErrorHandler', 'handleError') === $oldErrorHandler) { + if (array('PHPUnit_Util_ErrorHandler', 'handleError') === $oldErrorHandler || array('PHPUnit\Util\ErrorHandler', 'handleError') === $oldErrorHandler) { restore_error_handler(); self::register($mode); } diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php index 339ff3f8d417e..47a09bde64adf 100644 --- a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php +++ b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php @@ -12,13 +12,22 @@ namespace Symfony\Bridge\PhpUnit; use Doctrine\Common\Annotations\AnnotationRegistry; +use PHPUnit\Framework\AssertionFailedError as AssertionFailedError6; +use PHPUnit\Framework\TestCase as TestCase6; +use PHPUnit\Framework\TestSuite as TestSuite6; +use Symfony\Bridge\PhpUnit\Compat\Framework\AssertionFailedError; +use Symfony\Bridge\PhpUnit\Compat\Framework\BaseTestListener; +use Symfony\Bridge\PhpUnit\Compat\Framework\TestSuite; +use Symfony\Bridge\PhpUnit\Compat\Runner\BaseTestRunner; +use Symfony\Bridge\PhpUnit\Compat\Util\Blacklist; +use Symfony\Bridge\PhpUnit\Compat\Util\Test; /** * Collects and replays skipped tests. * * @author Nicolas Grekas */ -class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener +class SymfonyTestsListener extends BaseTestListener { private static $globallyEnabled = false; private $state = -1; @@ -35,7 +44,7 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener */ public function __construct(array $mockedNamespaces = array()) { - \PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\SymfonyTestsListener'] = 1; + Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\SymfonyTestsListener'] = 1; $warn = false; foreach ($mockedNamespaces as $type => $namespaces) { @@ -75,7 +84,7 @@ public function __destruct() } } - public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) + public function startTestSuite(TestSuite $suite) { $suiteName = $suite->getName(); $this->testsWithWarnings = array(); @@ -103,12 +112,12 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) $testSuites = array($suite); for ($i = 0; isset($testSuites[$i]); ++$i) { foreach ($testSuites[$i]->tests() as $test) { - if ($test instanceof \PHPUnit_Framework_TestSuite) { + if ($this->isInstanceOfPHPUnitTestSuite($test)) { if (!class_exists($test->getName(), false)) { $testSuites[] = $test; continue; } - $groups = \PHPUnit_Util_Test::getGroups($test->getName()); + $groups = Test::getGroups($test->getName()); if (in_array('time-sensitive', $groups, true)) { ClockMock::register($test->getName()); } @@ -121,7 +130,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) } elseif (2 === $this->state) { $skipped = array(); foreach ($suite->tests() as $test) { - if (!$test instanceof \PHPUnit_Framework_TestCase + if (!$this->isInstanceOfPHPUnitTestSuite($test) || isset($this->wasSkipped[$suiteName]['*']) || isset($this->wasSkipped[$suiteName][$test->getName()])) { $skipped[] = $test; @@ -148,8 +157,8 @@ public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $ti public function startTest(\PHPUnit_Framework_Test $test) { - if (-2 < $this->state && $test instanceof \PHPUnit_Framework_TestCase) { - $groups = \PHPUnit_Util_Test::getGroups(get_class($test), $test->getName(false)); + if (-2 < $this->state && $this->isInstanceOfPHPUnitTestCase($test)) { + $groups = Test::getGroups(get_class($test), $test->getName(false)); if (in_array('time-sensitive', $groups, true)) { ClockMock::register(get_class($test)); @@ -159,14 +168,14 @@ public function startTest(\PHPUnit_Framework_Test $test) DnsMock::register(get_class($test)); } - $annotations = \PHPUnit_Util_Test::parseTestMethodAnnotations(get_class($test), $test->getName(false)); + $annotations = Test::parseTestMethodAnnotations(get_class($test), $test->getName(false)); if (isset($annotations['class']['expectedDeprecation'])) { - $test->getTestResultObject()->addError($test, new \PHPUnit_Framework_AssertionFailedError('`@expectedDeprecation` annotations are not allowed at the class level.'), 0); + $test->getTestResultObject()->addError($test, new AssertionFailedError('`@expectedDeprecation` annotations are not allowed at the class level.'), 0); } if (isset($annotations['method']['expectedDeprecation'])) { if (!in_array('legacy', $groups, true)) { - $test->getTestResultObject()->addError($test, new \PHPUnit_Framework_AssertionFailedError('Only tests with the `@group legacy` annotation can have `@expectedDeprecation`.'), 0); + $test->getTestResultObject()->addError($test, new AssertionFailedError('Only tests with the `@group legacy` annotation can have `@expectedDeprecation`.'), 0); } $this->expectedDeprecations = $annotations['method']['expectedDeprecation']; $this->previousErrorHandler = set_error_handler(array($this, 'handleError')); @@ -190,19 +199,21 @@ public function endTest(\PHPUnit_Framework_Test $test, $time) if ($this->expectedDeprecations) { restore_error_handler(); - if (!in_array($test->getStatus(), array(\PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED, \PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE, \PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE, \PHPUnit_Runner_BaseTestRunner::STATUS_ERROR), true)) { + if (!in_array($test->getStatus(), array(BaseTestRunner::STATUS_SKIPPED, BaseTestRunner::STATUS_INCOMPLETE, BaseTestRunner::STATUS_FAILURE, BaseTestRunner::STATUS_ERROR), true)) { try { $prefix = "@expectedDeprecation:\n"; $test->assertStringMatchesFormat($prefix.'%A '.implode("\n%A ", $this->expectedDeprecations)."\n%A", $prefix.' '.implode("\n ", $this->gatheredDeprecations)."\n"); } catch (\PHPUnit_Framework_AssertionFailedError $e) { $test->getTestResultObject()->addFailure($test, $e, $time); + } catch (AssertionFailedError6 $e) { + $test->getTestResultObject()->addFailure($test, $e, $time); } } $this->expectedDeprecations = $this->gatheredDeprecations = array(); $this->previousErrorHandler = null; } - if (-2 < $this->state && $test instanceof \PHPUnit_Framework_TestCase) { + if (-2 < $this->state && $this->isInstanceOfPHPUnitTestCase($test)) { if (in_array('time-sensitive', $groups, true)) { ClockMock::withClockMock(false); } @@ -240,4 +251,14 @@ public function handleError($type, $msg, $file, $line, $context) } $this->gatheredDeprecations[] = $msg; } + + private function isInstanceOfPHPUnitTestSuite($object) + { + return $object instanceof \PHPUnit_Framework_TestSuite || $object instanceof TestSuite6; + } + + private function isInstanceOfPHPUnitTestCase($object) + { + return $object instanceof \PHPUnit_Framework_TestCase || $object instanceof TestCase6; + } } diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php index 034d07a30f67a..f5b3be23f5467 100644 --- a/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php +++ b/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php @@ -11,9 +11,10 @@ namespace Symfony\Bridge\PhpUnit\Tests; +use Symfony\Bridge\PhpUnit\Compat\Framework\TestCase; use Symfony\Bridge\PhpUnit\DnsMock; -class DnsMockTest extends \PHPUnit_Framework_TestCase +class DnsMockTest extends TestCase { protected function tearDown() { diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/TextUI/Command.php index 203fd16414820..5b9535875a698 100644 --- a/src/Symfony/Bridge/PhpUnit/TextUI/Command.php +++ b/src/Symfony/Bridge/PhpUnit/TextUI/Command.php @@ -14,7 +14,7 @@ /** * {@inheritdoc} */ -class Command extends \PHPUnit_TextUI_Command +class Command extends \Symfony\Bridge\PhpUnit\Compat\TextUI\Command { /** * {@inheritdoc} diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php index 94602bb3d63ca..c3a48b8f33e13 100644 --- a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php +++ b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php @@ -16,7 +16,7 @@ /** * {@inheritdoc} */ -class TestRunner extends \PHPUnit_TextUI_TestRunner +class TestRunner extends \Symfony\Bridge\PhpUnit\Compat\TextUI\TestRunner { /** * {@inheritdoc} diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php index 5e2ed0ca85f82..f2ceffb1b51ae 100644 --- a/src/Symfony/Bridge/PhpUnit/bootstrap.php +++ b/src/Symfony/Bridge/PhpUnit/bootstrap.php @@ -13,7 +13,7 @@ use Symfony\Bridge\PhpUnit\DeprecationErrorHandler; // Detect if we're loaded by an actual run of phpunit -if (!defined('PHPUNIT_COMPOSER_INSTALL') && !class_exists('PHPUnit_TextUI_Command', false)) { +if (!defined('PHPUNIT_COMPOSER_INSTALL') && !class_exists('PHPUnit_TextUI_Command', false) && !class_exists('PHPUnit\TextUI\Command', false)) { return; } From 1a56153252a6b2fec420f51891b770461aadd362 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 4 Jan 2017 12:45:10 +0100 Subject: [PATCH 02/11] Add compat classes to PSR-4 autoloader --- composer.json | 1 + .../Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php | 2 +- .../Bridge/PhpUnit/Compat/Framework/BaseTestListener.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index acfbd0d3c29d1..76d51a05dbaeb 100644 --- a/composer.json +++ b/composer.json @@ -104,6 +104,7 @@ "psr-4": { "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/", + "Symfony\\Bridge\\PhpUnit\\Compat\\": "src/Symfony/Bridge/PhpUnit/Compat/", "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/", "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php index cf849375c4310..8f1f34ff2a7b5 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; if (class_exists(PHPUnit\Framework\AssertionFailedError::class)) { - class AssertionFailedError extends PHPUnit\Framework\AssertionFailedError + class AssertionFailedError extends \PHPUnit\Framework\AssertionFailedError {} } else { class AssertionFailedError extends \PHPUnit_Framework_AssertionFailedError diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php index abe6050d15dce..c4cf6f9d03fc3 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; if (class_exists(PHPUnit\Framework\BaseTestListener::class)) { - abstract class BaseTestListener extends PHPUnit\Framework\BaseTestListener + abstract class BaseTestListener extends \PHPUnit\Framework\BaseTestListener {} } else { abstract class BaseTestListener extends \PHPUnit_Framework_BaseTestListener diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php index 202ca11548de0..27f51fcea73dc 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; if (class_exists(PHPUnit\Framework\TestCase::class)) { - class TestCase extends PHPUnit\Framework\TestCase + class TestCase extends \PHPUnit\Framework\TestCase {} } else { class TestCase extends \PHPUnit_Framework_TestCase diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php index ee58dd50fc9ca..0cdf69d6693bb 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; if (class_exists(PHPUnit\Framework\TestSuite::class)) { - class TestSuite extends PHPUnit\Framework\TestSuite + class TestSuite extends \PHPUnit\Framework\TestSuite {} } else { class TestSuite extends \PHPUnit_Framework_TestSuite diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php index f1cf54196c440..b2bbfc4662d1a 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Runner; if (class_exists(PHPUnit\Runner\BaseTestRunner::class)) { - abstract class BaseTestRunner extends PHPUnit\Runner\BaseTestRunner + abstract class BaseTestRunner extends \PHPUnit\Runner\BaseTestRunner {} } else { abstract class BaseTestRunner extends \PHPUnit_Runner_BaseTestRunner diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php index 0f56cd42beae9..c46171bc198fe 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\TextUI; if (class_exists(PHPUnit\TextUI\Command::class)) { - class Command extends PHPUnit\TextUI\Command + class Command extends \PHPUnit\TextUI\Command {} } else { class Command extends \PHPUnit_TextUI_Command diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php index 8fcd52adba072..7085522d99bff 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\TextUI; if (class_exists(PHPUnit\TextUI\TestRunner::class)) { - class TestRunner extends PHPUnit\TextUI\TestRunner + class TestRunner extends \PHPUnit\TextUI\TestRunner {} } else { class TestRunner extends \PHPUnit_TextUI_TestRunner diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php index 39acc9d17756c..1a9e06bbae475 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Util; if (class_exists(PHPUnit\Util\Blacklist::class)) { - class Blacklist extends PHPUnit\Util\Blacklist + class Blacklist extends \PHPUnit\Util\Blacklist {} } else { class Blacklist extends \PHPUnit_Util_Blacklist diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php index a197a81c2a71d..184ec8d707195 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Util; if (class_exists(PHPUnit\Util\ErrorHandler::class)) { - class ErrorHandler extends PHPUnit\Util\ErrorHandler + class ErrorHandler extends \PHPUnit\Util\ErrorHandler {} } else { class ErrorHandler extends \PHPUnit_Util_ErrorHandler diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php index 8cdb28b848210..afeac39c024bb 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php @@ -12,7 +12,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Util; if (class_exists(PHPUnit\Util\Test::class)) { - class Test extends PHPUnit\Util\Test + class Test extends \PHPUnit\Util\Test {} } else { class Test extends \PHPUnit_Util_Test From abb1f917fd7a8b6ae698a3728d652324354c44ba Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 4 Jan 2017 12:50:11 +0100 Subject: [PATCH 03/11] Revert wrong edit of typehint --- src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php index 47a09bde64adf..7d2e081989e51 100644 --- a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php +++ b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php @@ -84,7 +84,7 @@ public function __destruct() } } - public function startTestSuite(TestSuite $suite) + public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) { $suiteName = $suite->getName(); $this->testsWithWarnings = array(); From a75694ec212279c27aa1f35f8e62ed38d6341d6f Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 4 Jan 2017 13:01:50 +0100 Subject: [PATCH 04/11] Avoid ::class to maintain PHP 5.3 compat --- .../Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php | 2 +- .../Bridge/PhpUnit/Compat/Framework/BaseTestListener.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php | 2 +- src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php index 8f1f34ff2a7b5..146c10517e73b 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; -if (class_exists(PHPUnit\Framework\AssertionFailedError::class)) { +if (class_exists('PHPUnit\Framework\AssertionFailedError')) { class AssertionFailedError extends \PHPUnit\Framework\AssertionFailedError {} } else { diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php index c4cf6f9d03fc3..a4d57b4db0be3 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; -if (class_exists(PHPUnit\Framework\BaseTestListener::class)) { +if (class_exists('PHPUnit\Framework\BaseTestListener')) { abstract class BaseTestListener extends \PHPUnit\Framework\BaseTestListener {} } else { diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php index 27f51fcea73dc..f6779a0d27c29 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; -if (class_exists(PHPUnit\Framework\TestCase::class)) { +if (class_exists('PHPUnit\Framework\TestCase')) { class TestCase extends \PHPUnit\Framework\TestCase {} } else { diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php index 0cdf69d6693bb..b2ddecc495a66 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; -if (class_exists(PHPUnit\Framework\TestSuite::class)) { +if (class_exists('PHPUnit\Framework\TestSuite')) { class TestSuite extends \PHPUnit\Framework\TestSuite {} } else { diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php index b2bbfc4662d1a..7bf561e912c14 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Runner; -if (class_exists(PHPUnit\Runner\BaseTestRunner::class)) { +if (class_exists('PHPUnit\Runner\BaseTestRunner')) { abstract class BaseTestRunner extends \PHPUnit\Runner\BaseTestRunner {} } else { diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php index c46171bc198fe..e72933bd22814 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\TextUI; -if (class_exists(PHPUnit\TextUI\Command::class)) { +if (class_exists('PHPUnit\TextUI\Command')) { class Command extends \PHPUnit\TextUI\Command {} } else { diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php index 7085522d99bff..7f43ed5d14c69 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\TextUI; -if (class_exists(PHPUnit\TextUI\TestRunner::class)) { +if (class_exists('PHPUnit\TextUI\TestRunner')) { class TestRunner extends \PHPUnit\TextUI\TestRunner {} } else { diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php index 1a9e06bbae475..c2ede6acd1365 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Util; -if (class_exists(PHPUnit\Util\Blacklist::class)) { +if (class_exists('PHPUnit\Util\Blacklist')) { class Blacklist extends \PHPUnit\Util\Blacklist {} } else { diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php index 184ec8d707195..a31428cbc763e 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Util; -if (class_exists(PHPUnit\Util\ErrorHandler::class)) { +if (class_exists('PHPUnit\Util\ErrorHandler')) { class ErrorHandler extends \PHPUnit\Util\ErrorHandler {} } else { diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php index afeac39c024bb..345f8283850e8 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php @@ -11,7 +11,7 @@ namespace Symfony\Bridge\PhpUnit\Compat\Util; -if (class_exists(PHPUnit\Util\Test::class)) { +if (class_exists('PHPUnit\Util\Test')) { class Test extends \PHPUnit\Util\Test {} } else { From 22ca4c0fd515ebaa3b4a9dea73e712bc658c3eb7 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 4 Jan 2017 13:05:39 +0100 Subject: [PATCH 05/11] Fix wrong method as per review --- src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php index 7d2e081989e51..e19011a56e432 100644 --- a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php +++ b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php @@ -112,7 +112,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) $testSuites = array($suite); for ($i = 0; isset($testSuites[$i]); ++$i) { foreach ($testSuites[$i]->tests() as $test) { - if ($this->isInstanceOfPHPUnitTestSuite($test)) { + if ($this->isInstanceOfPHPUnitTestCase($test)) { if (!class_exists($test->getName(), false)) { $testSuites[] = $test; continue; From 73946f55a4e5843ad64d8b3a89da529a5f247864 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 4 Jan 2017 13:07:28 +0100 Subject: [PATCH 06/11] Mark all compat classes as @internal to avoid BC policy --- .../PhpUnit/Compat/Framework/AssertionFailedError.php | 10 ++++++++++ .../PhpUnit/Compat/Framework/BaseTestListener.php | 10 ++++++++++ .../Bridge/PhpUnit/Compat/Framework/TestCase.php | 10 ++++++++++ .../Bridge/PhpUnit/Compat/Framework/TestSuite.php | 10 ++++++++++ .../Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php | 10 ++++++++++ src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php | 10 ++++++++++ .../Bridge/PhpUnit/Compat/TextUI/TestRunner.php | 10 ++++++++++ src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php | 10 ++++++++++ .../Bridge/PhpUnit/Compat/Util/ErrorHandler.php | 10 ++++++++++ src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php | 10 ++++++++++ 10 files changed, 100 insertions(+) diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php index 146c10517e73b..b7fdf13052dce 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; if (class_exists('PHPUnit\Framework\AssertionFailedError')) { + /** + * Class AssertionFailedError + * @package Symfony\Bridge\PhpUnit\Compat\Framework + * @internal + */ class AssertionFailedError extends \PHPUnit\Framework\AssertionFailedError {} } else { + /** + * Class AssertionFailedError + * @package Symfony\Bridge\PhpUnit\Compat\Framework + * @internal + */ class AssertionFailedError extends \PHPUnit_Framework_AssertionFailedError {} } diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php index a4d57b4db0be3..1914832ab417d 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; if (class_exists('PHPUnit\Framework\BaseTestListener')) { + /** + * Class BaseTestListener + * @package Symfony\Bridge\PhpUnit\Compat\Framework + * @internal + */ abstract class BaseTestListener extends \PHPUnit\Framework\BaseTestListener {} } else { + /** + * Class BaseTestListener + * @package Symfony\Bridge\PhpUnit\Compat\Framework + * @internal + */ abstract class BaseTestListener extends \PHPUnit_Framework_BaseTestListener {} } diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php index f6779a0d27c29..b60c84d74ab15 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; if (class_exists('PHPUnit\Framework\TestCase')) { + /** + * Class TestCase + * @package Symfony\Bridge\PhpUnit\Compat\Framework + * @internal + */ class TestCase extends \PHPUnit\Framework\TestCase {} } else { + /** + * Class TestCase + * @package Symfony\Bridge\PhpUnit\Compat\Framework + * @internal + */ class TestCase extends \PHPUnit_Framework_TestCase {} } diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php index b2ddecc495a66..7996896e56b4a 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\Framework; if (class_exists('PHPUnit\Framework\TestSuite')) { + /** + * Class TestSuite + * @package Symfony\Bridge\PhpUnit\Compat\Framework + * @internal + */ class TestSuite extends \PHPUnit\Framework\TestSuite {} } else { + /** + * Class TestSuite + * @package Symfony\Bridge\PhpUnit\Compat\Framework + * @internal + */ class TestSuite extends \PHPUnit_Framework_TestSuite {} } diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php index 7bf561e912c14..288896cd2b8c4 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\Runner; if (class_exists('PHPUnit\Runner\BaseTestRunner')) { + /** + * Class BaseTestRunner + * @package Symfony\Bridge\PhpUnit\Compat\Runner + * @internal + */ abstract class BaseTestRunner extends \PHPUnit\Runner\BaseTestRunner {} } else { + /** + * Class BaseTestRunner + * @package Symfony\Bridge\PhpUnit\Compat\Runner + * @internal + */ abstract class BaseTestRunner extends \PHPUnit_Runner_BaseTestRunner {} } diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php index e72933bd22814..9a4b37ddb41fc 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\TextUI; if (class_exists('PHPUnit\TextUI\Command')) { + /** + * Class Command + * @package Symfony\Bridge\PhpUnit\Compat\TextUI + * @internal + */ class Command extends \PHPUnit\TextUI\Command {} } else { + /** + * Class Command + * @package Symfony\Bridge\PhpUnit\Compat\TextUI + * @internal + */ class Command extends \PHPUnit_TextUI_Command {} } diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php index 7f43ed5d14c69..8208ca083565e 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\TextUI; if (class_exists('PHPUnit\TextUI\TestRunner')) { + /** + * Class TestRunner + * @package Symfony\Bridge\PhpUnit\Compat\TextUI + * @internal + */ class TestRunner extends \PHPUnit\TextUI\TestRunner {} } else { + /** + * Class TestRunner + * @package Symfony\Bridge\PhpUnit\Compat\TextUI + * @internal + */ class TestRunner extends \PHPUnit_TextUI_TestRunner {} } diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php index c2ede6acd1365..ea8b240b13258 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\Util; if (class_exists('PHPUnit\Util\Blacklist')) { + /** + * Class Blacklist + * @package Symfony\Bridge\PhpUnit\Compat\Util + * @internal + */ class Blacklist extends \PHPUnit\Util\Blacklist {} } else { + /** + * Class Blacklist + * @package Symfony\Bridge\PhpUnit\Compat\Util + * @internal + */ class Blacklist extends \PHPUnit_Util_Blacklist {} } diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php index a31428cbc763e..f0b87b16f6653 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\Util; if (class_exists('PHPUnit\Util\ErrorHandler')) { + /** + * Class ErrorHandler + * @package Symfony\Bridge\PhpUnit\Compat\Util + * @internal + */ class ErrorHandler extends \PHPUnit\Util\ErrorHandler {} } else { + /** + * Class ErrorHandler + * @package Symfony\Bridge\PhpUnit\Compat\Util + * @internal + */ class ErrorHandler extends \PHPUnit_Util_ErrorHandler {} } diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php index 345f8283850e8..022815093587a 100644 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php +++ b/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php @@ -12,9 +12,19 @@ namespace Symfony\Bridge\PhpUnit\Compat\Util; if (class_exists('PHPUnit\Util\Test')) { + /** + * Class Test + * @package Symfony\Bridge\PhpUnit\Compat\Util + * @internal + */ class Test extends \PHPUnit\Util\Test {} } else { + /** + * Class Test + * @package Symfony\Bridge\PhpUnit\Compat\Util + * @internal + */ class Test extends \PHPUnit_Util_Test {} } From 5065e8716f7075978b2e8ec158d683cca843d1fa Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 4 Jan 2017 13:09:56 +0100 Subject: [PATCH 07/11] Fix --- src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php index e19011a56e432..23272e5efb6b6 100644 --- a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php +++ b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php @@ -17,7 +17,6 @@ use PHPUnit\Framework\TestSuite as TestSuite6; use Symfony\Bridge\PhpUnit\Compat\Framework\AssertionFailedError; use Symfony\Bridge\PhpUnit\Compat\Framework\BaseTestListener; -use Symfony\Bridge\PhpUnit\Compat\Framework\TestSuite; use Symfony\Bridge\PhpUnit\Compat\Runner\BaseTestRunner; use Symfony\Bridge\PhpUnit\Compat\Util\Blacklist; use Symfony\Bridge\PhpUnit\Compat\Util\Test; @@ -112,7 +111,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) $testSuites = array($suite); for ($i = 0; isset($testSuites[$i]); ++$i) { foreach ($testSuites[$i]->tests() as $test) { - if ($this->isInstanceOfPHPUnitTestCase($test)) { + if ($this->isInstanceOfPHPUnitTestSuite($test)) { if (!class_exists($test->getName(), false)) { $testSuites[] = $test; continue; @@ -130,7 +129,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) } elseif (2 === $this->state) { $skipped = array(); foreach ($suite->tests() as $test) { - if (!$this->isInstanceOfPHPUnitTestSuite($test) + if (!$this->isInstanceOfPHPUnitTestCase($test) || isset($this->wasSkipped[$suiteName]['*']) || isset($this->wasSkipped[$suiteName][$test->getName()])) { $skipped[] = $test; From c5a77d53b4bb4c28b65a3ff9c45f2409aa616aec Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 4 Jan 2017 14:12:26 +0100 Subject: [PATCH 08/11] Revert composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 76d51a05dbaeb..acfbd0d3c29d1 100644 --- a/composer.json +++ b/composer.json @@ -104,7 +104,6 @@ "psr-4": { "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/", "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/", - "Symfony\\Bridge\\PhpUnit\\Compat\\": "src/Symfony/Bridge/PhpUnit/Compat/", "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/", "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/", "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/", From 61f68a19a53ab5213de86536ccafd6931ea6ee61 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 9 Jan 2017 14:41:39 +0100 Subject: [PATCH 09/11] Change approach to conditional use statements; ditch Compat classes --- .../Compat/Framework/AssertionFailedError.php | 30 ------------ .../Compat/Framework/BaseTestListener.php | 30 ------------ .../PhpUnit/Compat/Framework/TestCase.php | 30 ------------ .../PhpUnit/Compat/Framework/TestSuite.php | 30 ------------ .../PhpUnit/Compat/Runner/BaseTestRunner.php | 30 ------------ .../Bridge/PhpUnit/Compat/TextUI/Command.php | 30 ------------ .../PhpUnit/Compat/TextUI/TestRunner.php | 30 ------------ .../Bridge/PhpUnit/Compat/Util/Blacklist.php | 30 ------------ .../PhpUnit/Compat/Util/ErrorHandler.php | 30 ------------ .../Bridge/PhpUnit/Compat/Util/Test.php | 30 ------------ .../PhpUnit/DeprecationErrorHandler.php | 9 +++- .../Bridge/PhpUnit/SymfonyTestsListener.php | 49 +++++++++---------- .../Bridge/PhpUnit/Tests/DnsMockTest.php | 6 ++- src/Symfony/Bridge/PhpUnit/TextUI/Command.php | 8 ++- .../Bridge/PhpUnit/TextUI/TestRunner.php | 7 ++- 15 files changed, 47 insertions(+), 332 deletions(-) delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php delete mode 100644 src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php deleted file mode 100644 index b7fdf13052dce..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/AssertionFailedError.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\Framework; - -if (class_exists('PHPUnit\Framework\AssertionFailedError')) { - /** - * Class AssertionFailedError - * @package Symfony\Bridge\PhpUnit\Compat\Framework - * @internal - */ - class AssertionFailedError extends \PHPUnit\Framework\AssertionFailedError - {} -} else { - /** - * Class AssertionFailedError - * @package Symfony\Bridge\PhpUnit\Compat\Framework - * @internal - */ - class AssertionFailedError extends \PHPUnit_Framework_AssertionFailedError - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php deleted file mode 100644 index 1914832ab417d..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/BaseTestListener.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\Framework; - -if (class_exists('PHPUnit\Framework\BaseTestListener')) { - /** - * Class BaseTestListener - * @package Symfony\Bridge\PhpUnit\Compat\Framework - * @internal - */ - abstract class BaseTestListener extends \PHPUnit\Framework\BaseTestListener - {} -} else { - /** - * Class BaseTestListener - * @package Symfony\Bridge\PhpUnit\Compat\Framework - * @internal - */ - abstract class BaseTestListener extends \PHPUnit_Framework_BaseTestListener - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php deleted file mode 100644 index b60c84d74ab15..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestCase.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\Framework; - -if (class_exists('PHPUnit\Framework\TestCase')) { - /** - * Class TestCase - * @package Symfony\Bridge\PhpUnit\Compat\Framework - * @internal - */ - class TestCase extends \PHPUnit\Framework\TestCase - {} -} else { - /** - * Class TestCase - * @package Symfony\Bridge\PhpUnit\Compat\Framework - * @internal - */ - class TestCase extends \PHPUnit_Framework_TestCase - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php b/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php deleted file mode 100644 index 7996896e56b4a..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/Framework/TestSuite.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\Framework; - -if (class_exists('PHPUnit\Framework\TestSuite')) { - /** - * Class TestSuite - * @package Symfony\Bridge\PhpUnit\Compat\Framework - * @internal - */ - class TestSuite extends \PHPUnit\Framework\TestSuite - {} -} else { - /** - * Class TestSuite - * @package Symfony\Bridge\PhpUnit\Compat\Framework - * @internal - */ - class TestSuite extends \PHPUnit_Framework_TestSuite - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php deleted file mode 100644 index 288896cd2b8c4..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/Runner/BaseTestRunner.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\Runner; - -if (class_exists('PHPUnit\Runner\BaseTestRunner')) { - /** - * Class BaseTestRunner - * @package Symfony\Bridge\PhpUnit\Compat\Runner - * @internal - */ - abstract class BaseTestRunner extends \PHPUnit\Runner\BaseTestRunner - {} -} else { - /** - * Class BaseTestRunner - * @package Symfony\Bridge\PhpUnit\Compat\Runner - * @internal - */ - abstract class BaseTestRunner extends \PHPUnit_Runner_BaseTestRunner - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php deleted file mode 100644 index 9a4b37ddb41fc..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/Command.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\TextUI; - -if (class_exists('PHPUnit\TextUI\Command')) { - /** - * Class Command - * @package Symfony\Bridge\PhpUnit\Compat\TextUI - * @internal - */ - class Command extends \PHPUnit\TextUI\Command - {} -} else { - /** - * Class Command - * @package Symfony\Bridge\PhpUnit\Compat\TextUI - * @internal - */ - class Command extends \PHPUnit_TextUI_Command - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php deleted file mode 100644 index 8208ca083565e..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/TextUI/TestRunner.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\TextUI; - -if (class_exists('PHPUnit\TextUI\TestRunner')) { - /** - * Class TestRunner - * @package Symfony\Bridge\PhpUnit\Compat\TextUI - * @internal - */ - class TestRunner extends \PHPUnit\TextUI\TestRunner - {} -} else { - /** - * Class TestRunner - * @package Symfony\Bridge\PhpUnit\Compat\TextUI - * @internal - */ - class TestRunner extends \PHPUnit_TextUI_TestRunner - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php deleted file mode 100644 index ea8b240b13258..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/Blacklist.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\Util; - -if (class_exists('PHPUnit\Util\Blacklist')) { - /** - * Class Blacklist - * @package Symfony\Bridge\PhpUnit\Compat\Util - * @internal - */ - class Blacklist extends \PHPUnit\Util\Blacklist - {} -} else { - /** - * Class Blacklist - * @package Symfony\Bridge\PhpUnit\Compat\Util - * @internal - */ - class Blacklist extends \PHPUnit_Util_Blacklist - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php deleted file mode 100644 index f0b87b16f6653..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/ErrorHandler.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\Util; - -if (class_exists('PHPUnit\Util\ErrorHandler')) { - /** - * Class ErrorHandler - * @package Symfony\Bridge\PhpUnit\Compat\Util - * @internal - */ - class ErrorHandler extends \PHPUnit\Util\ErrorHandler - {} -} else { - /** - * Class ErrorHandler - * @package Symfony\Bridge\PhpUnit\Compat\Util - * @internal - */ - class ErrorHandler extends \PHPUnit_Util_ErrorHandler - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php b/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php deleted file mode 100644 index 022815093587a..0000000000000 --- a/src/Symfony/Bridge/PhpUnit/Compat/Util/Test.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Bridge\PhpUnit\Compat\Util; - -if (class_exists('PHPUnit\Util\Test')) { - /** - * Class Test - * @package Symfony\Bridge\PhpUnit\Compat\Util - * @internal - */ - class Test extends \PHPUnit\Util\Test - {} -} else { - /** - * Class Test - * @package Symfony\Bridge\PhpUnit\Compat\Util - * @internal - */ - class Test extends \PHPUnit_Util_Test - {} -} diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php index 0171ff234b5e0..30aa65075330a 100644 --- a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php +++ b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php @@ -11,8 +11,13 @@ namespace Symfony\Bridge\PhpUnit; -use Symfony\Bridge\PhpUnit\Compat\Util\ErrorHandler; -use Symfony\Bridge\PhpUnit\Compat\Util\Test; +if (class_exists('PHPUnit\Framework\Test')) { + use PHPUnit\Util\ErrorHandler; + use PHPUnit\Util\Test; +} else { + use \PHPUnit_Util_ErrorHandler as ErrorHandler; + use \PHPUnit_Util_Test as Test; +} /** * Catch deprecation notices and print a summary report at the end of the test suite. diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php index 23272e5efb6b6..8e8b8439897af 100644 --- a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php +++ b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php @@ -12,14 +12,21 @@ namespace Symfony\Bridge\PhpUnit; use Doctrine\Common\Annotations\AnnotationRegistry; -use PHPUnit\Framework\AssertionFailedError as AssertionFailedError6; -use PHPUnit\Framework\TestCase as TestCase6; -use PHPUnit\Framework\TestSuite as TestSuite6; -use Symfony\Bridge\PhpUnit\Compat\Framework\AssertionFailedError; -use Symfony\Bridge\PhpUnit\Compat\Framework\BaseTestListener; -use Symfony\Bridge\PhpUnit\Compat\Runner\BaseTestRunner; -use Symfony\Bridge\PhpUnit\Compat\Util\Blacklist; -use Symfony\Bridge\PhpUnit\Compat\Util\Test; +if (class_exists('PHPUnit\Framework\Test')) { + use PHPUnit\Framework\AssertionFailedError; + use PHPUnit\Framework\TestCase; + use PHPUnit\Framework\TestSuite; + use PHPUnit\Util\Blacklist; + use PHPUnit\Util\Test; +} else { + use \PHPUnit_Framework_AssertionFailedError as AssertionFailedError; + use \PHPUnit_Framework_BaseTestListener as BaseTestListener; + use \PHPUnit_Framework_TestCase as TestCase; + use \PHPUnit_Framework_TestSuite as TestSuite; + use \PHPUnit_Runner_BaseTestRunner as BaseTestRunner; + use \PHPUnit_Util_Blacklist as Blacklist; + use \PHPUnit_Util_Test as Test; +} /** * Collects and replays skipped tests. @@ -83,7 +90,7 @@ public function __destruct() } } - public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) + public function startTestSuite(TestSuite $suite) { $suiteName = $suite->getName(); $this->testsWithWarnings = array(); @@ -111,7 +118,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) $testSuites = array($suite); for ($i = 0; isset($testSuites[$i]); ++$i) { foreach ($testSuites[$i]->tests() as $test) { - if ($this->isInstanceOfPHPUnitTestSuite($test)) { + if ($test instanceof TestSuite) { if (!class_exists($test->getName(), false)) { $testSuites[] = $test; continue; @@ -129,7 +136,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) } elseif (2 === $this->state) { $skipped = array(); foreach ($suite->tests() as $test) { - if (!$this->isInstanceOfPHPUnitTestCase($test) + if (!$test instanceof TestCase || isset($this->wasSkipped[$suiteName]['*']) || isset($this->wasSkipped[$suiteName][$test->getName()])) { $skipped[] = $test; @@ -142,7 +149,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite) public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) { if (0 < $this->state) { - if ($test instanceof \PHPUnit_Framework_TestCase) { + if ($test instanceof TestCase) { $class = get_class($test); $method = $test->getName(); } else { @@ -156,7 +163,7 @@ public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $ti public function startTest(\PHPUnit_Framework_Test $test) { - if (-2 < $this->state && $this->isInstanceOfPHPUnitTestCase($test)) { + if (-2 < $this->state && $test instanceof TestCase) { $groups = Test::getGroups(get_class($test), $test->getName(false)); if (in_array('time-sensitive', $groups, true)) { @@ -202,9 +209,7 @@ public function endTest(\PHPUnit_Framework_Test $test, $time) try { $prefix = "@expectedDeprecation:\n"; $test->assertStringMatchesFormat($prefix.'%A '.implode("\n%A ", $this->expectedDeprecations)."\n%A", $prefix.' '.implode("\n ", $this->gatheredDeprecations)."\n"); - } catch (\PHPUnit_Framework_AssertionFailedError $e) { - $test->getTestResultObject()->addFailure($test, $e, $time); - } catch (AssertionFailedError6 $e) { + } catch (AssertionFailedError $e) { $test->getTestResultObject()->addFailure($test, $e, $time); } } @@ -212,7 +217,7 @@ public function endTest(\PHPUnit_Framework_Test $test, $time) $this->expectedDeprecations = $this->gatheredDeprecations = array(); $this->previousErrorHandler = null; } - if (-2 < $this->state && $this->isInstanceOfPHPUnitTestCase($test)) { + if (-2 < $this->state && $test instanceof TestCase) { if (in_array('time-sensitive', $groups, true)) { ClockMock::withClockMock(false); } @@ -250,14 +255,4 @@ public function handleError($type, $msg, $file, $line, $context) } $this->gatheredDeprecations[] = $msg; } - - private function isInstanceOfPHPUnitTestSuite($object) - { - return $object instanceof \PHPUnit_Framework_TestSuite || $object instanceof TestSuite6; - } - - private function isInstanceOfPHPUnitTestCase($object) - { - return $object instanceof \PHPUnit_Framework_TestCase || $object instanceof TestCase6; - } } diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php index f5b3be23f5467..276257f3a9225 100644 --- a/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php +++ b/src/Symfony/Bridge/PhpUnit/Tests/DnsMockTest.php @@ -11,7 +11,11 @@ namespace Symfony\Bridge\PhpUnit\Tests; -use Symfony\Bridge\PhpUnit\Compat\Framework\TestCase; +if (class_exists('PHPUnit\Framework\Test')) { + use PHPUnit\Framework\TestCase; +} else { + use \PHPUnit_Framework_TestCase as TestCase; +} use Symfony\Bridge\PhpUnit\DnsMock; class DnsMockTest extends TestCase diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/TextUI/Command.php index 5b9535875a698..f7cc2976a4714 100644 --- a/src/Symfony/Bridge/PhpUnit/TextUI/Command.php +++ b/src/Symfony/Bridge/PhpUnit/TextUI/Command.php @@ -11,10 +11,16 @@ namespace Symfony\Bridge\PhpUnit\TextUI; +if (class_exists('PHPUnit\Framework\Test')) { + use PHPUnit\TextUI\Command as PHPUnitCommand; +} else { + use \PHPUnit_TextUI_Command as PHPUnitCommand; +} + /** * {@inheritdoc} */ -class Command extends \Symfony\Bridge\PhpUnit\Compat\TextUI\Command +class Command extends PHPUnitCommand { /** * {@inheritdoc} diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php index c3a48b8f33e13..3bf1eb44e86bb 100644 --- a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php +++ b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php @@ -11,12 +11,17 @@ namespace Symfony\Bridge\PhpUnit\TextUI; +if (class_exists('PHPUnit\Framework\Test')) { + use PHPUnit\TextUI\TestRunner as PHPUnitTestRunner; +} else { + use \PHPUnit_TextUI_TestRunner as PHPUnitTestRunner; +} use Symfony\Bridge\PhpUnit\SymfonyTestsListener; /** * {@inheritdoc} */ -class TestRunner extends \Symfony\Bridge\PhpUnit\Compat\TextUI\TestRunner +class TestRunner extends PHPUnitTestRunner { /** * {@inheritdoc} From e43f288cacc529b169450aab68bd74601a23347f Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 9 Jan 2017 14:45:32 +0100 Subject: [PATCH 10/11] Fix argument typehint --- .../Bridge/PhpUnit/SymfonyTestsListener.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php index 8e8b8439897af..d2da84fa4bf01 100644 --- a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php +++ b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php @@ -14,18 +14,20 @@ use Doctrine\Common\Annotations\AnnotationRegistry; if (class_exists('PHPUnit\Framework\Test')) { use PHPUnit\Framework\AssertionFailedError; + use PHPUnit\Framework\Test; use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestSuite; use PHPUnit\Util\Blacklist; - use PHPUnit\Util\Test; + use PHPUnit\Util\Test as TestUtil; } else { use \PHPUnit_Framework_AssertionFailedError as AssertionFailedError; use \PHPUnit_Framework_BaseTestListener as BaseTestListener; + use \PHPUnit_Framework_Test as Test; use \PHPUnit_Framework_TestCase as TestCase; use \PHPUnit_Framework_TestSuite as TestSuite; use \PHPUnit_Runner_BaseTestRunner as BaseTestRunner; use \PHPUnit_Util_Blacklist as Blacklist; - use \PHPUnit_Util_Test as Test; + use \PHPUnit_Util_Test as TestUtil; } /** @@ -123,7 +125,7 @@ public function startTestSuite(TestSuite $suite) $testSuites[] = $test; continue; } - $groups = Test::getGroups($test->getName()); + $groups = TestUtil::getGroups($test->getName()); if (in_array('time-sensitive', $groups, true)) { ClockMock::register($test->getName()); } @@ -146,7 +148,7 @@ public function startTestSuite(TestSuite $suite) } } - public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) + public function addSkippedTest(Test $test, \Exception $e, $time) { if (0 < $this->state) { if ($test instanceof TestCase) { @@ -161,10 +163,10 @@ public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $ti } } - public function startTest(\PHPUnit_Framework_Test $test) + public function startTest(Test $test) { if (-2 < $this->state && $test instanceof TestCase) { - $groups = Test::getGroups(get_class($test), $test->getName(false)); + $groups = TestUtil::getGroups(get_class($test), $test->getName(false)); if (in_array('time-sensitive', $groups, true)) { ClockMock::register(get_class($test)); @@ -174,7 +176,7 @@ public function startTest(\PHPUnit_Framework_Test $test) DnsMock::register(get_class($test)); } - $annotations = Test::parseTestMethodAnnotations(get_class($test), $test->getName(false)); + $annotations = TestUtil::parseTestMethodAnnotations(get_class($test), $test->getName(false)); if (isset($annotations['class']['expectedDeprecation'])) { $test->getTestResultObject()->addError($test, new AssertionFailedError('`@expectedDeprecation` annotations are not allowed at the class level.'), 0); @@ -196,7 +198,7 @@ public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_War } } - public function endTest(\PHPUnit_Framework_Test $test, $time) + public function endTest(Test $test, $time) { $className = get_class($test); $classGroups = \PHPUnit_Util_Test::getGroups($className); From dbd94a22ec75428989d5ba4e7e0e288ca1e033dd Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 9 Jan 2017 14:57:24 +0100 Subject: [PATCH 11/11] Fix new usages after rebase --- .../Bridge/PhpUnit/SymfonyTestsListener.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php index d2da84fa4bf01..b744ec9a9e7f2 100644 --- a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php +++ b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php @@ -19,12 +19,14 @@ use PHPUnit\Framework\TestSuite; use PHPUnit\Util\Blacklist; use PHPUnit\Util\Test as TestUtil; + use PHPUnit\Framework\Warning; } else { use \PHPUnit_Framework_AssertionFailedError as AssertionFailedError; use \PHPUnit_Framework_BaseTestListener as BaseTestListener; use \PHPUnit_Framework_Test as Test; use \PHPUnit_Framework_TestCase as TestCase; use \PHPUnit_Framework_TestSuite as TestSuite; + use \PHPUnit_Framework_Warning as Warning; use \PHPUnit_Runner_BaseTestRunner as BaseTestRunner; use \PHPUnit_Util_Blacklist as Blacklist; use \PHPUnit_Util_Test as TestUtil; @@ -191,9 +193,9 @@ public function startTest(Test $test) } } - public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_Warning $e, $time) + public function addWarning(Test $test, Warning $e, $time) { - if ($test instanceof \PHPUnit_Framework_TestCase) { + if ($test instanceof TestCase) { $this->testsWithWarnings[$test->getName()] = true; } } @@ -201,8 +203,8 @@ public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_War public function endTest(Test $test, $time) { $className = get_class($test); - $classGroups = \PHPUnit_Util_Test::getGroups($className); - $groups = \PHPUnit_Util_Test::getGroups($className, $test->getName(false)); + $classGroups = TestUtil::getGroups($className); + $groups = TestUtil::getGroups($className, $test->getName(false)); if ($this->expectedDeprecations) { restore_error_handler(); @@ -228,19 +230,19 @@ public function endTest(Test $test, $time) } } - if ($test instanceof \PHPUnit_Framework_TestCase && 0 === strpos($test->getName(), 'testLegacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $groups, true)) { + if ($test instanceof TestCase && 0 === strpos($test->getName(), 'testLegacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $groups, true)) { $result = $test->getTestResultObject(); if (method_exists($result, 'addWarning')) { - $result->addWarning($test, new \PHPUnit_Framework_Warning('Using the "testLegacy" prefix to mark tests as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time); + $result->addWarning($test, new Warning('Using the "testLegacy" prefix to mark tests as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time); } } - if ($test instanceof \PHPUnit_Framework_TestCase && strpos($className, '\Legacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $classGroups, true)) { + if ($test instanceof TestCase && strpos($className, '\Legacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $classGroups, true)) { $result = $test->getTestResultObject(); if (method_exists($result, 'addWarning')) { - $result->addWarning($test, new \PHPUnit_Framework_Warning('Using the "Legacy" prefix to mark all tests of a class as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time); + $result->addWarning($test, new Warning('Using the "Legacy" prefix to mark all tests of a class as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time); } } }