Merge branch 'master' into feature/video-update

Author: joedawson

src/Youtube.php

@@ -76,7 +76,7 @@ public function __construct($app, Google_Client $client)
      * @param  string $path
      * @param  array $data
      * @param  string $privacyStatus
-     * @return string
+     * @return self
      * @throws Exception
      */
     public function upload($path, array $data = [], $privacyStatus = 'public')
@@ -146,7 +146,7 @@ public function upload($path, array $data = [], $privacyStatus = 'public')
      * @param  string $id
      * @param  array $data
      * @param  string $privacyStatus
-     * @return string
+     * @return self
      * @throws Exception
      */
     public function update($id, array $data = [], $privacyStatus = 'public')
@@ -395,13 +395,11 @@ public function handleAccessToken()
 
         if($this->client->isAccessTokenExpired())
         {
-            $accessToken = json_decode($accessToken);
-
             // If we have a "refresh_token"
-            if(property_exists($accessToken, 'refresh_token'))
+            if (array_key_exists('refresh_token', $accessToken))
             {
                 // Refresh the access token
-                $this->client->refreshToken($accessToken->refresh_token);
+                $this->client->refreshToken($accessToken['refresh_token']);
 
                 // Save the access token
                 $this->saveAccessTokenToDB($this->client->getAccessToken());