Merge branch 'milestones/autoloading' of https://github.com/mfacenet/zf2

into hotfix/standard_autoloader
zendframework · Apr 28, 2011 · 25c04a5 · 25c04a5
16 parents 4e037a4 + 5ff214e + a135f67 + dc6fc8d + ea87c57 + e81a7a9 + 2a31e0f + 8bf7d74 + 40c70ad + 0a944c3 + 634f136 + 1c5d175 + 57b4987 + 07b07fa + 8992bfe + be69400
commit 25c04a5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/src/AutoloaderFactory.php b/src/AutoloaderFactory.php
@@ -86,7 +86,8 @@ public static function factory($options)
 
         foreach ($options as $class => $opts) {
             if (!class_exists($class)) {
-                if (!self::getStandardAutoloader()->autoload($class)) {
+                $autoloader = self::getStandardAutoloader();
+            	if (!class_exists($class) && !$autoloader->autoload($class))
                     require_once 'Exception/InvalidArgumentException.php';
                     throw new Exception\InvalidArgumentException(sprintf('Autoloader class "%s" not loaded', $class));
                 }

diff --git a/src/ResourceAutoloader.php b/src/ResourceAutoloader.php
@@ -65,6 +65,7 @@ class ResourceAutoloader implements SplAutoloader
      * Constructor
      *
      * @param  array|Traversable $options Configuration options for resource autoloader
+     * @throws Exception\InvalidArgumentException
      * @return void
      */
     public function __construct($options = null)
@@ -102,23 +103,24 @@ public function __construct($options = null)
      * @param  string $method
      * @param  array $args
      * @return mixed
-     * @throws Zend_Loader_Exception if method not beginning with 'get' or not matching a valid resource type is called
+     * @throws Exception\InvalidArgumentException if method not beginning with 'get' or not matching a valid resource type is called
+     * @throws Exception\BadMethodCallException
      */
     public function __call($method, $args)
     {
         if ('get' == substr($method, 0, 3)) {
             $type  = strtolower(substr($method, 3));
             if (!$this->hasResourceType($type)) {
-                throw new InvalidArgumentException("Invalid resource type $type; cannot load resource");
+                throw new Exception\InvalidArgumentException("Invalid resource type $type; cannot load resource");
             }
             if (empty($args)) {
-                throw new InvalidArgumentException("Cannot load resources; no resource specified");
+                throw new Exception\InvalidArgumentException("Cannot load resources; no resource specified");
             }
             $resource = array_shift($args);
             return $this->load($resource, $type);
         }
 
-        throw new BadMethodCallException("Method '$method' is not supported");
+        throw new Exception\BadMethodCallException("Method '$method' is not supported");
     }
 
     /**
@@ -268,7 +270,8 @@ public function register()
      * Set class state from options
      *
      * @param  array $options
-     * @return Zend_Loader_Autoloader_Resource
+     * @throws Exception\InvalidArgumentExceptions
+     * @return \Zend\Loader\Autoloader\Resource
      */
     public function setOptions($options)
     {
@@ -370,14 +373,16 @@ public function getBasePath()
      * @param  string $type identifier for the resource type being loaded
      * @param  string $path path relative to resource base path containing the resource types
      * @param  null|string $namespace sub-component namespace to append to base namespace that qualifies this resource type
+     * @throws Exception\MissingResourceNamespaceException
+     * @throws Exception\InvalidPathException
      * @return Zend_Loader_Autoloader_Resource
      */
     public function addResourceType($type, $path, $namespace = null)
     {
         $type = strtolower($type);
         if (!isset($this->_resourceTypes[$type])) {
             if (null === $namespace) {
-                throw new MissingResourceNamespaceException('Initial definition of a resource type must include a namespace');
+                throw new Exception\MissingResourceNamespaceException('Initial definition of a resource type must include a namespace');
             }
             if (null !== $this->getNamespace()) {
                 $this->_addNamespaceResource($type, $namespace);
@@ -386,7 +391,7 @@ public function addResourceType($type, $path, $namespace = null)
             }
         }
         if (!is_string($path)) {
-            throw new InvalidPathException('Invalid path specification provided; must be string');
+            throw new Exception\InvalidPathException('Invalid path specification provided; must be string');
         }
         $this->_resourceTypes[$type]['path'] = $this->getBasePath() . '/' . rtrim($path, '\/');
 
@@ -451,16 +456,17 @@ protected function _addPrefixResource($type, $prefix)
      * </code>
      *
      * @param  array $types
-     * @return Zend_Loader_Autoloader_Resource
+     * @throws Exception\InvalidArgumentException
+     * @return \Zend\Loader\Autoloader\Resource
      */
     public function addResourceTypes(array $types)
     {
         foreach ($types as $type => $spec) {
             if (!is_array($spec)) {
-                throw new InvalidArgumentException('addResourceTypes() expects an array of arrays');
+                throw new Exception\InvalidArgumentException('addResourceTypes() expects an array of arrays');
             }
             if (!isset($spec['path'])) {
-                throw new InvalidArgumentException('addResourceTypes() expects each array to include a paths element');
+                throw new Exception\InvalidArgumentException('addResourceTypes() expects each array to include a paths element');
             }
             $paths  = $spec['path'];
             $namespace = null;
@@ -568,18 +574,18 @@ public function getDefaultResourceType()
      * @param  string $resource
      * @param  string $type
      * @return object
-     * @throws Zend_Loader_Exception if resource type not specified or invalid
+     * @throws Exception\InvalidArgumentException if resource type not specified or invalid
      */
     public function load($resource, $type = null)
     {
         if (null === $type) {
             $type = $this->getDefaultResourceType();
             if (empty($type)) {
-                throw new InvalidArgumentException('No resource type specified');
+                throw new Exception\InvalidArgumentException('No resource type specified');
             }
         }
         if (!$this->hasResourceType($type)) {
-            throw new InvalidArgumentException('Invalid resource type specified');
+            throw new Exception\InvalidArgumentException('Invalid resource type specified');
         }
         $namespace = $this->_resourceTypes[$type]['namespace'];
         if (null !== $this->getNamespace()) {