Refactor

Author: sebastianbergmann

.psalm/baseline.xml

@@ -840,7 +840,18 @@
       <code>static function () use ($cacheData) {</code>
     </MissingClosureReturnType>
   </file>
-  <file src="src/Runner/ExtensionHandler.php">
+  <file src="src/Runner/Extension/ExtensionHandler.php">
+    <DeprecatedClass occurrences="1">
+      <code>TestListener</code>
+    </DeprecatedClass>
+    <MissingThrowsDocblock occurrences="4">
+      <code>ensureClassExists</code>
+    </MissingThrowsDocblock>
+    <UnresolvableInclude occurrences="1">
+      <code>require_once $extension-&gt;sourceFile()</code>
+    </UnresolvableInclude>
+  </file>
+  <file src="src/Runner/Extension/PharLoader.php">
     <UnresolvableInclude occurrences="1">
       <code>require $file</code>
     </UnresolvableInclude>
@@ -1171,17 +1182,6 @@
       <code>$position</code>
     </PropertyNotSetInConstructor>
   </file>
-  <file src="src/TextUI/XmlConfiguration/PHPUnit/ExtensionHandler.php">
-    <DeprecatedClass occurrences="1">
-      <code>TestListener</code>
-    </DeprecatedClass>
-    <MissingThrowsDocblock occurrences="4">
-      <code>ensureClassExists</code>
-    </MissingThrowsDocblock>
-    <UnresolvableInclude occurrences="1">
-      <code>require_once $extension-&gt;sourceFile()</code>
-    </UnresolvableInclude>
-  </file>
   <file src="src/TextUI/XmlConfiguration/PHPUnit/PHPUnit.php">
     <DeprecatedMethod occurrences="2">
       <code>hasTestSuiteLoaderClass</code>

src/TextUI/XmlConfiguration/PHPUnit/ExtensionHandler.php renamed to src/Runner/Extension/ExtensionHandler.php

@@ -7,13 +7,14 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\TextUI\XmlConfiguration;
+namespace PHPUnit\Runner\Extension;
 
 use function class_exists;
 use function sprintf;
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\TestListener;
 use PHPUnit\Runner\Hook;
+use PHPUnit\TextUI\XmlConfiguration\Extension;
 use ReflectionClass;
 use ReflectionException;
 

src/Runner/ExtensionHandler.php renamed to src/Runner/Extension/PharLoader.php

@@ -7,23 +7,24 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\Runner;
+namespace PHPUnit\Runner\Extension;
 
 use PharIo\Manifest\ApplicationName;
 use PharIo\Manifest\Exception as ManifestException;
 use PharIo\Manifest\ManifestLoader;
 use PharIo\Version\Version as PharIoVersion;
+use PHPUnit\Runner\Version;
 use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class ExtensionHandler
+final class PharLoader
 {
     /**
      * @psalm-return array{loadedExtensions: list<string>, notLoadedExtensions: list<string>}
      */
-    public function handle(string $directory): array
+    public function loadPharExtensionsInDirectory(string $directory): array
     {
         $loadedExtensions    = [];
         $notLoadedExtensions = [];

src/TextUI/Command.php

@@ -36,7 +36,7 @@
 use function trim;
 use function version_compare;
 use PHPUnit\Framework\TestSuite;
-use PHPUnit\Runner\ExtensionHandler;
+use PHPUnit\Runner\Extension\PharLoader;
 use PHPUnit\Runner\StandardTestSuiteLoader;
 use PHPUnit\Runner\TestSuiteLoader;
 use PHPUnit\Runner\Version;
@@ -348,7 +348,7 @@ protected function handleArguments(array $argv): void
             }
 
             if (!isset($this->arguments['noExtensions']) && $phpunitConfiguration->hasExtensionsDirectory() && extension_loaded('phar')) {
-                $result = (new ExtensionHandler)->handle($phpunitConfiguration->extensionsDirectory());
+                $result = (new PharLoader)->loadPharExtensionsInDirectory($phpunitConfiguration->extensionsDirectory());
 
                 $this->arguments['loadedExtensions']    = $result['loadedExtensions'];
                 $this->arguments['notLoadedExtensions'] = $result['notLoadedExtensions'];

src/TextUI/TestRunner.php

@@ -35,6 +35,7 @@
 use PHPUnit\Runner\BaseTestRunner;
 use PHPUnit\Runner\BeforeFirstTestHook;
 use PHPUnit\Runner\DefaultTestResultCache;
+use PHPUnit\Runner\Extension\ExtensionHandler;
 use PHPUnit\Runner\Filter\ExcludeGroupFilterIterator;
 use PHPUnit\Runner\Filter\Factory;
 use PHPUnit\Runner\Filter\IncludeGroupFilterIterator;
@@ -50,7 +51,6 @@
 use PHPUnit\Runner\Version;
 use PHPUnit\TextUI\XmlConfiguration\CodeCoverage\FilterMapper;
 use PHPUnit\TextUI\XmlConfiguration\Configuration;
-use PHPUnit\TextUI\XmlConfiguration\ExtensionHandler;
 use PHPUnit\TextUI\XmlConfiguration\Loader;
 use PHPUnit\TextUI\XmlConfiguration\PhpHandler;
 use PHPUnit\Util\Filesystem;