Closes #5405

sebastianbergmann · Jun 11, 2023 · 324512e · 324512e
1 parent 70e8497
commit 324512e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/ChangeLog-9.6.md b/ChangeLog-9.6.md
@@ -6,6 +6,7 @@ All notable changes of the PHPUnit 9.6 release series are documented in this fil
 
 ### Fixed
 
+* [#5405](https://github.com/sebastianbergmann/phpunit/issues/5405): XML configuration migration does not migrate `whitelist/file` elements
 * Always use `X.Y.Z` version number (and not just `X.Y`) of PHPUnit's version when checking whether a PHAR-distributed extension is compatible
 
 ## [9.6.8] - 2023-05-11

diff --git a/src/TextUI/XmlConfiguration/Migration/MigrationBuilder.php b/src/TextUI/XmlConfiguration/Migration/MigrationBuilder.php
@@ -28,7 +28,7 @@ final class MigrationBuilder
             IntroduceCoverageElement::class,
             MoveAttributesFromRootToCoverage::class,
             MoveAttributesFromFilterWhitelistToCoverage::class,
-            MoveWhitelistDirectoriesToCoverage::class,
+            MoveWhitelistIncludesToCoverage::class,
             MoveWhitelistExcludesToCoverage::class,
             RemoveEmptyFilter::class,
             CoverageCloverToReport::class,

diff --git a/...ns/MoveWhitelistDirectoriesToCoverage.php → ...tions/MoveWhitelistIncludesToCoverage.php b/...ns/MoveWhitelistDirectoriesToCoverage.php → ...tions/MoveWhitelistIncludesToCoverage.php
@@ -16,7 +16,7 @@
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class MoveWhitelistDirectoriesToCoverage implements Migration
+final class MoveWhitelistIncludesToCoverage implements Migration
 {
     /**
      * @throws MigrationException
@@ -39,7 +39,11 @@ public function migrate(DOMDocument $document): void
         $coverage->appendChild($include);
 
         foreach (SnapshotNodeList::fromNodeList($whitelist->childNodes) as $child) {
-            if (!$child instanceof DOMElement || $child->nodeName !== 'directory') {
+            if (!$child instanceof DOMElement) {
+                continue;
+            }
+
+            if (!($child->nodeName === 'directory' || $child->nodeName === 'file')) {
                 continue;
             }
 

diff --git a/tests/end-to-end/migration/_files/migration-from-92/phpunit-9.2.xml b/tests/end-to-end/migration/_files/migration-from-92/phpunit-9.2.xml
@@ -17,6 +17,7 @@
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src</directory>
+            <file>file.php</file>
         </whitelist>
     </filter>
 </phpunit>