Removing dependency on Guzzlehttp

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.5.0 (31/12/2015)
+
+### Changes
+
+* The dependency to Guzzle is removed. We are now using PHP-HTTP to make us independent from any transport library. 
+* We are using PSR7 requests and responses
+* Introduced HttpFactory to create clients and responses
+* `OAuth2::setAuthorizationUri`, `OAuth2::setRedirectUri` and `OAuth2::SetTokenCredentialUri` do not support an array as first parameter anymore.  
+
 ## 0.4.0 (23/04/2015)
 
 ### Changes

README.md

@@ -84,7 +84,7 @@ As long as you update the environment variable below to point to *your* JSON
 credentials file, the following code should output a list of your Drive files.
 
 ```php
-use GuzzleHttp\Client;
+use Google\Http\HttpFactory;
 use Google\Auth\ApplicationDefaultCredentials;
 
 // specify the path to your application credentials
@@ -93,21 +93,20 @@ putenv('GOOGLE_APPLICATION_CREDENTIALS=/path/to/my/credentials.json');
 // define the scopes for your API call
 $scopes = ['https://www.googleapis.com/auth/drive.readonly'];
 
-// create the HTTP client
-$client = new Client([
-  'base_url' => 'https://www.googleapis.com',
-  'defaults' => ['auth' => 'google_auth']  // authorize all requests
-]);
-
 // attach this library's auth listener
 $fetcher = ApplicationDefaultCredentials::getFetcher($scopes);
-$client->getEmitter()->attach($fetcher);
 
-// make the request
-$response = $client->get('drive/v2/files');
+// create the HTTP client with the auth listener
+$client = HttpFactory::getClient($fetcher);
+
+// create a PSR7 request
+$request = HttpFactory::getRequest('GET', 'https://www.googleapis.com/drive/v2/files');
+
+// send the request and get a PSR7 response back
+$response = $client->sendRequest($request);
 
 // show the result!
-print_r($response->json());
+print_r(json_decode($resp->getBody(), true));
 ```
 
 ## What about auth in google-apis-php-client?

composer.json

