diff --git a/src/Map/doc/index.rst b/src/Map/doc/index.rst
index 9ce87597f5c..c60cca8b592 100644
--- a/src/Map/doc/index.rst
+++ b/src/Map/doc/index.rst
@@ -47,9 +47,9 @@ Available renderers
========== ===============================================================
Renderer
========== ===============================================================
-`Google`_ **Install**: ``composer require symfony/ux-map-google`` \
+`Google`_ **Install**: ``composer require symfony/ux-google-map`` \
**DSN**: ``UX_MAP_DSN=google://GOOGLE_MAPS_API_KEY@default`` \
-`Leaflet`_ **Install**: ``composer require symfony/ux-map-leaflet`` \
+`Leaflet`_ **Install**: ``composer require symfony/ux-leaflet-map`` \
**DSN**: ``UX_MAP_DSN=leaflet://default`` \
========== ===============================================================
diff --git a/src/Map/src/Bridge/Google/assets/package.json b/src/Map/src/Bridge/Google/assets/package.json
index b189b4ff99e..28004e0ef73 100644
--- a/src/Map/src/Bridge/Google/assets/package.json
+++ b/src/Map/src/Bridge/Google/assets/package.json
@@ -1,5 +1,5 @@
{
- "name": "@symfony/ux-map-google",
+ "name": "@symfony/ux-google-map",
"description": "GoogleMaps bridge for Symfony UX Map, integrate interactive maps in your Symfony applications",
"license": "MIT",
"version": "1.0.0",
@@ -18,7 +18,7 @@
"importmap": {
"@hotwired/stimulus": "^3.0.0",
"@googlemaps/js-api-loader": "^1.16.6",
- "@symfony/ux-map-google/map-controller": "path:%PACKAGE%/dist/map_controller.js"
+ "@symfony/ux-google-map/map-controller": "path:%PACKAGE%/dist/map_controller.js"
}
},
"peerDependencies": {
diff --git a/src/Map/src/Bridge/Google/composer.json b/src/Map/src/Bridge/Google/composer.json
index 5e8ea160507..21a6a464097 100644
--- a/src/Map/src/Bridge/Google/composer.json
+++ b/src/Map/src/Bridge/Google/composer.json
@@ -1,5 +1,5 @@
{
- "name": "symfony/ux-map-google",
+ "name": "symfony/ux-google-map",
"type": "symfony-ux-map-bridge",
"description": "Symfony UX Map GoogleMaps Bridge",
"keywords": ["google-maps", "map", "symfony", "ux"],
diff --git a/src/Map/src/Bridge/Google/tests/GoogleRendererTest.php b/src/Map/src/Bridge/Google/tests/GoogleRendererTest.php
index 7536992450a..6e6fb76aab6 100644
--- a/src/Map/src/Bridge/Google/tests/GoogleRendererTest.php
+++ b/src/Map/src/Bridge/Google/tests/GoogleRendererTest.php
@@ -29,19 +29,19 @@ public function provideTestRenderMap(): iterable
->zoom(12);
yield 'simple map, with minimum options' => [
- 'expected_render' => '',
+ 'expected_render' => '',
'renderer' => new GoogleRenderer(new StimulusHelper(null), apiKey: 'api_key'),
'map' => $map,
];
yield 'with every options' => [
- 'expected_render' => '',
+ 'expected_render' => '',
'renderer' => new GoogleRenderer(new StimulusHelper(null), apiKey: 'api_key', id: 'gmap', language: 'fr', region: 'FR', nonce: 'abcd', retries: 10, url: 'https://maps.googleapis.com/maps/api/js', version: 'quarterly'),
'map' => $map,
];
yield 'with markers and infoWindows' => [
- 'expected_render' => '',
+ 'expected_render' => '',
'renderer' => new GoogleRenderer(new StimulusHelper(null), apiKey: 'api_key'),
'map' => (clone $map)
->addMarker(new Marker(new Point(48.8566, 2.3522), 'Paris'))
@@ -49,7 +49,7 @@ public function provideTestRenderMap(): iterable
];
yield 'with controls enabled' => [
- 'expected_render' => '',
+ 'expected_render' => '',
'renderer' => new GoogleRenderer(new StimulusHelper(null), apiKey: 'api_key'),
'map' => (clone $map)
->options(new GoogleOptions(
@@ -61,7 +61,7 @@ public function provideTestRenderMap(): iterable
];
yield 'without controls enabled' => [
- 'expected_render' => '',
+ 'expected_render' => '',
'renderer' => new GoogleRenderer(new StimulusHelper(null), apiKey: 'api_key'),
'map' => (clone $map)
->options(new GoogleOptions(
diff --git a/src/Map/src/Bridge/Leaflet/assets/package.json b/src/Map/src/Bridge/Leaflet/assets/package.json
index bba9cadb343..97d1014e125 100644
--- a/src/Map/src/Bridge/Leaflet/assets/package.json
+++ b/src/Map/src/Bridge/Leaflet/assets/package.json
@@ -1,5 +1,5 @@
{
- "name": "@symfony/ux-map-leaflet",
+ "name": "@symfony/ux-leaflet-map",
"description": "Leaflet bridge for Symfony UX Map, integrate interactive maps in your Symfony applications",
"license": "MIT",
"version": "1.0.0",
@@ -18,7 +18,7 @@
"importmap": {
"@hotwired/stimulus": "^3.0.0",
"leaflet": "^1.9.4",
- "@symfony/ux-map-leaflet/map-controller": "path:%PACKAGE%/dist/map_controller.js"
+ "@symfony/ux-leaflet-map/map-controller": "path:%PACKAGE%/dist/map_controller.js"
}
},
"peerDependencies": {
diff --git a/src/Map/src/Bridge/Leaflet/composer.json b/src/Map/src/Bridge/Leaflet/composer.json
index ba26827ebea..a6d916b4d45 100644
--- a/src/Map/src/Bridge/Leaflet/composer.json
+++ b/src/Map/src/Bridge/Leaflet/composer.json
@@ -1,5 +1,5 @@
{
- "name": "symfony/ux-map-leaflet",
+ "name": "symfony/ux-leaflet-map",
"type": "symfony-ux-map-bridge",
"description": "Symfony UX Map Leaflet Bridge",
"keywords": ["leaflet", "map", "symfony", "ux"],
diff --git a/src/Map/src/Bridge/Leaflet/tests/LeafletRendererTest.php b/src/Map/src/Bridge/Leaflet/tests/LeafletRendererTest.php
index d2491618a63..6730d2904cb 100644
--- a/src/Map/src/Bridge/Leaflet/tests/LeafletRendererTest.php
+++ b/src/Map/src/Bridge/Leaflet/tests/LeafletRendererTest.php
@@ -28,13 +28,13 @@ public function provideTestRenderMap(): iterable
->zoom(12);
yield 'simple map' => [
- 'expected_render' => '',
+ 'expected_render' => '',
'renderer' => new LeafletRenderer(new StimulusHelper(null)),
'map' => $map,
];
yield 'with markers and infoWindows' => [
- 'expected_render' => '',
+ 'expected_render' => '',
'renderer' => new LeafletRenderer(new StimulusHelper(null)),
'map' => (clone $map)
->addMarker(new Marker(new Point(48.8566, 2.3522), 'Paris'))
diff --git a/src/Map/src/Exception/UnsupportedSchemeException.php b/src/Map/src/Exception/UnsupportedSchemeException.php
index cfec4fda20a..a43c179c201 100644
--- a/src/Map/src/Exception/UnsupportedSchemeException.php
+++ b/src/Map/src/Exception/UnsupportedSchemeException.php
@@ -24,7 +24,7 @@ public function __construct(Dsn $dsn, ?\Throwable $previous = null)
$provider = $dsn->getScheme();
$bridge = UXMapBundle::$bridges[$provider] ?? null;
if ($bridge && !class_exists($bridge['renderer_factory'])) {
- parent::__construct(\sprintf('Unable to render maps via "%s" as the bridge is not installed. Try running "composer require symfony/ux-map-%s".', $provider, $provider));
+ parent::__construct(\sprintf('Unable to render maps via "%s" as the bridge is not installed. Try running "composer require symfony/ux-%s-map".', $provider, $provider));
return;
}
diff --git a/src/Map/src/Renderer/AbstractRenderer.php b/src/Map/src/Renderer/AbstractRenderer.php
index df392c05d92..ca66b5d2c70 100644
--- a/src/Map/src/Renderer/AbstractRenderer.php
+++ b/src/Map/src/Renderer/AbstractRenderer.php
@@ -53,7 +53,7 @@ final public function renderMap(Map $map, array $attributes = []): string
}
$stimulusAttributes->addController(
- '@symfony/ux-map-'.$this->getName().'/map',
+ '@symfony/ux-'.$this->getName().'-map/map',
[
'provider-options' => (object) $this->getProviderOptions(),
'view' => $map->toArray(),
diff --git a/src/Map/src/UXMapBundle.php b/src/Map/src/UXMapBundle.php
index 9f7f39e940c..52ecec412b5 100644
--- a/src/Map/src/UXMapBundle.php
+++ b/src/Map/src/UXMapBundle.php
@@ -58,7 +58,7 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
if (str_starts_with($config['renderer'], 'null://')) {
$container->services()
->set('ux_map.renderer_factory.null', NullRendererFactory::class)
- ->arg(0, array_map(fn ($name) => 'symfony/ux-map-'.$name, array_keys(self::$bridges)))
+ ->arg(0, array_map(fn ($name) => 'symfony/ux-'.$name.'-map', array_keys(self::$bridges)))
->tag('ux_map.renderer_factory');
}
@@ -68,7 +68,7 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
->arg(0, $renderers);
foreach (self::$bridges as $name => $bridge) {
- if (ContainerBuilder::willBeAvailable('symfony/ux-map-'.$name, $bridge['renderer_factory'], ['symfony/ux-map'])) {
+ if (ContainerBuilder::willBeAvailable('symfony/ux-'.$name.'-map', $bridge['renderer_factory'], ['symfony/ux-map'])) {
$container->services()
->set('ux_map.renderer_factory.'.$name, $bridge['renderer_factory'])
->parent('ux_map.renderer_factory.abstract')
@@ -88,10 +88,10 @@ public function prependExtension(ContainerConfigurator $container, ContainerBuil
];
foreach (self::$bridges as $name => $bridge) {
- if (ContainerBuilder::willBeAvailable('symfony/ux-map-'.$name, $bridge['renderer_factory'], ['symfony/ux-map'])) {
+ if (ContainerBuilder::willBeAvailable('symfony/ux-'.$name.'-map', $bridge['renderer_factory'], ['symfony/ux-map'])) {
$rendererFactoryReflection = new \ReflectionClass($bridge['renderer_factory']);
$bridgePath = \dirname($rendererFactoryReflection->getFileName(), 3);
- $paths[$bridgePath.'/assets/dist'] = '@symfony/ux-map-'.$name;
+ $paths[$bridgePath.'/assets/dist'] = '@symfony/ux-'.$name.'-map';
}
}
diff --git a/src/Map/tests/Renderer/NullRendererTest.php b/src/Map/tests/Renderer/NullRendererTest.php
index d5812bc9ae7..f026c3f11ae 100644
--- a/src/Map/tests/Renderer/NullRendererTest.php
+++ b/src/Map/tests/Renderer/NullRendererTest.php
@@ -30,14 +30,14 @@ public function provideTestRenderMap(): iterable
yield 'one bridge' => [
'expected_exception_message' => 'You must install at least one bridge package to use the Symfony UX Map component.'
- .\PHP_EOL.'Try running "composer require symfony/ux-map-leaflet".',
- 'renderer' => new NullRenderer(['symfony/ux-map-leaflet']),
+ .\PHP_EOL.'Try running "composer require symfony/ux-leaflet-map".',
+ 'renderer' => new NullRenderer(['symfony/ux-leaflet-map']),
];
yield 'two bridges' => [
'expected_exception_message' => 'You must install at least one bridge package to use the Symfony UX Map component.'
- .\PHP_EOL.'Try running "composer require symfony/ux-map-leaflet" or "composer require symfony/ux-map-google".',
- 'renderer' => new NullRenderer(['symfony/ux-map-leaflet', 'symfony/ux-map-google']),
+ .\PHP_EOL.'Try running "composer require symfony/ux-leaflet-map" or "composer require symfony/ux-google-map".',
+ 'renderer' => new NullRenderer(['symfony/ux-leaflet-map', 'symfony/ux-google-map']),
];
}
diff --git a/src/Map/tests/Renderer/RenderersTest.php b/src/Map/tests/Renderer/RenderersTest.php
index cc19ac9984b..845828761f9 100644
--- a/src/Map/tests/Renderer/RenderersTest.php
+++ b/src/Map/tests/Renderer/RenderersTest.php
@@ -32,11 +32,11 @@ public function testConstructWithoutRenderers(): void
public function testRenderMapWithDefaultRenderer(): void
{
$defaultRenderer = $this->createMock(RendererInterface::class);
- $defaultRenderer->expects(self::once())->method('renderMap')->willReturn('');
+ $defaultRenderer->expects(self::once())->method('renderMap')->willReturn('');
$renderers = new Renderers(['default' => $defaultRenderer]);
- self::assertSame('', $renderers->renderMap(new Map()));
+ self::assertSame('', $renderers->renderMap(new Map()));
}
public function testRenderMapWithCustomRenderer(): void
@@ -45,13 +45,13 @@ public function testRenderMapWithCustomRenderer(): void
$defaultRenderer->expects(self::never())->method('renderMap');
$customRenderer = $this->createMock(RendererInterface::class);
- $customRenderer->expects(self::once())->method('renderMap')->willReturn('');
+ $customRenderer->expects(self::once())->method('renderMap')->willReturn('');
$renderers = new Renderers(['default' => $defaultRenderer, 'custom' => $customRenderer]);
$map = new Map(rendererName: 'custom');
- self::assertSame('', $renderers->renderMap($map));
+ self::assertSame('', $renderers->renderMap($map));
}
public function testRenderMapWithUnknownRenderer(): void
diff --git a/src/Map/tests/TwigTest.php b/src/Map/tests/TwigTest.php
index 6864f633036..39a94fd42d4 100644
--- a/src/Map/tests/TwigTest.php
+++ b/src/Map/tests/TwigTest.php
@@ -35,7 +35,7 @@ public function testRenderMap(): void
->expects(self::once())
->method('renderMap')
->with($map, $attributes)
- ->willReturn('')
+ ->willReturn('')
;
self::getContainer()->set('test.ux_map.renderers', $renderer);
@@ -50,7 +50,7 @@ public function testRenderMap(): void
]));
self::assertSame(
- '',
+ '',
$twig->render('test', ['map' => $map, 'attributes' => $attributes])
);
}
diff --git a/src/Map/tests/UXMapBundleTest.php b/src/Map/tests/UXMapBundleTest.php
index 4fb76df0ebb..169b890deed 100644
--- a/src/Map/tests/UXMapBundleTest.php
+++ b/src/Map/tests/UXMapBundleTest.php
@@ -50,7 +50,7 @@ public function testBootKernel(string $kernelClass): void
*/
public function testNullRendererAsDefault(string $kernelClass): void
{
- $expectedRenderer = new NullRenderer(['symfony/ux-map-google', 'symfony/ux-map-leaflet']);
+ $expectedRenderer = new NullRenderer(['symfony/ux-google-map', 'symfony/ux-leaflet-map']);
$kernel = new $kernelClass('test', true);
$kernel->boot();