Only ignore test selection configured in XML configuration file

Author: sebastianbergmann

src/TextUI/Configuration/Cli/Builder.php

@@ -321,60 +321,6 @@ public function fromParameters(array $parameters): Configuration
 
             switch ($option[0]) {
                 case '--all':
-                    $this->warnWhenOptionsConflict(
-                        $testSuite,
-                        '--all',
-                        '--testsuite',
-                    );
-
-                    $this->warnWhenOptionsConflict(
-                        $excludeTestSuite,
-                        '--all',
-                        '--exclude-testsuite',
-                    );
-
-                    $this->warnWhenOptionsConflict(
-                        $groups,
-                        '--all',
-                        '--group',
-                    );
-
-                    $this->warnWhenOptionsConflict(
-                        $excludeGroups,
-                        '--all',
-                        '--exclude-group',
-                    );
-
-                    $this->warnWhenOptionsConflict(
-                        $testsCovering,
-                        '--all',
-                        '--covers',
-                    );
-
-                    $this->warnWhenOptionsConflict(
-                        $testsUsing,
-                        '--all',
-                        '--uses',
-                    );
-
-                    $this->warnWhenOptionsConflict(
-                        $testsRequiringPhpExtension,
-                        '--all',
-                        '--requires-php-extension',
-                    );
-
-                    $this->warnWhenOptionsConflict(
-                        $filter,
-                        '--all',
-                        '--filter',
-                    );
-
-                    $this->warnWhenOptionsConflict(
-                        $excludeFilter,
-                        '--all',
-                        '--exclude-filter',
-                    );
-
                     $all = true;
 
                     break;
@@ -513,45 +459,21 @@ public function fromParameters(array $parameters): Configuration
                     break;
 
                 case '--filter':
-                    $this->warnWhenOptionsConflict(
-                        $all,
-                        '--filter',
-                        '--all',
-                    );
-
                     $filter = $option[1];
 
                     break;
 
                 case '--exclude-filter':
-                    $this->warnWhenOptionsConflict(
-                        $all,
-                        '--exclude-filter',
-                        '--all',
-                    );
-
                     $excludeFilter = $option[1];
 
                     break;
 
                 case '--testsuite':
-                    $this->warnWhenOptionsConflict(
-                        $all,
-                        '--testsuite',
-                        '--all',
-                    );
-
                     $testSuite = $option[1];
 
                     break;
 
                 case '--exclude-testsuite':
-                    $this->warnWhenOptionsConflict(
-                        $all,
-                        '--exclude-testsuite',
-                        '--all',
-                    );
-
                     $excludeTestSuite = $option[1];
 
                     break;
@@ -590,12 +512,6 @@ public function fromParameters(array $parameters): Configuration
                     break;
 
                 case '--group':
-                    $this->warnWhenOptionsConflict(
-                        $all,
-                        '--group',
-                        '--all',
-                    );
-
                     if ($groups === null) {
                         $groups = [];
                     }
@@ -607,12 +523,6 @@ public function fromParameters(array $parameters): Configuration
                     break;
 
                 case '--exclude-group':
-                    $this->warnWhenOptionsConflict(
-                        $all,
-                        '--exclude-group',
-                        '--all',
-                    );
-
                     if ($excludeGroups === null) {
                         $excludeGroups = [];
                     }
@@ -624,12 +534,6 @@ public function fromParameters(array $parameters): Configuration
                     break;
 
                 case '--covers':
-                    $this->warnWhenOptionsConflict(
-                        $all,
-                        '--covers',
-                        '--all',
-                    );
-
                     if ($testsCovering === null) {
                         $testsCovering = [];
                     }
@@ -641,12 +545,6 @@ public function fromParameters(array $parameters): Configuration
                     break;
 
                 case '--uses':
-                    $this->warnWhenOptionsConflict(
-                        $all,
-                        '--uses',
-                        '--all',
-                    );
-
                     if ($testsUsing === null) {
                         $testsUsing = [];
                     }
@@ -658,12 +556,6 @@ public function fromParameters(array $parameters): Configuration
                     break;
 
                 case '--requires-php-extension':
-                    $this->warnWhenOptionsConflict(
-                        $all,
-                        '--requires-php-extension',
-                        '--all',
-                    );
-
                     if ($testsRequiringPhpExtension === null) {
                         $testsRequiringPhpExtension = [];
                     }
@@ -1508,10 +1400,9 @@ private function markProcessed(string $option): void
     }
 
     /**
-     * @param null|array<non-empty-string>|bool|string $current
-     * @param non-empty-string                         $option
+     * @param non-empty-string $option
      */
-    private function warnWhenOptionsConflict(null|array|bool|string $current, string $option, string $opposite): void
+    private function warnWhenOptionsConflict(?bool $current, string $option, string $opposite): void
     {
         if ($current === null) {
             return;

src/TextUI/Configuration/Merger.php

@@ -750,15 +750,25 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC
             $excludeFilter = $cliConfiguration->excludeFilter();
         }
 
+        $ignoreTestSelectionInXmlConfiguration = false;
+
+        if ($cliConfiguration->hasAll()) {
+            $ignoreTestSelectionInXmlConfiguration = true;
+        }
+
+        $groups = [];
+
         if ($cliConfiguration->hasGroups()) {
             $groups = $cliConfiguration->groups();
-        } else {
+        } elseif (!$ignoreTestSelectionInXmlConfiguration) {
             $groups = $xmlConfiguration->groups()->include()->asArrayOfStrings();
         }
 
+        $excludeGroups = [];
+
         if ($cliConfiguration->hasExcludeGroups()) {
             $excludeGroups = $cliConfiguration->excludeGroups();
-        } else {
+        } elseif (!$ignoreTestSelectionInXmlConfiguration) {
             $excludeGroups = $xmlConfiguration->groups()->exclude()->asArrayOfStrings();
         }
 
@@ -893,12 +903,6 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC
             $displayDetailsOnSkippedTests = true;
         }
 
-        $ignoreTestSelectionInXmlConfiguration = false;
-
-        if ($cliConfiguration->hasAll()) {
-            $ignoreTestSelectionInXmlConfiguration = true;
-        }
-
         return new Configuration(
             $cliConfiguration->arguments(),
             $configurationFile,

src/TextUI/TestSuiteFilterProcessor.php

@@ -31,10 +31,6 @@ public function process(Configuration $configuration, TestSuite $suite): void
     {
         $factory = new Factory;
 
-        if ($configuration->ignoreTestSelectionInXmlConfiguration()) {
-            return;
-        }
-
         if (!$configuration->hasFilter() &&
             !$configuration->hasGroups() &&
             !$configuration->hasExcludeGroups() &&