Merge branch '10.5' into 11.4

Author: sebastianbergmann

src/Framework/TestSuite.php

@@ -148,29 +148,31 @@ public function addTest(Test $test, array $groups = []): void
 
         $class = new ReflectionClass($test);
 
-        if (!$class->isAbstract()) {
-            $this->tests[] = $test;
+        if ($class->isAbstract()) {
+            return;
+        }
 
-            $this->clearCaches();
+        $this->tests[] = $test;
 
-            if ($this->containsOnlyVirtualGroups($groups)) {
-                $groups[] = 'default';
-            }
+        $this->clearCaches();
+
+        if ($this->containsOnlyVirtualGroups($groups)) {
+            $groups[] = 'default';
+        }
 
-            if ($test instanceof TestCase) {
-                $id = $test->valueObjectForEvents()->id();
+        if ($test instanceof TestCase) {
+            $id = $test->valueObjectForEvents()->id();
 
-                $test->setGroups($groups);
-            } else {
-                $id = $test->valueObjectForEvents()->id();
-            }
+            $test->setGroups($groups);
+        } else {
+            $id = $test->valueObjectForEvents()->id();
+        }
 
-            foreach ($groups as $group) {
-                if (!isset($this->groups[$group])) {
-                    $this->groups[$group] = [$id];
-                } else {
-                    $this->groups[$group][] = $id;
-                }
+        foreach ($groups as $group) {
+            if (!isset($this->groups[$group])) {
+                $this->groups[$group] = [$id];
+            } else {
+                $this->groups[$group][] = $id;
             }
         }
     }
@@ -221,23 +223,15 @@ public function addTestSuite(ReflectionClass $testClass, array $groups = []): vo
      */
     public function addTestFile(string $filename, array $groups = []): void
     {
-        if (str_ends_with($filename, '.phpt') && is_file($filename)) {
-            try {
+        try {
+            if (str_ends_with($filename, '.phpt') && is_file($filename)) {
                 $this->addTest(new PhptTestCase($filename));
-            } catch (RunnerException $e) {
-                Event\Facade::emitter()->testRunnerTriggeredWarning(
-                    $e->getMessage(),
+            } else {
+                $this->addTestSuite(
+                    (new TestSuiteLoader)->load($filename),
+                    $groups,
                 );
             }
-
-            return;
-        }
-
-        try {
-            $this->addTestSuite(
-                (new TestSuiteLoader)->load($filename),
-                $groups,
-            );
         } catch (RunnerException $e) {
             Event\Facade::emitter()->testRunnerTriggeredWarning(
                 $e->getMessage(),