Merge branch 'develop' of git://github.com/zendframework/zf2 into dev…

…elop

src/Factory.php

@@ -90,11 +90,11 @@ public static function fromFile($filename, $returnConfigObject = false)
             }
 
             $config = include $filename;
-        } elseif (isset(self::$extensions[$extension])) {
-            $reader = self::$extensions[$extension];
+        } elseif (isset(static::$extensions[$extension])) {
+            $reader = static::$extensions[$extension];
             if (!$reader instanceof Reader\ReaderInterface) {
-                $reader = self::getReaderPluginManager()->get($reader);
-                self::$extensions[$extension] = $reader;
+                $reader = static::getReaderPluginManager()->get($reader);
+                static::$extensions[$extension] = $reader;
             }
 
             /** @var Reader\ReaderInterface $reader  */
@@ -121,7 +121,7 @@ public static function fromFiles(array $files, $returnConfigObject = false)
         $config = array();
 
         foreach ($files as $file) {
-            $config = ArrayUtils::merge($config, self::fromFile($file));
+            $config = ArrayUtils::merge($config, static::fromFile($file));
         }
 
         return ($returnConfigObject) ? new Config($config) : $config;
@@ -191,7 +191,7 @@ public static function toFile($filename, $config)
      */
     public static function setReaderPluginManager(ReaderPluginManager $readers)
     {
-        self::$readers = $readers;
+        static::$readers = $readers;
     }
 
     /**
@@ -253,7 +253,7 @@ public static function registerReader($extension, $reader)
             ));
         }
 
-        self::$extensions[$extension] = $reader;
+        static::$extensions[$extension] = $reader;
     }
 
     /**