Remove $env parameter from initAutoloader method

[zf2.biz/galerie.git] / modules / Application / Module.php

diff --git a/modules/Application/Module.php b/modules/Application/Module.php
index df4dc5f..37cb11f 100644 (file)
--- a/modules/Application/Module.php
+++ b/modules/Application/Module.php
@@ -2,10 +2,9 @@
 
 namespace Application;
 
-use InvalidArgumentException,
-    Zend\Module\Manager,
-    Zend\Config\Config,
-    Zend\EventManager\StaticEventManager;
+use Zend\Module\Manager,
+    Zend\EventManager\StaticEventManager,
+    Zend\Loader\AutoloaderFactory;
 
 class Module
 {
@@ -14,19 +13,28 @@ class Module
 
     public function init(Manager $moduleManager)
     {
-        $this->initAutoloader($moduleManager->getOptions()->getApplicationEnv());
+        $this->initAutoloader();
         $events = StaticEventManager::getInstance();
         $events->attach('bootstrap', 'bootstrap', array($this, 'initializeView'), 100);
     }
 
-    protected function initAutoloader($env = null)
+    protected function initAutoloader()
     {
-        require __DIR__ . '/autoload_register.php';
+        AutoloaderFactory::factory(array(
+            'Zend\Loader\ClassMapAutoloader' => array(
+                __DIR__ . '/autoload_classmap.php',
+            ),
+            'Zend\Loader\StandardAutoloader' => array(
+                'namespaces' => array(
+                    __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)