Merge branch 'hotfix/ZF2-86' of https://github.com/jtai/zf2 into hotf…

…ix/zf2-86
nclundsten · Oct 26, 2011 · 5201a63 · 5201a63
2 parents 9ef861f + 6554cf9
commit 5201a63
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/library/Zend/View/PhpRenderer.php b/library/Zend/View/PhpRenderer.php
@@ -70,9 +70,9 @@ class PhpRenderer implements Renderer, Pluggable
     private $vars;
 
     /**
-     * @var ArrayAccess|array Temporary variable cache; used when variables passed to render()
+     * @var array Temporary variable stack; used when variables passed to render()
      */
-    private $varsCache;
+    private $varsCache = array();
 
     /**
      * Constructor.
@@ -414,8 +414,9 @@ public function render($name, $vars = null)
         $this->file = $this->resolver($name);
         unset($name); // remove $name from local scope
 
+        $this->varsCache[] = $this->vars();
+
         if (null !== $vars) {
-            $this->varsCache = $this->vars();
             $this->setVars($vars);
         }
         unset($vars);
@@ -428,15 +429,12 @@ public function render($name, $vars = null)
         }
         extract($__vars);
         unset($__vars); // remove $__vars from local scope
-        
+
         ob_start();
         include $this->file;
         $content = ob_get_clean();
 
-        if (null !== $this->varsCache) {
-            $this->setVars($this->varsCache);
-            $this->varsCache = null;
-        }
+        $this->setVars(array_pop($this->varsCache));
 
         return $this->getFilterChain()->filter($content); // filter output
     }

diff --git a/tests/Zend/View/PhpRendererTest.php b/tests/Zend/View/PhpRendererTest.php
@@ -201,6 +201,17 @@ public function testPassingVariablesObjectToSetVarsShouldUseItDirectoy()
         $this->assertSame($vars, $this->renderer->vars());
     }
 
+    /**
+     * @group ZF2-86
+     */
+    public function testNestedRenderingRestoresVariablesCorrectly()
+    {
+        $expected = "inner\n<p>content</p>";
+        $this->renderer->resolver()->addPath(__DIR__ . '/_templates');
+        $test = $this->renderer->render('testNestedOuter.phtml', array('content' => '<p>content</p>'));
+        $this->assertEquals($expected, $test);
+    }
+
     /**
      * @group convenience-api
      */

diff --git a/tests/Zend/View/_templates/testNestedInner.phtml b/tests/Zend/View/_templates/testNestedInner.phtml
@@ -0,0 +1 @@
+inner
diff --git a/tests/Zend/View/_templates/testNestedOuter.phtml b/tests/Zend/View/_templates/testNestedOuter.phtml
@@ -0,0 +1,4 @@
+<?php
+?>
+<?php echo $this->render('testNestedInner.phtml') ?>
+<?php echo $this->raw('content') ?>