bug symfony#10670 [Templating] PhpEngine should propagate charset to its helpers (stloyd)

fabpot · fabpot · commit 5599eb0aae2d · 2014-04-10T04:17:51.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [Templating] PhpEngine should propagate charset to its helpers | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#10666 | License | MIT Commits ------- ed9e48b [Templating] PhpEngine should propagate charset to its helpers
diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php
@@ -32,6 +32,9 @@ class PhpEngine implements EngineInterface, \ArrayAccess
 {
     protected $loader;
     protected $current;
+    /**
+     * @var HelperInterface[]
+     */
     protected $helpers;
     protected $parents;
     protected $stack;
@@ -368,6 +371,10 @@ public function escape($value, $context = 'html')
     public function setCharset($charset)
     {
         $this->charset = $charset;
+
+        foreach ($this->helpers as $helper) {
+            $helper->setCharset($this->charset);
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Templating/Tests/PhpEngineTest.php b/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Templating\PhpEngine;
 use Symfony\Component\Templating\Loader\Loader;
-use Symfony\Component\Templating\Storage\Storage;
 use Symfony\Component\Templating\Storage\StringStorage;
 use Symfony\Component\Templating\Helper\SlotsHelper;
 use Symfony\Component\Templating\TemplateNameParser;
@@ -126,10 +125,14 @@ public function testEscape()
 
     public function testGetSetCharset()
     {
-        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader);
-        $this->assertEquals('UTF-8', $engine->getCharset(), '->getCharset() returns UTF-8 by default');
+        $helper = new SlotsHelper();
+        $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader, array($helper));
+        $this->assertEquals('UTF-8', $engine->getCharset(), 'EngineInterface::getCharset() returns UTF-8 by default');
+        $this->assertEquals('UTF-8', $helper->getCharset(), 'HelperInterface::getCharset() returns UTF-8 by default');
+
         $engine->setCharset('ISO-8859-1');
-        $this->assertEquals('ISO-8859-1', $engine->getCharset(), '->setCharset() changes the default charset to use');
+        $this->assertEquals('ISO-8859-1', $engine->getCharset(), 'EngineInterface::setCharset() changes the default charset to use');
+        $this->assertEquals('ISO-8859-1', $helper->getCharset(), 'EngineInterface::setCharset() changes the default charset of helper');
     }
 
     public function testGlobalVariables()

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ class PhpEngine implements EngineInterface, \ArrayAccess`
`32`	`32`	`{`
`33`	`33`	`protected $loader;`
`34`	`34`	`protected $current;`
	`35`	`+ /**`
	`36`	`+ * @var HelperInterface[]`
	`37`	`+ */`
`35`	`38`	`protected $helpers;`
`36`	`39`	`protected $parents;`
`37`	`40`	`protected $stack;`
`@@ -368,6 +371,10 @@ public function escape($value, $context = 'html')`
`368`	`371`	`public function setCharset($charset)`
`369`	`372`	`{`
`370`	`373`	`$this->charset = $charset;`< 10000 /td>
	`374`	`+`
	`375`	`+ foreach ($this->helpers as $helper) {`
	`376`	`+ $helper->setCharset($this->charset);`
	`377`	`+ }`
`371`	`378`	`}`
`372`	`379`
`373`	`380`	`/**`