Report invalid data provider on exceptions

Author: staabm

src/Metadata/Api/DataProvider.php

@@ -167,51 +167,51 @@ private function dataProvidedByMethods(string $className, string $methodName, Me
                 $className  = $_dataProvider->className();
                 $methodName = $_dataProvider->methodName();
                 $data       = $className::$methodName();
-            } catch (Throwable $e) {
-                Event\Facade::emitter()->dataProviderMethodFinished(
-                    $testMethod,
-                    ...$methodsCalled,
-                );
 
-                throw new InvalidDataProviderException(
-                    $e->getMessage(),
-                    $e->getCode(),
-                    $e,
-                );
-            }
-
-            foreach ($data as $key => $value) {
-                if (is_int($key)) {
-                    $result[] = $value;
-                } elseif (is_string($key)) {
-                    if (array_key_exists($key, $result)) {
+                foreach ($data as $key => $value) {
+                    if (is_int($key)) {
+                        $result[] = $value;
+                    } elseif (is_string($key)) {
+                        if (array_key_exists($key, $result)) {
+                            Event\Facade::emitter()->dataProviderMethodFinished(
+                                $testMethod,
+                                ...$methodsCalled,
+                            );
+
+                            throw new InvalidDataProviderException(
+                                sprintf(
+                                    'The key "%s" has already been defined by a previous data provider',
+                                    $key,
+                                ),
+                            );
+                        }
+
+                        $result[$key] = $value;
+                    } else {
                         Event\Facade::emitter()->dataProviderMethodFinished(
                             $testMethod,
                             ...$methodsCalled,
                         );
 
                         throw new InvalidDataProviderException(
                             sprintf(
-                                'The key "%s" has already been defined by a previous data provider',
-                                $key,
+                                'The key must be an integer or a string, %s given',
+                                get_debug_type($key),
                             ),
                         );
                     }
-
-                    $result[$key] = $value;
-                } else {
-                    Event\Facade::emitter()->dataProviderMethodFinished(
-                        $testMethod,
-                        ...$methodsCalled,
-                    );
-
-                    throw new InvalidDataProviderException(
-                        sprintf(
-                            'The key must be an integer or a string, %s given',
-                            get_debug_type($key),
-                        ),
-                    );
                 }
+            } catch (Throwable $e) {
+                Event\Facade::emitter()->dataProviderMethodFinished(
+                    $testMethod,
+                    ...$methodsCalled,
+                );
+
+                throw new InvalidDataProviderException(
+                    $e->getMessage(),
+                    $e->getCode(),
+                    $e,
+                );
             }
         }
 

tests/_files/Bug6408.php

@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * 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\TestCase;
+use RuntimeException;
+
+class Bug6408 extends TestCase
+{
+    public static function provideData(): iterable
+    {
+        yield from self::gatherAssertTypes();
+    }
+
+    public static function gatherAssertTypes(): array
+    {
+        throw new RuntimeException('a users exception from data-provider context');
+    }
+
+    #[DataProvider('provideData')]
+    public function testFoo(): void
+    {
+    }
+}

tests/end-to-end/data-provider/error-when-exception-thrown.phpt

@@ -0,0 +1,31 @@
+--TEST--
+phpunit ../../_files/Bug6408.php
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../../_files/Bug6408.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+There was 1 PHPUnit error:
+
+1) %sBug6408::testFoo
+The data provider specified for %sBug6408::testFoo is invalid
+a users exception from data-provider context
+
+%sBug6408.php:%d
+
+--
+
+There was 1 PHPUnit test runner warning:
+
+1) No tests found in class "PHPUnit\TestFixture\Bug6408".
+
+No tests executed!
+