Merge branch 'hotfix/2878'

Close zendframework/zendframework#2878

src/ArrayUtils.php

@@ -235,7 +235,7 @@ public static function merge(array $a, array $b)
                 if (is_int($key)) {
                     $a[] = $value;
                 } elseif (is_array($value) && is_array($a[$key])) {
-                    $a[$key] = self::merge($a[$key], $value);
+                    $a[$key] = static::merge($a[$key], $value);
                 } else {
                     $a[$key] = $value;
                 }

src/CallbackHandler.php

@@ -81,12 +81,12 @@ protected function registerCallback($callback)
             throw new Exception\InvalidCallbackException('Invalid callback provided; not callable');
         }
 
-        if (null === self::$hasWeakRefExtension) {
-            self::$hasWeakRefExtension = class_exists('WeakRef');
+        if (null === static::$hasWeakRefExtension) {
+            static::$hasWeakRefExtension = class_exists('WeakRef');
         }
 
         // If pecl/weakref is not installed, simply store the callback and return
-        if (!self::$hasWeakRefExtension) {
+        if (!static::$hasWeakRefExtension) {
             $this->callback = $callback;
             return;
         }
@@ -172,13 +172,13 @@ public function call(array $args = array())
         }
 
         // Minor performance tweak, if the callback gets called more than once
-        if (!isset(self::$isPhp54)) {
-            self::$isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>=');
+        if (!isset(static::$isPhp54)) {
+            static::$isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>=');
         }
 
         $argCount = count($args);
 
-        if (self::$isPhp54 && is_string($callback)) {
+        if (static::$isPhp54 && is_string($callback)) {
             $result = $this->validateStringCallbackFor54($callback);
 
             if ($result !== true && $argCount <= 3) {
@@ -193,27 +193,27 @@ public function call(array $args = array())
         // reached
         switch ($argCount) {
             case 0:
-                if (self::$isPhp54) {
+                if (static::$isPhp54) {
                     return $callback();
                 }
                 return call_user_func($callback);
             case 1:
-                if (self::$isPhp54) {
+                if (static::$isPhp54) {
                     return $callback(array_shift($args));
                 }
                 return call_user_func($callback, array_shift($args));
             case 2:
                 $arg1 = array_shift($args);
                 $arg2 = array_shift($args);
-                if (self::$isPhp54) {
+                if (static::$isPhp54) {
                     return $callback($arg1, $arg2);
                 }
                 return call_user_func($callback, $arg1, $arg2);
             case 3:
                 $arg1 = array_shift($args);
                 $arg2 = array_shift($args);
                 $arg3 = array_shift($args);
-                if (self::$isPhp54) {
+                if (static::$isPhp54) {
                     return $callback($arg1, $arg2, $arg3);
                 }
                 return call_user_func($callback, $arg1, $arg2, $arg3);

src/Glob.php

@@ -42,9 +42,9 @@ abstract class Glob
     public static function glob($pattern, $flags, $forceFallback = false)
     {
         if (!defined('GLOB_BRACE') || $forceFallback) {
-            return self::fallbackGlob($pattern, $flags);
+            return static::fallbackGlob($pattern, $flags);
         } else {
-            return self::systemGlob($pattern, $flags);
+            return static::systemGlob($pattern, $flags);
         }
     }
 
@@ -92,7 +92,7 @@ protected static function systemGlob($pattern, $flags)
     protected static function fallbackGlob($pattern, $flags)
     {
         if (!$flags & self::GLOB_BRACE) {
-            return self::systemGlob($pattern, $flags);
+            return static::systemGlob($pattern, $flags);
         }
 
         $flags &= ~self::GLOB_BRACE;
@@ -119,22 +119,22 @@ protected static function fallbackGlob($pattern, $flags)
         }
 
         if ($begin === false) {
-            return self::systemGlob($pattern, $flags);
+            return static::systemGlob($pattern, $flags);
         }
 
-        $next = self::nextBraceSub($pattern, $begin + 1, $flags);
+        $next = static::nextBraceSub($pattern, $begin + 1, $flags);
 
         if ($next === null) {
-            return self::systemGlob($pattern, $flags);
+            return static::systemGlob($pattern, $flags);
         }
 
         $rest = $next;
 
         while ($pattern[$rest] !== '}') {
-            $rest = self::nextBraceSub($pattern, $rest + 1, $flags);
+            $rest = static::nextBraceSub($pattern, $rest + 1, $flags);
 
             if ($rest === null) {
-                return self::systemGlob($pattern, $flags);
+                return static::systemGlob($pattern, $flags);
             }
         }
 
@@ -145,7 +145,7 @@ protected static function fallbackGlob($pattern, $flags)
                         . substr($pattern, $p, $next - $p)
                         . substr($pattern, $rest + 1);
 
-            $result = self::fallbackGlob($subPattern, $flags | self::GLOB_BRACE);
+            $result = static::fallbackGlob($subPattern, $flags | self::GLOB_BRACE);
 
             if ($result) {
                 $paths = array_merge($paths, $result);
@@ -156,7 +156,7 @@ protected static function fallbackGlob($pattern, $flags)
             }
 
             $p    = $next + 1;
-            $next = self::nextBraceSub($pattern, $p, $flags);
+            $next = static::nextBraceSub($pattern, $p, $flags);
         }
 
         return array_unique($paths);

src/Hydrator/Reflection.php

@@ -80,16 +80,16 @@ protected static function getReflProperties($input)
             throw new Exception\InvalidArgumentException('Input must be a string or an object.');
         }
 
-        if (!isset(self::$reflProperties[$input])) {
+        if (!isset(static::$reflProperties[$input])) {
             $reflClass      = new ReflectionClass($input);
             $reflProperties = $reflClass->getProperties();
 
             foreach ($reflProperties as $property) {
                 $property->setAccessible(true);
-                self::$reflProperties[$input][$property->getName()] = $property;
+                static::$reflProperties[$input][$property->getName()] = $property;
             }
         }
 
-        return self::$reflProperties[$input];
+        return static::$reflProperties[$input];
     }
 }