Refactor

Author: sebastianbergmann

src/TextUI/Command.php

@@ -308,25 +308,19 @@ protected function handleArguments(array $argv): void
             $this->arguments['loader'] = $this->handleLoader($this->arguments['loader']);
         }
 
-        if (isset($this->arguments['configuration']) && is_dir($this->arguments['configuration'])) {
-            $configurationFile = $this->arguments['configuration'] . '/phpunit.xml';
+        if (isset($this->arguments['configuration'])) {
+            if (is_dir($this->arguments['configuration'])) {
+                $candidate = $this->configurationFileInDirectory($this->arguments['configuration']);
 
-            if (file_exists($configurationFile)) {
-                $this->arguments['configuration'] = realpath(
-                    $configurationFile
-                );
-            } elseif (file_exists($configurationFile . '.dist')) {
-                $this->arguments['configuration'] = realpath(
-                    $configurationFile . '.dist'
-                );
+                if ($candidate !== null) {
+                    $this->arguments['configuration'] = $candidate;
+                }
             }
-        } elseif (!isset($this->arguments['configuration']) && $this->arguments['useDefaultConfiguration']) {
-            if (file_exists('phpunit.xml')) {
-                $this->arguments['configuration'] = realpath('phpunit.xml');
-            } elseif (file_exists('phpunit.xml.dist')) {
-                $this->arguments['configuration'] = realpath(
-                    'phpunit.xml.dist'
-                );
+        } elseif ($this->arguments['useDefaultConfiguration']) {
+            $candidate = $this->configurationFileInDirectory(getcwd());
+
+            if ($candidate !== null) {
+                $this->arguments['configuration'] = $candidate;
             }
         }
 
@@ -890,4 +884,20 @@ private function handleWarmCoverageCache(XmlConfiguration\Configuration $configu
 
         exit(TestRunner::SUCCESS_EXIT);
     }
+
+    private function configurationFileInDirectory(string $directory): ?string
+    {
+        $candidates = [
+            $directory . '/phpunit.xml',
+            $directory . '/phpunit.xml.dist',
+        ];
+
+        foreach ($candidates as $candidate) {
+            if (file_exists($candidate)) {
+                return realpath($candidate);
+            }
+        }
+
+        return null;
+    }
 }