Updated docs and dependencies. Fix json decode

README.md

@@ -11,10 +11,16 @@ Check our docs page to get a complete guide on how to install it in an existing
 
 ## News
 
-The version 1.x of the PHP SDK now works with the Auth API v2 which adds lots of new [features and changes](https://auth0.com/docs/apiv2Changes).
+- The version 2.x of the PHP SDK was updated to work with Guzzle 6.1. For compatibility fith Guzzle 5, you should use 1.x branch.
+- The version 1.x of the PHP SDK now works with the Auth API v2 which adds lots of new [features and changes](https://auth0.com/docs/apiv2Changes).
 
 ### Backward compatibility breaks
 
+2.x
+- Session storage now returns null (and null is expected by the sdk) if there is no info stored (this change was made since false is a valid value to be stored in session).
+- Guzzle 6.1 required
+
+1.x
 - Now, all the SDK is under the namespace `\Auth0\SDK`
 - The exceptions were moved to the namespace `\Auth0\SDK\Exceptions`
 - The method `Auth0::getUserInfo` is deprecated and soon to be removed. We encourage to use `Auth0::getUser` to enforce the adoption of the API v2
@@ -55,6 +61,11 @@ $ composer install
 $ php -S localhost:3000
 ```
 
+## Migration guide from 1.x
+
+1. If you use Guzzle (or some other dependency does), you will need to update it to work with Guzzle 6.1.
+2. 
+
 ## Migration guide from 0.6.6
 
 1. First is important to read the [API v2 changes document](https://auth0.com/docs/apiv2Changes) to catch up the latest changes to the API.

composer.json

@@ -11,7 +11,7 @@
   ],
   "require": {
     "php": ">=5.4.0",
-    "guzzlehttp/guzzle": "~6.1",
+    "guzzlehttp/guzzle": "^6.1",
     "ext-json": "*",
     "adoy/oauth2": "~1.3",
     "firebase/php-jwt" : "~2.2"

examples/basic-api/composer.json

@@ -5,7 +5,7 @@
         "bramus/router": "dev-master",
         "adoy/oauth2": "dev-master",
         "vlucas/phpdotenv": "1.1.1",
-        "auth0/auth0-php": "~1.0"
+        "auth0/auth0-php": "~2.0"
     },
     "autoload": {
         "psr-4": {

examples/basic-oauth/composer.json

@@ -4,7 +4,7 @@
     "require": {
         "adoy/oauth2": "dev-master",
         "vlucas/phpdotenv": "1.1.1",
-        "auth0/auth0-php": "~1.0"
+        "auth0/auth0-php": "~2.0"
     },
     "license": "MIT",
     "authors": [

examples/basic-webapp/composer.json

@@ -4,7 +4,7 @@
     "require": {
          "adoy/oauth2": "dev-master",
          "vlucas/phpdotenv": "1.1.1",
-         "auth0/auth0-php": "~1.0"
+         "auth0/auth0-php": "~2.0"
     },
     "license": "MIT",
     "authors": [

examples/link-users/composer.json

@@ -4,7 +4,7 @@
     "require": {
         "adoy/oauth2": "dev-master",
         "vlucas/phpdotenv": "1.1.1",
-        "auth0/auth0-php": "~1.0"
+        "auth0/auth0-php": "~2.0"
     },
     "license": "MIT",
     "authors": [

src/API/RequestBuilder.php

@@ -96,7 +96,7 @@ public function call() {
             ]);
             $body = (string) $response->getBody();
 
-            return $this->jsonDecode($body, true);
+            return json_decode($body, true);
 
         } catch (RequestException $e) {
             throw $e;