From 286a2b64087b966c51740f18b81ce1a47bf77b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= Date: Thu, 5 Mar 2015 16:53:45 +0100 Subject: [PATCH] Fix: Also rename view template folder --- module/ZfModule/src/ZfModule/Controller/ModuleController.php | 2 +- .../Integration/Controller/ModuleControllerTest.php | 4 ++-- module/ZfModule/view/zf-module/{index => module}/index.phtml | 0 module/ZfModule/view/zf-module/{index => module}/view.phtml | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename module/ZfModule/view/zf-module/{index => module}/index.phtml (100%) rename module/ZfModule/view/zf-module/{index => module}/view.phtml (100%) diff --git a/module/ZfModule/src/ZfModule/Controller/ModuleController.php b/module/ZfModule/src/ZfModule/Controller/ModuleController.php index 3c25ca2d..d53653bb 100644 --- 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 index c1b2dcb5..1b3ced6a 100644 --- 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/module/ZfModule/view/zf-module/index/index.phtml b/module/ZfModule/view/zf-module/module/index.phtml similarity index 100% rename from module/ZfModule/view/zf-module/index/index.phtml rename to module/ZfModule/view/zf-module/module/index.phtml diff --git a/module/ZfModule/view/zf-module/index/view.phtml b/module/ZfModule/view/zf-module/module/view.phtml similarity index 100% rename from module/ZfModule/view/zf-module/index/view.phtml rename to module/ZfModule/view/zf-module/module/view.phtml