@@ -6,12 +6,18 @@
   "homepage": "http://github.com/google/google-auth-library-php",
   "license": "Apache-2.0",
   "require": {
+    "php": ">=5.4",
     "firebase/php-jwt": "~2.0|~3.0",
-    "guzzlehttp/guzzle": "5.2.*",
-    "php": ">=5.4"
+    "php-http/client-implementation": "@dev",
+    "php-http/discovery": "dev-master",
+    "php-http/plugins":"dev-master",
+    "php-http/utils":"dev-master"
   },
   "require-dev": {
     "phpunit/phpunit": "3.7.*",
+    "php-http/guzzle6-adapter": "dev-master",
+    "php-http/client-tools": "dev-master",
+    "php-http/httplug": "dev-master",
     "phplint/phplint": "0.0.1"
   },
   "autoload": {

src/AppIdentityCredentials.php

@@ -17,15 +17,13 @@
 
 namespace Google\Auth;
 
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Client;
-
 /**
  * The AppIdentityService class is automatically defined on App Engine,
  * so including this dependency is not necessary, and will result in a
  * PHP fatal error in the App Engine environment.
  */
 use google\appengine\api\app_identity\AppIdentityService;
+use Http\Client\HttpClient;
 
 /**
  * AppIdentityCredentials supports authorization on Google App Engine.
@@ -80,7 +78,7 @@ public static function onAppEngine()
    * As the AppIdentityService uses protobufs to fetch the access token,
    * the GuzzleHttp\ClientInterface instance passed in will not be used.
    *
-   * @param $client GuzzleHttp\ClientInterface optional client.
+   * @param $client HttpClient optional client.
    * @return array the auth metadata:
    *  array(2) {
    *   ["access_token"]=>
@@ -89,7 +87,7 @@ public static function onAppEngine()
    *   string(10) "1444339905"
    *  }
    */
-  public function fetchAuthToken(ClientInterface $unusedClient = null)
+  public function fetchAuthToken(HttpClient $httpClient = null)
   {
     if (!self::onAppEngine()) {
       return array();

src/ApplicationDefaultCredentials.php

@@ -17,8 +17,8 @@
 
 namespace Google\Auth;
 
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\ClientInterface;
+use Google\Auth\Http\Plugin\AuthTokenFetcher;
+use Http\Client\HttpClient;
 
 /**
  * ApplicationDefaultCredentials obtains the default credentials for
@@ -60,15 +60,15 @@ class ApplicationDefaultCredentials
    *
    * @param string|array scope the scope of the access request, expressed
    *   either as an Array or as a space-delimited String.
-   * @param $client GuzzleHttp\ClientInterface optional client.
+   * @param $client HttpClient optional client.
    * @param cacheConfig configuration for the cache when it's present
    * @param object $cache an implementation of CacheInterface
    *
-   * @throws DomainException if no implementation can be obtained.
+   * @throws \DomainException if no implementation can be obtained.
    */
   public static function getFetcher(
       $scope = null,
-      ClientInterface $client = null,
+      HttpClient $client = null,
       array $cacheConfig = null,
       CacheInterface $cache = null)
   {
@@ -86,10 +86,10 @@ public static function getFetcher(
    * @param string|array scope the scope of the access request, expressed
    *   either as an Array or as a space-delimited String.
    *
-   * @param $client GuzzleHttp\ClientInterface optional client.
-   * @throws DomainException if no implementation can be obtained.
+   * @param $client HttpClient optional client.
+   * @throws \DomainException if no implementation can be obtained.
    */
-  public static function getCredentials($scope = null, $client = null)
+  public static function getCredentials($scope = null, HttpClient $client = null)
   {
     $creds = CredentialsLoader::fromEnv($scope);
     if (!is_null($creds)) {

src/CredentialsLoader.php

@@ -17,11 +17,8 @@
 
 namespace Google\Auth;
 
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Client;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Exception\ServerException;
+use Google\Auth\Http\HttpFactory;
+use Http\Client\HttpClient;
 
 /**
  * CredentialsLoader contains the behaviour used to locate and find default
@@ -75,7 +72,7 @@ public static function fromEnv($scope = null)
       $cause = "file " . $path . " does not exist";
       throw new \DomainException(self::unableToReadEnv($cause));
     }
-    $keyStream = Stream::factory(file_get_contents($path));
+    $keyStream = HttpFactory::getStream(file_get_contents($path));
     return static::makeCredentials($scope, $keyStream);
   }
 
@@ -105,7 +102,7 @@ public static function fromWellKnownFile($scope = null)
     if (!file_exists($path)) {
       return null;
     }
-    $keyStream = Stream::factory(file_get_contents($path));
+    $keyStream = HttpFactory::getStream(file_get_contents($path));
     return static::makeCredentials($scope, $keyStream);
   }
 
@@ -157,10 +154,11 @@ public function getUpdateMetadataFunc()
    *
    * @return array updated metadata hashmap
    */
-  public function updateMetadata($metadata,
-                                 $authUri = null,
-                                 ClientInterface $client = null)
-  {
+  public function updateMetadata(
+      $metadata,
+      $authUri = null,
+      HttpClient $client = null
+  ) {
     $result = $this->fetchAuthToken($client);
     if (!isset($result['access_token'])) {
       return $metadata;

src/FetchAuthTokenInterface.php

@@ -17,7 +17,7 @@
 
 namespace Google\Auth;
 
-use GuzzleHttp\ClientInterface;
+use Http\Client\HttpClient;
 
 /**
  * An interface implemented by objects that can fetch auth tokens.
@@ -28,10 +28,10 @@ interface FetchAuthTokenInterface
  /**
   * Fetchs the auth tokens based on the current state.
   *
-  * @param $client GuzzleHttp\ClientInterface the optional client.
+  * @param HttpClient $client the optional client.
   * @return array a hash of auth tokens
   */
-  public function fetchAuthToken(ClientInterface $client = null);
+  public function fetchAuthToken(HttpClient $client = null);
 
 
  /**