[Toolkit] Drop Symfony PHPUnit Bridge in favor of PHPUnit >= 11.0

Kocal · Kocal · commit 0d895677ab9b · 2025-11-19T09:28:32.000+01:00
diff --git a/src/Toolkit/.gitignore b/src/Toolkit/.gitignore
@@ -1,7 +1,8 @@
-vendor
-composer.lock
-.phpunit.result.cache
-var
-.twig-cs-fixer.cache
-tests/ui/output
-tests/ui/screens
+/vendor/
+/composer.lock
+/phpunit.xml
+/.phpunit.cache
+/.twig-cs-fixer.cache
+
+/var
+/config/reference.php
diff --git a/src/Toolkit/composer.json b/src/Toolkit/composer.json
@@ -46,10 +46,9 @@
         "zenstruck/console-test": "^1.7",
         "symfony/http-client": "^6.4|^7.0|^8.0",
         "symfony/stopwatch": "^6.4|^7.0|^8.0",
-        "symfony/phpunit-bridge": "^7.2|^8.0",
+        "phpunit/phpunit": "^11.1|^12.0",
         "vincentlanglet/twig-cs-fixer": "^3.9",
-        "spatie/phpunit-snapshot-assertions": "^4.2.17|^5.2.3",
-        "phpunit/phpunit": "^9.6.22",
+        "spatie/phpunit-snapshot-assertions": "^5.2.3",
         "symfony/ux-icons": "^2.18",
         "tales-from-a-dev/twig-tailwind-extra": "^0.4.0"
     },
diff --git a/src/Toolkit/phpunit.dist.xml b/src/Toolkit/phpunit.dist.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
+<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="vendor/bin/.phpunit/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
         colors="true"
         bootstrap="tests/bootstrap.php"
+        failOnDeprecation="true"
         failOnRisky="true"
         failOnWarning="true"
+        cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="error_reporting" value="-1"/>
@@ -21,13 +23,18 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source
+            ignoreSuppressionOfDeprecations="true"
+            ignoreIndirectDeprecations="true"
+            restrictNotices="true"
+            restrictWarnings="true"
+    >
         <include>
-            <directory>./src</directory>
+            <directory>src</directory>
         </include>
-    </coverage>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
+        <deprecationTrigger>
+            <function>trigger_deprecation</function>
+        </deprecationTrigger>
+    </source>
 </phpunit>
diff --git a/src/Toolkit/tests/AssertTest.php b/src/Toolkit/tests/AssertTest.php
@@ -11,14 +11,13 @@
 
 namespace Symfony\UX\Toolkit\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\UX\Toolkit\Assert;
 
 class AssertTest extends TestCase
 {
-    /**
-     * @dataProvider provideValidKitNames
-     */
+    #[DataProvider('provideValidKitNames')]
     public function testValidKitName(string $name)
     {
         $this->expectNotToPerformAssertions();
@@ -50,9 +49,7 @@ public static function provideValidKitNames(): \Generator
         yield ['my_kit'];
     }
 
-    /**
-     * @dataProvider provideInvalidKitNames
-     */
+    #[DataProvider('provideInvalidKitNames')]
     public function testInvalidKitName(string $name)
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -82,9 +79,7 @@ public static function provideInvalidKitNames(): \Generator
         yield ['.abc'];
     }
 
-    /**
-     * @dataProvider provideValidComponentNames
-     */
+    #[DataProvider('provideValidComponentNames')]
     public function testValidComponentName(string $name)
     {
         $this->expectNotToPerformAssertions();
@@ -106,9 +101,7 @@ public static function provideValidComponentNames(): iterable
         yield ['Component123:Sub456'];
     }
 
-    /**
-     * @dataProvider provideInvalidComponentNames
-     */
+    #[DataProvider('provideInvalidComponentNames')]
     public function testInvalidComponentName(string $name)
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -143,9 +136,7 @@ public static function provideInvalidComponentNames(): iterable
         yield ['123:456'];
     }
 
-    /**
-     * @dataProvider provideValidPhpPackageNames
-     */
+    #[DataProvider('provideValidPhpPackageNames')]
     public function testValidPhpPackageName(string $name)
     {
         $this->expectNotToPerformAssertions();
@@ -159,9 +150,7 @@ public static function provideValidPhpPackageNames(): iterable
         yield ['tales-from-a-dev/twig-tailwind-extra'];
     }
 
-    /**
-     * @dataProvider provideInvalidPhpPackageNames
-     */
+    #[DataProvider('provideInvalidPhpPackageNames')]
     public function testInvalidPhpPackageName(string $name)
     {
         $this->expectException(\InvalidArgumentException::class);
@@ -178,9 +167,7 @@ public static function provideInvalidPhpPackageNames(): iterable
         yield ['twig/html-extra/twig'];
     }
 
