Merge branch '10.5' into 11.2

ChangeLog-11.2.md

@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 11.2 release series are documented in this fi
 ### Fixed
 
 * [#5887](https://github.com/sebastianbergmann/phpunit/pull/5887): Issue baseline generator does not correctly handle ignoring suppressed issues
+* [#5908](https://github.com/sebastianbergmann/phpunit/issues/5908): `--list-tests` and `--list-tests-xml` CLI options do not report error when data provider method throws exception
 
 ## [11.2.8] - 2024-07-18
 

src/TextUI/Application.php

@@ -292,15 +292,40 @@ public function run(array $argv): int
         // @codeCoverageIgnoreEnd
     }
 
-    private function execute(Command\Command $command): never
+    private function execute(Command\Command $command, bool $requiresResultCollectedFromEvents = false): never
     {
+        if ($requiresResultCollectedFromEvents) {
+            try {
+                TestResultFacade::init();
+                EventFacade::instance()->seal();
+
+                $resultCollectedFromEvents = TestResultFacade::result();
+            } catch (EventFacadeIsSealedException|UnknownSubscriberTypeException) {
+            }
+        }
+
         print Version::getVersionString() . PHP_EOL . PHP_EOL;
 
         $result = $command->execute();
 
         print $result->output();
 
-        exit($result->shellExitCode());
+        $shellExitCode = $result->shellExitCode();
+
+        if (isset($resultCollectedFromEvents) &&
+            $resultCollectedFromEvents->hasTestTriggeredPhpunitErrorEvents()) {
+            $shellExitCode = Result::EXCEPTION;
+
+            print PHP_EOL . PHP_EOL . 'There were errors:' . PHP_EOL;
+
+            foreach ($resultCollectedFromEvents->testTriggeredPhpunitErrorEvents() as $events) {
+                foreach ($events as $event) {
+                    print PHP_EOL . trim($event->message()) . PHP_EOL;
+                }
+            }
+        }
+
+        exit($shellExitCode);
     }
 
     private function loadBootstrapScript(string $filename): void
@@ -457,6 +482,7 @@ private function executeCommandsThatRequireTheTestSuite(Configuration $configura
                         $testSuite,
                     ),
                 ),
+                true,
             );
         }
 
@@ -468,6 +494,7 @@ private function executeCommandsThatRequireTheTestSuite(Configuration $configura
                         $testSuite,
                     ),
                 ),
+                true,
             );
         }
 
@@ -480,6 +507,7 @@ private function executeCommandsThatRequireTheTestSuite(Configuration $configura
                     ),
                     $cliConfiguration->listTestsXml(),
                 ),
+                true,
             );
         }
 
@@ -491,6 +519,7 @@ private function executeCommandsThatRequireTheTestSuite(Configuration $configura
                         $testSuite,
                     ),
                 ),
+                true,
             );
         }
     }

tests/end-to-end/regression/5908-list-tests-xml.phpt

@@ -0,0 +1,27 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/5908
+--FILE--
+<?php declare(strict_types=1);
+$file = tempnam(sys_get_temp_dir(), __FILE__);
+
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--list-tests-xml';
+$_SERVER['argv'][] = $file;
+$_SERVER['argv'][] = __DIR__ . '/5908/Issue5908Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+
+unlink($file);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Wrote list of tests that would have been run to %s
+
+
+There were errors:
+
+The data provider specified for PHPUnit\TestFixture\Issue5908\Issue5908Test::testOne is invalid
+message

tests/end-to-end/regression/5908-list-tests.phpt

@@ -0,0 +1,22 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/5908
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--list-tests';
+$_SERVER['argv'][] = __DIR__ . '/5908/Issue5908Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Available test(s):
+
+
+There were errors:
+
+The data provider specified for PHPUnit\TestFixture\Issue5908\Issue5908Test::testOne is invalid
+message

tests/end-to-end/regression/5908/Issue5908Test.php

@@ -0,0 +1,27 @@
+<?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\Issue5908;
+
+use Exception;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class Issue5908Test extends TestCase
+{
+    public static function provider(): array
+    {
+        throw new Exception('message');
+    }
+
+    #[DataProvider('provider')]
+    public function testOne(int $value): void
+    {
+    }
+}