Merge pull request #31 from php-http/adapter-create-with-config

add factory method to adapter client

Author: sagikazarmark

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.1.0 (unreleased)
+
+### Added
+
+- Factory method Client::createWithConfig to create an adapter with custom
+  configuration for the underlying guzzle client.
 
 ## 1.0.0 - 2016-01-26
 

composer.json

@@ -43,9 +43,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1-dev"
         }
     },
-    "prefer-stable": true,
-    "minimum-stability": "beta"
+    "prefer-stable": true
 }

src/Client.php

@@ -28,14 +28,24 @@ class Client implements HttpClient, HttpAsyncClient
     public function __construct(ClientInterface $client = null)
     {
         if (!$client) {
-            $handlerStack = new HandlerStack(\GuzzleHttp\choose_handler());
-            $handlerStack->push(Middleware::prepareBody(), 'prepare_body');
-            $client = new GuzzleClient(['handler' => $handlerStack]);
+            $client = static::buildClient();
         }
 
         $this->client = $client;
     }
 
+    /**
+     * Factory method to create the guzzle 6 adapter with custom configuration for guzzle.
+     *
+     * @param array $config Configuration to create guzzle with.
+     *
+     * @return Client
+     */
+    public static function createWithConfig(array $config)
+    {
+        return new self(static::buildClient($config));
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -55,4 +65,20 @@ public function sendAsyncRequest(RequestInterface $request)
 
         return new Promise($promise, $request);
     }
+
+    /**
+     * Build the guzzle client instance.
+     *
+     * @param array $config Additional configuration
+     *
+     * @return GuzzleClient
+     */
+    private static function buildClient(array $config)
+    {
+        $handlerStack = new HandlerStack(\GuzzleHttp\choose_handler());
+        $handlerStack->push(Middleware::prepareBody(), 'prepare_body');
+        $config = array_merge(['handler' => $handlerStack], $config);
+
+        return new GuzzleClient($config);
+    }
 }