From 7889d92c1550c6122119815ad673d186fee4f415 Mon Sep 17 00:00:00 2001 From: Evan Coury Date: Mon, 7 May 2012 13:43:50 -0700 Subject: [PATCH] Updates for ZF2 master changes --- module/Application/Module.php | 2 +- module/Application/config/module.config.php | 4 ++-- public/index.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/Application/Module.php b/module/Application/Module.php index a540a11..5f93426 100644 --- a/module/Application/Module.php +++ b/module/Application/Module.php @@ -11,7 +11,7 @@ class Module implements AutoloaderProvider public function init(Manager $moduleManager) { $events = $moduleManager->events(); - $sharedEvents = $events->getSharedCollections(); + $sharedEvents = $events->getSharedManager(); $sharedEvents->attach('bootstrap', 'bootstrap', array($this, 'initializeView'), 100); } diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php index 7321cde..6a300aa 100644 --- a/module/Application/config/module.config.php +++ b/module/Application/config/module.config.php @@ -20,7 +20,7 @@ return array( ), // Setup for router and routes - 'Zend\Mvc\Router\RouteStack' => array( + 'Zend\Mvc\Router\RouteStackInterface' => array( 'parameters' => array( 'routes' => array( 'default' => array( @@ -95,7 +95,7 @@ return array( // Injecting the router into the url helper 'Zend\View\Helper\Url' => array( 'parameters' => array( - 'router' => 'Zend\Mvc\Router\RouteStack', + 'router' => 'Zend\Mvc\Router\RouteStackInterface', ), ), // Configuration for the doctype helper diff --git a/public/index.php b/public/index.php index 6c1ddb7..edd629b 100644 --- a/public/index.php +++ b/public/index.php @@ -13,13 +13,13 @@ $defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.php $moduleManager = new Zend\Module\Manager($appConfig['modules']); $events = $moduleManager->events(); -$events->setSharedCollections($sharedEvents); +$events->setSharedManager($sharedEvents); $events->attach($defaultListeners); $moduleManager->loadModules(); // Create application, bootstrap, and run $bootstrap = new Zend\Mvc\Bootstrap($defaultListeners->getConfigListener()->getMergedConfig()); -$bootstrap->events()->setSharedCollections($sharedEvents); +$bootstrap->events()->setSharedManager($sharedEvents); $application = new Zend\Mvc\Application; $bootstrap->bootstrap($application); $application->run()->send(); -- 1.7.10.4