Refactor

Author: sebastianbergmann

.psalm/baseline.xml

@@ -840,6 +840,11 @@
       <code>static function () use ($cacheData) {</code>
     </MissingClosureReturnType>
   </file>
+  <file src="src/Runner/ExtensionHandler.php">
+    <UnresolvableInclude occurrences="1">
+      <code>require $file</code>
+    </UnresolvableInclude>
+  </file>
   <file src="src/Runner/Filter/GroupFilterIterator.php">
     <MissingReturnType occurrences="1">
       <code>doAccept</code>
@@ -960,8 +965,7 @@
     <RedundantCondition occurrences="1">
       <code>assert(isset($arguments) &amp;&amp; $arguments instanceof Configuration)</code>
     </RedundantCondition>
-    <UnresolvableInclude occurrences="3">
-      <code>require $file</code>
+    <UnresolvableInclude occurrences="2">
       <code>require $loaderFile</code>
       <code>require $printerFile</code>
     </UnresolvableInclude>

src/Runner/ExtensionHandler.php

@@ -0,0 +1,70 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Runner;
+
+use PharIo\Manifest\ApplicationName;
+use PharIo\Manifest\Exception as ManifestException;
+use PharIo\Manifest\ManifestLoader;
+use PharIo\Version\Version as PharIoVersion;
+use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class ExtensionHandler
+{
+    /**
+     * @psalm-return array{loadedExtensions: list<string>, notLoadedExtensions: list<string>}
+     */
+    public function handle(string $directory): array
+    {
+        $loadedExtensions    = [];
+        $notLoadedExtensions = [];
+
+        foreach ((new FileIteratorFacade)->getFilesAsArray($directory, '.phar') as $file) {
+            if (!is_file('phar://' . $file . '/manifest.xml')) {
+                $notLoadedExtensions[] = $file . ' is not an extension for PHPUnit';
+
+                continue;
+            }
+
+            try {
+                $applicationName = new ApplicationName('phpunit/phpunit');
+                $version         = new PharIoVersion(Version::series());
+                $manifest        = ManifestLoader::fromFile('phar://' . $file . '/manifest.xml');
+
+                if (!$manifest->isExtensionFor($applicationName)) {
+                    $notLoadedExtensions[] = $file . ' is not an extension for PHPUnit';
+
+                    continue;
+                }
+
+                if (!$manifest->isExtensionFor($applicationName, $version)) {
+                    $notLoadedExtensions[] = $file . ' is not compatible with this version of PHPUnit';
+
+                    continue;
+                }
+            } catch (ManifestException $e) {
+                $notLoadedExtensions[] = $file . ': ' . $e->getMessage();
+
+                continue;
+            }
+
+            require $file;
+
+            $loadedExtensions[] = $manifest->getName()->asString() . ' ' . $manifest->getVersion()->getVersionString();
+        }
+
+        return [
+            'loadedExtensions'    => $loadedExtensions,
+            'notLoadedExtensions' => $notLoadedExtensions,
+        ];
+    }
+}

src/TextUI/Command.php

@@ -35,11 +35,8 @@
 use function strpos;
 use function trim;
 use function version_compare;
-use PharIo\Manifest\ApplicationName;
-use PharIo\Manifest\Exception as ManifestException;
-use PharIo\Manifest\ManifestLoader;
-use PharIo\Version\Version as PharIoVersion;
 use PHPUnit\Framework\TestSuite;
+use PHPUnit\Runner\ExtensionHandler;
 use PHPUnit\Runner\StandardTestSuiteLoader;
 use PHPUnit\Runner\TestSuiteLoader;
 use PHPUnit\Runner\Version;
@@ -61,7 +58,6 @@
 use ReflectionClass;
 use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\StaticAnalysis\CacheWarmer;
-use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
 use SebastianBergmann\Timer\Timer;
 use Throwable;
 
@@ -352,7 +348,12 @@ protected function handleArguments(array $argv): void
             }
 
             if (!isset($this->arguments['noExtensions']) && $phpunitConfiguration->hasExtensionsDirectory() && extension_loaded('phar')) {
-                $this->handleExtensions($phpunitConfiguration->extensionsDirectory());
+                $result = (new ExtensionHandler)->handle($phpunitConfiguration->extensionsDirectory());
+
+                $this->arguments['loadedExtensions']    = $result['loadedExtensions'];
+                $this->arguments['notLoadedExtensions'] = $result['notLoadedExtensions'];
+
+                unset($result);
             }
 
             if (!isset($this->arguments['columns'])) {
@@ -611,43 +612,6 @@ private function exitWithErrorMessage(string $message): void
         exit(TestRunner::FAILURE_EXIT);
     }
 
-    private function handleExtensions(string $directory): void
-    {
-        foreach ((new FileIteratorFacade)->getFilesAsArray($directory, '.phar') as $file) {
-            if (!is_file('phar://' . $file . '/manifest.xml')) {
-                $this->arguments['notLoadedExtensions'][] = $file . ' is not an extension for PHPUnit';
-
-                continue;
-            }
-
-            try {
-                $applicationName = new ApplicationName('phpunit/phpunit');
-                $version         = new PharIoVersion(Version::series());
-                $manifest        = ManifestLoader::fromFile('phar://' . $file . '/manifest.xml');
-
-                if (!$manifest->isExtensionFor($applicationName)) {
-                    $this->arguments['notLoadedExtensions'][] = $file . ' is not an extension for PHPUnit';
-
-                    continue;
-                }
-
-                if (!$manifest->isExtensionFor($applicationName, $version)) {
-                    $this->arguments['notLoadedExtensions'][] = $file . ' is not compatible with this version of PHPUnit';
-
-                    continue;
-                }
-            } catch (ManifestException $e) {
-                $this->arguments['notLoadedExtensions'][] = $file . ': ' . $e->getMessage();
-
-                continue;
-            }
-
-            require $file;
-
-            $this->arguments['loadedExtensions'][] = $manifest->getName()->asString() . ' ' . $manifest->getVersion()->getVersionString();
-        }
-    }
-
     private function handleListGroups(TestSuite $suite, bool $exit): int
     {
         $this->printVersionString();