Merge branch '11.5'

sebastianbergmann · Dec 20, 2024 · 9c95792 · 9c95792
2 parents 510e81f + be53591
commit 9c95792
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 49 deletions.
diff --git a/schema/11.2.xsd b/schema/11.2.xsd
@@ -172,7 +172,6 @@
         <xs:attribute name="bootstrap" type="xs:anyURI"/>
         <xs:attribute name="cacheDirectory" type="xs:anyURI"/>
         <xs:attribute name="cacheResult" type="xs:boolean" default="true"/>
-        <xs:attribute name="cacheResultFile" type="xs:anyURI"/>
         <xs:attribute name="colors" type="xs:boolean" default="false"/>
         <xs:attribute name="columns" type="columnsType" default="80"/>
         <xs:attribute name="controlGarbageCollector" type="xs:boolean" default="false"/>
@@ -198,7 +197,6 @@
         <xs:attribute name="beStrictAboutChangesToGlobalState" type="xs:boolean" default="false"/>
         <xs:attribute name="beStrictAboutOutputDuringTests" type="xs:boolean" default="false"/>
         <xs:attribute name="beStrictAboutTestsThatDoNotTestAnything" type="xs:boolean" default="true"/>
-        <xs:attribute name="beStrictAboutTodoAnnotatedTests" type="xs:boolean" default="false"/>
         <xs:attribute name="beStrictAboutCoverageMetadata" type="xs:boolean" default="false"/>
         <xs:attribute name="defaultTimeLimit" type="xs:integer" default="0"/>
         <xs:attribute name="enforceTimeLimit" type="xs:boolean" default="false"/>

diff --git a/src/TextUI/Configuration/Xml/Migration/MigrationBuilder.php b/src/TextUI/Configuration/Xml/Migration/MigrationBuilder.php
@@ -67,6 +67,10 @@
             MoveCoverageDirectoriesToSource::class,
         ],
 
+        '10.4' => [
+            RemoveBeStrictAboutTodoAnnotatedTestsAttribute::class,
+        ],
+
         '10.5' => [
             RemoveRegisterMockObjectsFromTestArgumentsRecursivelyAttribute::class,
         ],
@@ -80,6 +84,10 @@
             RemoveCoverageElementCacheDirectoryAttribute::class,
         ],
 
+        '11.2' => [
+            RemoveBeStrictAboutTodoAnnotatedTestsAttribute::class,
+        ],
+
         '11.4' => [
             RemoveCoverageElementIncludeUncoveredFilesAttribute::class,
         ],

diff --git a/.../XmlConfigurationMigration/input-5859.xml → ...nfigurationMigration/input-issue-5859.xml b/.../XmlConfigurationMigration/input-5859.xml → ...nfigurationMigration/input-issue-5859.xml
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/11.1/phpunit.xsd"
+         beStrictAboutTodoAnnotatedTests="true"
+>
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/...XmlConfigurationMigration/output-5859.xml → ...figurationMigration/output-issue-5859.xml b/...XmlConfigurationMigration/output-5859.xml → ...figurationMigration/output-issue-5859.xml
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/12.0/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
@@ -9,63 +9,44 @@
  */
 namespace PHPUnit\TextUI\XmlConfiguration;
 
-use PHPUnit\Framework\Attributes\TestDox;
-use PHPUnit\Framework\Attributes\Ticket;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Util\Xml\Loader as XmlLoader;
 
 final class MigratorTest extends TestCase
 {
-    #[TestDox('Can migrate PHPUnit 9.2 configuration')]
-    public function testCanMigratePhpUnit92Configuration(): void
+    public static function provider(): array
     {
-        $this->assertEquals(
-            (new XmlLoader)->loadFile(__DIR__ . '/../../../../_files/XmlConfigurationMigration/output-9.2.xml'),
-            (new XmlLoader)->load(
-                (new Migrator)->migrate(
-                    __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-9.2.xml',
-                ),
-            ),
-        );
-    }
-
-    #[TestDox('Can migrate PHPUnit 9.5 configuration')]
-    public function testCanMigratePhpUnit95Configuration(): void
-    {
-        $this->assertEquals(
-            (new XmlLoader)->loadFile(__DIR__ . '/../../../../_files/XmlConfigurationMigration/output-9.5.xml'),
-            (new XmlLoader)->load(
-                (new Migrator)->migrate(
-                    __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-9.5.xml',
-                ),
-            ),
-        );
-    }
-
-    #[TestDox('Remove cacheDirectory attribute from <coverage> element when migrating from PHPUnit 11.1 to PHPUnit 11.2')]
-    #[Ticket('https://github.com/sebastianbergmann/phpunit/issues/5859')]
-    public function testIssue5859(): void
-    {
-        $this->assertEquals(
-            (new XmlLoader)->loadFile(__DIR__ . '/../../../../_files/XmlConfigurationMigration/output-5859.xml'),
-            (new XmlLoader)->load(
-                (new Migrator)->migrate(
-                    __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-5859.xml',
-                ),
-            ),
-        );
+        return [
+            'PHPUnit 9.2' => [
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/output-9.2.xml',
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-9.2.xml',
+            ],
+            'PHPUnit 9.5' => [
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/output-9.5.xml',
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-9.5.xml',
+            ],
+            'Relative Path' => [
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/output-relative-schema-path.xml',
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-relative-schema-path.xml',
+            ],
+            'Issue 5859' => [
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/output-issue-5859.xml',
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-issue-5859.xml',
+            ],
+            'Issue 6087' => [
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/output-issue-6087.xml',
+                __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-issue-6087.xml',
+            ],
+        ];
     }
 
-    #[TestDox('Keep relative schema path when present')]
-    public function testKeepRelativeSchema(): void
+    #[DataProvider('provider')]
+    public function testCanMigrateConfigurationFileThatValidatesAgainstPreviousSchema(string $output, string $input): void
     {
         $this->assertEquals(
-            (new XmlLoader)->loadFile(__DIR__ . '/../../../../_files/XmlConfigurationMigration/output-relative-schema-path.xml'),
-            (new XmlLoader)->load(
-                (new Migrator)->migrate(
-                    __DIR__ . '/../../../../_files/XmlConfigurationMigration/input-relative-schema-path.xml',
-                ),
-            ),
+            (new XmlLoader)->loadFile($output),
+            (new XmlLoader)->load((new Migrator)->migrate($input)),
         );
     }
 }