Drop PHP 5.4 support

Fix Symfony 2.3-incompatible calls

Author: ddeboer

.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

@@ -23,7 +23,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=5.4.8",
+        "php": ">=5.5.9",
         "symfony/event-dispatcher": "^2.3||^3.0",
         "symfony/options-resolver": "^2.3||^3.0",
         "php-http/client-implementation": "^1.0.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

src/ProxyClient/AbstractProxyClient.php

@@ -93,7 +93,7 @@ public function flush()
     protected function getDefaultOptions()
     {
         $resolver = new OptionsResolver();
-        $resolver->setDefault('base_uri', null);
+        $resolver->setDefaults(['base_uri' => null]);
 
         return $resolver;
     }

src/ProxyClient/Varnish.php

@@ -196,7 +196,7 @@ public function refresh($url, array $headers = [])
     protected function getDefaultOptions()
     {
         $resolver = parent::getDefaultOptions();
-        $resolver->setDefault('tags_header', 'X-Cache-Tags');
+        $resolver->setDefaults(['tags_header' => 'X-Cache-Tags']);
 
         return $resolver;
     }