[#1] Ensured nested + sequential children render correctly

- Scenario was: - child "content" with children, followed by: - child "sidebar" with no children
shevron · Feb 16, 2012 · 3d9aabe · 3d9aabe
1 parent f55c9c1
commit 3d9aabe
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/library/Zend/View/Helper/RenderChildModel.php b/library/Zend/View/Helper/RenderChildModel.php
@@ -79,10 +79,11 @@ public function render($child)
             return '';
         }
 
-        $view   = $this->getView();
-        $return = $view->render($model);
-        $helper = $this->getViewModelHelper();
-        $helper->setCurrent($this->current);
+        $current = $this->current;
+        $view    = $this->getView();
+        $return  = $view->render($model);
+        $helper  = $this->getViewModelHelper();
+        $helper->setCurrent($current);
         return $return;
     }
 

diff --git a/tests/Zend/View/Helper/RenderChildModelTest.php b/tests/Zend/View/Helper/RenderChildModelTest.php
@@ -44,9 +44,10 @@ class RenderChildModelTest extends TestCase
     public function setUp()
     {
         $this->resolver = new TemplateMapResolver(array(
-            'layout' => __DIR__ . '/../_templates/nested-view-model-layout.phtml',
-            'child1' => __DIR__ . '/../_templates/nested-view-model-content.phtml',
-            'child2' => __DIR__ . '/../_templates/nested-view-model-child2.phtml',
+            'layout'  => __DIR__ . '/../_templates/nested-view-model-layout.phtml',
+            'child1'  => __DIR__ . '/../_templates/nested-view-model-content.phtml',
+            'child2'  => __DIR__ . '/../_templates/nested-view-model-child2.phtml',
+            'complex' => __DIR__ . '/../_templates/nested-view-model-complexlayout.phtml',
         ));
         $this->renderer = $renderer = new PhpRenderer();
         $renderer->setCanRenderTrees(true);
@@ -118,6 +119,25 @@ public function testRendersNestedChildren()
         $this->assertContains('Layout end', $result, $result);
     }
 
+    public function testRendersSequentialChildrenWithNestedChildren()
+    {
+        $this->parent->setTemplate('complex');
+        $child1 = $this->setupFirstChild();
+        $child1->setTemplate('layout');
+        $child1->setCaptureTo('content');
+
+        $child2 = $this->setupSecondChild();
+        $child2->setCaptureTo('sidebar');
+
+        $nested = new ViewModel();
+        $nested->setTemplate('child1');
+        $nested->setCaptureTo('content');
+        $child1->addChild($nested);
+
+        $result = $this->renderer->render($this->parent);
+        $this->assertRegExp('/Content:\s+Layout start\s+Content for layout\s+Layout end\s+Sidebar:\s+Second child/s', $result, $result);
+    }
+
     /**
      * @outputBuffering enabled
      */

diff --git a/tests/Zend/View/_templates/nested-view-model-complexlayout.phtml b/tests/Zend/View/_templates/nested-view-model-complexlayout.phtml
@@ -0,0 +1,5 @@
+Content:
+<?php echo $this->renderChildModel('content') ?>
+
+Sidebar:
+<?php echo $this->renderChildModel('sidebar') ?>