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

…evelop
zendframework · Jan 23, 2013 · 603dabb · 603dabb
commit 603dabb
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 83 deletions.
diff --git a/src/AutoloaderFactory.php b/src/AutoloaderFactory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -19,10 +18,6 @@
     return;
 }
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- */
 abstract class AutoloaderFactory
 {
     const STANDARD_AUTOLOADER = 'Zend\Loader\StandardAutoloader';

diff --git a/src/ClassMapAutoloader.php b/src/ClassMapAutoloader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -19,9 +18,6 @@
  * Class-map autoloader
  *
  * Utilizes class-map files to lookup classfile locations.
- *
- * @category   Zend
- * @package    Zend_Loader
  */
 class ClassMapAutoloader implements SplAutoloader
 {

diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class BadMethodCallException extends \BadMethodCallException implements
     ExceptionInterface
 {

diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.php
@@ -5,17 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class DomainException extends \DomainException implements ExceptionInterface
 {}
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -5,14 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- */
 interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {}
diff --git a/src/Exception/InvalidPathException.php b/src/Exception/InvalidPathException.php
@@ -5,17 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class InvalidPathException extends \Exception implements ExceptionInterface
 {}
diff --git a/src/Exception/MissingResourceNamespaceException.php b/src/Exception/MissingResourceNamespaceException.php
@@ -5,18 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class MissingResourceNamespaceException extends \Exception implements
     ExceptionInterface
 {}
diff --git a/src/Exception/PluginLoaderException.php b/src/Exception/PluginLoaderException.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
@@ -14,10 +13,6 @@
 
 /**
  * Plugin class loader exceptions
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
  */
 class PluginLoaderException extends DomainException
 {

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -5,17 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Exception/SecurityException.php b/src/Exception/SecurityException.php
@@ -5,17 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/DomainException.php';
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage Exception
- */
 class SecurityException extends DomainException
 {}
diff --git a/src/ModuleAutoloader.php b/src/ModuleAutoloader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -98,6 +97,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 +135,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 +322,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 +352,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)
             ));

diff --git a/src/PluginClassLoader.php b/src/PluginClassLoader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -16,9 +15,6 @@
 
 /**
  * Plugin class locator interface
- *
- * @category   Zend
- * @package    Zend_Loader
  */
 class PluginClassLoader implements PluginClassLocator
 {

diff --git a/src/PluginClassLocator.php b/src/PluginClassLocator.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -14,9 +13,6 @@
 
 /**
  * Plugin class locator interface
- *
- * @category   Zend
- * @package    Zend_Loader
  */
 interface PluginClassLocator extends ShortNameLocator, \IteratorAggregate
 {

diff --git a/src/ShortNameLocator.php b/src/ShortNameLocator.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
 
 /**
  * Short name locator interface
- *
- * @category   Zend
- * @package    Zend_Loader
  */
 interface ShortNameLocator
 {

diff --git a/src/SplAutoloader.php b/src/SplAutoloader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -17,8 +16,6 @@
 /**
  * Defines an interface for classes that may register with the spl_autoload
  * registry
- *
- * @package    Zend_Loader
  */
 interface SplAutoloader
 {

diff --git a/src/StandardAutoloader.php b/src/StandardAutoloader.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace Zend\Loader;
@@ -19,8 +18,6 @@
  * Allows autoloading both namespaced and vendor-prefixed classes. Class
  * lookups are performed on the filesystem. If a class file for the referenced
  * class is not found, a PHP warning will be raised by include().
- *
- * @package    Zend_Loader
  */
 class StandardAutoloader implements SplAutoloader
 {

diff --git a/test/ModuleAutoloaderTest.php b/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'));
     }
-
 }
diff --git a/test/_files/BarModule/Module.php b/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
+{
+}
diff --git a/test/_files/PharModuleMap.phar b/test/_files/PharModuleMap.phar