diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed templating to use setter injection for renderers

Browse Source
This commit is contained in:
Lukas Kahwe Smith 2011-01-06 20:35:08 +01:00 committed by Fabien Potencier
parent 5390b16573
commit f2ac2a4c8a
5 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddTemplatingRenderersPass.php
View File

@ -30,11 +30,12 @@ class AddTemplatingRenderersPass implements CompilerPassInterface
$definition = $container->getDefinition('templating.engine');
$arguments = $definition->getArguments();
$arguments[2] = $renderers;
$definition->setArguments($arguments);
$definition->addMethodCall('setRenderers', array($renderers));
if (count($helpers) > 0) {
$definition->addMethodCall('setHelpers', array($helpers));
}
}
}
}

1
src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
View File

@ -29,7 +29,6 @@
<service id="templating.engine" class="%templating.engine.class%" public="false">
<argument type="service" id="service_container" />
<argument type="service" id="templating.loader" />
<argument type="collection" />
<call method="setCharset"><argument>%kernel.charset%</argument></call>
</service>

4
src/Symfony/Bundle/FrameworkBundle/Templating/Engine.php
View File

@ -32,11 +32,11 @@ class Engine extends BaseEngine
* @param LoaderInterface $loader A loader instance
* @param array $renderers All templating renderers
*/
public function __construct(ContainerInterface $container, LoaderInterface $loader, array $renderers)
public function __construct(ContainerInterface $container, LoaderInterface $loader)
{
$this->container = $container;
parent::__construct($loader, $renderers);
parent::__construct($loader);
}
public function getContainer()

22
src/Symfony/Component/Templating/Engine.php
View File

@ -39,14 +39,11 @@ class Engine implements \ArrayAccess
* Constructor.
*
* @param LoaderInterface $loader A loader instance
* @param array $renderers An array of renderer instances
* @param array $helpers A array of helper instances
* @param array $escapers An array of escapers
*/
public function __construct(LoaderInterface $loader, array $renderers = array(), array $helpers = array(), array $escapers = array())
public function __construct(LoaderInterface $loader, array $helpers = array())
{
$this->loader = $loader;
$this->renderers = $renderers;
$this->helpers = array();
$this->parents = array();
$this->stack = array();
@ -56,6 +53,17 @@ class Engine implements \ArrayAccess
$this->addHelpers($helpers);
$this->initializeEscapers();
foreach ($this->escapers as $context => $escaper) {
$this->setEscaper($context, $escaper);
}
}
public function setRenderers(array $renderers = array())
{
$this->renderers = $renderers;
if (!isset($this->renderers['php'])) {
$this->renderers['php'] = new PhpRenderer();
}
@ -63,12 +71,6 @@ class Engine implements \ArrayAccess
foreach ($this->renderers as $renderer) {
$renderer->setEngine($this);
}
$this->initializeEscapers();
foreach ($this->escapers as $context => $escaper) {
$this->setEscaper($context, $escaper);
}
}
/**

10
tests/Symfony/Tests/Component/Templating/EngineTest.php
View File

@ -35,13 +35,17 @@ class EngineTest extends \PHPUnit_Framework_TestCase
{
$engine = new ProjectTemplateEngine(self::$loader);
$this->assertEquals(self::$loader, $engine->getLoader(), '__construct() takes a loader instance as its second first argument');
$this->assertEquals(array('php'), array_keys($engine->getRenderers()), '__construct() automatically registers a PHP renderer if none is given');
}
$engine = new ProjectTemplateEngine(self::$loader, array('foo' => self::$renderer));
public function testSetRenderers()
{
$engine = new ProjectTemplateEngine(self::$loader);
$engine->setRenderers(array('foo' => self::$renderer));
$this->assertEquals(array('foo', 'php'), array_keys($engine->getRenderers()), '__construct() takes an array of renderers as its third argument');
$this->assertTrue(self::$renderer->getEngine() === $engine, '__construct() registers itself on all renderers');
$engine = new ProjectTemplateEngine(self::$loader, array('php' => self::$renderer));
$engine = new ProjectTemplateEngine(self::$loader);
$engine->setRenderers(array('php' => self::$renderer));
$this->assertTrue($engine->getRenderers() === array('php' => self::$renderer), '__construct() can overridde the default PHP renderer');
}