Merge branch '12.5' into 13.1

* 12.5:
  Closes #5881

Author: sebastianbergmann

ChangeLog-13.1.md

@@ -11,6 +11,7 @@ All notable changes of the PHPUnit 13.1 release series are documented in this fi
 
 ### Fixed
 
+* [#5881](https://github.com/sebastianbergmann/phpunit/issues/5881): `colors="true"` in XML configuration file does not unconditionally enable colored output
 * [#6019](https://github.com/sebastianbergmann/phpunit/issues/6019): `--migrate-configuration` does not update schema location when XML content already validates against current schema
 * [#6372](https://github.com/sebastianbergmann/phpunit/issues/6372): Assertion failure inside `willReturnCallback()` is silently swallowed when code under test catches exceptions
 * [#6464](https://github.com/sebastianbergmann/phpunit/issues/6464): Process isolation template unconditionally calls `set_include_path()`

src/TextUI/Configuration/Xml/Loader.php

@@ -1038,10 +1038,8 @@ private function parseColors(DOMDocument $document): string
         $colors = Configuration::COLOR_DEFAULT;
 
         if ($document->documentElement->hasAttribute('colors')) {
-            /* only allow boolean for compatibility with previous versions
-              'always' only allowed from command line */
             if ($this->booleanFromString($document->documentElement->getAttribute('colors'), false)) {
-                $colors = Configuration::COLOR_AUTO;
+                $colors = Configuration::COLOR_ALWAYS;
             } else {
                 $colors = Configuration::COLOR_NEVER;
             }

tests/end-to-end/_files/coverage/coverage-no-tests-when-wrong-xdebug-mode.phpt

@@ -10,6 +10,7 @@ XDEBUG_MODE=debug
 --FILE--
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--colors=never';
 $_SERVER['argv'][] = '--coverage-html';
 $_SERVER['argv'][] = 'my_coverage_folder';
 

tests/unit/TextUI/Configuration/Xml/LoaderTest.php

@@ -71,7 +71,7 @@ public function testShouldReadColorsWhenTrueInConfigurationFile(): void
     {
         $phpunit = $this->configuration('configuration.colors.true.xml')->phpunit();
 
-        $this->assertEquals(Configuration::COLOR_AUTO, $phpunit->colors());
+        $this->assertEquals(Configuration::COLOR_ALWAYS, $phpunit->colors());
     }
 
     public function testShouldReadColorsWhenFalseInConfigurationFile(): void