Experimental Bridge Refactoring

symfony · peterrehm · Feb 18, 2017 · Feb 18, 2017 · Feb 18, 2017 · Feb 18, 2017
commit 4c616530e647e0d1539271250caa4fd474e9b13c
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Bridge\PhpUnit;
 
+use PHPUnit\Util\ErrorHandler;
+use PHPUnit\Util\Test;
+
 /**
  * Catch deprecation notices and print a summary report at the end of the test suite.
  *
@@ -68,15 +71,15 @@ public static function register($mode = 0)
         );
         $deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $getMode) {
             if (E_USER_DEPRECATED !== $type) {
-                return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
+                return ErrorHandler::handleError($type, $msg, $file, $line, $context);
             }
 
             $mode = $getMode();
             $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
             }
 
@@ -90,7 +93,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 {
@@ -127,7 +130,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) {
                 restore_error_handler();
                 self::register($mode);
             }

diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/Error/Notice.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/Error/Notice.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\Framework\Error;
+
+if (class_exists('\PHPUnit_Framework_Error_Notice')) {
+    class Notice extends \PHPUnit_Framework_Error_Notice
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/Error/Warning.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/Error/Warning.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\Framework\Error;
+
+if (class_exists('\PHPUnit_Framework_Error_Warning')) {
+    class Warning extends \PHPUnit_Framework_Error_Warning
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/Exception.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/Exception.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\TextUI;
+
+if (class_exists('\PHPUnit_Framework_Exception')) {
+    class Exception extends \PHPUnit_Framework_Exception
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/ExpectationFailedException.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/ExpectationFailedException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\TextUI;
+
+if (class_exists('\PHPUnit_Framework_ExpectationFailedException')) {
+    class ExpectationFailedException extends \PHPUnit_Framework_ExpectationFailedException
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/SkippedTestError.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/SkippedTestError.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\TextUI;
+
+if (class_exists('\PHPUnit_Framework_SkippedTestError')) {
+    class SkippedTestError extends \PHPUnit_Framework_SkippedTestError
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/TestSuite.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Framework/TestSuite.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\TextUI;
+
+if (class_exists('\PHPUnit_Framework_TestSuite')) {
+    class TestSuite extends \PHPUnit_Framework_TestSuite
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/TextUI/Command.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\TextUI;
+
+if (class_exists('\PHPUnit_TextUI_Command')) {
+    class Command extends \PHPUnit_TextUI_Command
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/TextUI/TestRunner.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\TextUI;
+
+if (class_exists('\PHPUnit_TextUI_TestRunner')) {
+    class TestRunner extends \PHPUnit_TextUI_TestRunner
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Util/ErrorHandler.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Util/ErrorHandler.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\Util;
+
+if (class_exists('\PHPUnit_Util_ErrorHandler')) {
+    class ErrorHandler extends \PHPUnit_Util_ErrorHandler
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Util/Test.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Util/Test.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\Util;
+
+if (class_exists('\PHPUnit_Util_Test')) {
+    class Test extends \PHPUnit_Util_Test
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Util/XML.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatibility/Util/XML.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPUnit\Util;
+
+if (class_exists('\PHPUnit_Util_XML')) {
+    class XML extends \PHPUnit_Util_XML
+    {
+    }
+}
diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -14,6 +14,8 @@
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use PHPUnit\Framework\BaseTestListener;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\TextUI\TestSuite;
+use PHPUnit\Util\Test;
 
 /**
  * Collects and replays skipped tests.
@@ -66,7 +68,7 @@ public function __destruct()
         }
     }
 
-    public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
+    public function startTestSuite(TestSuite $suite)
     {
         $suiteName = $suite->getName();
 
@@ -93,12 +95,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 ($test instanceof TestSuite) {
                         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());
                         }
@@ -118,7 +120,7 @@ public function startTestSuite(\PHPUnit_Framework_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) {
@@ -133,10 +135,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 = \PHPUnit_Util_Test::getGroups(get_class($test), $test->getName(false));
+            $groups = Test::getGroups(get_class($test), $test->getName(false));
 
             if (in_array('time-sensitive', $groups, true)) {
                 ClockMock::register(get_class($test));
@@ -145,10 +147,10 @@ public function startTest(\PHPUnit_Framework_Test $test)
         }
     }
 
-    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    public function endTest(Test $test, $time)
     {
         if (-2 < $this->state && $test instanceof TestCase) {
-            $groups = \PHPUnit_Util_Test::getGroups(get_class($test), $test->getName(false));
+            $groups = Test::getGroups(get_class($test), $test->getName(false));
 
             if (in_array('time-sensitive', $groups, true)) {
                 ClockMock::withClockMock(false);

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
@@ -18,28 +18,34 @@ require_once __DIR__.'/../../bootstrap.php';
 
 @trigger_error('root deprecation', E_USER_DEPRECATED);
 
-class PHPUnit_Util_Test
+namespace PHPUnit\Util;
+
+class Test
 {
     public static function getGroups()
     {
         return array();
     }
 }
 
-class FooTestCase
-{
-    public function testLegacyFoo()
-    {
-        @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
-        trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
-        trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
-    }
+namespace {
 
-    public function testNonLegacyBar()
+    class FooTestCase
     {
-        @trigger_error('silenced bar deprecation', E_USER_DEPRECATED);
-        trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);
+        public function testLegacyFoo()
+        {
+            @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
+            trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
+            trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
+        }
+
+        public function testNonLegacyBar()
+        {
+            @trigger_error('silenced bar deprecation', E_USER_DEPRECATED);
+            trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);
+        }
     }
+
 }
 
 $foo = new FooTestCase();

diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/Command.php b/src/Symfony/Bridge/PhpUnit/TextUI/Command.php
@@ -11,10 +11,12 @@
 
 namespace Symfony\Bridge\PhpUnit\TextUI;
 
+use PHPUnit\TextUI\Command as BaseCommand;
+
 /**
  * {@inheritdoc}
  */
-class Command extends \PHPUnit_TextUI_Command
+class Command extends BaseCommand
 {
     /**
      * {@inheritdoc}

diff --git a/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php b/src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Bridge\PhpUnit\TextUI;
 
+use PHPUnit\TextUI\TestRunner as BaseTestRunner;
 use Symfony\Bridge\PhpUnit\SymfonyTestsListener;
 
 /**
  * {@inheritdoc}
  */
-class TestRunner extends \PHPUnit_TextUI_TestRunner
+class TestRunner extends BaseTestRunner
 {
     /**
      * {@inheritdoc}

diff --git 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)) {
     return;
 }
 

diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -24,11 +24,16 @@
         "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
     },
     "conflict": {
-        "phpunit/phpunit": ">=6.0"
+        "phpunit/phpunit": "<4.8.35|<5.7,>=5.0"
     },
     "autoload": {
         "files": [ "bootstrap.php" ],
-        "psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" },
+        "psr-4": {
+            "Symfony\\Bridge\\PhpUnit\\": "",
+            "PHPUnit\\Framework": "ForwardCompatibility/Framework/",
+            "PHPUnit\\TextUI": "ForwardCompatibility/TextUI/",
+            "PHPUnit\\Util": "ForwardCompatibility/Util/"
+        },
         "exclude-from-classmap": [
             "/Tests/"
         ]