Skip to content

Commit dcc8dbd

Browse files
KocalKocal
committed
[Map] Rename "symfony/ux-map-%s" to "symfony/ux-%s-map"
1 parent 1b4c6b3 commit dcc8dbd

File tree

12 files changed

+25
-25
lines changed

12 files changed

+25
-25
lines changed

‎src/Map/doc/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ Available renderers
4747
========== ===============================================================
4848
Renderer
4949
========== ===============================================================
50-
`Google`_ **Install**: ``composer require symfony/ux-map-google`` \
50+
`Google`_ **Install**: ``composer require symfony/ux-google-map`` \
5151
**DSN**: ``UX_MAP_DSN=google://GOOGLE_MAPS_API_KEY@default`` \
52-
`Leaflet`_ **Install**: ``composer require symfony/ux-map-leaflet`` \
52+
`Leaflet`_ **Install**: ``composer require symfony/ux-leaflet-map`` \
5353
**DSN**: ``UX_MAP_DSN=leaflet://default`` \
5454
========== ===============================================================
5555

‎src/Map/src/Bridge/Google/assets/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@symfony/ux-map-google",
2+
"name": "@symfony/ux-google-map",
33
"description": "GoogleMaps bridge for Symfony UX Map, integrate interactive maps in your Symfony applications",
44
"license": "MIT",
55
"version": "1.0.0",
@@ -18,7 +18,7 @@
1818
"importmap": {
1919
"@hotwired/stimulus": "^3.0.0",
2020
"@googlemaps/js-api-loader": "^1.16.6",
21-
"@symfony/ux-map-google/map-controller": "path:%PACKAGE%/dist/map_controller.js"
21+
"@symfony/ux-google-map/map-controller": "path:%PACKAGE%/dist/map_controller.js"
2222
}
2323
},
2424
"peerDependencies": {

‎src/Map/src/Bridge/Google/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "symfony/ux-map-google",
2+
"name": "symfony/ux-google-map",
33
"type": "symfony-ux-map-bridge",
44
"description": "Symfony UX Map GoogleMaps Bridge",
55
"keywords": ["google-maps", "map", "symfony", "ux"],

‎src/Map/src/Bridge/Leaflet/assets/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@symfony/ux-map-leaflet",
2+
"name": "@symfony/ux-leaflet-map",
33
"description": "Leaflet bridge for Symfony UX Map, integrate interactive maps in your Symfony applications",
44
"license": "MIT",
55
"version": "1.0.0",
@@ -18,7 +18,7 @@
1818
"importmap": {
1919
"@hotwired/stimulus": "^3.0.0",
2020
"leaflet": "^1.9.4",
21-
"@symfony/ux-map-leaflet/map-controller": "path:%PACKAGE%/dist/map_controller.js"
21+
"@symfony/ux-leaflet-map/map-controller": "path:%PACKAGE%/dist/map_controller.js"
2222
}
2323
},
2424
"peerDependencies": {

‎src/Map/src/Bridge/Leaflet/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "symfony/ux-map-leaflet",
2+
"name": "symfony/ux-leaflet-map",
33
"type": "symfony-ux-map-bridge",
44
"description": "Symfony UX Map Leaflet Bridge",
55
"keywords": ["leaflet", "map", "symfony", "ux"],

‎src/Map/src/Exception/UnsupportedSchemeException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function __construct(Dsn $dsn, ?\Throwable $previous = null)
2424
$provider = $dsn->getScheme();
2525
$bridge = UXMapBundle::$bridges[$provider] ?? null;
2626
if ($bridge && !class_exists($bridge['renderer_factory'])) {
27-
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));
27+
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));
2828

2929
return;
3030
}

‎src/Map/src/Renderer/AbstractRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ final public function renderMap(Map $map, array $attributes = []): string
5353
}
5454

