Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Mar 17, 2012 · b0fd8b1 · b0fd8b1
2 parents d96666f + a860d41
commit b0fd8b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/Model/JsonModel.php b/src/Model/JsonModel.php
@@ -22,6 +22,7 @@
 namespace Zend\View\Model;
 
 use Traversable,
+    Zend\Json\Json,
     Zend\Stdlib\ArrayUtils;
 
 /**

diff --git a/test/ViewTest.php b/test/ViewTest.php
@@ -145,6 +145,7 @@ public function testChildrenMayInvokeDifferentRenderingStrategiesThanParents()
 
         $child2 = new Model\JsonModel(array('bar' => 'baz'));
         $child2->setCaptureTo('child2');
+        $child2->setTerminal(false);
 
         $this->model->setVariable('parent', 'node');
         $this->model->addChild($child1);