Use httplug instead of old adapter

Author: joelwurtz

composer.json

@@ -13,7 +13,8 @@
     "require": {
         "php": ">=5.4",
         "phpunit/phpunit": "^4.4",
-        "php-http/discovery": "^0.1",
+        "php-http/discovery": "~0.2@dev",
+        "php-http/httplug": "~1.0@dev",
         "guzzlehttp/psr7": "^1.0",
         "th3n3rd/cartesian-product": "^0.3"
     },

src/HttpAdapterTest.php

@@ -11,9 +11,9 @@
 
 namespace Http\Adapter\Tests;
 
-use Http\Adapter\HttpAdapter;
-use Http\Adapter\HttpAdapterException;
-use Http\Adapter\Exception\MultiHttpAdapterException;
+use Http\Client\HttpClient;
+use Http\Client\Exception\RequestException;
+use Http\Client\Exception\BatchException;
 use Http\Message\MessageFactory;
 use Http\Discovery\MessageFactoryDiscovery;
 use Nerd\CartesianProduct\CartesianProduct;
@@ -36,7 +36,7 @@ abstract class HttpAdapterTest extends \PHPUnit_Framework_TestCase
     protected static $messageFactory;
 
     /**
-     * @var HttpAdapter
+     * @var HttpClient
      */
     protected $httpAdapter;
 
@@ -97,7 +97,7 @@ protected function tearDown()
     abstract public function testGetName();
 
     /**
-     * @return HttpAdapter
+     * @return HttpClient
      */
     abstract protected function createHttpAdapter();
 
@@ -157,7 +157,7 @@ public function testSendRequestWithOutcome($uriAndOutcome, $protocolVersion, arr
     }
 
     /**
-     * @expectedException \Http\Adapter\Exception\HttpAdapterException
+     * @expectedException \Http\Client\Exception
      * @group             integration
      */
     public function testSendWithInvalidUri()
@@ -178,9 +178,9 @@ public function testSendWithInvalidUri()
      */
     public function testSendRequests(array $requests)
     {
-        $responses = $this->httpAdapter->sendRequests($requests);
+        $batchResult = $this->httpAdapter->sendRequests($requests);
 
-        $this->assertMultiResponses($responses, $requests);
+        $this->assertMultiResponses($batchResult->getResponses(), $requests);
     }
 
     /**
@@ -192,9 +192,9 @@ public function testSendErroredRequests(array $requests, array $erroredRequests)
         try {
             $this->httpAdapter->sendRequests(array_merge($requests, $erroredRequests));
             $this->fail();
-        } catch (MultiHttpAdapterException $e) {
-            $this->assertMultiResponses($e->getResponses(), $requests);
-            $this->assertMultiExceptions($e->getExceptions(), $erroredRequests);
+        } catch (BatchException $e) {
+            $this->assertMultiResponses($e->getResult()->getResponses(), $requests);
+            $this->assertMultiExceptions($e->getResult()->getExceptions(), $erroredRequests);
         }
     }
 
@@ -470,15 +470,14 @@ private function assertMultiResponses(array $responses, array $requests)
     }
 
     /**
-     * @param HttpAdapterException[] $exceptions
-     * @param array                  $requests
+     * @param RequestException[] $exceptions
+     * @param array              $requests
      */
     private function assertMultiExceptions(array $exceptions, array $requests)
     {
         $this->assertCount(count($requests), $exceptions);
 
         foreach ($exceptions as $exception) {
-            $this->assertTrue($exception->hasRequest());
             $this->assertInstanceOf(
                 'Psr\Http\Message\RequestInterface',
                 $exception->getRequest()