-    /**
-     * @dataProvider provideValidNpmPackageNames
-     */
+    #[DataProvider('provideValidNpmPackageNames')]
     public function testValidNpmPackageName(string $name)
     {
         $this->expectNotToPerformAssertions();
@@ -202,9 +189,7 @@ public static function provideValidNpmPackageNames(): iterable
         yield ['~foo'];
     }
 
-    /**
-     * @dataProvider provideInvalidNpmPackageNames
-     */
+    #[DataProvider('provideInvalidNpmPackageNames')]
     public function testInvalidNpmPackageName(string $name)
     {
         $this->expectException(\InvalidArgumentException::class);
diff --git a/src/Toolkit/tests/Functional/ComponentsRenderingTest.php b/src/Toolkit/tests/Functional/ComponentsRenderingTest.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\UX\Toolkit\Tests\Functional;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
 use Spatie\Snapshots\Drivers\HtmlDriver;
 use Spatie\Snapshots\MatchesSnapshots;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
@@ -60,11 +62,8 @@ public static function provideTestComponentRendering(): iterable
         }
     }
 
-    /**
-     * @dataProvider provideTestComponentRendering
-     *
-     * @group skip-on-lowest
-     */
+    #[DataProvider('provideTestComponentRendering')]
+    #[Group('skip-on-lowest')]
     public function testComponentRendering(string $kitName, string $recipeName, string $code)
     {
         $twig = self::getContainer()->get('twig');
diff --git a/src/Toolkit/tests/Registry/RegistryFactoryTest.php b/src/Toolkit/tests/Registry/RegistryFactoryTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\UX\Toolkit\Tests\Registry;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\UX\Toolkit\Registry\GitHubRegistry;
 use Symfony\UX\Toolkit\Registry\LocalRegistry;
@@ -31,9 +32,7 @@ public static function provideRegistryNames(): array
         ];
     }
 
-    /**
-     * @dataProvider provideRegistryNames
-     */
+    #[DataProvider('provideRegistryNames')]
     public function testCanCreateRegistry(string $registryName, string $expectedRegistryClass)
     {
         $registryFactory = self::getContainer()->get('ux_toolkit.registry.registry_factory');
@@ -53,9 +52,7 @@ public static function provideInvalidRegistryNames(): array
         ];
     }
 
