Closes #6340

Author: sebastianbergmann

ChangeLog-11.5.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 11.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [11.5.36] - 2025-MM-DD
+
+### Fixed
+
+* [#6340](https://github.com/sebastianbergmann/phpunit/issues/6340): Implicitly enabled display of deprecation details is not disabled when it should be
+
 ## [11.5.35] - 2025-08-28
 
 ### Changed
@@ -320,6 +326,7 @@ All notable changes of the PHPUnit 11.5 release series are documented in this fi
 * [#6055](https://github.com/sebastianbergmann/phpunit/issues/6055): `assertNotContainsOnly()` (use `assertContainsNotOnlyArray()`, `assertContainsNotOnlyBool()`, `assertContainsNotOnlyCallable()`, `assertContainsNotOnlyFloat()`, `assertContainsNotOnlyInt()`, `assertContainsNotOnlyIterable()`, `assertContainsNotOnlyNumeric()`, `assertContainsNotOnlyObject()`, `assertContainsNotOnlyResource()`, `assertContainsNotOnlyClosedResource()`, `assertContainsNotOnlyScalar()`, or `assertContainsNotOnlyString()` instead)
 * [#6059](https://github.com/sebastianbergmann/phpunit/issues/6059): `containsOnly()` (use `containsOnlyArray()`, `containsOnlyBool()`, `containsOnlyCallable()`, `containsOnlyFloat()`, `containsOnlyInt()`, `containsOnlyIterable()`, `containsOnlyNumeric()`, `containsOnlyObject()`, `containsOnlyResource()`, `containsOnlyClosedResource()`, `containsOnlyScalar()`, or `containsOnlyString()` instead)
 
+[11.5.36]: https://github.com/sebastianbergmann/phpunit/compare/11.5.35...11.5
 [11.5.35]: https://github.com/sebastianbergmann/phpunit/compare/11.5.34...11.5.35
 [11.5.34]: https://github.com/sebastianbergmann/phpunit/compare/11.5.33...11.5.34
 [11.5.33]: https://github.com/sebastianbergmann/phpunit/compare/11.5.32...11.5.33

src/TextUI/Configuration/Merger.php

@@ -825,27 +825,27 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC
             $displayDetailsOnAllIssues = true;
         }
 
-        if ($failOnDeprecation) {
+        if ($failOnDeprecation && !$doNotFailOnDeprecation) {
             $displayDetailsOnTestsThatTriggerDeprecations = true;
         }
 
-        if ($failOnPhpunitDeprecation) {
+        if ($failOnPhpunitDeprecation && !$doNotFailOnPhpunitDeprecation) {
             $displayDetailsOnPhpunitDeprecations = true;
         }
 
-        if ($failOnNotice) {
+        if ($failOnNotice && !$doNotFailOnNotice) {
             $displayDetailsOnTestsThatTriggerNotices = true;
         }
 
-        if ($failOnWarning) {
+        if ($failOnWarning && !$doNotFailOnWarning) {
             $displayDetailsOnTestsThatTriggerWarnings = true;
         }
 
-        if ($failOnIncomplete) {
+        if ($failOnIncomplete && !$doNotFailOnIncomplete) {
             $displayDetailsOnIncompleteTests = true;
         }
 
-        if ($failOnSkipped) {
+        if ($failOnSkipped && !$doNotFailOnSkipped) {
             $displayDetailsOnSkippedTests = true;
         }
 

tests/_files/configuration-issue-6340.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../phpunit.xsd"
+         failOnPhpunitDeprecation="true"
+         failOnDeprecation="true"
+         failOnNotice="true"
+         failOnWarning="true"
+         failOnIncomplete="true"
+         failOnSkipped="true"
+>
+</phpunit>

tests/unit/TextUI/Configuration/MergerTest.php

@@ -12,6 +12,7 @@
 use function uniqid;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Medium;
+use PHPUnit\Framework\Attributes\Ticket;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\TextUI\CliArguments\Builder;
 use PHPUnit\TextUI\Configuration\Merger;
@@ -81,4 +82,49 @@ public function testNoCoverageShouldOnlyAffectXmlConfiguration(): void
         $this->assertTrue($mergedConfig->hasCoveragePhp());
         $this->assertSame($phpCoverage, $mergedConfig->coveragePhp());
     }
+
+    #[Ticket('https://github.com/sebastianbergmann/phpunit/issues/6340')]
+    public function testIssue6340(): void
+    {
+        $fromFile = (new Loader)->load(TEST_FILES_PATH . 'configuration-issue-6340.xml');
+
+        $this->assertTrue($fromFile->phpunit()->failOnPhpunitDeprecation());
+        $this->assertTrue($fromFile->phpunit()->failOnDeprecation());
+        $this->assertTrue($fromFile->phpunit()->failOnNotice());
+        $this->assertTrue($fromFile->phpunit()->failOnWarning());
+        $this->assertTrue($fromFile->phpunit()->failOnIncomplete());
+        $this->assertTrue($fromFile->phpunit()->failOnSkipped());
+
+        $fromCli = (new Builder)->fromParameters([
+            '--do-not-fail-on-phpunit-deprecation',
+            '--do-not-fail-on-deprecation',
+            '--do-not-fail-on-notice',
+            '--do-not-fail-on-warning',
+            '--do-not-fail-on-incomplete',
+            '--do-not-fail-on-skipped',
+        ]);
+
+        $this->assertTrue($fromCli->doNotFailOnPhpunitDeprecation());
+        $this->assertTrue($fromCli->doNotFailOnDeprecation());
+        $this->assertTrue($fromCli->doNotFailOnNotice());
+        $this->assertTrue($fromCli->doNotFailOnWarning());
+        $this->assertTrue($fromCli->doNotFailOnIncomplete());
+        $this->assertTrue($fromCli->doNotFailOnSkipped());
+
+        $mergedConfig = (new Merger)->merge($fromCli, $fromFile);
+
+        $this->assertTrue($mergedConfig->doNotFailOnPhpunitDeprecation());
+        $this->assertTrue($mergedConfig->doNotFailOnDeprecation());
+        $this->assertTrue($mergedConfig->doNotFailOnNotice());
+        $this->assertTrue($mergedConfig->doNotFailOnWarning());
+        $this->assertTrue($mergedConfig->doNotFailOnIncomplete());
+        $this->assertTrue($mergedConfig->doNotFailOnSkipped());
+
+        $this->assertFalse($mergedConfig->displayDetailsOnPhpunitDeprecations());
+        $this->assertFalse($mergedConfig->displayDetailsOnTestsThatTriggerDeprecations());
+        $this->assertFalse($mergedConfig->displayDetailsOnTestsThatTriggerNotices());
+        $this->assertFalse($mergedConfig->displayDetailsOnTestsThatTriggerWarnings());
+        $this->assertFalse($mergedConfig->displayDetailsOnIncompleteTests());
+        $this->assertFalse($mergedConfig->displayDetailsOnSkippedTests());
+    }
 }