Adds tests

Author: sagikazarmark

composer.json

@@ -12,12 +12,12 @@
     ],
     "require": {
         "php": ">=5.4",
-        "php-http/adapter-core": "dev-internal_separation",
+        "php-http/adapter-common": "dev-client_separation",
         "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
         "ext-curl": "*",
-        "php-http/adapter-integration-tests": "dev-internal_separation"
+        "php-http/adapter-integration-tests": "dev-client_separation"
     },
     "provide": {
         "php-http/adapter-implementation": "0.1"

src/Guzzle6HttpAdapter.php

@@ -17,13 +17,14 @@
 use Http\Adapter\Common\Exception\HttpAdapterException;
 use Http\Adapter\Common\Exception\MultiHttpAdapterException;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Guzzle 6 HTTP adapter
  *
  * @author David de Boer <[email protected]>
  */
-class Guzzle6HttpAdapter implements PsrHttpAdapter
+class Guzzle6HttpAdapter implements HttpAdapter
 {
     /**
      * @param Client $client
@@ -41,7 +42,7 @@ public function sendRequest(RequestInterface $request)
         try {
             return $this->client->send($request);
         } catch (RequestException $exception) {
-            throw new $this->createException($exception);
+            throw $this->createException($exception);
         }
     }
 
@@ -56,14 +57,18 @@ public function sendRequests(array $requests)
         );
 
         $exceptions = [];
+        $responses = [];
+
         foreach ($results as $result) {
-            if ($result instanceof TransferException) {
+            if ($result instanceof ResponseInterface) {
+                $responses[] = $result;
+            } elseif ($result instanceof RequestException) {
                 $exceptions[] = $this->createException($result);
             }
         }
 
         if (count($exceptions) > 0) {
-            throw new MultiHttpAdapterException($exceptions);
+            throw new MultiHttpAdapterException($exceptions, $responses);
         }
 
         return $results;

tests/Guzzle6CurlHttpAdapterTest.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Http Adapter package.
+ *
+ * (c) Eric GELOEN <[email protected]>
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Http\Adapter\Tests;
+
+use GuzzleHttp\Handler\CurlHandler;
+
+/**
+ * @requires PHP 5.5
+ *
+ * @author GeLo <[email protected]>
+ */
+class Guzzle6CurlHttpAdapterTest extends Guzzle6HttpAdapterTest
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function createHandler()
+    {
+        return new CurlHandler();
+    }
+}

tests/Guzzle6HttpAdapterTest.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Http Adapter package.
+ *
+ * (c) Eric GELOEN <[email protected]>
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Http\Adapter\Tests;
+
+use GuzzleHttp\Client;
+use Http\Adapter\Guzzle6HttpAdapter;
+
+/**
+ * @author GeLo <[email protected]>
+ */
+abstract class Guzzle6HttpAdapterTest extends HttpAdapterTest
+{
+    public function testGetName()
+    {
+        $this->assertSame('guzzle6', $this->httpAdapter->getName());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createHttpAdapter()
+    {
+        return new Guzzle6HttpAdapter(new Client(['handler' => $this->createHandler()]));
+    }
+
+    /**
+     * Returns a handler for the client
+     *
+     * @return object
+     */
+    abstract protected function createHandler();
+}

tests/Guzzle6MultiCurlHttpAdapterTest.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Http Adapter package.
+ *
+ * (c) Eric GELOEN <[email protected]>
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Http\Adapter\Tests;
+
+use GuzzleHttp\Handler\CurlMultiHandler;
+
+/**
+ * @author GeLo <[email protected]>
+ */
+class Guzzle6MultiCurlHttpAdapterTest extends Guzzle6HttpAdapterTest
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function createHandler()
+    {
+        return new CurlMultiHandler();
+    }
+}

tests/Guzzle6StreamHttpAdapterTest.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Http Adapter package.
+ *
+ * (c) Eric GELOEN <[email protected]>
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Http\Adapter\Tests;
+
+use GuzzleHttp\Handler\StreamHandler;
+
+/**
+ * @author GeLo <[email protected]>
+ */
+class Guzzle6StreamHttpAdapterTest extends Guzzle6HttpAdapterTest
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function createHandler()
+    {
+        return new StreamHandler();
+    }
+}