From 4c1704774b146f5827fdf4adcebc7940e9bf07c4 Mon Sep 17 00:00:00 2001 From: Evan Coury Date: Tue, 8 Nov 2011 07:11:39 -0700 Subject: [PATCH] Updated for ZF changeges - Module::getConfig() now returns a simple array, not a config object - View listener returns a PhpEnvironment\Response (sendable) upon error --- modules/Application/Module.php | 3 +-- modules/Application/src/Application/View/Listener.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/Application/Module.php b/modules/Application/Module.php index 9dee84c..e37f6f9 100644 --- a/modules/Application/Module.php +++ b/modules/Application/Module.php @@ -3,7 +3,6 @@ namespace Application; use Zend\Module\Manager, - Zend\Config\Config, Zend\EventManager\StaticEventManager, Zend\Loader\AutoloaderFactory; @@ -35,7 +34,7 @@ class Module public function getConfig() { - return new Config(include __DIR__ . '/configs/module.config.php'); + return include __DIR__ . '/configs/module.config.php'; } public function initializeView($e) diff --git a/modules/Application/src/Application/View/Listener.php b/modules/Application/src/Application/View/Listener.php index 8625902..8adf746 100644 --- a/modules/Application/src/Application/View/Listener.php +++ b/modules/Application/src/Application/View/Listener.php @@ -7,7 +7,7 @@ use ArrayAccess, Zend\EventManager\EventCollection, Zend\EventManager\ListenerAggregate, Zend\EventManager\StaticEventCollection, - Zend\Http\Response, + Zend\Http\PhpEnvironment\Response, Zend\Mvc\Application, Zend\Mvc\MvcEvent, Zend\View\Renderer; -- 1.7.10.4