Skip to content

Commit 602370c

Browse files
Remove the processUncoveredFiles attribute on the <coverage> XML configuration element (because the corresponding functionality in php-code-coverage has been removed)
1 parent 4b70280 commit 602370c

File tree

15 files changed

+42
-34
lines changed

15 files changed

+42
-34
lines changed

ChangeLog-10.0.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ All notable changes of the PHPUnit 10.0 release series are documented in this fi
5252
* [#4601](https://github.com/sebastianbergmann/phpunit/issues/4601): Deprecate assertions that operate on class/object properties
5353
* Removed the `PHPUnit\Runner\TestSuiteLoader` interface
5454
* Removed the `<listeners>` XML configuration element and its children
55-
* Removed the `groups` attribute on the `test` element in the TestDox XML report
55+
* Removed the `groups` attribute on the `<test>` element in the TestDox XML report
56+
* Removed the `processUncoveredFiles` attribute on the `<coverage>` XML configuration element
5657

5758
[10.0.0]: https://github.com/sebastianbergmann/phpunit/compare/9.5...master

phpunit.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
</testsuite>
1919
</testsuites>
2020

21-
<coverage processUncoveredFiles="true"
22-
ignoreDeprecatedCodeUnits="true">
21+
<coverage ignoreDeprecatedCodeUnits="true">
2322
<include>
2423
<directory suffix=".php">src</directory>
2524
</include>

phpunit.xsd

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<xs:attribute name="cacheDirectory" type="xs:anyURI"/>
3333
<xs:attribute name="pathCoverage" type="xs:boolean" default="false"/>
3434
<xs:attribute name="includeUncoveredFiles" type="xs:boolean" default="true"/>
35-
<xs:attribute name="processUncoveredFiles" type="xs:boolean" default="false"/>
3635
<xs:attribute name="ignoreDeprecatedCodeUnits" type="xs:boolean" default="false"/>
3736
<xs:attribute name="disableCodeCoverageIgnore" type="xs:boolean" default="false"/>
3837
</xs:complexType>

src/TextUI/TestRunner.php

-6
Original file line numberDiff line numberDiff line change
@@ -466,12 +466,6 @@ public function run(TestSuite $suite, array $arguments = [], array $warnings = [
466466
} else {
467467
CodeCoverage::instance()->excludeUncoveredFiles();
468468
}
469-
470-
if ($codeCoverageConfiguration->processUncoveredFiles()) {
471-
CodeCoverage::instance()->processUncoveredFiles();
472-
} else {
473-
CodeCoverage::instance()->doNotProcessUncoveredFiles();
474-
}
475469
}
476470
}
477471

src/TextUI/XmlConfiguration/CodeCoverage/CodeCoverage.php

+1-9
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ final class CodeCoverage
4242

4343
private bool $includeUncoveredFiles;
4444

45-
private bool $processUncoveredFiles;
46-
4745
private bool $ignoreDeprecatedCodeUnits;
4846

4947
private bool $disableCodeCoverageIgnore;
@@ -62,7 +60,7 @@ final class CodeCoverage
6260

6361
private ?Xml $xml = null;
6462

