Fix json exceptions

LaravelRUS · Feb 6, 2017 · b7cec3d · b7cec3d
1 parent 03a9af2
commit b7cec3d
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -160,10 +160,6 @@ protected function getResponseData(ResponseInterface $response)
     {
         $data = json_decode((string)$response->getBody(), true);
 
-        if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new VkException('Invalid VK response format: ' . json_last_error_msg());
-        }
-
         if (!$this->passError) {
             $this->checkErrors($data);
         }
@@ -172,11 +168,19 @@ protected function getResponseData(ResponseInterface $response)
     }
 
     /**
-     * @param $data
+     * @param array|false $data
      * @throws VkException
      */
     protected function checkErrors($data)
     {
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            throw new VkException('Invalid VK response format: ' . json_last_error_msg());
+        }
+
+        if (!is_array($data)) {
+            throw new VkException('Invalid response format');
+        }
+
         if (isset($data['error'])) {
             throw self::toException($data['error']);
         }