Use egeloen/http-adapter for HTTP library abstraction

Author: ddeboer

.travis.yml

@@ -39,7 +39,8 @@ before_script:
   - sudo pip install -r doc/requirements.txt
 
 script:
-  - phpunit --coverage-clover=coverage.clover
+                                              # *temporarily* exclude Nginx
+  - phpunit --coverage-clover=coverage.clover --exclude-group nginx
   - make -C doc SPHINXOPTS='-nW' html
   - make -C doc spelling
 

composer.json

@@ -21,14 +21,13 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
-        "guzzle/guzzle": "~3.0",
+        "php": ">=5.4.8",
         "symfony/event-dispatcher": "~2.3",
-        "symfony/options-resolver": "~2.3"
+        "symfony/options-resolver": "~2.3",
+        "egeloen/http-adapter": "0.7.x-dev"
     },
     "require-dev": {
         "guzzle/plugin-mock": "*",
-        "guzzlehttp/guzzle": "~5",
         "mockery/mockery": "*",
         "monolog/monolog": "*",
         "symfony/process": "~2.3",

src/Exception/ExceptionCollection.php

@@ -15,9 +15,16 @@
  * A collection of exceptions that might occur during the flush operation of a
  * ProxyClientInterface implementation
  */
-class ExceptionCollection extends \Exception implements \IteratorAggregate, \Countable,  HttpCacheExceptionInterface
+class ExceptionCollection extends \Exception implements \IteratorAggregate, \Countable, HttpCacheExceptionInterface
 {
     private $exceptions = array();
+    
+    public function __construct(array $exceptions = array())
+    {
+        foreach ($exceptions as $exception) {
+            $this->add($exception);
+        }
+    }
 
     /**
      * Add an exception to the collection

src/Http/InvalidationRequest.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace FOS\HttpCache\Http;
+
+class InvalidationRequest
+{
+
+}

src/HttpClient/BuzzAdapter.php

@@ -11,12 +11,13 @@
 
 namespace FOS\HttpCache\ProxyClient;
 
-use FOS\HttpCache\Exception\HttpClientException;
-use FOS\HttpCache\HttpClient\Guzzle3Adapter;
-use FOS\HttpCache\HttpClient\HttpClientInterface;
+use FOS\HttpCache\Exception\ExceptionCollection;
+use FOS\HttpCache\Exception\ProxyUnreachableException;
 use FOS\HttpCache\ProxyClient\Request\InvalidationRequest;
 use FOS\HttpCache\ProxyClient\Request\RequestQueue;
-use Guzzle\Http\ClientInterface;
+use Ivory\HttpAdapter\HttpAdapterFactory;
+use Ivory\HttpAdapter\HttpAdapterInterface;
+use Ivory\HttpAdapter\MultiHttpAdapterException;
 
 /**
  * Abstract caching proxy client
@@ -28,9 +29,9 @@ abstract class AbstractProxyClient implements ProxyClientInterface
     /**
      * HTTP client
      *
-     * @var ClientInterface
+     * @var HttpAdapterInterface
      */
-    private $client;
+    private $httpAdapter;
 
     /**
      * Request queue
@@ -50,23 +51,15 @@ abstract class AbstractProxyClient implements ProxyClientInterface
      *                                 requests (optional). This is required if
      *                                 you purge and refresh paths instead of
      *                                 absolute URLs.
-     * @param HttpClientInterface|ClientInterface $client HTTP client (optional).
-     *                                 If no HTTP client is supplied, a default
-     *                                 one will be created.
+     * @param HttpAdapterInterface $httpAdapter If no HTTP client is supplied, a
+     *                                 default one will be created.
      */
-    public function __construct(array $servers, $baseUrl = null, $client = null)
-    {
-        if ($client instanceof ClientInterface) {
-            // Only for BC; Guzzle 3 for PHP 5.3 compatibility
-            $this->client  = new Guzzle3Adapter($client);
-        } elseif ($client instanceof HttpClientInterface) {
-            $this->client = $client;
-        } elseif (null === $client) {
-            $this->client = new Guzzle3Adapter();
-        } else {
-            throw new HttpClientException();
-        }
-        
+    public function __construct(
+        array $servers,
+        $baseUrl = null,
+        HttpAdapterInterface $httpAdapter = null
+    ) {
+        $this->httpAdapter = $httpAdapter ?: HttpAdapterFactory::guess();
         $this->initQueue($servers, $baseUrl);
     }
 
@@ -81,9 +74,26 @@ public function flush()
 
         $queue = clone $this->queue;
         $this->queue->clear();
-        $this->client->sendRequests($queue);
+
+        try {
+            $responses = $this->httpAdapter->sendRequests($queue->all());
+        } catch (MultiHttpAdapterException $e) {
+            $collection = new ExceptionCollection();
+            foreach ($e->getExceptions() as $exception) {
+                $collection->add(
+                    ProxyUnreachableException::proxyUnreachable(
+                        $exception->getRequest()->getHeader('Host'),
+                        $exception->getMessage(),
+                        null,
+                        $exception
+                    )
+                );
+            }
+
+            throw $collection;
+        }
 
-        return $queue->count();
+        return count($responses);
     }
 
     protected function queueRequest($method, $url, array $headers = array())

src/HttpClient/Guzzle3Adapter.php

@@ -12,11 +12,13 @@
 namespace FOS\HttpCache\ProxyClient\Request;
 
 use FOS\HttpCache\Exception\InvalidUrlException;
+use Ivory\HttpAdapter\Message\Request;
+use Ivory\HttpAdapter\Message\RequestInterface;
 
 /**
  * A queue of requests to be sent to the HTTP caching server
  */
-class RequestQueue implements \IteratorAggregate, \Countable
+class RequestQueue implements \Countable
 {
     private $servers = array();
     private $baseUrl;
@@ -52,8 +54,11 @@ public function count()
     {
         return count($this->queue);
     }
-    
-    public function getIterator()
+
+    /**
+     * @return RequestInterface[]
+     */
+    public function all()
     {
         $requests = array();
         foreach ($this->queue as $queuedRequest) {
@@ -67,15 +72,18 @@ public function getIterator()
             }
 
             foreach ($this->servers as $server) {
-                $requests[] = new InvalidationRequest(
-                    $queuedRequest->getMethod(),
+                $request = new Request(
                     $this->combineUrls($server, $queuedRequest->getUrl()),
+                    $queuedRequest->getMethod(),
+                    'php://memory',
                     $headers
                 );
+                
+                $requests[] = $request;
             }
         }
 
-        return new \ArrayIterator($requests);
+        return $requests;
     }