Merge branch 'google-sdk-conflict' into develop-alim

Author: Md. Alimuzzaman Alim

lib/Google/composer.json

@@ -25,11 +25,8 @@
         "cache/filesystem-adapter": "For caching certs and tokens (using Google_Client::setCache)"
     },
     "autoload": {
-        "psr-0": {
-            "Google_": "src/"
-        },
         "classmap": [
-            "src/Google/Service/"
+            "src/Google/"
         ]
     },
     "extra": {

lib/Google/src/Google/AccessToken/Revoke.php

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+namespace wpCloud\StatelessMedia\Google_Client;
 
 use Google\Auth\HttpHandler\HttpHandlerFactory;
 use GuzzleHttp\ClientInterface;

lib/Google/src/Google/AccessToken/Verify.php

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+namespace wpCloud\StatelessMedia\Google_Client;
 
 use Firebase\JWT\ExpiredException as ExpiredExceptionV3;
 use Firebase\JWT\SignatureInvalidException;
@@ -79,7 +80,7 @@ public function __construct(
   public function verifyIdToken($idToken, $audience = null)
   {
     if (empty($idToken)) {
-      throw new LogicException('id_token cannot be null');
+      throw new \LogicException('id_token cannot be null');
     }
 
     // set phpseclib constants if applicable
@@ -123,7 +124,7 @@ public function verifyIdToken($idToken, $audience = null)
         return false;
       } catch (SignatureInvalidException $e) {
         // continue
-      } catch (DomainException $e) {
+      } catch (\DomainException $e) {
         // continue
       }
     }
@@ -196,7 +197,7 @@ private function getFederatedSignOnCerts()
     }
 
     if (!isset($certs['keys'])) {
-      throw new InvalidArgumentException(
+      throw new \InvalidArgumentException(
           'federated sign-on certs expects "keys" to be set'
       );
     }

lib/Google/src/Google/AuthHandler/AuthHandlerFactory.php

@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+namespace wpCloud\StatelessMedia\Google_Client;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
@@ -36,7 +37,7 @@ public static function build($cache = null, array $cacheConfig = [])
       case '6':
         return new Google_AuthHandler_Guzzle6AuthHandler($cache, $cacheConfig);
       default:
-        throw new Exception('Version not supported');
+        throw new \Exception('Version not supported');
     }
   }
 }

lib/Google/src/Google/AuthHandler/Guzzle5AuthHandler.php

@@ -1,4 +1,5 @@
 <?php
+namespace wpCloud\StatelessMedia\Google_Client;
 
 use Google\Auth\CredentialsLoader;
 use Google\Auth\HttpHandler\HttpHandlerFactory;

lib/Google/src/Google/AuthHandler/Guzzle6AuthHandler.php

@@ -1,4 +1,5 @@
 <?php
+namespace wpCloud\StatelessMedia\Google_Client;
 
 use Google\Auth\CredentialsLoader;
 use Google\Auth\HttpHandler\HttpHandlerFactory;

lib/Google/src/Google/Client.php

@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+namespace wpCloud\StatelessMedia\Google_Client;
 
 use Google\Auth\ApplicationDefaultCredentials;
 use Google\Auth\Cache\MemoryCacheItemPool;
