Revert "Closes #5952"

This reverts commit 1964ae3.

Author: sebastianbergmann

ChangeLog-12.0.md

@@ -6,6 +6,7 @@ All notable changes of the PHPUnit 12.0 release series are documented in this fi
 
 ### Fixed
 
+* [#5951](https://github.com/sebastianbergmann/phpunit/issues/5951#issuecomment-2656364815): Restore the `includeUncoveredFiles` configuration option
 * A `Test\Passed` event is no longer emitted in addition to a `Test\Failed` or `Test\Errored` event when an assertion failure or an unexpected exception is triggered in an after-test method
 * A `TestSuite\Finished` event is now emitted when a before-first-test method errors
 

src/Runner/CodeCoverage.php

@@ -100,6 +100,12 @@ public function init(Configuration $configuration, CodeCoverageFilterRegistry $c
             $this->codeCoverage()->enableAnnotationsForIgnoringCode();
         }
 
+        if ($configuration->includeUncoveredFiles()) {
+            $this->codeCoverage()->includeUncoveredFiles();
+        } else {
+            $this->codeCoverage()->excludeUncoveredFiles();
+        }
+
         if ($codeCoverageFilterRegistry->get()->isEmpty()) {
             if (!$codeCoverageFilterRegistry->configured()) {
                 EventFacade::emitter()->testRunnerTriggeredWarning(

src/TextUI/Configuration/Configuration.php

@@ -149,6 +149,7 @@
      */
     private array $excludeGroups;
     private int $randomOrderSeed;
+    private bool $includeUncoveredFiles;
     private TestSuiteCollection $testSuite;
     private string $includeTestSuite;
     private string $excludeTestSuite;
@@ -186,7 +187,7 @@
      * @param null|non-empty-string                                                       $generateBaseline
      * @param non-negative-int                                                            $shortenArraysForExportThreshold
      */
-    public function __construct(array $cliArguments, ?string $configurationFile, ?string $bootstrap, bool $cacheResult, ?string $cacheDirectory, ?string $coverageCacheDirectory, Source $source, string $testResultCacheFile, ?string $coverageClover, ?string $coverageCobertura, ?string $coverageCrap4j, int $coverageCrap4jThreshold, ?string $coverageHtml, int $coverageHtmlLowUpperBound, int $coverageHtmlHighLowerBound, string $coverageHtmlColorSuccessLow, string $coverageHtmlColorSuccessMedium, string $coverageHtmlColorSuccessHigh, string $coverageHtmlColorWarning, string $coverageHtmlColorDanger, ?string $coverageHtmlCustomCssFile, ?string $coveragePhp, ?string $coverageText, bool $coverageTextShowUncoveredFiles, bool $coverageTextShowOnlySummary, ?string $coverageXml, bool $pathCoverage, bool $ignoreDeprecatedCodeUnitsFromCodeCoverage, bool $disableCodeCoverageIgnore, bool $failOnDeprecation, bool $failOnPhpunitDeprecation, bool $failOnEmptyTestSuite, bool $failOnIncomplete, bool $failOnNotice, bool $failOnRisky, bool $failOnSkipped, bool $failOnWarning, bool $stopOnDefect, bool $stopOnDeprecation, ?string $specificDeprecationToStopOn, bool $stopOnError, bool $stopOnFailure, bool $stopOnIncomplete, bool $stopOnNotice, bool $stopOnRisky, bool $stopOnSkipped, bool $stopOnWarning, bool $outputToStandardErrorStream, int $columns, bool $noExtensions, ?string $pharExtensionDirectory, array $extensionBootstrappers, bool $backupGlobals, bool $backupStaticProperties, bool $beStrictAboutChangesToGlobalState, bool $colors, bool $processIsolation, bool $enforceTimeLimit, int $defaultTimeLimit, int $timeoutForSmallTests, int $timeoutForMediumTests, int $timeoutForLargeTests, bool $reportUselessTests, bool $strictCoverage, bool $disallowTestOutput, bool $displayDetailsOnIncompleteTests, bool $displayDetailsOnSkippedTests, bool $displayDetailsOnTestsThatTriggerDeprecations, bool $displayDetailsOnPhpunitDeprecations, bool $displayDetailsOnTestsThatTriggerErrors, bool $displayDetailsOnTestsThatTriggerNotices, bool $displayDetailsOnTestsThatTriggerWarnings, bool $reverseDefectList, bool $requireCoverageMetadata, bool $noProgress, bool $noResults, bool $noOutput, int $executionOrder, int $executionOrderDefects, bool $resolveDependencies, ?string $logfileTeamcity, ?string $logfileJunit, ?string $logfileTestdoxHtml, ?string $logfileTestdoxText, ?string $logEventsText, ?string $logEventsVerboseText, bool $teamCityOutput, bool $testDoxOutput, bool $testDoxOutputSummary, ?array $testsCovering, ?array $testsUsing, ?array $testsRequiringPhpExtension, ?string $filter, ?string $excludeFilter, array $groups, array $excludeGroups, int $randomOrderSeed, TestSuiteCollection $testSuite, string $includeTestSuite, string $excludeTestSuite, ?string $defaultTestSuite, array $testSuffixes, Php $php, bool $controlGarbageCollector, int $numberOfTestsBeforeGarbageCollection, ?string $generateBaseline, bool $debug, int $shortenArraysForExportThreshold)
+    public function __construct(array $cliArguments, ?string $configurationFile, ?string $bootstrap, bool $cacheResult, ?string $cacheDirectory, ?string $coverageCacheDirectory, Source $source, string $testResultCacheFile, ?string $coverageClover, ?string $coverageCobertura, ?string $coverageCrap4j, int $coverageCrap4jThreshold, ?string $coverageHtml, int $coverageHtmlLowUpperBound, int $coverageHtmlHighLowerBound, string $coverageHtmlColorSuccessLow, string $coverageHtmlColorSuccessMedium, string $coverageHtmlColorSuccessHigh, string $coverageHtmlColorWarning, string $coverageHtmlColorDanger, ?string $coverageHtmlCustomCssFile, ?string $coveragePhp, ?string $coverageText, bool $coverageTextShowUncoveredFiles, bool $coverageTextShowOnlySummary, ?string $coverageXml, bool $pathCoverage, bool $ignoreDeprecatedCodeUnitsFromCodeCoverage, bool $disableCodeCoverageIgnore, bool $failOnDeprecation, bool $failOnPhpunitDeprecation, bool $failOnEmptyTestSuite, bool $failOnIncomplete, bool $failOnNotice, bool $failOnRisky, bool $failOnSkipped, bool $failOnWarning, bool $stopOnDefect, bool $stopOnDeprecation, ?string $specificDeprecationToStopOn, bool $stopOnError, bool $stopOnFailure, bool $stopOnIncomplete, bool $stopOnNotice, bool $stopOnRisky, bool $stopOnSkipped, bool $stopOnWarning, bool $outputToStandardErrorStream, int $columns, bool $noExtensions, ?string $pharExtensionDirectory, array $extensionBootstrappers, bool $backupGlobals, bool $backupStaticProperties, bool $beStrictAboutChangesToGlobalState, bool $colors, bool $processIsolation, bool $enforceTimeLimit, int $defaultTimeLimit, int $timeoutForSmallTests, int $timeoutForMediumTests, int $timeoutForLargeTests, bool $reportUselessTests, bool $strictCoverage, bool $disallowTestOutput, bool $displayDetailsOnIncompleteTests, bool $displayDetailsOnSkippedTests, bool $displayDetailsOnTestsThatTriggerDeprecations, bool $displayDetailsOnPhpunitDeprecations, bool $displayDetailsOnTestsThatTriggerErrors, bool $displayDetailsOnTestsThatTriggerNotices, bool $displayDetailsOnTestsThatTriggerWarnings, bool $reverseDefectList, bool $requireCoverageMetadata, bool $noProgress, bool $noResults, bool $noOutput, int $executionOrder, int $executionOrderDefects, bool $resolveDependencies, ?string $logfileTeamcity, ?string $logfileJunit, ?string $logfileTestdoxHtml, ?string $logfileTestdoxText, ?string $logEventsText, ?string $logEventsVerboseText, bool $teamCityOutput, bool $testDoxOutput, bool $testDoxOutputSummary, ?array $testsCovering, ?array $testsUsing, ?array $testsRequiringPhpExtension, ?string $filter, ?string $excludeFilter, array $groups, array $excludeGroups, int $randomOrderSeed, bool $includeUncoveredFiles, TestSuiteCollection $testSuite, string $includeTestSuite, string $excludeTestSuite, ?string $defaultTestSuite, array $testSuffixes, Php $php, bool $controlGarbageCollector, int $numberOfTestsBeforeGarbageCollection, ?string $generateBaseline, bool $debug, int $shortenArraysForExportThreshold)
     {
         $this->cliArguments                                 = $cliArguments;
         $this->configurationFile                            = $configurationFile;
@@ -285,6 +286,7 @@ public function __construct(array $cliArguments, ?string $configurationFile, ?st
         $this->groups                                       = $groups;
         $this->excludeGroups                                = $excludeGroups;
         $this->randomOrderSeed                              = $randomOrderSeed;
+        $this->includeUncoveredFiles                        = $includeUncoveredFiles;
         $this->testSuite                                    = $testSuite;
         $this->includeTestSuite                             = $includeTestSuite;
         $this->excludeTestSuite                             = $excludeTestSuite;
@@ -1225,6 +1227,11 @@ public function randomOrderSeed(): int
         return $this->randomOrderSeed;
     }
 
+    public function includeUncoveredFiles(): bool
+    {
+        return $this->includeUncoveredFiles;
+    }
+
     public function testSuite(): TestSuiteCollection
     {
         return $this->testSuite;

src/TextUI/Configuration/Merger.php

@@ -671,6 +671,8 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC
             }
         }
 
+        $includeUncoveredFiles = $xmlConfiguration->codeCoverage()->includeUncoveredFiles();
+
         $includePaths = [];
 
         if ($cliConfiguration->hasIncludePath()) {
@@ -889,6 +891,7 @@ public function merge(CliConfiguration $cliConfiguration, XmlConfiguration $xmlC
             $groups,
             $excludeGroups,
             $randomOrderSeed,
+            $includeUncoveredFiles,
             $xmlConfiguration->testSuite(),
             $includeTestSuite,
             $excludeTestSuite,

src/TextUI/Configuration/Xml/CodeCoverage/CodeCoverage.php

@@ -28,6 +28,7 @@
 final readonly class CodeCoverage
 {
     private bool $pathCoverage;
+    private bool $includeUncoveredFiles;
     private bool $ignoreDeprecatedCodeUnits;
     private bool $disableCodeCoverageIgnore;
     private ?Clover $clover;
@@ -38,9 +39,10 @@
     private ?Text $text;
     private ?Xml $xml;
 
-    public function __construct(bool $pathCoverage, bool $ignoreDeprecatedCodeUnits, bool $disableCodeCoverageIgnore, ?Clover $clover, ?Cobertura $cobertura, ?Crap4j $crap4j, ?Html $html, ?Php $php, ?Text $text, ?Xml $xml)
+    public function __construct(bool $pathCoverage, bool $includeUncoveredFiles, bool $ignoreDeprecatedCodeUnits, bool $disableCodeCoverageIgnore, ?Clover $clover, ?Cobertura $cobertura, ?Crap4j $crap4j, ?Html $html, ?Php $php, ?Text $text, ?Xml $xml)
     {
         $this->pathCoverage              = $pathCoverage;
+        $this->includeUncoveredFiles     = $includeUncoveredFiles;
         $this->ignoreDeprecatedCodeUnits = $ignoreDeprecatedCodeUnits;
         $this->disableCodeCoverageIgnore = $disableCodeCoverageIgnore;
         $this->clover                    = $clover;
@@ -57,6 +59,11 @@ public function pathCoverage(): bool
         return $this->pathCoverage;
     }
 
+    public function includeUncoveredFiles(): bool
+    {
+        return $this->includeUncoveredFiles;
+    }
+
     public function ignoreDeprecatedCodeUnits(): bool
     {
         return $this->ignoreDeprecatedCodeUnits;

src/TextUI/Configuration/Xml/DefaultConfiguration.php

@@ -63,6 +63,7 @@ public static function create(): self
             ),
             new CodeCoverage(
                 false,
+                true,
                 false,
                 false,
                 null,

src/TextUI/Configuration/Xml/Loader.php

@@ -351,6 +351,7 @@ private function source(string $filename, DOMXPath $xpath): Source
     private function codeCoverage(string $filename, DOMXPath $xpath): CodeCoverage
     {
         $pathCoverage              = false;
+        $includeUncoveredFiles     = true;
         $ignoreDeprecatedCodeUnits = false;
         $disableCodeCoverageIgnore = false;
 
@@ -363,6 +364,12 @@ private function codeCoverage(string $filename, DOMXPath $xpath): CodeCoverage
                 false,
             );
 
+            $includeUncoveredFiles = $this->getBooleanAttribute(
+                $element,
+                'includeUncoveredFiles',
+                true,
+            );
+
             $ignoreDeprecatedCodeUnits = $this->getBooleanAttribute(
                 $element,
                 'ignoreDeprecatedCodeUnits',
@@ -490,6 +497,7 @@ private function codeCoverage(string $filename, DOMXPath $xpath): CodeCoverage
 
         return new CodeCoverage(
             $pathCoverage,
+            $includeUncoveredFiles,
             $ignoreDeprecatedCodeUnits,
             $disableCodeCoverageIgnore,
             $clover,

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

@@ -186,6 +186,7 @@ public function testCodeCoverageConfigurationIsReadCorrectly(): void
         $codeCoverage = $this->configuration('configuration_codecoverage.xml')->codeCoverage();
 
         $this->assertTrue($codeCoverage->pathCoverage());
+        $this->assertTrue($codeCoverage->includeUncoveredFiles());
         $this->assertTrue($codeCoverage->ignoreDeprecatedCodeUnits());
         $this->assertTrue($codeCoverage->disableCodeCoverageIgnore());