Merge branch '11.5' into 12.1

Author: sebastianbergmann

ChangeLog-12.1.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 12.1 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [12.1.1] - 2025-MM-DD
+
+### Fixed
+
+* [#6104](https://github.com/sebastianbergmann/phpunit/issues/6104): Test with dependencies and data provider fails
+
 ## [12.1.0] - 2025-04-04
 
 ### Added
@@ -19,4 +25,5 @@ All notable changes of the PHPUnit 12.1 release series are documented in this fi
 
 * [#6140](https://github.com/sebastianbergmann/phpunit/issues/6140): The `testClassName()` method on the `AfterTestMethodCalled`, `AfterTestMethodErrored`, `AfterTestMethodFinished`, `BeforeTestMethodCalled`, `BeforeTestMethodErrored`, `BeforeTestMethodFinished`, `PostConditionCalled`, `PostConditionErrored`, `PostConditionFinished`, `PreConditionCalled`, `PreConditionErrored`, and `PreConditionFinished` event value objects (use `test()->className()` instead)
 
+[12.1.1]: https://github.com/sebastianbergmann/phpunit/compare/12.1.0...12.1
 [12.1.0]: https://github.com/sebastianbergmann/phpunit/compare/12.0.10...12.1.0

src/Framework/TestCase.php

@@ -1113,54 +1113,6 @@ final protected function registerFailureType(string $classOrInterface): void
         $this->failureTypes[$classOrInterface] = true;
     }
 
-    /**
-     * @throws AssertionFailedError
-     * @throws Exception
-     * @throws ExpectationFailedException
-     * @throws Throwable
-     *
-     * @internal This method is not covered by the backward compatibility promise for PHPUnit
-     */
-    final protected function runTest(): mixed
-    {
-        $testArguments = array_merge($this->data, array_values($this->dependencyInput));
-
-        $capture          = tmpfile();
-        $errorLogPrevious = ini_set('error_log', stream_get_meta_data($capture)['uri']);
-
-        try {
-            /** @phpstan-ignore method.dynamicName */
-            $testResult = $this->{$this->methodName}(...$testArguments);
-
-            $errorLogOutput = stream_get_contents($capture);
-
-            if ($this->expectErrorLog) {
-                $this->assertNotEmpty($errorLogOutput, 'Test did not call error_log().');
-            } else {
-                // strip date from logged error, see https://github.com/php/php-src/blob/c696087e323263e941774ebbf902ac249774ec9f/main/main.c#L905
-                print preg_replace('/\[.+\] /', '', $errorLogOutput);
-            }
-        } catch (Throwable $exception) {
-            if (!$this->shouldExceptionExpectationsBeVerified($exception)) {
-                throw $exception;
-            }
-
-            $this->verifyExceptionExpectations($exception);
-
-            return null;
-        } finally {
-            if ($capture !== false) {
-                fclose($capture);
-            }
-
-            ini_set('error_log', $errorLogPrevious);
-        }
-
-        $this->expectedExceptionWasNotRaised();
-
-        return $testResult;
-    }
-
     /**
      * Creates a mock object for the specified interface or class.
      *
@@ -1290,6 +1242,62 @@ protected function onNotSuccessfulTest(Throwable $t): never
         throw $t;
     }
 
+    /**
+     * @throws AssertionFailedError
+     * @throws Exception
+     * @throws ExpectationFailedException
+     * @throws Throwable
+     */
+    private function runTest(): mixed
+    {
+        $testArguments       = array_merge($this->data, array_values($this->dependencyInput));
+        $positionalArguments = [];
+        $namedArguments      = [];
+
+        foreach ($testArguments as $key => $value) {
+            if (is_int($key)) {
+                $positionalArguments[] = $value;
+            } else {
+                $namedArguments[$key] = $value;
+            }
+        }
+
+        $capture          = tmpfile();
+        $errorLogPrevious = ini_set('error_log', stream_get_meta_data($capture)['uri']);
+
+        try {
+            /** @phpstan-ignore method.dynamicName */
+            $testResult = $this->{$this->methodName}(...$namedArguments, ...$positionalArguments);
+
+            $errorLogOutput = stream_get_contents($capture);
+
+            if ($this->expectErrorLog) {
+                $this->assertNotEmpty($errorLogOutput, 'Test did not call error_log().');
+            } else {
+                // strip date from logged error, see https://github.com/php/php-src/blob/c696087e323263e941774ebbf902ac249774ec9f/main/main.c#L905
+                print preg_replace('/\[.+\] /', '', $errorLogOutput);
+            }
+        } catch (Throwable $exception) {
+            if (!$this->shouldExceptionExpectationsBeVerified($exception)) {
+                throw $exception;
+            }
+
+            $this->verifyExceptionExpectations($exception);
+
+            return null;
+        } finally {
+            if ($capture !== false) {
+                fclose($capture);
+            }
+
+            ini_set('error_log', $errorLogPrevious);
+        }
+
+        $this->expectedExceptionWasNotRaised();
+
+        return $testResult;
+    }
+
     /**
      * @throws ExpectationFailedException
      */

tests/end-to-end/data-provider/dependency-result.phpt

@@ -13,14 +13,9 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Runtime: %s
 
-...E                                                                4 / 4 (100%)
+....                                                                4 / 4 (100%)
 
 Time: %s, Memory: %s
 
-There was 1 error:
+OK (4 tests, 7 assertions)
 
-1) PHPUnit\TestFixture\DataProviderDependencyResultTest::testAdd with data set #2 (2, 0)
-Error: Cannot use positional argument after named argument during unpacking
-
-ERRORS!
-Tests: 4, Assertions: 5, Errors: 1.

tests/unit/Framework/TestCaseTest.php

@@ -11,6 +11,8 @@
 
 use function sprintf;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\Attributes\ExcludeGlobalVariableFromBackup;
 use PHPUnit\TestFixture\TestWithDifferentNames;
 
@@ -21,6 +23,18 @@ class TestCaseTest extends TestCase
 {
     protected static int $testStatic = 456;
 
+    /**
+     * @return array<non-empty-string, array<non-empty-string, string>>
+     */
+    public static function provider(): array
+    {
+        return [
+            'case 1' => [
+                'fromProvider' => 'value from provider',
+            ],
+        ];
+    }
+
     public static function setUpBeforeClass(): void
     {
         $GLOBALS['a']  = 'a';
@@ -83,4 +97,19 @@ public function testGetNameReturnsMethodName(): void
 
         $this->assertSame($methodName, $testCase->nameWithDataSet());
     }
+
+    public function testDependedUponTest(): string
+    {
+        $this->assertTrue(true);
+
+        return 'value from depended-upon test';
+    }
+
+    #[DataProvider('provider')]
+    #[Depends('testDependedUponTest')]
+    public function testTestDataFromProviderAndDependedUponTest(string $fromProvider, string $fromDependency): void
+    {
+        $this->assertSame('value from provider', $fromProvider);
+        $this->assertSame('value from depended-upon test', $fromDependency);
+    }
 }