Merge branch 'release'

zendframework · Sep 10, 2012 · 8243aea · 8243aea
19 parents c13245d + 4c0c206 + d20df42 + 84cabf6 + 4daeba0 + 660eb19 + 587b0dd + 13e8cbe + 7100033 + 50b1c92 + 94eb741 + 1ca385c + 86e6515 + 58c378d + 061dbfa + 897f6bf + e3cc86e + 6524484 + 627112b
commit 8243aea
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 8 deletions.
diff --git a/src/AutoloaderFactory.php b/src/AutoloaderFactory.php
@@ -11,6 +11,7 @@
 namespace Zend\Loader;
 
 use ReflectionClass;
+use Traversable;
 
 require_once __DIR__ . '/SplAutoloader.php';
 
@@ -74,7 +75,7 @@ public static function factory($options = null)
             return;
         }
 
-        if (!is_array($options) && !($options instanceof \Traversable)) {
+        if (!is_array($options) && !($options instanceof Traversable)) {
             require_once __DIR__ . '/Exception/InvalidArgumentException.php';
             throw new Exception\InvalidArgumentException(
                 'Options provided must be an array or Traversable'

diff --git a/src/ClassMapAutoloader.php b/src/ClassMapAutoloader.php
@@ -10,6 +10,8 @@
 
 namespace Zend\Loader;
 
+use Traversable;
+
 // Grab SplAutoloader interface
 require_once __DIR__ . '/SplAutoloader.php';
 
@@ -40,7 +42,7 @@ class ClassMapAutoloader implements SplAutoloader
      *
      * Create a new instance, and optionally configure the autoloader.
      *
-     * @param  null|array|\Traversable $options
+     * @param  null|array|Traversable $options
      */
     public function __construct($options = null)
     {
@@ -73,6 +75,7 @@ public function setOptions($options)
      * classname/file pairs.
      *
      * @param  string|array $map
+     * @throws Exception\InvalidArgumentException
      * @return ClassMapAutoloader
      */
     public function registerAutoloadMap($map)
@@ -105,11 +108,12 @@ public function registerAutoloadMap($map)
      * Register many autoload maps at once
      *
      * @param  array $locations
+     * @throws Exception\InvalidArgumentException
      * @return ClassMapAutoloader
      */
     public function registerAutoloadMaps($locations)
     {
-        if (!is_array($locations) && !($locations instanceof \Traversable)) {
+        if (!is_array($locations) && !($locations instanceof Traversable)) {
             require_once __DIR__ . '/Exception/InvalidArgumentException.php';
             throw new Exception\InvalidArgumentException('Map list must be an array or implement Traversable');
         }

diff --git a/src/ModuleAutoloader.php b/src/ModuleAutoloader.php
@@ -262,7 +262,8 @@ public function unregister()
      * registerPaths
      *
      * @param array|Traversable $paths
-     * @return ModuleLoader
+     * @throws \InvalidArgumentException
+     * @return ModuleAutoloader
      */
     public function registerPaths($paths)
     {
@@ -289,8 +290,9 @@ public function registerPaths($paths)
      * registerPath
      *
      * @param string $path
-     * @param string $moduleName
-     * @return ModuleLoader
+     * @param bool|string $moduleName
+     * @throws \InvalidArgumentException
+     * @return ModuleAutoloader
      */
     public function registerPath($path, $moduleName = false)
     {
@@ -339,6 +341,7 @@ protected function pharFileToModuleName($pharPath)
      * Normalize a path for insertion in the stack
      *
      * @param  string $path
+     * @param  bool   $trailingSlash Whether trailing slash should be included
      * @return string
      */
     public static function normalizePath($path, $trailingSlash = true)

diff --git a/src/PluginClassLoader.php b/src/PluginClassLoader.php
@@ -58,6 +58,7 @@ public function __construct($map = null)
      * A null value will clear the static map.
      *
      * @param  null|array|Traversable $map
+     * @throws Exception\InvalidArgumentException
      * @return void
      */
     public static function addStaticMap($map)
@@ -211,7 +212,7 @@ public function load($name)
      * Returns an instance of ArrayIterator, containing a map of
      * all plugins
      *
-     * @return Iterator
+     * @return ArrayIterator
      */
     public function getIterator()
     {

diff --git a/src/PluginClassLocator.php b/src/PluginClassLocator.php
@@ -10,6 +10,8 @@
 
 namespace Zend\Loader;
 
+use Traversable;
+
 /**
  * Plugin class locator interface
  *

diff --git a/src/SplAutoloader.php b/src/SplAutoloader.php
@@ -10,6 +10,8 @@
 
 namespace Zend\Loader;
 
+use Traversable;
+
 if (interface_exists('Zend\Loader\SplAutoloader')) return;
 
 /**
@@ -25,7 +27,7 @@ interface SplAutoloader
      *
      * Allow configuration of the autoloader via the constructor.
      *
-     * @param  null|array|\Traversable $options
+     * @param  null|array|Traversable $options
      */
     public function __construct($options = null);
 

diff --git a/src/StandardAutoloader.php b/src/StandardAutoloader.php
@@ -77,6 +77,7 @@ public function __construct($options = null)
      * </code>
      *
      * @param  array|\Traversable $options
+     * @throws Exception\InvalidArgumentException
      * @return StandardAutoloader
      */
     public function setOptions($options)
@@ -153,6 +154,7 @@ public function registerNamespace($namespace, $directory)
      * Register many namespace/directory pairs at once
      *
      * @param  array $namespaces
+     * @throws Exception\InvalidArgumentException
      * @return StandardAutoloader
      */
     public function registerNamespaces($namespaces)
@@ -186,6 +188,7 @@ public function registerPrefix($prefix, $directory)
      * Register many namespace/directory pairs at once
      *
      * @param  array $prefixes
+     * @throws Exception\InvalidArgumentException
      * @return StandardAutoloader
      */
     public function registerPrefixes($prefixes)
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,8 @@ @@
     namespace Zend\Loader;
+    use Traversable;
     /**
      * Plugin class locator interface
      *
@@ Expand Down @@