resolve aliases in factories
This commit is contained in:
parent
1876b4f1c8
commit
fde10e799a
@ -12,6 +12,7 @@
|
||||
namespace Symfony\Component\DependencyInjection\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Alias;
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
@ -42,6 +43,7 @@ class ResolveReferencesToAliasesPass implements CompilerPassInterface
|
||||
$definition->setArguments($this->processArguments($definition->getArguments()));
|
||||
$definition->setMethodCalls($this->processArguments($definition->getMethodCalls()));
|
||||
$definition->setProperties($this->processArguments($definition->getProperties()));
|
||||
$definition->setFactory($this->processFactory($definition->getFactory()));
|
||||
}
|
||||
|
||||
foreach ($container->getAliases() as $id => $alias) {
|
||||
@ -76,6 +78,21 @@ class ResolveReferencesToAliasesPass implements CompilerPassInterface
|
||||
return $arguments;
|
||||
}
|
||||
|
||||
private function processFactory($factory)
|
||||
{
|
||||
if (null === $factory || !is_array($factory) || !$factory[0] instanceof Reference) {
|
||||
return $factory;
|
||||
}
|
||||
|
||||
$defId = $this->getDefinitionId($id = (string) $factory[0]);
|
||||
|
||||
if ($defId !== $id) {
|
||||
$factory[0] = new Reference($defId, $factory[0]->getInvalidBehavior(), $factory[0]->isStrict());
|
||||
}
|
||||
|
||||
return $factory;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolves an alias into a definition id.
|
||||
*
|
||||
|
@ -11,6 +11,8 @@
|
||||
|
||||
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Alias;
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
use Symfony\Component\DependencyInjection\Compiler\ResolveReferencesToAliasesPass;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
@ -59,6 +61,27 @@ class ResolveReferencesToAliasesPassTest extends \PHPUnit_Framework_TestCase
|
||||
$this->process($container);
|
||||
}
|
||||
|
||||
public function testResolveFactory()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
$container->register('factory', 'Factory');
|
||||
$container->setAlias('factory_alias', new Alias('factory'));
|
||||
$foo = new Definition();
|
||||
$foo->setFactory(array(new Reference('factory_alias'), 'createFoo'));
|
||||
$container->setDefinition('foo', $foo);
|
||||
$bar = new Definition();
|
||||
$bar->setFactory(array('Factory', 'createFoo'));
|
||||
$container->setDefinition('bar', $bar);
|
||||
|
||||
$this->process($container);
|
||||
|
||||
$resolvedFooFactory = $container->getDefinition('foo')->getFactory();
|
||||
$resolvedBarFactory = $container->getDefinition('bar')->getFactory();
|
||||
|
||||
$this->assertSame('factory', (string) $resolvedFooFactory[0]);
|
||||
$this->assertSame('Factory', (string) $resolvedBarFactory[0]);
|
||||
}
|
||||
|
||||
protected function process(ContainerBuilder $container)
|
||||
{
|
||||
$pass = new ResolveReferencesToAliasesPass();
|
||||
|
Reference in New Issue
Block a user