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

Kocal · Kocal · commit 0b6a1a6ef16a · 2025-11-19T09:28:32.000+01:00
diff --git a/src/Map/.gitignore b/src/Map/.gitignore
@@ -1,3 +1,5 @@
-vendor
-composer.lock
-.phpunit.result.cache
+/assets/node_modules/
+/vendor/
+/composer.lock
+/phpunit.xml
+/.phpunit.cache
diff --git a/src/Map/composer.json b/src/Map/composer.json
@@ -38,12 +38,11 @@
     "require-dev": {
         "symfony/asset-mapper": "^6.4|^7.0|^8.0",
         "symfony/framework-bundle": "^6.4|^7.0|^8.0",
-        "symfony/phpunit-bridge": "^7.2|^8.0",
+        "phpunit/phpunit": "^11.1|^12.0",
         "symfony/twig-bundle": "^6.4|^7.0|^8.0",
         "symfony/ux-twig-component": "^2.18|^8.0",
         "symfony/ux-icons": "^2.18",
-        "spatie/phpunit-snapshot-assertions": "^4.2.17|^5.2.3",
-        "phpunit/phpunit": "^9.6.22"
+        "spatie/phpunit-snapshot-assertions": "^5.2.3"
     },
     "conflict": {
         "symfony/ux-twig-component": "<2.21"
diff --git a/src/Map/phpunit.dist.xml b/src/Map/phpunit.dist.xml
@@ -2,11 +2,13 @@
 <!-- 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="vendor/autoload.php"
+        bootstrap="tests/bootstrap.php"
+        failOnDeprecation="true"
         failOnRisky="true"
         failOnWarning="true"
+        cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="error_reporting" value="-1"/>
@@ -20,13 +22,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/Map/src/Bridge/Google/.gitignore b/src/Map/src/Bridge/Google/.gitignore
@@ -1,3 +1,5 @@
-vendor/
-composer.lock
-phpunit.xml
+/assets/node_modules/
+/vendor/
+/composer.lock
+/phpunit.xml
+/.phpunit.cache
diff --git a/src/Map/src/Bridge/Google/composer.json b/src/Map/src/Bridge/Google/composer.json
@@ -21,10 +21,9 @@
         "symfony/ux-map": "^2.19"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^7.2|^8.0",
+        "phpunit/phpunit": "^11.1|^12.0",
         "symfony/ux-icons": "^2.18",
-        "spatie/phpunit-snapshot-assertions": "^4.2.17|^5.2.3",
-        "phpunit/phpunit": "^9.6.22"
+        "spatie/phpunit-snapshot-assertions": "^5.2.3"
     },
     "autoload": {
         "psr-4": { "Symfony\\UX\\Map\\Bridge\\Google\\": "src/" },
diff --git a/src/Map/src/Bridge/Google/phpunit.dist.xml b/src/Map/src/Bridge/Google/phpunit.dist.xml
@@ -2,16 +2,17 @@
 <!-- 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="vendor/autoload.php"
+        bootstrap="tests/bootstrap.php"
+        failOnDeprecation="true"
         failOnRisky="true"
         failOnWarning="true"
+        cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="error_reporting" value="-1"/>
         <env name="SHELL_VERBOSITY" value="-1"/>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0"/>
     </php>
 
     <testsuites>
@@ -20,13 +21,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/Map/src/Bridge/Google/tests/bootstrap.php b/src/Map/src/Bridge/Google/tests/bootstrap.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Component\ErrorHandler\ErrorHandler;
+
+require __DIR__.'/../vendor/autoload.php';
+
+// @see https://github.com/symfony/symfony/issues/53812
+ErrorHandler::register(null, false);
diff --git a/src/Map/src/Bridge/Leaflet/.gitignore b/src/Map/src/Bridge/Leaflet/.gitignore
@@ -1,3 +1,5 @@
-vendor/
-composer.lock
-phpunit.xml
+/assets/node_modules/
+/vendor/
+/composer.lock
+/phpunit.xml
+/.phpunit.cache
diff --git a/src/Map/src/Bridge/Leaflet/composer.json b/src/Map/src/Bridge/Leaflet/composer.json
@@ -21,10 +21,9 @@
         "symfony/ux-map": "^2.19"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^7.2|^8.0",
+        "phpunit/phpunit": "^11.1|^12.0",
         "symfony/ux-icons": "^2.18",
-        "spatie/phpunit-snapshot-assertions": "^4.2.17|^5.2.3",
-        "phpunit/phpunit": "^9.6.22"
+        "spatie/phpunit-snapshot-assertions": "^5.2.3"
     },
     "autoload": {
         "psr-4": { "Symfony\\UX\\Map\\Bridge\\Leaflet\\": "src/" },
diff --git a/src/Map/src/Bridge/Leaflet/phpunit.dist.xml b/src/Map/src/Bridge/Leaflet/phpunit.dist.xml
@@ -2,16 +2,17 @@
 <!-- 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="vendor/autoload.php"
+        bootstrap="tests/bootstrap.php"
+        failOnDeprecation="true"
         failOnRisky="true"
         failOnWarning="true"
+        cacheDirectory=".phpunit.cache"
 >
     <php>
         <ini name="error_reporting" value="-1"/>
         <env name="SHELL_VERBOSITY" value="-1"/>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0"/>
     </php>
 
     <testsuites>
@@ -20,13 +21,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/Map/src/Bridge/Leaflet/tests/bootstrap.php b/src/Map/src/Bridge/Leaflet/tests/bootstrap.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Component\ErrorHandler\ErrorHandler;
+
+require __DIR__.'/../vendor/autoload.php';
+
+// @see https://github.com/symfony/symfony/issues/53812
+ErrorHandler::register(null, false);
diff --git a/src/Map/tests/Cluster/ClusteringPerformanceTest.php b/src/Map/tests/Cluster/ClusteringPerformanceTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\UX\Map\Tests\Cluster;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\UX\Map\Cluster\ClusteringAlgorithmInterface;
 use Symfony\UX\Map\Cluster\GridClusteringAlgorithm;
@@ -50,9 +51,8 @@ public static function algorithmProvider(): iterable
 
     /**
      * Scenario 1: Large number of points (50,000), concentrated area (Paris region).
-     *
-     * @dataProvider algorithmProvider
      */
+    #[DataProvider('algorithmProvider')]
     public function testScenarioRegion50000(ClusteringAlgorithmInterface $algorithm, float $zoom)
     {
         $points = $this->generatePoints(50000, 48.8, 49, 2.2, 2.5);
@@ -62,9 +62,8 @@ public function testScenarioRegion50000(ClusteringAlgorithmInterface $algorithm,
 
     /**
      * Scenario 2: Moderate number of points (5,000), broad area (France and surroundings).
-     *
-     * @dataProvider algorithmProvider
      */
+    #[DataProvider('algorithmProvider')]
     public function testScenarioCountry5000(ClusteringAlgorithmInterface $algorithm, float $zoom)
     {
         $points = $this->generatePoints(5000, 30, 60, -10, 35);
@@ -74,9 +73,8 @@ public function testScenarioCountry5000(ClusteringAlgorithmInterface $algorithm,
 
     /**
      * Scenario 3: Very large number of points (100,000), global distribution.
-     *
-     * @dataProvider algorithmProvider
      */
+    #[DataProvider('algorithmProvider')]
     public function testScenarioWorld100000(ClusteringAlgorithmInterface $algorithm, float $zoom)
     {
         $points = $this->generatePoints(100000, -90, 90, -180, 180);
diff --git a/src/Map/tests/Distance/DistanceCalculatorTest.php b/src/Map/tests/Distance/DistanceCalculatorTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\UX\Map\Tests\Distance;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\UX\Map\Distance\DistanceCalculator;
 use Symfony\UX\Map\Distance\DistanceCalculatorInterface;
@@ -38,9 +39,8 @@ public function calculateDistance(Point $point1, Point $point2): float
     /**
      * Test that the non-reference calculators (Haversine and Spherical Cosine)
      * produce results close to the reference (Vincenty) within an acceptable margin.
-     *
-     * @dataProvider distanceAccuracyProvider
      */
+    #[DataProvider('distanceAccuracyProvider')]
     public function testAccuracyAgainstVincenty(Point $point1, Point $point2, float $tolerance)
     {
         $vincenty = new VincentyDistanceCalculator();
diff --git a/src/Map/tests/Distance/DistanceUnitTest.php b/src/Map/tests/Distance/DistanceUnitTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\UX\Map\Tests\Distance;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\UX\Map\Distance\DistanceUnit;
 
@@ -30,9 +31,7 @@ public function testConversionFactorToMeterIsSameAsConversionFactor()
         }
     }
 
-    /**
-     * @dataProvider provideConvertedUnits
-     */
+    #[DataProvider('provideConvertedUnits')]
     public function testConversionFactorFrom(DistanceUnit $unit, DistanceUnit $otherUnit, float $expected)
     {
         $this->assertEqualsWithDelta($expected, $unit->getConversionFactorFrom($otherUnit), 0.001);
diff --git a/src/Map/tests/IconTest.php b/src/Map/tests/IconTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\UX\Map\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\UX\Map\Icon\Icon;
 use Symfony\UX\Map\Icon\SvgIcon;
@@ -39,26 +40,21 @@ public static function provideIcons(): iterable
     }
 
     /**
-     * @dataProvider provideIcons
-     *
      * @param class-string<Icon> $expectedInstance
      */
+    #[DataProvider('provideIcons')]
     public function testIconConstruction(Icon $icon, string $expectedInstance, array $expectedToArray)
     {
         self::assertInstanceOf($expectedInstance, $icon);
     }
 
-    /**
-     * @dataProvider provideIcons
-     */
+    #[DataProvider('provideIcons')]
     public function testToArray(Icon $icon, string $expectedInstance, array $expectedToArray)
     {
         self::assertSame($expectedToArray, $icon->toArray());
     }
 
-    /**
-     * @dataProvider provideIcons
-     */
+    #[DataProvider('provideIcons')]
     public function testFromArray(Icon $icon, string $expectedInstance, array $expectedToArray)
     {
         self::assertEquals($icon, Icon::fromArray($expectedToArray));
@@ -84,9 +80,7 @@ public static function dataProviderForTestSvgIconCustomizationMethodsCanNotBeCal
         }
     }
 
-    /**
-     * @dataProvider dataProviderForTestSvgIconCustomizationMethodsCanNotBeCalled
-     */
+    #[DataProvider('dataProviderForTestSvgIconCustomizationMethodsCanNotBeCalled')]
     public function testSvgIconCustomizationMethodsCanNotBeCalled(string $method, mixed ...$args)
     {
         $this->expectException(\LogicException::class);
diff --git a/src/Map/tests/MapTest.php b/src/Map/tests/MapTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\UX\Map\Tests;
 
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 use Symfony\UX\Map\Circle;
 use Symfony\UX\Map\Exception\InvalidArgumentException;
@@ -408,14 +409,12 @@ public function testWithMaximumConfiguration()
         ], $map->toArray());
     }
 
-    /**
-     * @testWith [-1, null, null, "The \"minZoom\" must be greater than or equal to 0."]
-     *           [null, -1, null, "The \"zoom\" must be greater than or equal to 0."]
-     *           [null, null, -1, "The \"maxZoom\" must be greater than or equal to 0."]
-     *           [5, 2, null, "The \"zoom\" must be greater than or equal to \"minZoom\"."]
-     *           [null, 5, 2, "The \"zoom\" must be less than or equal to \"maxZoom\"."]
-     *           [2.1, null, 2.0, "The \"minZoom\" must be less than or equal to \"maxZoom\"."]
-     */
+    #[TestWith([-1.0, null, null, 'The "minZoom" must be greater than or equal to 0.'])]
+    #[TestWith([null, -1.0, null, 'The "zoom" must be greater than or equal to 0.'])]
+    #[TestWith([null, null, -1.0, 'The "maxZoom" must be greater than or equal to 0.'])]
+    #[TestWith([5.0, 2.0, null, 'The "zoom" must be greater than or equal to "minZoom".'])]
+    #[TestWith([null, 5.0, 2.0, 'The "zoom" must be less than or equal to "maxZoom".'])]
+    #[TestWith([2.1, null, 2.0, 'The "minZoom" must be less than or equal to "maxZoom".'])]
     public function testZoomsValidation(?float $minZoom, ?float $zoom, ?float $maxZoom, string $expectedExceptionMessage)
     {
         self::expectException(InvalidArgumentException::class);
diff --git a/src/Map/tests/PointTest.php b/src/Map/tests/PointTest.php
diff --git a/src/Map/tests/Renderer/DsnTest.php b/src/Map/tests/Renderer/DsnTest.php
diff --git a/src/Map/tests/Renderer/NullRendererTest.php b/src/Map/tests/Renderer/NullRendererTest.php
diff --git a/src/Map/tests/Twig/MapExtensionTest.php b/src/Map/tests/Twig/MapExtensionTest.php
diff --git a/src/Map/tests/UXMapBundleTest.php b/src/Map/tests/UXMapBundleTest.php
diff --git a/src/Map/tests/bootstrap.php b/src/Map/tests/bootstrap.php
