Merge branch 'hotfix/2843' into develop

Forward port zendframework/zendframework#2843

Author: weierophinney

src/ClientStatic.php

@@ -30,10 +30,10 @@ class ClientStatic
      */
     protected static function getStaticClient()
     {
-        if (!isset(self::$client)) {
-            self::$client = new Client();
+        if (!isset(static::$client)) {
+            static::$client = new Client();
         }
-        return self::$client;
+        return static::$client;
     }
 
     /**
@@ -67,7 +67,7 @@ public static function get($url, $query = array(), $headers = array(), $body = n
             $request->setBody($body);
         }
 
-        return self::getStaticClient()->send($request);
+        return static::getStaticClient()->send($request);
     }
 
     /**
@@ -108,6 +108,6 @@ public static function post($url, $params, $headers = array(), $body = null)
             $request->setContent($body);
         }
 
-        return self::getStaticClient()->send($request);
+        return static::getStaticClient()->send($request);
     }
 }