Merge branch '10.5' into 11.5

sebastianbergmann · sebastianbergmann · commit 63d4286cee9a · 2025-04-08T07:12:23.000+02:00
diff --git a/src/TextUI/Command/Commands/ListTestSuitesCommand.php b/src/TextUI/Command/Commands/ListTestSuitesCommand.php
@@ -83,7 +83,7 @@ private function warnAboutConflictingOptions(): string
         }
 
         if ($configuration->includeTestSuite() !== '') {
-            $buffer .= 'The --testsuite and --list-suites options cannot be combined, --exclude-group is ignored' . PHP_EOL;
+            $buffer .= 'The --testsuite and --list-suites options cannot be combined, --testsuite is ignored' . PHP_EOL;
         }
 
         if (!empty($buffer)) {

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ private function warnAboutConflictingOptions(): string`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`if ($configuration->includeTestSuite() !== '') {`
`86`		`- $buffer .= 'The --testsuite and --list-suites options cannot be combined, --exclude-group is ignored' . PHP_EOL;`
	`86`	`+ $buffer .= 'The --testsuite and --list-suites options cannot be combined, --testsuite is ignored' . PHP_EOL;`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`if (!empty($buffer)) {`