merged branch fabpot/hinclude-fix (PR #7116)

fabpot · fabpot · commit dde77ee99a47 · 2013-02-20T23:02:50.000+01:00
This PR was merged into the 2.2 branch. Commits ------- 3933912 fixed HInclude renderer (closes #7113) Discussion ---------- fixed HInclude renderer (closes #7113) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7113 | License | MIT | Doc PR | n/a --------------------------------------------------------------------------- by stof at 2013-02-19T08:36:20Z :+1:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Fragment/ContainerAwareHIncludeFragmentRenderer.php b/src/Symfony/Bundle/FrameworkBundle/Fragment/ContainerAwareHIncludeFragmentRenderer.php
@@ -40,7 +40,9 @@ public function __construct(ContainerInterface $container, UriSigner $signer = n
      */
     public function render($uri, Request $request, array $options = array())
     {
-        if (!$this->templating) {
+        // setting the templating cannot be done in the constructor
+        // as it would lead to an infinite recursion in the service container
+        if (!$this->hasTemplating()) {
             $this->setTemplating($this->container->get('templating'));
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fragments/ContainerAwareHIncludeFragmentRendererTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fragments/ContainerAwareHIncludeFragmentRendererTest.php
@@ -0,0 +1,30 @@
+<?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\Bundle\FrameworkBundle\Tests\Fragment;
+
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Bundle\FrameworkBundle\Fragment\ContainerAwareHIncludeFragmentRenderer;
+use Symfony\Component\HttpFoundation\Request;
+
+class ContainerAwareHIncludeFragmentRendererTest extends TestCase
+{
+    public function testRender()
+    {
+        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+        $container->expects($this->once())
+            ->method('get')
+            ->will($this->returnValue($this->getMock('\Twig_Environment')))
+        ;
+        $renderer = new ContainerAwareHIncludeFragmentRenderer($container);
+        $renderer->render('/', Request::create('/'));
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
@@ -56,6 +56,16 @@ public function setTemplating($templating)
         $this->templating = $templating;
     }
 
+    /**
+     * Checks if a templating engine has been set.
+     *
+     * @return Boolean true if the templating engine has been set, false otherwise
+     */
+    public function hasTemplating()
+    {
+        return null !== $this->templating;
+    }
+
     /**
      * {@inheritdoc}
      *

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ public function __construct(ContainerInterface $container, UriSigner $signer = n`
`40`	`40`	`*/`
`41`	`41`	`public function render($uri, Request $request, array $options = array())`
`42`	`42`	`{`
`43`		`- if (!$this->templating) {`
	`43`	`+ // setting the templating cannot be done in the constructor`
	`44`	`+ // as it would lead to an infinite recursion in the service container`
	`45`	`+ if (!$this->hasTemplating()) {`
`44`	`46`	`$this->setTemplating($this->container->get('templating'));`
`45`	`47`	`}`
`46`	`48`