X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=modules%2FApplication%2FModule.php;h=5bd9a70bc4d72707b812a25225da049b83bc67fc;hb=07f9a36fe6140f21229a07b3f1342edbe7cd8da1;hp=9dee84c8687de0ba547e2ea8e1a0b3e06d4dfeec;hpb=c98ce242fea38efa5abfa940202b55747fbed7a9;p=zf2.biz%2Fgalerie.git

diff --git a/modules/Application/Module.php b/modules/Application/Module.php
index 9dee84c..5bd9a70 100644
--- a/modules/Application/Module.php
+++ b/modules/Application/Module.php
@@ -3,25 +3,23 @@
 namespace Application;
 
 use Zend\Module\Manager,
-    Zend\Config\Config,
     Zend\EventManager\StaticEventManager,
-    Zend\Loader\AutoloaderFactory;
+    Zend\Module\Consumer\AutoloaderProvider;
 
-class Module
+class Module implements AutoloaderProvider
 {
     protected $view;
     protected $viewListener;
 
     public function init(Manager $moduleManager)
     {
-        $this->initAutoloader($moduleManager->getOptions()->getApplicationEnv());
         $events = StaticEventManager::getInstance();
         $events->attach('bootstrap', 'bootstrap', array($this, 'initializeView'), 100);
     }
 
-    protected function initAutoloader($env = null)
+    public function getAutoloaderConfig()
     {
-        AutoloaderFactory::factory(array(
+        return array(
             'Zend\Loader\ClassMapAutoloader' => array(
                 __DIR__ . '/autoload_classmap.php',
             ),
@@ -30,19 +28,19 @@ class Module
                     __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                 ),
             ),
-        ));
+        );
     }
 
-    public function getConfig()
+    public function getConfig($env = null)
     {
-        return new Config(include __DIR__ . '/configs/module.config.php');
+        return include __DIR__ . '/configs/module.config.php';
     }
     
     public function initializeView($e)
     {
         $app          = $e->getParam('application');
         $locator      = $app->getLocator();
-        $config       = $e->getParam('modules')->getMergedConfig();
+        $config       = $e->getParam('config');
         $view         = $this->getView($app);
         $viewListener = $this->getViewListener($view, $config);
         $app->events()->attachAggregate($viewListener);