Merge branch 'master' of git://github.com/zendframework/zf2 into cach…

…e_internals

Conflicts:
	library/Zend/Cache/Storage/Adapter/Filesystem.php

src/ModuleAutoloader.php

@@ -259,21 +259,22 @@ public function unregister()
      */
     public function registerPaths($paths)
     {
-        if (is_array($paths) || $paths instanceof Traversable) {
-            foreach ($paths as $module => $path) {
-                if (is_string($module)) {
-                    $this->registerPath($path, $module);
-                } else {
-                    $this->registerPath($path);
-                }
-            }
-        } else {
+        if (!is_array($paths) && !$paths instanceof Traversable) {
             throw new \InvalidArgumentException(
                 'Parameter to \\Zend\\Loader\\ModuleAutoloader\'s '
                 . 'registerPaths method must be an array or '
                 . 'implement the \\Traversable interface'
             );
         }
+
+        foreach ($paths as $module => $path) {
+            if (is_string($module)) {
+                $this->registerPath($path, $module);
+            } else {
+                $this->registerPath($path);
+            }
+        }
+
         return $this;
     }
 

test/ModuleAutoloaderTest.php

@@ -188,4 +188,5 @@ public function testCanLoadModulesFromExplicitLocation()
         $this->assertTrue(class_exists('My\NonmatchingModule\Module'));
         $this->assertTrue(class_exists('PharModuleExplicit\Module'));
     }
+
 }