Move adapter into React subnamespace

Fix #9

Author: shulard

composer.json

@@ -12,8 +12,7 @@
     ],
     "require": {
         "php": ">=5.4",
-        "php-http/httplug": "1.0.0-alpha3",
-        "php-http/message-factory": "^0.4@dev",
+        "php-http/client-common": "^0.1.1",
         "react/http-client": "^0.4.8",
         "react/dns": "^0.4.1",
         "react/stream": "^0.4.3"
@@ -24,12 +23,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Http\\Adapter\\": "src/"
+            "Http\\Adapter\\React\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Http\\Adapter\\Tests\\": "tests/"
+            "Http\\Adapter\\React\\Tests\\": "tests/"
         }
     },
     "extra": {

src/ReactHttpAdapter.php renamed to src/Client.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Http\Adapter;
+namespace Http\Adapter\React;
 
 use React\EventLoop\LoopInterface;
 use React\Promise\Deferred;
-use React\HttpClient\Client;
+use React\HttpClient\Client as ReactClient;
 use React\HttpClient\Request as ReactRequest;
 use React\HttpClient\Response as ReactResponse;
 use Http\Client\HttpClient;
@@ -20,7 +20,7 @@
  * Client for the React promise implementation
  * @author Stéphane Hulard <stephane@hlrd.me>
  */
-class ReactHttpAdapter implements HttpClient, HttpAsyncClient
+class Client implements HttpClient, HttpAsyncClient
 {
     /**
      * React HTTP client
@@ -38,11 +38,12 @@ class ReactHttpAdapter implements HttpClient, HttpAsyncClient
      * Initialize the React client
      * @param LoopInterface|null $loop     React Event loop
      * @param Resolver           $resolver React async DNS resolver
+     * @param ReactClient        $client   React client to use
      */
     public function __construct(
         MessageFactory $messageFactory,
         LoopInterface $loop = null,
-        Client $client = null
+        ReactClient $client = null
     ) {
         $this->loop = null === $loop?ReactFactory::buildEventLoop():$loop;
         if (null === $client) {

src/ReactFactory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Http\Adapter;
+namespace Http\Adapter\React;
 
 use React\EventLoop\LoopInterface;
 use React\EventLoop\Factory as EventLoopFactory;

src/ReactPromiseAdapter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Http\Adapter;
+namespace Http\Adapter\React;
 
 use React\EventLoop\LoopInterface;
 use React\Promise\PromiseInterface as ReactPromise;

tests/ReactHttpAdapterTest.php renamed to tests/HttpAdapterTest.php

@@ -1,22 +1,22 @@
 <?php
 
-namespace Http\Adapter\Tests;
+namespace Http\Adapter\React\Tests;
 
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Client\Tests\HttpClientTest;
-use Http\Adapter\ReactHttpAdapter;
+use Http\Adapter\React\Client;
 
 /**
  * @author Stéphane Hulard <stephane@hlrd.me>
  */
-class ReactHttpClientTest extends HttpClientTest
+class HttpAdapterTest extends HttpClientTest
 {
     /**
      * @return HttpClient
      */
     protected function createHttpAdapter()
     {
         $messageFactory = MessageFactoryDiscovery::find();
-        return new ReactHttpAdapter($messageFactory);
+        return new Client($messageFactory);
     }
 }

tests/ReactHttpAsyncAdapterTest.php renamed to tests/HttpAsyncAdapterTest.php

@@ -1,22 +1,22 @@
 <?php
 
-namespace Http\Adapter\Tests;
+namespace Http\Adapter\React\Tests;
 
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Client\Tests\HttpAsyncClientTest;
-use Http\Adapter\ReactHttpAdapter;
+use Http\Adapter\React\Client;
 
 /**
  * @author Stéphane Hulard <stephane@hlrd.me>
  */
-class ReactHttpAsyncClientTest extends HttpAsyncClientTest
+class HttpAsyncAdapterTest extends HttpAsyncClientTest
 {
     /**
      * @return HttpClient
      */
     protected function createHttpAsyncClient()
     {
         $messageFactory = MessageFactoryDiscovery::find();
-        return new ReactHttpAdapter($messageFactory);
+        return new Client($messageFactory);
     }
 }