updated guzzle6 namespace

Author: Nyholm

ClientFactory/Guzzle6Factory.php

@@ -3,7 +3,7 @@
 namespace Http\HttplugBundle\ClientFactory;
 
 use GuzzleHttp\Client;
-use Http\Adapter\Guzzle6HttpAdapter;
+use Http\Adapter\Guzzle6\Client as Adapter;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -12,12 +12,12 @@ class Guzzle6Factory implements ClientFactoryInterface
 {
     public function createClient(array $config = array())
     {
-        if (!class_exists('Http\Adapter\Guzzle6HttpAdapter')) {
+        if (!class_exists('Http\Adapter\Guzzle6\Client')) {
             throw new \LogicException('To use the Guzzle6 adapter you need to install the "php-http/guzzle6-adapter" package.');
         }
 
         $client = new Client($config);
 
-        return new Guzzle6HttpAdapter($client);
+        return new Adapter($client);
     }
 }

Tests/Resources/Fixtures/config/full.php

@@ -8,7 +8,7 @@
         'stream_factory' => 'my_stream_factory',
     ),
     'classes' => array(
-        'client' => 'Http\Adapter\Guzzle6HttpAdapter',
+        'client' => 'Http\Adapter\Guzzle6\Client',
         'message_factory' => 'Http\Message\MessageFactory\GuzzleMessageFactory',
         'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
         'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',

Tests/Resources/Fixtures/config/full.xml

@@ -9,7 +9,7 @@
             <stream-factory>my_stream_factory</stream-factory>
         </main-alias>
         <classes>
-            <client>Http\Adapter\Guzzle6HttpAdapter</client>
+            <client>Http\Adapter\Guzzle6\Client</client>
             <message-factory>Http\Message\MessageFactory\GuzzleMessageFactory</message-factory>
             <uri-factory>Http\Message\UriFactory\GuzzleUriFactory</uri-factory>
             <stream-factory>Http\Message\StreamFactory\GuzzleStreamFactory</stream-factory>

Tests/Resources/Fixtures/config/full.yml

@@ -5,7 +5,7 @@ httplug:
         uri_factory: my_uri_factory
         stream_factory: my_stream_factory
     classes:
-        client: Http\Adapter\Guzzle6HttpAdapter
+        client: Http\Adapter\Guzzle6\Client
         message_factory: Http\Message\MessageFactory\GuzzleMessageFactory
         uri_factory: Http\Message\UriFactory\GuzzleUriFactory
         stream_factory: Http\Message\StreamFactory\GuzzleStreamFactory

Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -62,7 +62,7 @@ public function testSupportsAllConfigFormats()
                 'stream_factory' => 'my_stream_factory',
             ),
             'classes' => array(
-                'client' => 'Http\Adapter\Guzzle6HttpAdapter',
+                'client' => 'Http\Adapter\Guzzle6\Client',
                 'message_factory' => 'Http\Message\MessageFactory\GuzzleMessageFactory',
                 'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
                 'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',

Tests/Unit/DependencyInjection/HttplugExtensionTest.php

@@ -35,15 +35,15 @@ public function testConfigLoadClass()
     {
         $this->load(array(
             'classes' => array(
-                'client' => 'Http\Adapter\Guzzle6HttpAdapter'
+                'client' => 'Http\Adapter\Guzzle6\Client'
             ),
         ));
 
         foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {
             $this->assertContainerBuilderHasAlias("httplug.$type", "httplug.$type.default");
         }
 
-        $this->assertContainerBuilderHasService('httplug.client.default', 'Http\Adapter\Guzzle6HttpAdapter');
+        $this->assertContainerBuilderHasService('httplug.client.default', 'Http\Adapter\Guzzle6\Client');
         $this->assertContainerBuilderHasService('httplug.message_factory.default', 'Http\Message\MessageFactory');
         $this->assertContainerBuilderHasService('httplug.uri_factory.default', 'Http\Message\UriFactory');
         $this->assertContainerBuilderHasService('httplug.stream_factory.default', 'Http\Message\StreamFactory');