Merge branch '10.5' into 11.5

Author: sebastianbergmann

ChangeLog-11.5.md

@@ -6,6 +6,7 @@ All notable changes of the PHPUnit 11.5 release series are documented in this fi
 
 ### Changed
 
+* [#6308](https://github.com/sebastianbergmann/phpunit/pull/6308): Improve output of `--check-php-configuration`
 * The version number for the test result cache file has been incremented to reflect that its structure for PHPUnit 11.5 is not compatible with its structure for PHPUnit 8.5 and PHPUnit 9.6
 
 ### Fixed

src/TextUI/Command/Commands/CheckPhpConfigurationCommand.php

@@ -87,10 +87,12 @@ public function execute(): Result
                 }
             }
 
-            if (ini_get($name) === $setting['expectedValue']) {
+            $actualValue = ini_get($name);
+
+            if ($actualValue === $setting['expectedValue']) {
                 $check = $this->ok();
             } else {
-                $check         = $this->notOk();
+                $check         = $this->notOk($actualValue);
                 $shellExitCode = 1;
             }
 
@@ -143,14 +145,16 @@ private function ok(): string
     /**
      * @return non-empty-string
      */
-    private function notOk(): string
+    private function notOk(string $actualValue): string
     {
+        $message = sprintf('not ok (%s)', $actualValue);
+
         if (!$this->colorize) {
-            return 'not ok';
+            return $message;
         }
 
         // @codeCoverageIgnoreStart
-        return Color::colorizeTextBox('fg-red, bold', 'not ok');
+        return Color::colorizeTextBox('fg-red, bold', $message);
         // @codeCoverageIgnoreEnd
     }
 }

tests/end-to-end/check-php-configuration/failure-with-xdebug.phpt

@@ -26,7 +26,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Checking whether PHP is configured according to https://docs.phpunit.de/en/%s/installation.html#configuring-php-for-development
 
-display_errors = On             ... not ok
+display_errors = On             ... not ok (0)
 display_startup_errors = On     ... ok
 error_reporting = -1            ... ok
 xdebug.show_exception_trace = 0 ... ok

tests/end-to-end/check-php-configuration/failure-without-xdebug.phpt

@@ -25,7 +25,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Checking whether PHP is configured according to https://docs.phpunit.de/en/%s/installation.html#configuring-php-for-development
 
-display_errors = On         ... not ok
+display_errors = On         ... not ok (0)
 display_startup_errors = On ... ok
 error_reporting = -1        ... ok
 zend.assertions = 1         ... ok