Remove already added Flexible client

Replace request matcher with one from php-http/message

Author: sagikazarmark

composer.json

@@ -13,7 +13,8 @@
     "require": {
         "php": ">=5.4",
         "php-http/httplug": "^1.0",
-        "php-http/message-factory": "^1.0"
+        "php-http/message-factory": "^1.0",
+        "php-http/message": "^1.2"
     },
     "require-dev": {
         "phpspec/phpspec": "^2.4",

spec/HttpClientFlexibleSpec.php

@@ -2,13 +2,13 @@
 
 namespace spec\Http\Client\Common;
 
-use Http\Client\Common\RequestMatcher;
+use Http\Message\RequestMatcher;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use Http\Promise\Promise;
-use PhpSpec\ObjectBehavior;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use PhpSpec\ObjectBehavior;
 
 class HttpClientRouterSpec extends ObjectBehavior
 {

spec/HttpClientRouterSpec.php

@@ -5,13 +5,19 @@
 use Http\Client\Exception\RequestException;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
+use Http\Message\RequestMatcher;
 use Psr\Http\Message\RequestInterface;
 
 /**
+ * Route a request to a specific client in the stack based using a RequestMatcher.
  *
+ * @author Joel Wurtz <[email protected]>
  */
 class HttpClientRouter implements HttpClient, HttpAsyncClient
 {
+    /**
+     * @var array
+     */
     private $clients = [];
 
     /**
@@ -35,7 +41,7 @@ public function sendRequest(RequestInterface $request)
     }
 
     /**
-     * Add a client to the router
+     * Add a client to the router.
      *
      * @param HttpClient|HttpAsyncClient $client
      * @param RequestMatcher             $requestMatcher
@@ -44,12 +50,12 @@ public function addClient($client, RequestMatcher $requestMatcher)
     {
         $this->clients[] = [
             'matcher' => $requestMatcher,
-            'client'  => new HttpClientFlexible($client)
+            'client'  => new FlexibleHttpClient($client)
         ];
     }
 
     /**
-     * Choose a http client given a specific request
+     * Choose an HTTP client given a specific request.
      *
      * @param RequestInterface $request
      *