65-
public function __construct(?Directory $cacheDirectory, DirectoryCollection $directories, FileCollection $files, DirectoryCollection $excludeDirectories, FileCollection $excludeFiles, bool $pathCoverage, bool $includeUncoveredFiles, bool $processUncoveredFiles, bool $ignoreDeprecatedCodeUnits, bool $disableCodeCoverageIgnore, ?Clover $clover, ?Cobertura $cobertura, ?Crap4j $crap4j, ?Html $html, ?Php $php, ?Text $text, ?Xml $xml)
63+
public function __construct(?Directory $cacheDirectory, DirectoryCollection $directories, FileCollection $files, DirectoryCollection $excludeDirectories, FileCollection $excludeFiles, bool $pathCoverage, bool $includeUncoveredFiles, bool $ignoreDeprecatedCodeUnits, bool $disableCodeCoverageIgnore, ?Clover $clover, ?Cobertura $cobertura, ?Crap4j $crap4j, ?Html $html, ?Php $php, ?Text $text, ?Xml $xml)
6664
{
6765
$this->cacheDirectory = $cacheDirectory;
6866
$this->directories = $directories;
@@ -71,7 +69,6 @@ public function __construct(?Directory $cacheDirectory, DirectoryCollection $dir
7169
$this->excludeFiles = $excludeFiles;
7270
$this->pathCoverage = $pathCoverage;
7371
$this->includeUncoveredFiles = $includeUncoveredFiles;
74-
$this->processUncoveredFiles = $processUncoveredFiles;
7572
$this->ignoreDeprecatedCodeUnits = $ignoreDeprecatedCodeUnits;
7673
$this->disableCodeCoverageIgnore = $disableCodeCoverageIgnore;
7774
$this->clover = $clover;
@@ -154,11 +151,6 @@ public function disableCodeCoverageIgnore(): bool
154151
return $this->disableCodeCoverageIgnore;
155152
}
156153

157-
public function processUncoveredFiles(): bool
158-
{
159-
return $this->processUncoveredFiles;
160-
}
161-
162154
/**
163155
* @psalm-assert-if-true !null $this->clover
164156
*/

src/TextUI/XmlConfiguration/Generator.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ final class Generator
3939
</testsuite>
4040
</testsuites>
4141
42-
<coverage processUncoveredFiles="true">
42+
<coverage>
4343
<include>
4444
<directory suffix=".php">{src_directory}</directory>
4545
</include>

src/TextUI/XmlConfiguration/Loader.php

-8
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ private function codeCoverage(string $filename, DOMXPath $xpath, DOMDocument $do
306306
$cacheDirectory = null;
307307
$pathCoverage = false;
308308
$includeUncoveredFiles = true;
309-
$processUncoveredFiles = false;
310309
$ignoreDeprecatedCodeUnits = false;
311310
$disableCodeCoverageIgnore = false;
312311

@@ -333,12 +332,6 @@ private function codeCoverage(string $filename, DOMXPath $xpath, DOMDocument $do
333332
true
334333
);
335334

336-
$processUncoveredFiles = $this->getBooleanAttribute(
337-
$element,
338-
'processUncoveredFiles',
339-
false
340-
);
341-
342335
$ignoreDeprecatedCodeUnits = $this->getBooleanAttribute(
343336
$element,
344337
'ignoreDeprecatedCodeUnits',
@@ -463,7 +456,6 @@ private function codeCoverage(string $filename, DOMXPath $xpath, DOMDocument $do
463456
$this->readFilterFiles($filename, $xpath, 'coverage/exclude/file'),
464457
$pathCoverage,
465458
$includeUncoveredFiles,
466-
$processUncoveredFiles,
467459
$ignoreDeprecatedCodeUnits,
468460
$disableCodeCoverageIgnore,
469461
$clover,

src/TextUI/XmlConfiguration/Migration/MigrationBuilder.php

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ final class MigrationBuilder
4545
RemoveTestSuiteLoaderAttributes::class,
4646
RemoveCacheResultFileAttribute::class,
4747
RemoveCoverageElementCacheDirectoryAttribute::class,
48+
RemoveCoverageElementProcessUncoveredFilesAttribute::class,
4849
IntroduceCacheDirectoryAttribute::class,
4950
RenameBackupStaticAttributesAttribute::class,
5051
],
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php declare(strict_types=1);
2+
/*
3+
* This file is part of PHPUnit.
4+
*
5+
* (c) Sebastian Bergmann <sebastian@phpunit.de>
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
9+
*/
10+
namespace PHPUnit\TextUI\XmlConfiguration;
11+
12+
use DOMDocument;
13+
use DOMElement;
14+
15+
/**
16+
* @internal This class is not covered by the backward compatibility promise for PHPUnit
17+
*/
18+
final class RemoveCoverageElementProcessUncoveredFilesAttribute implements Migration
19+
{
20+
public function migrate(DOMDocument $document): void
21+
{
22+
$node = $document->getElementsByTagName('coverage')->item(0);
23+
24+
if (!$node instanceof DOMElement || $node->parentNode === null) {
25+
return;
26+
}
27+
28+
if ($node->hasAttribute('processUncoveredFiles')) {
29+
$node->removeAttribute('processUncoveredFiles');
30+
}
31+
}
32+
}

tests/_files/XmlConfigurationMigration/output-9.2.xml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
cacheDirectory=".phpunit.cache">
55

66
<coverage includeUncoveredFiles="true"
7-
processUncoveredFiles="true"
87
ignoreDeprecatedCodeUnits="true"
98
disableCodeCoverageIgnore="true">
109
<include>

tests/_files/XmlConfigurationMigration/output-9.5.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
44
cacheDirectory=".phpunit.cache">
55

6-
<coverage processUncoveredFiles="true">
6+
<coverage>
77
<include>
88
<directory suffix=".php">src</directory>
99
</include>

tests/end-to-end/force-covers-annotation/phpunit.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</testsuite>
99
</testsuites>
1010

11-
<coverage processUncoveredFiles="true">
11+
<coverage>
1212
<include>
1313
<directory suffix=".php">src</directory>
1414
</include>

tests/end-to-end/risky-tests/global-state/phpunit.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</testsuite>
1818
</testsuites>
1919

20-
<coverage processUncoveredFiles="true">
20+
<coverage>
2121
<include>
2222
<directory suffix=".php">src</directory>
2323
</include>

tests/unit/TextUI/XmlConfigurationGeneratorTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function testGeneratesConfigurationCorrectly(): void
4141
</testsuite>
4242
</testsuites>
4343
44-
<coverage processUncoveredFiles="true">
44+
<coverage>
4545
<include>
4646
<directory suffix=".php">src</directory>
4747
</include>

tests/unit/TextUI/XmlConfigurationTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ public function testCodeCoverageConfigurationIsReadCorrectly(): void
158158

159159
$this->assertTrue($codeCoverage->pathCoverage());
160160
$this->assertTrue($codeCoverage->includeUncoveredFiles());
161-
$this->assertTrue($codeCoverage->processUncoveredFiles());
162161
$this->assertTrue($codeCoverage->ignoreDeprecatedCodeUnits());
163162
$this->assertTrue($codeCoverage->disableCodeCoverageIgnore());
164163

0 commit comments

Comments
 (0)