Merge branch 'develop' of https://github.com/zendframework/zf2 into h…

…otfix/zend-session-global-session-storage

src/ModuleAutoloader.php

@@ -98,6 +98,29 @@ public function setOptions($options)
         return $this;
     }
 
+    /**
+     * Retrieves the class map for all loaded modules.
+     *
+     * @return array
+     */
+    public function getModuleClassMap()
+    {
+        return $this->moduleClassMap;
+    }
+
+    /**
+     * Sets the class map used to speed up the module autoloading.
+     *
+     * @param  array $classmap
+     * @return ModuleLoader
+     */
+    public function setModuleClassMap(array $classmap)
+    {
+        $this->moduleClassMap = $classmap;
+
+        return $this;
+    }
+
     /**
      * Autoload a class
      *
@@ -113,6 +136,11 @@ public function autoload($class)
             return false;
         }
 
+        if (isset($this->moduleClassMap[$class])) {
+            require_once $this->moduleClassMap[$class];
+            return $class;
+        }
+
         $moduleName = substr($class, 0, -7);
         if (isset($this->explicitPaths[$moduleName])) {
             $classLoaded = $this->loadModuleFromDir($this->explicitPaths[$moduleName], $class);
@@ -295,7 +323,8 @@ public function unregister()
     public function registerPaths($paths)
     {
         if (!is_array($paths) && !$paths instanceof Traversable) {
-            throw new \InvalidArgumentException(
+            require_once __DIR__ . '/Exception/InvalidArgumentException.php';
+            throw new Exception\InvalidArgumentException(
                 'Parameter to \\Zend\\Loader\\ModuleAutoloader\'s '
                 . 'registerPaths method must be an array or '
                 . 'implement the \\Traversable interface'
@@ -324,7 +353,8 @@ public function registerPaths($paths)
     public function registerPath($path, $moduleName = false)
     {
         if (!is_string($path)) {
-            throw new \InvalidArgumentException(sprintf(
+            require_once __DIR__ . '/Exception/InvalidArgumentException.php';
+            throw new Exception\InvalidArgumentException(sprintf(
                 'Invalid path provided; must be a string, received %s',
                 gettype($path)
             ));

test/ModuleAutoloaderTest.php

@@ -197,6 +197,19 @@ public function testCanLoadModulesFromExplicitLocation()
         $this->assertTrue(class_exists('PharModuleExplicit\Module'));
     }
 
+    public function testCanLoadModulesFromClassMap()
+    {
+        $loader = new ModuleAutoloader();
+        $loader->setModuleClassMap(array(
+            'BarModule\Module' =>     __DIR__ . '/_files/BarModule/Module.php',
+            'PharModuleMap\Module' => __DIR__ . '/_files/PharModuleMap.phar',
+        ));
+        $loader->register();
+
+        $this->assertTrue(class_exists('BarModule\Module'));
+        $this->assertTrue(class_exists('PharModuleMap\Module'));
+    }
+
     public function testCanLoadModulesFromNamespace()
     {
         $loader = new ModuleAutoloader(array(
@@ -208,5 +221,4 @@ public function testCanLoadModulesFromNamespace()
         $this->assertTrue(class_exists('FooModule\SubModule\Module'));
         $this->assertTrue(class_exists('FooModule\Module'));
     }
-
 }

test/_files/BarModule/Module.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Loader
+ */
+
+namespace BarModule;
+
+class Module
+{
+}

test/_files/_buildPhars.php

@@ -4,6 +4,7 @@
 // Executable
 // .phar
 buildModulePhar('PharModule');
+buildModulePhar('PharModuleMap');
 // .phar.gz
 buildModulePhar('PharModuleGz', Phar::PHAR, Phar::GZ);
 // .phar.bz2