Fix collecting data from data providers

sebastianbergmann · Apr 19, 2024 · 1e82280 · 1e82280
1 parent 0e03860
commit 1e82280
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 36 deletions.
diff --git a/src/Metadata/Api/DataProvider.php b/src/Metadata/Api/DataProvider.php
@@ -10,7 +10,6 @@
 namespace PHPUnit\Metadata\Api;
 
 use function array_key_exists;
-use function array_merge;
 use function assert;
 use function explode;
 use function is_array;
@@ -39,7 +38,6 @@
 use ReflectionClass;
 use ReflectionMethod;
 use Throwable;
-use Traversable;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
@@ -176,33 +174,24 @@ private function dataProvidedByMethods(string $className, string $methodName, Me
                 );
             }
 
-            if ($data instanceof Traversable) {
-                $origData = $data;
-                $data     = [];
-
-                foreach ($origData as $key => $value) {
-                    if (is_int($key)) {
-                        $data[] = $value;
-                    } elseif (array_key_exists($key, $data)) {
-                        Event\Facade::emitter()->dataProviderMethodFinished(
-                            $testMethod,
-                            ...$methodsCalled,
-                        );
-
-                        throw new InvalidDataProviderException(
-                            sprintf(
-                                'The key "%s" has already been defined by a previous data provider',
-                                $key,
-                            ),
-                        );
-                    } else {
-                        $data[$key] = $value;
-                    }
-                }
-            }
+            foreach ($data as $key => $value) {
+                if (is_int($key)) {
+                    $result[] = $value;
+                } elseif (array_key_exists($key, $result)) {
+                    Event\Facade::emitter()->dataProviderMethodFinished(
+                        $testMethod,
+                        ...$methodsCalled,
+                    );
 
-            if (is_array($data)) {
-                $result = array_merge($result, $data);
+                    throw new InvalidDataProviderException(
+                        sprintf(
+                            'The key "%s" has already been defined by a previous data provider',
+                            $key,
+                        ),
+                    );
+                } else {
+                    $result[$key] = $value;
+                }
             }
         }
 

diff --git a/tests/unit/Metadata/Api/DataProviderTest.php b/tests/unit/Metadata/Api/DataProviderTest.php
@@ -168,13 +168,10 @@ public function testWithDuplicateKeyDataProvider(): void
 
     public function testWithDuplicateKeyDataProviders(): void
     {
-        $dataSets = (new DataProvider)->providedData(DuplicateKeyDataProvidersTest::class, 'test');
-
-        $this->assertSame(
-            [
-                'bar' => [2],
-            ],
-            $dataSets,
-        );
+        $this->expectException(InvalidDataProviderException::class);
+        $this->expectExceptionMessage('The key "bar" has already been defined by a previous data provider');
+
+        /* @noinspection UnusedFunctionResultInspection */
+        (new DataProvider)->providedData(DuplicateKeyDataProvidersTest::class, 'test');
     }
 }