Don't trigger deprecation for deprecated aliases pointing to deprecated definitions
This commit is contained in:
parent
d23b74ebce
commit
38f98a1165
@ -62,8 +62,11 @@ class ResolveReferencesToAliasesPass extends AbstractRecursivePass
|
||||
$alias = $container->getAlias($id);
|
||||
|
||||
if ($alias->isDeprecated()) {
|
||||
$referencingDefinition = $container->hasDefinition($this->currentId) ? $container->getDefinition($this->currentId) : $container->getAlias($this->currentId);
|
||||
if (!$referencingDefinition->isDeprecated()) {
|
||||
@trigger_error(sprintf('%s. It is being referenced by the "%s" %s.', rtrim($alias->getDeprecationMessage($id), '. '), $this->currentId, $container->hasDefinition($this->currentId) ? 'service' : 'alias'), \E_USER_DEPRECATED);
|
||||
}
|
||||
}
|
||||
|
||||
$seen = [];
|
||||
do {
|
||||
|
@ -123,6 +123,44 @@ class ResolveReferencesToAliasesPassTest extends TestCase
|
||||
$this->process($container);
|
||||
}
|
||||
|
||||
public function testNoDeprecationNoticeWhenReferencedByDeprecatedAlias()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$container->register('foo', 'stdClass');
|
||||
|
||||
$aliasDeprecated = new Alias('foo');
|
||||
$aliasDeprecated->setDeprecated(true);
|
||||
$container->setAlias('deprecated_foo_alias', $aliasDeprecated);
|
||||
|
||||
$alias = new Alias('deprecated_foo_alias');
|
||||
$alias->setDeprecated(true);
|
||||
$container->setAlias('alias', $alias);
|
||||
|
||||
$this->process($container);
|
||||
$this->addToAssertionCount(1);
|
||||
}
|
||||
|
||||
public function testNoDeprecationNoticeWhenReferencedByDeprecatedDefinition()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
|
||||
$container->register('foo', 'stdClass');
|
||||
|
||||
$aliasDeprecated = new Alias('foo');
|
||||
$aliasDeprecated->setDeprecated(true);
|
||||
$container->setAlias('foo_aliased', $aliasDeprecated);
|
||||
|
||||
$container
|
||||
->register('definition')
|
||||
->setDeprecated(true)
|
||||
->setArguments([new Reference('foo_aliased')])
|
||||
;
|
||||
|
||||
$this->process($container);
|
||||
$this->addToAssertionCount(1);
|
||||
}
|
||||
|
||||
protected function process(ContainerBuilder $container)
|
||||
{
|
||||
$pass = new ResolveReferencesToAliasesPass();
|
||||
|
Reference in New Issue
Block a user