Fix: Also rename view template folder

zendframework · Mar 5, 2015 · 286a2b6 · 286a2b6
1 parent 40bc336
commit 286a2b6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/module/ZfModule/src/ZfModule/Controller/ModuleController.php b/module/ZfModule/src/ZfModule/Controller/ModuleController.php
@@ -116,7 +116,7 @@ public function organizationAction()
 
         $viewModel = new ViewModel(['repositories' => $repositories]);
         $viewModel->setTerminal(true);
-        $viewModel->setTemplate('zf-module/index/index.phtml');
+        $viewModel->setTemplate('zf-module/module/index.phtml');
 
         return $viewModel;
     }

diff --git a/module/ZfModule/test/ZfModuleTest/Integration/Controller/ModuleControllerTest.php b/module/ZfModule/test/ZfModuleTest/Integration/Controller/ModuleControllerTest.php
@@ -159,7 +159,7 @@ public function testIndexActionRendersUnregisteredModulesOnly()
         $viewModel = $this->getApplication()->getMvcEvent()->getViewModel();
 
         $this->assertTrue($viewModel->terminate());
-        $this->assertSame('zf-module/index/index', $viewModel->getTemplate());
+        $this->assertSame('zf-module/module/index', $viewModel->getTemplate());
 
         $viewVariable = $viewModel->getVariable('repositories');
 
@@ -418,7 +418,7 @@ public function testOrganizationActionRendersUnregisteredModulesOnly()
         $viewModel = $this->getApplication()->getMvcEvent()->getViewModel();
 
         $this->assertTrue($viewModel->terminate());
-        $this->assertSame('zf-module/index/index.phtml', $viewModel->getTemplate());
+        $this->assertSame('zf-module/module/index.phtml', $viewModel->getTemplate());
 
         $viewVariable = $viewModel->getVariable('repositories');
 

diff --git a/...ZfModule/view/zf-module/index/index.phtml → ...fModule/view/zf-module/module/index.phtml b/...ZfModule/view/zf-module/index/index.phtml → ...fModule/view/zf-module/module/index.phtml
diff --git a/.../ZfModule/view/zf-module/index/view.phtml → ...ZfModule/view/zf-module/module/view.phtml b/.../ZfModule/view/zf-module/index/view.phtml → ...ZfModule/view/zf-module/module/view.phtml