Merge pull request #76 from php-http/guzzle_default_fix

Update guzzle client

Author: dbu

CHANGELOG.md

@@ -6,6 +6,12 @@
 
 - Client factories for Buzz.
 
+### Changed
+
+- Guzzle 6 client is now created according to the Httplug specifications with automated minimal behaviour.
+  Make sure you configure the Httplug plugins as needed,
+  for example if you want to get exceptions for failure HTTP status codes.
+
 
 ### Fixed
 

ClientFactory/Guzzle6Factory.php

@@ -2,8 +2,7 @@
 
 namespace Http\HttplugBundle\ClientFactory;
 
-use GuzzleHttp\Client;
-use Http\Adapter\Guzzle6\Client as Adapter;
+use Http\Adapter\Guzzle6\Client;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -19,8 +18,6 @@ public function createClient(array $config = [])
             throw new \LogicException('To use the Guzzle6 adapter you need to install the "php-http/guzzle6-adapter" package.');
         }
 
-        $client = new Client($config);
-
-        return new Adapter($client);
+        return Client::createWithConfig($config);
     }
 }

composer.json

@@ -27,7 +27,7 @@
         "phpunit/phpunit": "^4.5",
         "php-http/curl-client": "^1.0",
         "php-http/socket-client": "^1.0",
-        "php-http/guzzle6-adapter": "^1.0",
+        "php-http/guzzle6-adapter": "^1.1",
         "php-http/react-adapter": "^0.1",
         "php-http/buzz-adapter": "^0.1",
         "php-http/message": "^1.0",
@@ -37,6 +37,7 @@
         "puli/symfony-bundle": "^1.0@beta"
     },
     "conflict": {
+        "php-http/guzzle6-adapter": "<1.1",
         "puli/composer-plugin": "<1.0.0-beta9",
         "puli/symfony-bundle": "<=1.0.0-beta7"
     },