@@ -179,7 +180,7 @@ public function authenticate($code)
   public function fetchAccessTokenWithAuthCode($code)
   {
     if (strlen($code) == 0) {
-      throw new InvalidArgumentException("Invalid code");
+      throw new \InvalidArgumentException("Invalid code");
     }
 
     $auth = $this->getOAuth2Service();
@@ -216,7 +217,7 @@ public function refreshTokenWithAssertion()
   public function fetchAccessTokenWithAssertion(ClientInterface $authHttp = null)
   {
     if (!$this->isUsingApplicationDefaultCredentials()) {
-      throw new DomainException(
+      throw new \DomainException(
           'set the JSON service account credentials using'
           . ' Google_Client::setAuthConfig or set the path to your JSON file'
           . ' with the "GOOGLE_APPLICATION_CREDENTIALS" environment variable'
@@ -263,7 +264,7 @@ public function fetchAccessTokenWithRefreshToken($refreshToken = null)
   {
     if (null === $refreshToken) {
       if (!isset($this->token['refresh_token'])) {
-        throw new LogicException(
+        throw new \LogicException(
             'refresh token must be passed in or set as part of setAccessToken'
         );
       }
@@ -412,7 +413,7 @@ public function isUsingApplicationDefaultCredentials()
 
   /**
    * @param string|array $token
-   * @throws InvalidArgumentException
+   * @throws \InvalidArgumentException
    */
   public function setAccessToken($token)
   {
@@ -427,10 +428,10 @@ public function setAccessToken($token)
       }
     }
     if ($token == null) {
-      throw new InvalidArgumentException('invalid json token');
+      throw new \InvalidArgumentException('invalid json token');
     }
     if (!isset($token['access_token'])) {
-      throw new InvalidArgumentException("Invalid token format");
+      throw new \InvalidArgumentException("Invalid token format");
     }
     $this->token = $token;
   }
@@ -489,7 +490,7 @@ public function isAccessTokenExpired()
    */
   public function getAuth()
   {
-    throw new BadMethodCallException(
+    throw new \BadMethodCallException(
         'This function no longer exists. See UPGRADING.md for more information'
     );
   }
@@ -499,7 +500,7 @@ public function getAuth()
    */
   public function setAuth($auth)
   {
-    throw new BadMethodCallException(
+    throw new \BadMethodCallException(
         'This function no longer exists. See UPGRADING.md for more information'
     );
   }
@@ -693,7 +694,7 @@ public function revokeToken($token = null)
    * Verify an id_token. This method will verify the current id_token, if one
    * isn't provided.
    *
-   * @throws LogicException
+   * @throws \LogicException
    * @param string|null $idToken The token (id_token) that should be verified.
    * @return array|false Returns the token payload as an array if the verification was
    * successful, false otherwise.
@@ -709,7 +710,7 @@ public function verifyIdToken($idToken = null)
     if (null === $idToken) {
       $token = $this->getAccessToken();
       if (!isset($token['id_token'])) {
-        throw new LogicException(
+        throw new \LogicException(
             'id_token must be passed in or set as part of setAccessToken'
         );
       }
@@ -856,13 +857,13 @@ public function setAuthConfig($config)
   {
     if (is_string($config)) {
       if (!file_exists($config)) {
-        throw new InvalidArgumentException('file does not exist');
+        throw new \InvalidArgumentException('file does not exist');
       }
 
       $json = file_get_contents($config);
 
       if (!$config = json_decode($json, true)) {
-        throw new LogicException('invalid json for auth config');
+        throw new \LogicException('invalid json for auth config');
       }
     }
 
@@ -1091,7 +1092,7 @@ private function createApplicationDefaultCredentials()
     // @see https://developers.google.com/identity/protocols/OAuth2ServiceAccount
     if ($sub) {
       if (!$credentials instanceof ServiceAccountCredentials) {
-        throw new DomainException('domain-wide authority requires service account credentials');
+        throw new \DomainException('domain-wide authority requires service account credentials');
       }
 
       $credentials->setSub($sub);

lib/Google/src/Google/Collection.php

@@ -1,15 +1,12 @@
 <?php
-
-if (!class_exists('Google_Client')) {
-  require_once __DIR__ . '/autoload.php';
-}
+namespace wpCloud\StatelessMedia\Google_Client;
 
 /**
  * Extension to the regular Google_Model that automatically
  * exposes the items array for iteration, so you can just
  * iterate over the object rather than a reference inside.
  */
-class Google_Collection extends Google_Model implements Iterator, Countable
+class Google_Collection extends Google_Model implements \Iterator, \Countable
 {
   protected $collection_key = 'items';
 

lib/Google/src/Google/Exception.php

@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+namespace wpCloud\StatelessMedia\Google_Client;
 
-class Google_Exception extends Exception
+class Google_Exception extends \Exception
 {
 }

lib/Google/src/Google/Http/Batch.php

@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+namespace wpCloud\StatelessMedia\Google_Client;
 
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Psr7\Request;