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.6] - 2025-MM-DD
+
+### Fixed
+
+* [#6104](https://github.com/sebastianbergmann/phpunit/issues/6104): Test with dependencies and data provider fails
+
 ## [12.2.5] - 2025-06-27
 
 ### Fixed
@@ -88,6 +94,7 @@ 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.6]: https://github.com/sebastianbergmann/phpunit/compare/12.2.5...12.2
 [12.2.5]: https://github.com/sebastianbergmann/phpunit/compare/12.2.4...12.2.5
 [12.2.4]: https://github.com/sebastianbergmann/phpunit/compare/12.2.3...12.2.4
 [12.2.3]: https://github.com/sebastianbergmann/phpunit/compare/12.2.2...12.2.3

src/Framework/TestCase.php

@@ -1456,6 +1456,10 @@ private function handleDependencies(): bool
                 return true;
             }
 
+            if (!$passedTests->hasReturnValue($dependencyTarget)) {
+                return true;
+            }
+
             $returnValue = $passedTests->returnValue($dependencyTarget);
 
             if ($dependency->deepClone()) {

src/Runner/TestResult/PassedTests.php

@@ -11,11 +11,14 @@
 
 use function array_merge;
 use function assert;
+use function explode;
 use function in_array;
 use PHPUnit\Event\Code\TestMethod;
 use PHPUnit\Framework\TestSize\Known;
 use PHPUnit\Framework\TestSize\TestSize;
 use PHPUnit\Metadata\Api\Groups;
+use ReflectionMethod;
+use ReflectionNamedType;
 
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -113,6 +116,13 @@ public function isGreaterThan(string $method, TestSize $other): bool
         return $size->isGreaterThan($other);
     }
 
+    public function hasReturnValue(string $method): mixed
+    {
+        $returnType = (new ReflectionMethod(...explode('::', $method)))->getReturnType();
+
+        return !$returnType instanceof ReflectionNamedType || !in_array($returnType->getName(), ['never', 'void'], true);
+    }
+
     public function returnValue(string $method): mixed
     {
         if (isset($this->passedTestMethods[$method])) {

tests/_files/DataProviderDependencyVoidTest.php

@@ -0,0 +1,39 @@
+<?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;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
+use PHPUnit\Framework\TestCase;
+
+final class DataProviderDependencyVoidTest extends TestCase
+{
+    public static function provider(): iterable
+    {
+        return [
+            [0, 0],
+            [1, 'b' => 1],
+            ['a' => 2, 'b' => 2],
+            ['b' => 3, 'a' => 3],
+        ];
+    }
+
+    #[DataProvider('provider')]
+    #[Depends('testDependency')]
+    public function testEquality($a, $b): void
+    {
+        $this->assertSame($a, $b);
+    }
+
+    public function testDependency(): void
+    {
+        $this->assertTrue(true);
+    }
+}

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

@@ -0,0 +1,20 @@
+--TEST--
+phpunit ../../_files/DataProviderDependencyVoidTest.php
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../../_files/DataProviderDependencyVoidTest.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+.....                                                               5 / 5 (100%)
+
+Time: %s, Memory: %s
+
+OK (5 tests, 5 assertions)