Closes #6087

sebastianbergmann · Dec 20, 2024 · e4e732d · e4e732d
1 parent 3449010
commit e4e732d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/ChangeLog-10.5.md b/ChangeLog-10.5.md
@@ -7,6 +7,7 @@ All notable changes of the PHPUnit 10.5 release series are documented in this fi
 ### Fixed
 
 * [#6082](/~https://github.com/sebastianbergmann/phpunit/issues/6082): `assertArrayHasKey()`, `assertArrayNotHasKey()`, `arrayHasKey()`, and `ArrayHasKey::__construct()` do not support all possible key types
+* [#6087](/~https://github.com/sebastianbergmann/phpunit/issues/6087): `--migrate-configuration` does not remove `beStrictAboutTodoAnnotatedTests` attribute from XML configuration file
 
 ## [10.5.39] - 2024-12-11
 

diff --git a/src/TextUI/Configuration/Xml/Migration/MigrationBuilder.php b/src/TextUI/Configuration/Xml/Migration/MigrationBuilder.php
@@ -63,6 +63,10 @@ final class MigrationBuilder
         '10.0' => [
             MoveCoverageDirectoriesToSource::class,
         ],
+
+        '10.4' => [
+            RemoveBeStrictAboutTodoAnnotatedTestsAttribute::class,
+        ],
     ];
 
     public function build(string $fromVersion): array

diff --git a/tests/_files/XmlConfigurationMigration/input-issue-6087.xml b/tests/_files/XmlConfigurationMigration/input-issue-6087.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         beStrictAboutTodoAnnotatedTests="true"
+>
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/tests/_files/XmlConfigurationMigration/output-issue-6087.xml b/tests/_files/XmlConfigurationMigration/output-issue-6087.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+>
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/tests/unit/TextUI/Configuration/Xml/MigratorTest.php b/tests/unit/TextUI/Configuration/Xml/MigratorTest.php
@@ -26,6 +26,10 @@ public static function provider(): array
                 __DIR__ . '/../../../../_files/XmlConfigurationMigration/output-9.5.xml',
                 __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-9.5.xml',
             ],
+            'Issue 6087' => [
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/output-issue-6087.xml',
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-issue-6087.xml',
+            ],
         ];
     }