Merge branch '10.5' into 11.5

Author: sebastianbergmann

ChangeLog-11.5.md

@@ -4,6 +4,10 @@ All notable changes of the PHPUnit 11.5 release series are documented in this fi
 
 ## [11.5.33] - 2025-MM-DD
 
+### Changed
+
+* [#6321](https://github.com/sebastianbergmann/phpunit/issues/6321): Allow `error_reporting=E_ALL` for `--check-php-configuration`
+
 ### Fixed
 
 * [#5863](https://github.com/sebastianbergmann/phpunit/issues/5863): TestDox printer does not show previous exception

src/TextUI/Command/Commands/CheckPhpConfigurationCommand.php

@@ -9,8 +9,10 @@
  */
 namespace PHPUnit\TextUI\Command;
 
+use const E_ALL;
 use const PHP_EOL;
 use function extension_loaded;
+use function in_array;
 use function ini_get;
 use function max;
 use function sprintf;
@@ -26,46 +28,6 @@
  */
 final readonly class CheckPhpConfigurationCommand implements Command
 {
-    /**
-     * @var non-empty-array<non-empty-string, array{expectedValue: non-empty-string, valueForConfiguration: non-empty-string, requiredExtensions: list<non-empty-string>}>
-     */
-    private const SETTINGS = [
-        'display_errors' => [
-            'expectedValue'         => '1',
-            'valueForConfiguration' => 'On',
-            'requiredExtensions'    => [],
-        ],
-        'display_startup_errors' => [
-            'expectedValue'         => '1',
-            'valueForConfiguration' => 'On',
-            'requiredExtensions'    => [],
-        ],
-        'error_reporting' => [
-            'expectedValue'         => '-1',
-            'valueForConfiguration' => '-1',
-            'requiredExtensions'    => [],
-        ],
-        'xdebug.show_exception_trace' => [
-            'expectedValue'         => '0',
-            'valueForConfiguration' => '0',
-            'requiredExtensions'    => ['xdebug'],
-        ],
-        'zend.assertions' => [
-            'expectedValue'         => '1',
-            'valueForConfiguration' => '1',
-            'requiredExtensions'    => [],
-        ],
-        'assert.exception' => [
-            'expectedValue'         => '1',
-            'valueForConfiguration' => '1',
-            'requiredExtensions'    => [],
-        ],
-        'memory_limit' => [
-            'expectedValue'         => '-1',
-            'valueForConfiguration' => '-1',
-            'requiredExtensions'    => [],
-        ],
-    ];
     private bool $colorize;
 
     public function __construct()
@@ -78,7 +40,7 @@ public function execute(): Result
         $lines         = [];
         $shellExitCode = 0;
 
-        foreach (self::SETTINGS as $name => $setting) {
+        foreach ($this->settings() as $name => $setting) {
             foreach ($setting['requiredExtensions'] as $extension) {
                 if (!extension_loaded($extension)) {
                     // @codeCoverageIgnoreStart
@@ -89,7 +51,7 @@ public function execute(): Result
 
             $actualValue = ini_get($name);
 
-            if ($actualValue === $setting['expectedValue']) {
+            if (in_array($actualValue, $setting['expectedValues'], true)) {
                 $check = $this->ok();
             } else {
                 $check         = $this->notOk($actualValue);
@@ -157,4 +119,48 @@ private function notOk(string $actualValue): string
         return Color::colorizeTextBox('fg-red, bold', $message);
         // @codeCoverageIgnoreEnd
     }
+
+    /**
+     * @return non-empty-array<non-empty-string, array{expectedValues: non-empty-list<non-empty-string>, valueForConfiguration: non-empty-string, requiredExtensions: list<non-empty-string>}>
+     */
+    private function settings(): array
+    {
+        return [
+            'display_errors' => [
+                'expectedValues'        => ['1'],
+                'valueForConfiguration' => 'On',
+                'requiredExtensions'    => [],
+            ],
+            'display_startup_errors' => [
+                'expectedValues'        => ['1'],
+                'valueForConfiguration' => 'On',
+                'requiredExtensions'    => [],
+            ],
+            'error_reporting' => [
+                'expectedValues'        => ['-1', (string) E_ALL],
+                'valueForConfiguration' => '-1',
+                'requiredExtensions'    => [],
+            ],
+            'xdebug.show_exception_trace' => [
+                'expectedValues'        => ['0'],
+                'valueForConfiguration' => '0',
+                'requiredExtensions'    => ['xdebug'],
+            ],
+            'zend.assertions' => [
+                'expectedValues'        => ['1'],
+                'valueForConfiguration' => '1',
+                'requiredExtensions'    => [],
+            ],
+            'assert.exception' => [
+                'expectedValues'        => ['1'],
+                'valueForConfiguration' => '1',
+                'requiredExtensions'    => [],
+            ],
+            'memory_limit' => [
+                'expectedValues'        => ['-1'],
+                'valueForConfiguration' => '-1',
+                'requiredExtensions'    => [],
+            ],
+        ];
+    }
 }