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.5] - 2025-MM-DD
+
+### Fixed
+
+* [#6249](https://github.com/sebastianbergmann/phpunit/issues/6249): No meaningful error when `<testsuite>` element is missing required `name` attribute
+
 ## [12.2.4] - 2025-06-26
 
 ### Changed
@@ -82,6 +88,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.5]: https://github.com/sebastianbergmann/phpunit/compare/12.2.4...12.4
 [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
 [12.2.2]: https://github.com/sebastianbergmann/phpunit/compare/12.2.1...12.2.2

src/TextUI/Configuration/Xml/Loader.php

@@ -10,6 +10,7 @@
 namespace PHPUnit\TextUI\XmlConfiguration;
 
 use const DIRECTORY_SEPARATOR;
+use const PHP_EOL;
 use const PHP_VERSION;
 use function assert;
 use function defined;
@@ -18,6 +19,7 @@
 use function is_numeric;
 use function preg_match;
 use function realpath;
+use function sprintf;
 use function str_contains;
 use function str_starts_with;
 use function strlen;
@@ -76,6 +78,7 @@
 use PHPUnit\Util\Xml\XmlException;
 use SebastianBergmann\CodeCoverage\Report\Html\Colors;
 use SebastianBergmann\CodeCoverage\Report\Thresholds;
+use Throwable;
 
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -115,18 +118,33 @@ public function load(string $filename): LoadedFromFileConfiguration
 
         assert($configurationFileRealpath !== false && $configurationFileRealpath !== '');
 
-        return new LoadedFromFileConfiguration(
-            $configurationFileRealpath,
-            (new Validator)->validate($document, $xsdFilename),
-            $this->extensions($xpath),
-            $this->source($configurationFileRealpath, $xpath),
-            $this->codeCoverage($configurationFileRealpath, $xpath),
-            $this->groups($xpath),
-            $this->logging($configurationFileRealpath, $xpath),
-            $this->php($configurationFileRealpath, $xpath),
-            $this->phpunit($configurationFileRealpath, $document),
-            $this->testSuite($configurationFileRealpath, $xpath),
-        );
+        $validationResult = (new Validator)->validate($document, $xsdFilename);
+
+        try {
+            return new LoadedFromFileConfiguration(
+                $configurationFileRealpath,
+                $validationResult,
+                $this->extensions($xpath),
+                $this->source($configurationFileRealpath, $xpath),
+                $this->codeCoverage($configurationFileRealpath, $xpath),
+                $this->groups($xpath),
+                $this->logging($configurationFileRealpath, $xpath),
+                $this->php($configurationFileRealpath, $xpath),
+                $this->phpunit($configurationFileRealpath, $document),
+                $this->testSuite($configurationFileRealpath, $xpath),
+            );
+        } catch (Throwable $t) {
+            $message = sprintf(
+                'Cannot load XML configuration file %s',
+                $configurationFileRealpath,
+            );
+
+            if ($validationResult->hasValidationErrors()) {
+                $message .= ' because it has validation errors:' . PHP_EOL . $validationResult->asString();
+            }
+
+            throw new Exception($message, previous: $t);
+        }
     }
 
     private function logging(string $filename, DOMXPath $xpath): Logging

tests/_files/configuration.testsuite_no_name.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit>
+    <testsuite>
+        <directory>tests</directory>
+    </testsuite>
+</phpunit>

tests/end-to-end/generic/defaulttestsuite-using-testsuite-without-name.phpt

@@ -0,0 +1,17 @@
+--TEST--
+phpunit --configuration=__DIR__.'/../../_files/configuration.testsuite_no_name.xml'
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__.'/../../_files/configuration.testsuite_no_name.xml';
+
+require_once __DIR__ . '/../../bootstrap.php';
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Cannot load XML configuration file %sconfiguration.testsuite_no_name.xml because it has validation errors:
+
+  Line 3:
+  - Element 'testsuite': The attribute 'name' is required but missing.