Merge pull request #257 from FriendsOfSymfony/adjust-php-http

Upgrade php-http integration

Author: dbu

.gitignore

@@ -2,3 +2,5 @@ vendor/
 composer.lock
 phpunit.xml
 doc/_build/
+puli.json
+.puli/

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - hhvm
@@ -12,7 +11,7 @@ env:
 
 matrix:
   include:
-    - php: 5.4
+    - php: 5.5
       env: SYMFONY_VERSION=2.3.* VARNISH_VERSION=3.0 COMPOSER_FLAGS="--prefer-lowest"
 
 branches:
@@ -22,8 +21,6 @@ branches:
     - '/^\d+\.\d+$/'
 
 install:
-  - if [[ "$TRAVIS_PHP_VERSION" == "5.4" || "$TRAVIS_PHP_VERSION" == "hhvm" ]]; then composer remove "php-http/guzzle6-adapter" --dev --no-update; fi
-  - if [[ "$TRAVIS_PHP_VERSION" == "5.4" || "$TRAVIS_PHP_VERSION" == "hhvm" ]]; then composer require "php-http/guzzle5-adapter" --dev --no-update; fi
   - composer update $COMPOSER_FLAGS --prefer-source --no-interaction
 
 before_script:

composer.json

@@ -20,20 +20,22 @@
             "homepage": "https://github.com/friendsofsymfony/FOSHttpCache/contributors"
         }
     ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
-        "php": ">=5.4.8",
+        "php": "^5.5.9||^7.0.0",
         "symfony/event-dispatcher": "^2.3||^3.0",
         "symfony/options-resolver": "^2.3||^3.0",
-        "psr/http-message-implementation": "~1.0",
-        "php-http/adapter-implementation": "^0.1.0",
-        "php-http/discovery": "^0.1.1",
-        "php-http/message-decorator": "^0.1.0"
+        "php-http/client-implementation": "^1.0.0",
+        "php-http/discovery": "^0.6.0",
+        "php-http/message": "^0.2.1",
+        "puli/cli": "^1.0.0-beta8"
     },
     "require-dev": {
         "mockery/mockery": "~0.9.1",
-        "monolog/monolog": "~1.0",
-        "php-http/guzzle6-adapter": "^0.1.0",
-        "guzzlehttp/psr7": "^1.0",
+        "monolog/monolog": "^1.0",
+        "php-http/guzzle6-adapter": "^0.3.1",
+        "php-http/mock-client": "~0.1",
         "symfony/process": "^2.3||^3.0",
         "symfony/http-kernel": "^2.3||^3.0"
     },

doc/contributing.rst

@@ -36,12 +36,9 @@ The library also includes functional tests against a Varnish and NGINX instance.
 The functional test suite by default uses PHP’s built-in web server. If you have
 PHP 5.4 or newer, simply run with the default configuration.
 
-If you want to run the tests on PHP 5.3, you need to configure a web server
+If you want to run the tests on HHVM_, you need to configure a web server
 listening on localhost:8080 that points to the folder
-``tests/Functional/Fixtures/web``.
-
-If you want to run the tests on HHVM_, you need to configure a web server and
-start a `HHVM FastCGI server`_.
+``tests/Functional/Fixtures/web`` and start a `HHVM FastCGI server`_.
 
 To run the functional tests:
 

doc/installation.rst

@@ -5,23 +5,20 @@ Installation
 ------------
 
 The FOSHttpCache library is available on Packagist_. You can install it using
-Composer_:
+Composer_.
 
-.. code-block:: bash
+The library relies on HTTPlug_ for sending invalidation requests over HTTP, so
+you need to install an HTTPlug-compatible client or adapter first:
 
-    $ composer require friendsofsymfony/http-cache
+.. code-block:: bash
 
-Note that the library needs a ``psr/http-message-implementation`` and
-``php-http/adapter-implementation``. If your project does not contain one,
-composer will complain that it did not find ``psr/http-message-implementation``.
+    $ composer require php-http/guzzle6-adapter
 
-When on PHP 5.5+, use the following line instead:
+Then install the FOSHttpCache library itself:
 
 .. code-block:: bash
 