5555
$stimulusAttributes->addController(
56-
'@symfony/ux-map-'.$this->getName().'/map',
56+
'@symfony/ux-'.$this->getName().'-map/map',
5757
[
5858
'provider-options' => (object) $this->getProviderOptions(),
5959
'view' => $map->toArray(),

‎src/Map/src/UXMapBundle.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
5858
if (str_starts_with($config['renderer'], 'null://')) {
5959
$container->services()
6060
->set('ux_map.renderer_factory.null', NullRendererFactory::class)
61-
->arg(0, array_map(fn ($name) => 'symfony/ux-map-'.$name, array_keys(self::$bridges)))
61+
->arg(0, array_map(fn ($name) => 'symfony/ux-'.$name.'-map', array_keys(self::$bridges)))
6262
->tag('ux_map.renderer_factory');
6363
}
6464

@@ -68,7 +68,7 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
6868
->arg(0, $renderers);
6969

7070
foreach (self::$bridges as $name => $bridge) {
71-
if (ContainerBuilder::willBeAvailable('symfony/ux-map-'.$name, $bridge['renderer_factory'], ['symfony/ux-map'])) {
71+
if (ContainerBuilder::willBeAvailable('symfony/ux-'.$name.'-map', $bridge['renderer_factory'], ['symfony/ux-map'])) {
7272
$container->services()
7373
->set('ux_map.renderer_factory.'.$name, $bridge['renderer_factory'])
7474
->parent('ux_map.renderer_factory.abstract')
@@ -88,10 +88,10 @@ public function prependExtension(ContainerConfigurator $container, ContainerBuil
8888
];
8989

9090
foreach (self::$bridges as $name => $bridge) {
91-
if (ContainerBuilder::willBeAvailable('symfony/ux-map-'.$name, $bridge['renderer_factory'], ['symfony/ux-map'])) {
91+
if (ContainerBuilder::willBeAvailable('symfony/ux-'.$name.'-map', $bridge['renderer_factory'], ['symfony/ux-map'])) {
9292
$rendererFactoryReflection = new \ReflectionClass($bridge['renderer_factory']);
9393
$bridgePath = \dirname($rendererFactoryReflection->getFileName(), 3);
94-
$paths[$bridgePath.'/assets/dist'] = '@symfony/ux-map-'.$name;
94+
$paths[$bridgePath.'/assets/dist'] = '@symfony/ux-'.$name.'-map';
9595
}
9696
}
9797

‎src/Map/tests/Renderer/NullRendererTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ public function provideTestRenderMap(): iterable
3030

3131
yield 'one bridge' => [
3232
'expected_exception_message' => 'You must install at least one bridge package to use the Symfony UX Map component.'
33-
.\PHP_EOL.'Try running "composer require symfony/ux-map-leaflet".',
34-
'renderer' => new NullRenderer(['symfony/ux-map-leaflet']),
33+
.\PHP_EOL.'Try running "composer require symfony/ux-leaflet-map".',
34+
'renderer' => new NullRenderer(['symfony/ux-leaflet-map']),
3535
];
3636

3737
yield 'two bridges' => [
3838
'expected_exception_message' => 'You must install at least one bridge package to use the Symfony UX Map component.'
39-
.\PHP_EOL.'Try running "composer require symfony/ux-map-leaflet" or "composer require symfony/ux-map-google".',
40-
'renderer' => new NullRenderer(['symfony/ux-map-leaflet', 'symfony/ux-map-google']),
39+
.\PHP_EOL.'Try running "composer require symfony/ux-leaflet-map" or "composer require symfony/ux-google-map".',
40+
'renderer' => new NullRenderer(['symfony/ux-leaflet-map', 'symfony/ux-google-map']),
4141
];
4242
}
4343

‎src/Map/tests/Renderer/RenderersTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ public function testConstructWithoutRenderers(): void
3232
public function testRenderMapWithDefaultRenderer(): void
3333
{
3434
$defaultRenderer = $this->createMock(RendererInterface::class);
35-
$defaultRenderer->expects(self::once())->method('renderMap')->willReturn('<div data-controller="@symfony/ux-map-default"></div>');
35+
$defaultRenderer->expects(self::once())->method('renderMap')->willReturn('<div data-controller="@symfony/ux-default-map"></div>');
3636

3737
$renderers = new Renderers(['default' => $defaultRenderer]);
3838

39-
self::assertSame('<div data-controller="@symfony/ux-map-default"></div>', $renderers->renderMap(new Map()));
39+
self::assertSame('<div data-controller="@symfony/ux-default-map"></div>', $renderers->renderMap(new Map()));
4040
}
4141

4242
public function testRenderMapWithCustomRenderer(): void
@@ -45,13 +45,13 @@ public function testRenderMapWithCustomRenderer(): void
4545
$defaultRenderer->expects(self::never())->method('renderMap');
4646

4747
$customRenderer = $this->createMock(RendererInterface::class);
48-
$customRenderer->expects(self::once())->method('renderMap')->willReturn('<div data-controller="@symfony/ux-map-custom"></div>');
48+
$customRenderer->expects(self::once())->method('renderMap')->willReturn('<div data-controller="@symfony/ux-custom-map"></div>');
4949

5050
$renderers = new Renderers(['default' => $defaultRenderer, 'custom' => $customRenderer]);
5151

5252
$map = new Map(rendererName: 'custom');
5353

54-
self::assertSame('<div data-controller="@symfony/ux-map-custom"></div>', $renderers->renderMap($map));
54+
self::assertSame('<div data-controller="@symfony/ux-custom-map"></div>', $renderers->renderMap($map));
5555
}
5656

5757
public function testRenderMapWithUnknownRenderer(): void

‎src/Map/tests/TwigTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function testRenderMap(): void
3535
->expects(self::once())
3636
->method('renderMap')
3737
->with($map, $attributes)
38-
->willReturn('<div data-controller="@symfony/ux-map-foobar"></div>')
38+
->willReturn('<div data-controller="@symfony/ux-foobar-map"></div>')
3939
;
4040

4141
self::getContainer()->set('test.ux_map.renderers', $renderer);
@@ -50,7 +50,7 @@ public function testRenderMap(): void
5050
]));
5151

5252
self::assertSame(
53-
'<div data-controller="@symfony/ux-map-foobar"></div>',
53+
'<div data-controller="@symfony/ux-foobar-map"></div>',
5454
$twig->render('test', ['map' => $map, 'attributes' => $attributes])
5555
);
5656
}

‎src/Map/tests/UXMapBundleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function testBootKernel(string $kernelClass): void
5050
*/
5151
public function testNullRendererAsDefault(string $kernelClass): void
5252
{
53-
$expectedRenderer = new NullRenderer(['symfony/ux-map-google', 'symfony/ux-map-leaflet']);
53+
$expectedRenderer = new NullRenderer(['symfony/ux-google-map', 'symfony/ux-leaflet-map']);
5454

5555
$kernel = new $kernelClass('test', true);
5656
$kernel->boot();

0 commit comments

Comments
 (0)