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.2] - 2025-04-08
+
+### Fixed
+
+* [#6104](https://github.com/sebastianbergmann/phpunit/issues/6104): Reverted change introduced in PHPUnit 12.1.1
+
 ## [12.1.1] - 2025-04-08
 
 ### Fixed
@@ -26,5 +32,6 @@ 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.2]: https://github.com/sebastianbergmann/phpunit/compare/12.1.1...12.1.2
 [12.1.1]: https://github.com/sebastianbergmann/phpunit/compare/12.1.0...12.1.1
 [12.1.0]: https://github.com/sebastianbergmann/phpunit/compare/12.0.10...12.1.0

src/Framework/TestCase.php

@@ -1250,24 +1250,14 @@ protected function onNotSuccessfulTest(Throwable $t): never
      */
     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;
-            }
-        }
+        $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}(...$namedArguments, ...$positionalArguments);
+            $testResult = $this->{$this->methodName}(...$testArguments);
 
             $errorLogOutput = stream_get_contents($capture);
 

src/Runner/Version.php

@@ -34,7 +34,7 @@ public static function id(): string
         }
 
         if (self::$version === '') {
-            self::$version = (new VersionId('12.1.1', dirname(__DIR__, 2)))->asString();
+            self::$version = (new VersionId('12.1.2', dirname(__DIR__, 2)))->asString();
         }
 
         return self::$version;

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

@@ -13,9 +13,14 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Runtime: %s
 
-....                                                                4 / 4 (100%)
+...E                                                                4 / 4 (100%)
 
 Time: %s, Memory: %s
 
-OK (4 tests, 7 assertions)
+There was 1 error:
 
+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,8 +11,6 @@
 
 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;
 
@@ -23,18 +21,6 @@ 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';
@@ -97,19 +83,4 @@ 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);
-    }
 }