Merge branch '2.3' into 2.6
* 2.3: `ResolveParameterPlaceHoldersPass` unit tests Fixing wrong variable name from #13519
This commit is contained in:
commit
be053446bd
@ -1332,7 +1332,7 @@ EOF;
|
||||
if (null !== $value->getFactoryClass()) {
|
||||
return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($value->getFactoryClass()), $value->getFactoryMethod(), count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
|
||||
} elseif (null !== $value->getFactoryService()) {
|
||||
$service = $this->dumpValue($definition->getFactoryService());
|
||||
$service = $this->dumpValue($value->getFactoryService());
|
||||
|
||||
return sprintf("%s->%s(%s)", 0 === strpos($service, '$') ? sprintf('$this->get(%s)', $service) : $this->getServiceCall($value->getFactoryService()), $value->getFactoryMethod(), implode(', ', $arguments));
|
||||
} else {
|
||||
|
@ -0,0 +1,91 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
|
||||
|
||||
use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
|
||||
class ResolveParameterPlaceHoldersPassTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
private $compilerPass;
|
||||
private $container;
|
||||
private $fooDefinition;
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
$this->compilerPass = new ResolveParameterPlaceHoldersPass();
|
||||
$this->container = $this->createContainerBuilder();
|
||||
$this->compilerPass->process($this->container);
|
||||
$this->fooDefinition = $this->container->getDefinition('foo');
|
||||
}
|
||||
|
||||
public function testClassParametersShouldBeResolved()
|
||||
{
|
||||
$this->assertSame('Foo', $this->fooDefinition->getClass());
|
||||
}
|
||||
|
||||
public function testFactoryClassParametersShouldBeResolved()
|
||||
{
|
||||
$this->assertSame('FooFactory', $this->fooDefinition->getFactoryClass());
|
||||
}
|
||||
|
||||
public function testArgumentParametersShouldBeResolved()
|
||||
{
|
||||
$this->assertSame(array('bar', 'baz'), $this->fooDefinition->getArguments());
|
||||
}
|
||||
|
||||
public function testMethodCallParametersShouldBeResolved()
|
||||
{
|
||||
$this->assertSame(array(array('foobar', array('bar', 'baz'))), $this->fooDefinition->getMethodCalls());
|
||||
}
|
||||
|
||||
public function testPropertyParametersShouldBeResolved()
|
||||
{
|
||||
$this->assertSame(array('bar' => 'baz'), $this->fooDefinition->getProperties());
|
||||
}
|
||||
|
||||
public function testFileParametersShouldBeResolved()
|
||||
{
|
||||
$this->assertSame('foo.php', $this->fooDefinition->getFile());
|
||||
}
|
||||
|
||||
public function testAliasParametersShouldBeResolved()
|
||||
{
|
||||
$this->assertSame('foo', $this->container->getAlias('bar')->__toString());
|
||||
}
|
||||
|
||||
private function createContainerBuilder()
|
||||
{
|
||||
$containerBuilder = new ContainerBuilder();
|
||||
|
||||
$containerBuilder->setParameter('foo.class', 'Foo');
|
||||
$containerBuilder->setParameter('foo.factory.class', 'FooFactory');
|
||||
$containerBuilder->setParameter('foo.arg1', 'bar');
|
||||
$containerBuilder->setParameter('foo.arg2', 'baz');
|
||||
$containerBuilder->setParameter('foo.method', 'foobar');
|
||||
$containerBuilder->setParameter('foo.property.name', 'bar');
|
||||
$containerBuilder->setParameter('foo.property.value', 'baz');
|
||||
$containerBuilder->setParameter('foo.file', 'foo.php');
|
||||
$containerBuilder->setParameter('alias.id', 'bar');
|
||||
|
||||
$fooDefinition = $containerBuilder->register('foo', '%foo.class%');
|
||||
$fooDefinition->setFactoryClass('%foo.factory.class%');
|
||||
$fooDefinition->setArguments(array('%foo.arg1%', '%foo.arg2%'));
|
||||
$fooDefinition->addMethodCall('%foo.method%', array('%foo.arg1%', '%foo.arg2%'));
|
||||
$fooDefinition->setProperty('%foo.property.name%', '%foo.property.value%');
|
||||
$fooDefinition->setFile('%foo.file%');
|
||||
|
||||
$containerBuilder->setAlias('%alias.id%', 'foo');
|
||||
|
||||
return $containerBuilder;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user