Merge branch '5.2' into 5.x
* 5.2: [DI] fix merge
This commit is contained in:
commit
de5d0fd3e2
@ -133,11 +133,11 @@ class ResolveReferencesToAliasesPassTest extends TestCase
|
|||||||
$container->register('foo', 'stdClass');
|
$container->register('foo', 'stdClass');
|
||||||
|
|
||||||
$aliasDeprecated = new Alias('foo');
|
$aliasDeprecated = new Alias('foo');
|
||||||
$aliasDeprecated->setDeprecated(true);
|
$aliasDeprecated->setDeprecated('foobar', '1.2.3.4', '');
|
||||||
$container->setAlias('deprecated_foo_alias', $aliasDeprecated);
|
$container->setAlias('deprecated_foo_alias', $aliasDeprecated);
|
||||||
|
|
||||||
$alias = new Alias('deprecated_foo_alias');
|
$alias = new Alias('deprecated_foo_alias');
|
||||||
$alias->setDeprecated(true);
|
$alias->setDeprecated('foobar', '1.2.3.4', '');
|
||||||
$container->setAlias('alias', $alias);
|
$container->setAlias('alias', $alias);
|
||||||
|
|
||||||
$this->process($container);
|
$this->process($container);
|
||||||
@ -151,12 +151,12 @@ class ResolveReferencesToAliasesPassTest extends TestCase
|
|||||||
$container->register('foo', 'stdClass');
|
$container->register('foo', 'stdClass');
|
||||||
|
|
||||||
$aliasDeprecated = new Alias('foo');
|
$aliasDeprecated = new Alias('foo');
|
||||||
$aliasDeprecated->setDeprecated(true);
|
$aliasDeprecated->setDeprecated('foobar', '1.2.3.4', '');
|
||||||
$container->setAlias('foo_aliased', $aliasDeprecated);
|
$container->setAlias('foo_aliased', $aliasDeprecated);
|
||||||
|
|
||||||
$container
|
$container
|
||||||
->register('definition')
|
->register('definition')
|
||||||
->setDeprecated(true)
|
->setDeprecated('foobar', '1.2.3.4', '')
|
||||||
->setArguments([new Reference('foo_aliased')])
|
->setArguments([new Reference('foo_aliased')])
|
||||||
;
|
;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user