-    $ composer require friendsofsymfony/http-cache guzzlehttp/psr7:^1.0 php-http/guzzle6-adapter:^0.1.0
-
-On PHP 5.4, the ``php-http/guzzle5-adapter:^0.1.0`` works fine.
+    $ composer require friendsofsymfony/http-cache
 
 .. note::
 
@@ -61,3 +58,4 @@ invalidation requests:
 .. _Packagist: https://packagist.org/packages/friendsofsymfony/http-cache
 .. _Composer: http://getcomposer.org
 .. _Semantic Versioning: http://semver.org/
+.. _HTTPlug: http://httplug.io

doc/proxy-clients.rst

@@ -12,21 +12,21 @@ which caching solution you use.
 Setup
 -----
 
-HTTP Adapter Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~
+HTTP Client Installation
+~~~~~~~~~~~~~~~~~~~~~~~~
 
-Because the clients send invalidation requests over HTTP, an `HTTP adapter`_
-must be installed. Which one you need depends on the HTTP client library that
-you use in your project. For instance, if you use Guzzle 6 in your project,
-install the appropriate adapter:
+Because the clients send invalidation requests over HTTP, an `HTTPlug client`_
+must be installed. Pick either a standalone client or an adapter to a client
+library that is already included in your project. For instance, if you use
+Guzzle 6 in your project, install the appropriate adapter:
 
 .. code-block:: bash
 
     $ composer require php-http/guzzle6-adapter
 
 You also need a `PSR-7 message implementation`_. If you use Guzzle 6, Guzzle’s
-implementation is already included. If you use another client, install one of
-the implementations. Recommended:
+implementation is already included. If you use another client, you need to
+install one of the message implementations. Recommended:
 
 .. code-block:: bash
 
@@ -40,13 +40,13 @@ Alternatively:
 
 .. _HTTP adapter configuration:
 
-HTTP Adapter Configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+HTTP Client Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-By default, the proxy client will find the adapter that you have installed
-through Composer. But you can also pass the adapter explicitly. This is most
-useful when you have created a HTTP client with custom options or middleware
-(such as logging)::
+By default, the proxy client will automatically locate an HTTP client that you
+have installed through Composer. But you can also pass the adapter explicitly.
+This is most useful when you have created a HTTP client with custom options or
+middleware (such as logging)::
 
     use GuzzleHttp\Client;
 
@@ -66,6 +66,13 @@ Then pass that adapter to the caching proxy client::
     $proxyClient = new Varnish($servers, '/baseUrl', $adapter);
     // Varnish as example, but also possible for NGINX and Symfony
 
+HTTP Message Factory Configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Similar to the HTTP client, the HTTP message factory is automatically located
+by default. You can pass an explicit instance of the message factory if you
+need to.
+
 .. _varnish client:
 
 Varnish Client
@@ -276,6 +283,5 @@ Varnish client::
 Make sure to add any headers that you want to ban on to your
 :doc:`proxy configuration <proxy-configuration>`.
 
-.. _header: http://php.net/header
-.. _HTTP Adapter: http://php-http.readthedocs.org/en/latest/
+.. _HTTPlug client: http://httplug.io/
 .. _PSR-7 message implementation: https://packagist.org/providers/psr/http-message-implementation

src/Exception/ProxyUnreachableException.php

@@ -11,7 +11,7 @@
 
 namespace FOS\HttpCache\Exception;
 
-use Http\Adapter\Exception\HttpAdapterException;
+use Http\Client\Exception\RequestException;
 
 /**
  * Thrown when a request to the reverse caching proxy fails to establish a
@@ -20,18 +20,18 @@
 class ProxyUnreachableException extends \RuntimeException implements HttpCacheExceptionInterface
 {
     /**
-     * @param HttpAdapterException $adapterException
+     * @param RequestException $adapterException
      *
      * @return ProxyUnreachableException
      */
-    public static function proxyUnreachable(HttpAdapterException $adapterException)
+    public static function proxyUnreachable(RequestException $adapterException)
     {
         $message = sprintf(
             'Request to caching proxy at %s failed with message "%s"',
             $adapterException->getRequest()->getHeaderLine('Host'),
             $adapterException->getMessage()
         );
-        
+
         return new ProxyUnreachableException(
             $message,
             0,