Merge pull request #29 from SRLabs-Forks/master

Enable Support for both Guzzle 5 and 6

composer.json

@@ -1,19 +1,19 @@
-{
-    "name": "jelovac/bitly4laravel",
-    "description": "Provides a Laravel package to communicate with Bit.ly API",
-    "license": "MIT",
-    "require": {
-        "php": ">=5.4",
-        "illuminate/support": "~4|~5",
-        "guzzlehttp/guzzle": "~5"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.4.*"
-    },
-    "autoload": {
-        "psr-0": {
-            "Jelovac\\Bitly4laravel\\": "src/"
-        }
-    },
-    "minimum-stability": "dev"
-}
+{
+    "name": "jelovac/bitly4laravel",
+    "description": "Provides a Laravel package to communicate with Bit.ly API",
+    "license": "MIT",
+    "require": {
+        "php": ">=5.4",
+        "illuminate/support": "~4|~5",
+        "guzzlehttp/guzzle": "~5|~6"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.4.*"
+    },
+    "autoload": {
+        "psr-0": {
+            "Jelovac\\Bitly4laravel\\": "src/"
+        }
+    },
+    "minimum-stability": "dev"
+}

src/Jelovac/Bitly4laravel/API.php

@@ -82,7 +82,7 @@ protected function call($action, array $params = array())
                 case 'json':
 
                 default:
-                    $body = $response->json();
+                    $body = method_exists($response, 'json') ? $response->json() : json_decode($response->getBody());
             }
 
             return $body;