Merge pull request #5 from Nyholm/nyholm

Updated the client to reflect changes in httplug

Author: sagikazarmark

.travis.yml

@@ -1,30 +1,41 @@
 language: php
 
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 php:
   - 5.4
   - 5.5
   - 5.6
   - 7.0
   - hhvm
 
+env:
+  global:
+    - TEST_COMMAND="composer test"
+
 matrix:
   allow_failures:
     - php: 7.0
     - php: hhvm
   include:
     - php: 5.4
-      env:
-        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
-        - COVERAGE=true
-        - PHPUNIT_FLAGS="--coverage-clover build/coverage.xml"
+      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
-install:
+before_install:
   - travis_retry composer self-update
+
+install:
   - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
 
-before_script: vendor/bin/http_test_server > /dev/null 2>&1 &
+before_script:
+  - vendor/bin/http_test_server > /dev/null 2>&1 &
 
-script: vendor/bin/phpunit ${PHPUNIT_FLAGS}
+script:
+  - $TEST_COMMAND
 
 after_script:
   - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi

composer.json

@@ -16,17 +16,17 @@
     ],
     "require": {
         "php": ">=5.4",
-        "php-http/adapter": "^0.1",
-        "php-http/discovery": "^0.1",
-        "guzzlehttp/guzzle": "^5.1",
-        "guzzlehttp/ringphp": "^1.1"
+        "php-http/httplug": "^1.0@dev",
+        "php-http/discovery": "^0.2",
+        "guzzlehttp/guzzle": "^5.1"
     },
     "require-dev": {
         "ext-curl": "*",
-        "php-http/adapter-integration-tests": "^0.1"
+        "guzzlehttp/ringphp": "^1.1",
+        "php-http/adapter-integration-tests": "dev-master"
     },
     "provide": {
-        "php-http/adapter-implementation": "0.1"
+        "php-http/client-implementation": "1.0"
     },
     "autoload": {
         "psr-4": {
@@ -38,6 +38,10 @@
             "Http\\Adapter\\Tests\\": "tests/"
         }
     },
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.2-dev"

src/Guzzle5HttpAdapter.php

@@ -1,31 +1,23 @@
 <?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;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Message\RequestInterface as GuzzleRequest;
 use GuzzleHttp\Message\ResponseInterface as GuzzleResponse;
-use GuzzleHttp\Pool;
+use Http\Client\HttpClient;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Message\MessageFactory;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Http\Client\Exception as HttplugException;
+use GuzzleHttp\Exception as GuzzleExceptions;
 
 /**
  * @author GeLo <[email protected]>
  */
