Merge branch '11.5' into 12.2

Author: sebastianbergmann

ChangeLog-12.2.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 12.2 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [12.2.2] - 2025-MM-DD
+
+### Fixed
+
+* [#6222](https://github.com/sebastianbergmann/phpunit/issues/6222): Data Provider seems to mess up Test Dependencies
+
 ## [12.2.1] - 2025-06-07
 
 ### Fixed
@@ -53,5 +59,6 @@ This feature is experimental and the generated XML may change to enhance complia
 * A warning is now emitted when more than one of `#[Small]`, `#[Medium]`, or `#[Large]` is used on a test class
 * A warning is now emitted when a data provider provides data sets that have more values than the test method consumes using arguments
 
+[12.2.2]: https://github.com/sebastianbergmann/phpunit/compare/12.2.1...12.2
 [12.2.1]: https://github.com/sebastianbergmann/phpunit/compare/12.2.0...12.2.1
 [12.2.0]: https://github.com/sebastianbergmann/phpunit/compare/12.1.6...12.2.0

src/Runner/TestResult/Collector.php

@@ -57,11 +57,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
@@ -258,16 +257,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()) {
@@ -282,6 +275,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;
@@ -334,8 +333,6 @@ public function testErrored(Errored $event): void
     {
         $this->testErroredEvents[] = $event;
 
-        $this->currentTestSuiteForTestClassFailed = true;
-
         /*
          * @todo Eliminate this special case
          */
@@ -351,8 +348,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

@@ -0,0 +1,55 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/6222
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--display-skipped';
+$_SERVER['argv'][] = __DIR__ . '/6222/Issue6222Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+F....FSFFS                                                        10 / 10 (100%)
+
+Time: %s, Memory: %s
+
+There were 4 failures:
+
+1) PHPUnit\TestFixture\Issue6222\Issue6222Test::testOne
+Failed asserting that false is true.
+
+%sIssue6222Test.php:%d
+
+2) PHPUnit\TestFixture\Issue6222\Issue6222Test::testOneCasePassing with data set #1 (2)
+Failed asserting that 2 is identical to 1.
+
+%sIssue6222Test.php:%d
+
+3) PHPUnit\TestFixture\Issue6222\Issue6222Test::testZeroCasesPassing with data set #0 (1)
+Failed asserting that 1 is identical to 3.
+
+%sIssue6222Test.php:%d
+
+4) PHPUnit\TestFixture\Issue6222\Issue6222Test::testZeroCasesPassing with data set #1 (2)
+Failed asserting that 2 is identical to 3.
+
+%sIssue6222Test.php:%d
+
+--
+
+There were 2 skipped tests:
+
+1) PHPUnit\TestFixture\Issue6222\Issue6222Test::testDependingOnOneCasePassing
+This test depends on "PHPUnit\TestFixture\Issue6222\Issue6222Test::testOneCasePassing" to pass
+
+2) PHPUnit\TestFixture\Issue6222\Issue6222Test::testDependingOnZeroCasesPassing
+This test depends on "PHPUnit\TestFixture\Issue6222\Issue6222Test::testZeroCasesPassing" to pass
+
+FAILURES!
+Tests: 10, Assertions: 8, Failures: 4, Skipped: 2.

tests/end-to-end/regression/6222/Issue6222Test.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6222;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\TestCase;
+
+class Issue6222Test extends TestCase
+{
+    public static function provider(): iterable
+    {
+        yield [1];
+
+        yield [2];
+    }
+
+    public function testOne(): void
+    {
+        $this->assertTrue(false);
+    }
+
+    #[DataProvider('provider')]
+    public function testTwoCasesPassing(int $x): void
+    {
+        $this->assertGreaterThan(0, $x);
+    }
+
+    #[Depends('testTwoCasesPassing')]
+    public function testDependingOnTwoCasesPassing(): void
+    {
+        $this->assertTrue(true);
+    }
+
+    #[DataProvider('provider')]
+    public function testOneCasePassing(int $x): void
+    {
+        $this->assertSame(1, $x);
+    }
+
+    #[Depends('testOneCasePassing')]
+    public function testDependingOnOneCasePassing(): void
+    {
+        $this->assertTrue(true);
+    }
+
+    #[DataProvider('provider')]
+    public function testZeroCasesPassing(int $x): void
+    {
+        $this->assertSame(3, $x);
+    }
+
+    #[Depends('testZeroCasesPassing')]
+    public function testDependingOnZeroCasesPassing(): void
+    {
+        $this->assertTrue(true);
+    }
+}