[HttpKernel] simplified and enhanced code managing the hinclude strategy

fabpot · fabpot · commit 1f1392dc8bce · 2013-01-10T09:21:31.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/RenderingStrategy/HIncludeRenderingStrategy.php b/src/Symfony/Component/HttpKernel/RenderingStrategy/HIncludeRenderingStrategy.php
@@ -32,7 +32,7 @@ class HIncludeRenderingStrategy extends GeneratorAwareRenderingStrategy
      *
      * @param EngineInterface|\Twig_Environment $templating            An EngineInterface or a \Twig_Environment instance
      * @param UriSigner                         $signer                A UriSigner instance
-     * @param string                            $globalDefaultTemplate The content of the global default template
+     * @param string                            $globalDefaultTemplate The global default content (it can be a template name or the content)
      */
     public function __construct($templating, UriSigner $signer = null, $globalDefaultTemplate = null)
     {
@@ -47,6 +47,10 @@ public function __construct($templating, UriSigner $signer = null, $globalDefaul
 
     /**
      * {@inheritdoc}
+     *
+     * Additional available options:
+     *
+     *  * default: The default content (it can be a template name or the content)
      */
     public function render($uri, Request $request = null, array $options = array())
     {
@@ -58,31 +62,14 @@ public function render($uri, Request $request = null, array $options = array())
             $uri = $this->signer->sign($this->generateProxyUri($uri, $request));
         }
 
-        $defaultTemplate = isset($options['default']) ? $options['default'] : null;
-        $defaultContent = null;
-
-        if (null !== $defaultTemplate) {
-            if ($this->templateExists($defaultTemplate)) {
-                $defaultContent = $this->templating->render($defaultContent);
-            } else {
-                $defaultContent = $defaultTemplate;
-            }
-        } elseif ($this->globalDefaultTemplate) {
-            $defaultContent = $this->templating->render($this->globalDefaultTemplate);
+        $template = isset($options['default']) ? $options['default'] : $this->globalDefaultTemplate;
+        if ($this->templateExists($template)) {
+            $content = $this->templating->render($template);
+        } else {
+            $content = $template;
         }
 
-        return $this->renderHIncludeTag($uri, $defaultContent);
-    }
-
-    /**
-     * Renders an HInclude tag.
-     *
-     * @param string $uri            A URI
-     * @param string $defaultContent Default content
-     */
-    protected function renderHIncludeTag($uri, $defaultContent = null)
-    {
-        return sprintf('<hx:include src="%s">%s</hx:include>', $uri, $defaultContent);
+        return sprintf('<hx:include src="%s">%s</hx:include>', $uri, $content);
     }
 
     private function templateExists($template)