-class Guzzle5HttpAdapter implements HttpAdapter
+class Guzzle5HttpAdapter implements HttpClient
 {
     /**
      * @var ClientInterface
@@ -38,89 +30,48 @@ class Guzzle5HttpAdapter implements HttpAdapter
     private $messageFactory;
 
     /**
-     *
      * @param ClientInterface|null $client
      * @param MessageFactory|null  $messageFactory
      */
     public function __construct(ClientInterface $client = null, MessageFactory $messageFactory = null)
     {
         $this->client = $client ?: new Client();
         $this->messageFactory = $messageFactory ?: MessageFactoryDiscovery::find();
-
     }
 
     /**
      * {@inheritdoc}
      */
-    public function sendRequest(RequestInterface $request, array $options = [])
+    public function sendRequest(RequestInterface $request)
     {
-        $guzzleRequest = $this->createRequest($request, $options);
+        $guzzleRequest = $this->createRequest($request);
 
         try {
             $response = $this->client->send($guzzleRequest);
-        } catch (RequestException $e) {
-            throw $this->createException($e, $request);
+        } catch (GuzzleExceptions\TransferException $e) {
+            throw $this->handleException($e, $request);
         }
 
         return $this->createResponse($response);
     }
 
     /**
-     * {@inheritdoc}
-     */
-    public function sendRequests(array $requests, array $options = [])
-    {
-        $requests = array_values($requests);
-        $guzzleRequests = [];
-
-        foreach ($requests as $request) {
-            $guzzleRequests[] = $this->createRequest($request, $options);
-        }
-
-        $results = Pool::batch($this->client, $guzzleRequests);
-
-        $exceptions = [];
-        $responses = [];
-
-        foreach ($guzzleRequests as $key => $guzzleRequest) {
-            $result = $results->getResult($guzzleRequest);
-
-            if ($result instanceof GuzzleResponse) {
-                $responses[] = $this->createResponse($result);
-            } elseif ($result instanceof RequestException) {
-                $exceptions[] = $this->createException($result, $requests[$key]);
-            }
-        }
-
-        if (count($exceptions) > 0) {
-            throw new Exception\MultiHttpAdapterException($exceptions, $responses);
-        }
-
-        return $responses;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'guzzle5';
-    }
-
-    /**
-     * Converts a PSR request into a Guzzle request
+     * Converts a PSR request into a Guzzle request.
      *
      * @param RequestInterface $request
      *
      * @return GuzzleRequest
      */
-    private function createRequest(RequestInterface $request, array $options = [])
+    private function createRequest(RequestInterface $request)
     {
-        $options = $this->buildOptions($options);
+        $options = [
+            'exceptions'      => false,
+            'allow_redirects' => false,
+        ];
 
         $options['version'] = $request->getProtocolVersion();
         $options['headers'] = $request->getHeaders();
-        $options['body']    = (string) $request->getBody();
+        $options['body'] = (string) $request->getBody();
 
         return $this->client->createRequest(
             $request->getMethod(),
@@ -130,7 +81,7 @@ private function createRequest(RequestInterface $request, array $options = [])
     }
 
     /**
-     * Converts a Guzzle response into a PSR response
+     * Converts a Guzzle response into a PSR response.
      *
      * @param GuzzleResponse $response
      *
@@ -143,60 +94,41 @@ private function createResponse(GuzzleResponse $response)
         return $this->messageFactory->createResponse(
             $response->getStatusCode(),
             null,
-            $response->getProtocolVersion(),
             $response->getHeaders(),
-            isset($body) ? $body->detach() : null
+            isset($body) ? $body->detach() : null,
+            $response->getProtocolVersion()
         );
     }
 
     /**
-     * Converts a Guzzle exception into an HttpAdapter exception
+     * Converts a Guzzle exception into an Httplug exception.
      *
-     * @param RequestException $exception
+     * @param GuzzleExceptions\TransferException $exception
+     * @param RequestInterface                   $request
      *
-     * @return Exception\HttpAdapterException
+     * @return HttplugException
      */
-    private function createException(
-        RequestException $exception,
-        RequestInterface $originalRequest
-    ) {
-        $adapterException = new Exception\HttpAdapterException(
-            $exception->getMessage(),
-            0,
-            $exception
-        );
-
-        $response = null;
-
-        if ($exception->hasResponse()) {
-            $response = $this->createResponse($exception->getResponse());
+    private function handleException(GuzzleExceptions\TransferException $exception, RequestInterface $request)
+    {
+        if ($exception instanceof GuzzleExceptions\ConnectException) {
+            return new HttplugException\NetworkException($exception->getMessage(), $request, $exception);
         }
 
-        $adapterException->setResponse($response);
-        $adapterException->setRequest($originalRequest);
-
-        return $adapterException;
-    }
-
-    /**
-     * Builds options for Guzzle
-     *
-     * @param array $options
-     *
-     * @return array
-     */
-    private function buildOptions(array $options)
-    {
-        $guzzleOptions = [
-            'exceptions'      => false,
-            'allow_redirects' => false,
-        ];
+        if ($exception instanceof GuzzleExceptions\RequestException) {
+            // Make sure we have a response for the HttpException
+            if ($exception->hasResponse()) {
+                $psr7Response = $this->createResponse($exception->getResponse());
+                return new HttplugException\HttpException(
+                    $exception->getMessage(),
+                    $request,
+                    $psr7Response,
+                    $exception
+                );
+            }
 
-        if (isset($options['timeout'])) {
-            $guzzleOptions['connect_timeout'] = $options['timeout'];
-            $guzzleOptions['timeout'] = $options['timeout'];
+            return new HttplugException\RequestException($exception->getMessage(), $request, $exception);
         }
 
-        return $guzzleOptions;
+        return new HttplugException\TransferException($exception->getMessage(), 0, $exception);
     }
 }

tests/Guzzle5HttpAdapterTest.php

@@ -13,17 +13,13 @@
 
 use GuzzleHttp\Client;
 use Http\Adapter\Guzzle5HttpAdapter;
+use Http\Client\Tests\HttpClientTest;
 
 /**
  * @author GeLo <[email protected]>
  */
-abstract class Guzzle5HttpAdapterTest extends HttpAdapterTest
+abstract class Guzzle5HttpAdapterTest extends HttpClientTest
 {
-    public function testGetName()
-    {
-        $this->assertSame('guzzle5', $this->httpAdapter->getName());
-    }
-
     /**
      * {@inheritdoc}
      */