Refactor

Author: sebastianbergmann

src/TextUI/Command/Commands/ListTestsAsTextCommand.php

@@ -19,8 +19,14 @@
  */
 final readonly class ListTestsAsTextCommand implements Command
 {
+    /**
+     * @psalm-var list<TestCase|PhptTestCase>
+     */
     private array $tests;
 
+    /**
+     * @psalm-param list<TestCase|PhptTestCase> $tests
+     */
     public function __construct(array $tests)
     {
         $this->tests = $tests;
@@ -37,10 +43,8 @@ public function execute(): Result
                     $test::class,
                     str_replace(' with data set ', '', $test->nameWithDataSet()),
                 );
-            } elseif ($test instanceof PhptTestCase) {
-                $name = $test->getName();
             } else {
-                continue;
+                $name = $test->getName();
             }
 
             $buffer .= sprintf(

src/TextUI/Command/Commands/ListTestsAsXmlCommand.php

@@ -21,9 +21,15 @@
  */
 final readonly class ListTestsAsXmlCommand implements Command
 {
+    /**
+     * @psalm-var list<TestCase|PhptTestCase>
+     */
     private array $tests;
     private string $filename;
 
+    /**
+     * @psalm-param list<TestCase|PhptTestCase> $tests
+     */
     public function __construct(array $tests, string $filename)
     {
         $this->tests    = $tests;
@@ -76,17 +82,15 @@ public function execute(): Result
                 continue;
             }
 
-            if ($test instanceof PhptTestCase) {
-                if ($currentTestClass !== null) {
-                    $writer->endElement();
-
-                    $currentTestClass = null;
-                }
-
-                $writer->startElement('phpt');
-                $writer->writeAttribute('file', $test->getName());
+            if ($currentTestClass !== null) {
                 $writer->endElement();
+
+                $currentTestClass = null;
             }
+
+            $writer->startElement('phpt');
+            $writer->writeAttribute('file', $test->getName());
+            $writer->endElement();
         }
 
         if ($currentTestClass !== null) {