Merge branch 'dev'

Author: Helperhaps

src/JPush/Exceptions/ServiceNotAvaliable.php

@@ -0,0 +1,25 @@
+<?php
+namespace JPush\Exceptions;
+
+class ServiceNotAvaliable extends JPushException {
+
+    private $code;
+    private $headers;
+
+    function __construct($response){
+        $this->http_code = $response['http_code'];
+        $this->headers = $response['headers'];
+        $this->message = $response['body'];
+    }
+
+    function __toString() {
+        return "\n" . __CLASS__ . " -- [{$this->code}]: {$this->message} \n";
+    }
+
+    public function getHttpCode() {
+        return $this->http_code;
+    }
+    public function getHeaders() {
+        return $this->headers;
+    }
+}

src/JPush/Http.php

@@ -116,12 +116,13 @@ private static function sendRequest($client, $url, $method, $body=null, $times=1
     }
 
     public static function processResp($response) {
-        if($response['http_code'] === 200) {
+        $data = json_decode($response['body'], true);
+
+        if (is_null($data)) {
+            throw new ServiceNotAvaliable($response);
+        } elseif ($response['http_code'] === 200) {
             $result = array();
-            $data = json_decode($response['body'], true);
-            if (!is_null($data)) {
-                $result['body'] = $data;
-            }
+            $result['body'] = $data;
             $result['http_code'] = $response['http_code'];
             $result['headers'] = $response['headers'];
             return $result;

src/JPush/version.php

@@ -1,4 +1,4 @@
 <?php
 namespace JPush;
 
-  const VERSION = '3.5.11';
+  const VERSION = '3.5.12';