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

…e_filesystemSpeedup

src/AutoloaderFactory.php

@@ -88,7 +88,7 @@ public static function factory($options = null)
         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'
+                'Options provided must be an array or Traversable'
             );
         }
 
@@ -98,17 +98,17 @@ public static function factory($options = null)
                 if (!class_exists($class) && !$autoloader->autoload($class)) {
                     require_once 'Exception/InvalidArgumentException.php';
                     throw new Exception\InvalidArgumentException(
-                                sprintf('Autoloader class "%s" not loaded', $class)
+                        sprintf('Autoloader class "%s" not loaded', $class)
                     );
                 }
 
                 // unfortunately is_subclass_of is broken on some 5.3 versions
                 // additionally instanceof is also broken for this use case
                 if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
-                        if (!is_subclass_of($class, 'Zend\Loader\SplAutoloader')) {
+                    if (!is_subclass_of($class, 'Zend\Loader\SplAutoloader')) {
                         require_once 'Exception/InvalidArgumentException.php';
                         throw new Exception\InvalidArgumentException(
-                                    sprintf('Autoloader class %s must implement Zend\\Loader\\SplAutoloader', $class)
+                            sprintf('Autoloader class %s must implement Zend\\Loader\\SplAutoloader', $class)
                         );
                     }
                 }

src/ClassMapAutoloader.php

@@ -19,7 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** @namespace */
 namespace Zend\Loader;
 
 // Grab SplAutoloader interface

src/Pluggable.php

@@ -19,9 +19,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Loader;
 
 /**

src/PluginClassLoader.php

@@ -19,9 +19,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Loader;
 
 use ArrayIterator,

src/PluginClassLocator.php

@@ -19,9 +19,6 @@
  * @version    $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Loader;
 
 /**

src/PrefixPathLoader.php

@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Loader;
 
 use Zend\Stdlib\ArrayStack,
@@ -458,7 +455,7 @@ protected function formatName($name)
      */
     protected function formatPrefix($prefix, $namespaced = true)
     {
-        if($prefix == "") {
+        if ($prefix == "") {
             return $prefix;
         }
 

src/PrefixPathMapper.php

@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Loader;
 
 /**

src/ShortNameLocator.php

@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Loader;
 
 /**

src/StandardAutoloader.php

@@ -19,7 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** @namespace */
 namespace Zend\Loader;
 
 // Grab SplAutoloader interface