Move adapter into subnamespace

Author: Nyholm

composer.json

@@ -24,20 +24,20 @@
         "ext-curl": "*",
         "guzzlehttp/ringphp": "^1.1",
         "php-http/adapter-integration-tests": "dev-master",
-        "php-http/client-common": "^0.1",
+        "php-http/client-common": "^0.1.1",
         "guzzlehttp/psr7": "^1.2"
     },
     "provide": {
         "php-http/client-implementation": "1.0"
     },
     "autoload": {
         "psr-4": {
-            "Http\\Adapter\\": "src/"
+            "Http\\Adapter\\Guzzle5\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Http\\Adapter\\Tests\\": "tests/"
+            "Http\\Adapter\\Guzzle5\\Tests\\": "tests/"
         }
     },
     "scripts": {

src/Guzzle5HttpAdapter.php renamed to src/Client.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Http\Adapter;
+namespace Http\Adapter\Guzzle5;
 
-use GuzzleHttp\Client;
+use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Message\RequestInterface as GuzzleRequest;
 use GuzzleHttp\Message\ResponseInterface as GuzzleResponse;
@@ -18,7 +18,7 @@
  * @author GeLo <[email protected]>
  * @author Tobias Nyholm <[email protected]>
  */
-class Guzzle5HttpAdapter implements HttpClient
+class Client implements HttpClient
 {
     /**
      * @var ClientInterface
@@ -36,7 +36,7 @@ class Guzzle5HttpAdapter implements HttpClient
      */
     public function __construct(ClientInterface $client = null, MessageFactory $messageFactory = null)
     {
-        $this->client = $client ?: new Client();
+        $this->client = $client ?: new GuzzleClient();
         $this->messageFactory = $messageFactory ?: MessageFactoryDiscovery::find();
     }
 

tests/Guzzle5CurlHttpAdapterTest.php renamed to tests/CurlHttpAdapterTest.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Http\Adapter\Tests;
+namespace Http\Adapter\Guzzle5\Tests;
 
 use GuzzleHttp\Ring\Client\CurlHandler;
 
@@ -18,7 +18,7 @@
  *
  * @author GeLo <[email protected]>
  */
-class Guzzle5CurlHttpAdapterTest extends Guzzle5HttpAdapterTest
+class CurlHttpAdapterTest extends HttpAdapterTest
 {
     /**
      * {@inheritdoc}

tests/Guzzle5ExceptionTest.php renamed to tests/ExceptionTest.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Http\Adapter\Tests;
+namespace Http\Adapter\Guzzle5\Tests;
 
 use GuzzleHttp\Exception as GuzzleExceptions;
 use GuzzleHttp\Message\Request as GuzzleRequest;
 use GuzzleHttp\Message\Response as GuzzleResponse;
 use GuzzleHttp\Psr7\Request as Psr7Request;
 use GuzzleHttp\Stream\Stream;
-use Http\Adapter\Guzzle5HttpAdapter;
+use Http\Adapter\Guzzle5\Client;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class Guzzle5ExceptionTest extends \PHPUnit_Framework_TestCase
+class ExceptionTest extends \PHPUnit_Framework_TestCase
 {
     private $guzzleRequest;
     private $guzzleResponse;
@@ -30,7 +30,7 @@ protected function makeRequest(GuzzleExceptions\TransferException $exception)
         $client->expects($this->any())->method('createRequest')->willReturn($this->guzzleRequest);
 
         $request = new Psr7Request('GET', 'http://foo.com');
-        (new Guzzle5HttpAdapter($client))->sendRequest($request);
+        (new Client($client))->sendRequest($request);
     }
 
     public function testConnectException()

tests/Guzzle5HttpAdapterTest.php renamed to tests/HttpAdapterTest.php

@@ -9,23 +9,23 @@
  * file that was distributed with this source code.
  */
 
-namespace Http\Adapter\Tests;
+namespace Http\Adapter\Guzzle5\Tests;
 
-use GuzzleHttp\Client;
-use Http\Adapter\Guzzle5HttpAdapter;
+use GuzzleHttp\Client as GuzzleClient;
+use Http\Adapter\Guzzle5\Client;
 use Http\Client\Tests\HttpClientTest;
 
 /**
  * @author GeLo <[email protected]>
  */
-abstract class Guzzle5HttpAdapterTest extends HttpClientTest
+abstract class HttpAdapterTest extends HttpClientTest
 {
     /**
      * {@inheritdoc}
      */
     protected function createHttpAdapter()
     {
-        return new Guzzle5HttpAdapter(new Client(['handler' => $this->createHandler()]));
+        return new Client(new GuzzleClient(['handler' => $this->createHandler()]));
     }
 
     /**

tests/Guzzle5MultiCurlHttpAdapterTest.php renamed to tests/MultiCurlHttpAdapterTest.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Http\Adapter\Tests;
+namespace Http\Adapter\Guzzle5\Tests;
 
 use GuzzleHttp\Ring\Client\CurlMultiHandler;
 
 /**
  * @author GeLo <[email protected]>
  */
-class Guzzle5MultiCurlHttpAdapterTest extends Guzzle5HttpAdapterTest
+class MultiCurlHttpAdapterTest extends HttpAdapterTest
 {
     /**
      * {@inheritdoc}

tests/Guzzle5StreamHttpAdapterTest.php renamed to tests/StreamHttpAdapterTest.php

@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Http\Adapter\Tests;
+namespace Http\Adapter\Guzzle5\Tests;
 
 use GuzzleHttp\Ring\Client\StreamHandler;
 
 /**
  * @author GeLo <[email protected]>
  */
-class Guzzle5StreamHttpAdapterTest extends Guzzle5HttpAdapterTest
+class StreamHttpAdapterTest extends HttpAdapterTest
 {
     /**
      * {@inheritdoc}