Merge branch 'hotfix/4352' into develop

Close zendframework/zendframework#4352
zendframework · Apr 29, 2013 · d0835c3 · d0835c3
commit d0835c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/ClassMapAutoloader.php b/src/ClassMapAutoloader.php
@@ -201,7 +201,7 @@ public static function realPharPath($path)
             return;
         }
 
-        $parts = explode('/', str_replace(array('/','\\'), '/', substr($path, 8)));
+        $parts = explode('/', str_replace(array('/', '\\'), '/', substr($path, 8)));
         $parts = array_values(array_filter($parts, function ($p) {
             return ($p !== '' && $p !== '.');
         }));

diff --git a/src/ModuleAutoloader.php b/src/ModuleAutoloader.php
@@ -153,9 +153,9 @@ public function autoload($class)
             }
         }
 
-        if (count($this->namespacedPaths) >= 1 ) {
-            foreach ( $this->namespacedPaths as $namespace=>$path ) {
-                if ( false === strpos($moduleName,$namespace) ) {
+        if (count($this->namespacedPaths) >= 1) {
+            foreach ($this->namespacedPaths as $namespace => $path) {
+                if (false === strpos($moduleName, $namespace)) {
                     continue;
                 }
 
@@ -359,8 +359,8 @@ public function registerPath($path, $moduleName = false)
             ));
         }
         if ($moduleName) {
-            if (in_array( substr($moduleName, -2 ), array('\\*','\\%') ) ) {
-                $this->namespacedPaths[ substr($moduleName, 0, -2 ) ] = static::normalizePath($path);
+            if (in_array( substr($moduleName, -2), array('\\*', '\\%'))) {
+                $this->namespacedPaths[substr($moduleName, 0, -2)] = static::normalizePath($path);
             } else {
                 $this->explicitPaths[$moduleName] = static::normalizePath($path);
             }