Skip to content

Commit 376923a

Browse files
committed
mark legacy aliases as deprecated
1 parent 7d61c5a commit 376923a

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

DependencyInjection/FOSRestExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function load(array $configs, ContainerBuilder $container)
8484
if (null !== $service) {
8585
if ('view_handler' === $key) {
8686
$container->setAlias('fos_rest.'.$key, new Alias($service, true));
87-
} elseif('templating' === $key) {
87+
} elseif(in_array($key, ['inflector', 'router', 'templating'], true)) {
8888
$alias = new Alias($service);
8989

9090
if (method_exists($alias, 'setDeprecated')) {
@@ -355,7 +355,7 @@ private function loadView(array $config, XmlFileLoader $loader, ContainerBuilder
355355
$defaultViewHandler = $container->getDefinition('fos_rest.view_handler.default');
356356

357357
$defaultViewHandler->setArguments([
358-
new Reference('fos_rest.router'),
358+
new Reference($config['service']['router']),
359359
new Reference('fos_rest.serializer'),
360360
new Reference('fos_rest.templating', ContainerInterface::NULL_ON_INVALID_REFERENCE),
361361
new Reference('request_stack'),

Tests/DependencyInjection/FOSRestExtensionTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,4 +1160,17 @@ public function testRegisterSerializerErrorRenderer()
11601160
$this->assertTrue($this->container->hasAlias('error_renderer'));
11611161
$this->assertSame('fos_rest.error_renderer.serializer', (string) $this->container->getAlias('error_renderer'));
11621162
}
1163+
1164+
public function testLegacyAliasesAreDeprecated()
1165+
{
1166+
if (!method_exists(Alias::class, 'isDeprecated')) {
1167+
$this->markTestSkipped();
1168+
}
1169+
1170+
$this->extension->load([], $this->container);
1171+
1172+
$this->assertTrue($this->container->getAlias('fos_rest.inflector')->isDeprecated());
1173+
$this->assertTrue($this->container->getAlias('fos_rest.router')->isDeprecated());
1174+
$this->assertTrue($this->container->getAlias('fos_rest.templating')->isDeprecated());
1175+
}
11631176
}

0 commit comments

Comments
 (0)