-    /**
-     * @dataProvider provideInvalidRegistryNames
-     */
+    #[DataProvider('provideInvalidRegistryNames')]
     public function testShouldFailIfRegistryIsNotFound(string $registryName)
     {
         $registryFactory = self::getContainer()->get('ux_toolkit.registry.registry_factory');

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,13 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\UX\Toolkit\Tests;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`14`	`15`	`use PHPUnit\Framework\TestCase;`
`15`	`16`	`use Symfony\UX\Toolkit\Assert;`
`16`	`17`
`17`	`18`	`class AssertTest extends TestCase`
`18`	`19`	`{`
`19`		`- /**`
`20`		`- * @dataProvider provideValidKitNames`
`21`		`- */`
	`20`	`+ #[DataProvider('provideValidKitNames')]`
`22`	`21`	`public function testValidKitName(string $name)`
`23`	`22`	`{`
`24`	`23`	`$this->expectNotToPerformAssertions();`
`@@ -50,9 +49,7 @@ public static function provideValidKitNames(): \Generator`
`50`	`49`	`yield ['my_kit'];`
`51`	`50`	`}`
`52`	`51`
`53`		`- /**`
`54`		`- * @dataProvider provideInvalidKitNames`
`55`		`- */`
	`52`	`+ #[DataProvider('provideInvalidKitNames')]`
`56`	`53`	`public function testInvalidKitName(string $name)`
`57`	`54`	`{`
`58`	`55`	`$this->expectException(\InvalidArgumentException::class);`
`@@ -82,9 +79,7 @@ public static function provideInvalidKitNames(): \Generator`
`82`	`79`	`yield ['.abc'];`
`83`	`80`	`}`
`84`	`81`
`85`		`- /**`
`86`		`- * @dataProvider provideValidComponentNames`
`87`		`- */`
	`82`	`+ #[DataProvider('provideValidComponentNames')]`
`88`	`83`	`public function testValidComponentName(string $name)`
`89`	`84`	`{`
`90`	`85`	`$this->expectNotToPerformAssertions();`
`@@ -106,9 +101,7 @@ public static function provideValidComponentNames(): iterable`
`106`	`101`	`yield ['Component123:Sub456'];`
`107`	`102`	`}`
`108`	`103`
`109`		`- /**`
`110`		`- * @dataProvider provideInvalidComponentNames`
`111`		`- */`
	`104`	`+ #[DataProvider('provideInvalidComponentNames')]`
`112`	`105`	`public function testInvalidComponentName(string $name)`
`113`	`106`	`{`
`114`	`107`	`$this->expectException(\InvalidArgumentException::class);`
`@@ -143,9 +136,7 @@ public static function provideInvalidComponentNames(): iterable`
`143`	`136`	`yield ['123:456'];`
`144`	`137`	`}`
`145`	`138`
`146`		`- /**`
`147`		`- * @dataProvider provideValidPhpPackageNames`
`148`		`- */`
	`139`	`+ #[DataProvider('provideValidPhpPackageNames')]`
`149`	`140`	`public function testValidPhpPackageName(string $name)`
`150`	`141`	`{`
`151`	`142`	`$this->expectNotToPerformAssertions();`
`@@ -159,9 +150,7 @@ public static function provideValidPhpPackageNames(): iterable`
`159`	`150`	`yield ['tales-from-a-dev/twig-tailwind-extra'];`
`160`	`151`	`}`
`161`	`152`
`162`		`- /**`
`163`		`- * @dataProvider provideInvalidPhpPackageNames`
`164`		`- */`
	`153`	`+ #[DataProvider('provideInvalidPhpPackageNames')]`
`165`	`154`	`public function testInvalidPhpPackageName(string $name)`
`166`	`155`	`{`
`167`	`156`	`$this->expectException(\InvalidArgumentException::class);`
`@@ -178,9 +167,7 @@ public static function provideInvalidPhpPackageNames(): iterable`
`178`	`167`	`yield ['twig/html-extra/twig'];`
`179`	`168`	`}`
`180`	`169`
`181`		`- /**`
`182`		`- * @dataProvider provideValidNpmPackageNames`
`183`		`- */`
	`170`	`+ #[DataProvider('provideValidNpmPackageNames')]`
`184`	`171`	`public function testValidNpmPackageName(string $name)`
`185`	`172`	`{`
`186`	`173`	`$this->expectNotToPerformAssertions();`
`@@ -202,9 +189,7 @@ public static function provideValidNpmPackageNames(): iterable`
`202`	`189`	`yield ['~foo'];`
`203`	`190`	`}`
`204`	`191`
`205`		`- /**`
`206`		`- * @dataProvider provideInvalidNpmPackageNames`
`207`		`- */`
	`192`	`+ #[DataProvider('provideInvalidNpmPackageNames')]`
`208`	`193`	`public function testInvalidNpmPackageName(string $name)`
`209`	`194`	`{`
`210`	`195`	`$this->expectException(\InvalidArgumentException::class);`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\UX\Toolkit\Tests\Functional;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\Attributes\DataProvider;`
	`15`	`+use PHPUnit\Framework\Attributes\Group;`
`14`	`16`	`use Spatie\Snapshots\Drivers\HtmlDriver;`
`15`	`17`	`use Spatie\Snapshots\MatchesSnapshots;`
`16`	`18`	`use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;`
`@@ -60,11 +62,8 @@ public static function provideTestComponentRendering(): iterable`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`
`63`		`- /**`
`64`		`- * @dataProvider provideTestComponentRendering`
`65`		`- *`
`66`		`- * @group skip-on-lowest`
`67`		`- */`
	`65`	`+ #[DataProvider('provideTestComponentRendering')]`
	`66`	`+ #[Group('skip-on-lowest')]`
`68`	`67`	`public function testComponentRendering(string $kitName, string $recipeName, string $code)`
`69`	`68`	`{`
`70`	`69`	`$twig = self::getContainer()->get('twig');`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\UX\Toolkit\Tests\Registry;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\Attributes\DataProvider;`
`14`	`15`	`use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;`
`15`	`16`	`use Symfony\UX\Toolkit\Registry\GitHubRegistry;`
`16`	`17`	`use Symfony\UX\Toolkit\Registry\LocalRegistry;`
`@@ -31,9 +32,7 @@ public static function provideRegistryNames(): array`
`31`	`32`	`];`
`32`	`33`	`}`
`33`	`34`
`34`		`- /**`
`35`		`- * @dataProvider provideRegistryNames`
`36`		`- */`
	`35`	`+ #[DataProvider('provideRegistryNames')]`
`37`	`36`	`public function testCanCreateRegistry(string $registryName, string $expectedRegistryClass)`
`38`	`37`	`{`
`39`	`38`	`$registryFactory = self::getContainer()->get('ux_toolkit.registry.registry_factory');`
`@@ -53,9 +52,7 @@ public static function provideInvalidRegistryNames(): array`
`53`	`52`	`];`
`54`	`53`	`}`
`55`	`54`
`56`		`- /**`
`57`		`- * @dataProvider provideInvalidRegistryNames`
`58`		`- */`
	`55`	`+ #[DataProvider('provideInvalidRegistryNames')]`
`59`	`56`	`public function testShouldFailIfRegistryIsNotFound(string $registryName)`
`60`	`57`	`{`
`61`	`58`	`$registryFactory = self::getContainer()->get('ux_toolkit.registry.registry_factory');`