[zendframework/zendframework#1] s/setLayout/setTemplate/ in plugins

- per Akrabat
zendframework · Feb 22, 2012 · d993918 · d993918
1 parent bfd5623
commit d993918
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Helper/Layout.php b/src/Helper/Layout.php
@@ -59,7 +59,7 @@ public function getLayout()
      * @param  string $template
      * @return Layout
      */
-    public function setLayout($template)
+    public function setTemplate($template)
     {
         $model = $this->getRoot();
         $model->setTemplate((string) $template);
@@ -80,7 +80,7 @@ public function __invoke($template = null)
         if (null === $template) {
             return $this->getRoot();
         }
-        return $this->setLayout($template);
+        return $this->setTemplate($template);
     }
 
     /**

diff --git a/test/Helper/LayoutTest.php b/test/Helper/LayoutTest.php
@@ -59,9 +59,9 @@ public function setUp()
         $this->viewModelHelper->setRoot($this->parent);
     }
 
-    public function testCallingSetLayoutAltersRootModelTemplate()
+    public function testCallingSetTemplateAltersRootModelTemplate()
     {
-        $this->helper->setLayout('alternate/layout');
+        $this->helper->setTemplate('alternate/layout');
         $this->assertEquals('alternate/layout', $this->parent->getTemplate());
     }
 
@@ -70,7 +70,7 @@ public function testCallingGetLayoutReturnsRootModelTemplate()
         $this->assertEquals('layout', $this->helper->getLayout());
     }
 
-    public function testCallingInvokeProxiesToSetLayout()
+    public function testCallingInvokeProxiesToSetTemplate()
     {
         $helper = $this->helper;
         $helper('alternate/layout');
@@ -91,6 +91,6 @@ public function testRaisesExceptionIfViewModelHelperHasNoRoot()
         $helper          = $renderer->plugin('layout');
 
         $this->setExpectedException('Zend\View\Exception\RuntimeException', 'view model');
-        $helper->setLayout('foo/bar');
+        $helper->setTemplate('foo/bar');
     }
 }