Fix saving information about passed tests

Author: kubawerlos

src/Runner/TestResult/Collector.php

@@ -54,11 +54,10 @@
 final class Collector
 {
     private readonly IssueFilter $issueFilter;
-    private int $numberOfTests                       = 0;
-    private int $numberOfTestsRun                    = 0;
-    private int $numberOfAssertions                  = 0;
-    private bool $prepared                           = false;
-    private bool $currentTestSuiteForTestClassFailed = false;
+    private int $numberOfTests      = 0;
+    private int $numberOfTestsRun   = 0;
+    private int $numberOfAssertions = 0;
+    private bool $prepared          = false;
 
     /**
      * @var non-negative-int
@@ -243,16 +242,10 @@ public function testSuiteStarted(TestSuiteStarted $event): void
         if (!$testSuite->isForTestClass()) {
             return;
         }
-
-        $this->currentTestSuiteForTestClassFailed = false;
     }
 
     public function testSuiteFinished(TestSuiteFinished $event): void
     {
-        if ($this->currentTestSuiteForTestClassFailed) {
-            return;
-        }
-
         $testSuite = $event->testSuite();
 
         if ($testSuite->isWithName()) {
@@ -266,6 +259,12 @@ public function testSuiteFinished(TestSuiteFinished $event): void
 
             assert($test instanceof TestMethod);
 
+            foreach ($this->testFailedEvents as $testFailedEvent) {
+                if ($testFailedEvent->test()->isTestMethod() && $testFailedEvent->test()->methodName() === $test->methodName()) {
+                    return;
+                }
+            }
+
             PassedTests::instance()->testMethodPassed($test, null);
 
             return;
@@ -306,8 +305,6 @@ public function testErrored(Errored $event): void
     {
         $this->testErroredEvents[] = $event;
 
-        $this->currentTestSuiteForTestClassFailed = true;
-
         /*
          * @todo Eliminate this special case
          */
@@ -323,8 +320,6 @@ public function testErrored(Errored $event): void
     public function testFailed(Failed $event): void
     {
         $this->testFailedEvents[] = $event;
-
-        $this->currentTestSuiteForTestClassFailed = true;
     }
 
     public function testMarkedIncomplete(MarkedIncomplete $event): void

tests/end-to-end/regression/6222.phpt

@@ -15,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Runtime: %s
 
-F..S.FSFFS                                                        10 / 10 (100%)
+F....FSFFS                                                        10 / 10 (100%)
 
 Time: %s, Memory: %s
 
@@ -43,16 +43,13 @@ Failed asserting that 2 is identical to 3.
 
 --
 
-There were 3 skipped tests:
+There were 2 skipped tests:
 
-1) PHPUnit\TestFixture\Issue6222\Issue6222Test::testDependingOnTwoCasesPassing
-This test depends on "PHPUnit\TestFixture\Issue6222\Issue6222Test::testTwoCasesPassing" to pass
-
-2) PHPUnit\TestFixture\Issue6222\Issue6222Test::testDependingOnOneCasePassing
+1) PHPUnit\TestFixture\Issue6222\Issue6222Test::testDependingOnOneCasePassing
 This test depends on "PHPUnit\TestFixture\Issue6222\Issue6222Test::testOneCasePassing" to pass
 
-3) PHPUnit\TestFixture\Issue6222\Issue6222Test::testDependingOnZeroCasesPassing
+2) PHPUnit\TestFixture\Issue6222\Issue6222Test::testDependingOnZeroCasesPassing
 This test depends on "PHPUnit\TestFixture\Issue6222\Issue6222Test::testZeroCasesPassing" to pass
 
 FAILURES!
-Tests: 10, Assertions: 7, Failures: 4, Skipped: 3.
+Tests: 10, Assertions: 8, Failures: 4, Skipped: 2.