Refactor

Author: sebastianbergmann

src/Runner/Extension/ExtensionHandler.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\TestListener;
 use PHPUnit\Runner\Hook;
+use PHPUnit\TextUI\TestRunner;
 use PHPUnit\TextUI\XmlConfiguration\Extension;
 use ReflectionClass;
 use ReflectionException;
@@ -23,9 +24,9 @@
  */
 final class ExtensionHandler
 {
-    public function createInstance(Extension $extension): Hook
+    public function registerExtension(Extension $extension, TestRunner $runner): void
     {
-        $object = $this->doCreateInstance($extension);
+        $object = $this->createInstance($extension);
 
         if (!$object instanceof Hook) {
             throw new Exception(
@@ -36,15 +37,15 @@ public function createInstance(Extension $extension): Hook
             );
         }
 
-        return $object;
+        $runner->addExtension($object);
     }
 
     /**
      * @deprecated
      */
     public function createTestListenerInstance(Extension $extension): TestListener
     {
-        $object = $this->doCreateInstance($extension);
+        $object = $this->createInstance($extension);
 
         if (!$object instanceof TestListener) {
             throw new Exception(
@@ -58,7 +59,7 @@ public function createTestListenerInstance(Extension $extension): TestListener
         return $object;
     }
 
-    private function doCreateInstance(Extension $extension): object
+    private function createInstance(Extension $extension): object
     {
         $this->ensureClassExists($extension);
 

src/TextUI/TestRunner.php

@@ -1021,7 +1021,7 @@ private function handleConfiguration(array &$arguments): void
             $extensionHandler = new ExtensionHandler;
 
             foreach ($arguments['configurationObject']->extensions() as $extension) {
-                $this->addExtension($extensionHandler->createInstance($extension));
+                $extensionHandler->registerExtension($extension, $this);
             }
 
             foreach ($arguments['configurationObject']->listeners() as $listener) {
@@ -1082,7 +1082,7 @@ private function handleConfiguration(array &$arguments): void
         $extensionHandler = new ExtensionHandler;
 
         foreach ($arguments['extensions'] as $extension) {
-            $this->addExtension($extensionHandler->createInstance($extension));
+            $extensionHandler->registerExtension($extension, $this);
         }
 
         unset($extensionHandler);