continued refactoring

Author: dbu

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
@@ -20,14 +19,6 @@ matrix:
         - COVERAGE=true
     - php: 5.6
       env: SYMFONY_VERSION='2.3.*'
-    - php: 5.6
-      env:
-        - SYMFONY_VERSION='2.4.*'
-        - FRAMEWORK_EXTRA_VERSION='~3.0'
-    - php: 5.6
-      env:
-        - SYMFONY_VERSION='2.5.*'
-        - FRAMEWORK_EXTRA_VERSION='~3.0'
     - php: 5.6
       env:
         - SYMFONY_VERSION='2.6.*'
@@ -40,16 +31,14 @@ matrix:
       env:
         - SYMFONY_VERSION='2.8.*@dev'
         - FRAMEWORK_EXTRA_VERSION='~3.0'
-    - php: 5.4
+    - php: 5.5
       env:
         - SYMFONY_VERSION=2.3.*
         - COMPOSER_FLAGS="--prefer-lowest"
 
 before_script:
   - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
   - sh -c 'if [ "$FRAMEWORK_EXTRA_VERSION" != "" ]; then composer require --dev --no-update sensio/framework-extra-bundle=$FRAMEWORK_EXTRA_VERSION; fi;'
-  - 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 --no-interaction
   - sudo apt-get install python-sphinx enchant
   - sudo pip install -r Resources/doc/requirements.txt

CHANGELOG.md

@@ -7,9 +7,10 @@ Changelog
 * Updated the version of FOSHttpCache to 2.*. See [FOSHttpCache changelog]
   (https://github.com/FriendsOfSymfony/FOSHttpCache/blob/master/CHANGELOG.md).  
   Most important, there is no more hard coupling on Guzzle HTTP client. We now
-  use the HTTP adapter. You now need to explicitly specify the adapter you 
-  want, see [installation instructions]
+  use the HTTPlug HTTP client abstraction. You now need to explicitly specify 
+  the adapter you want, see [installation instructions]
   (http://foshttpcachebundle.readthedocs.org/en/stable/installation.html)
+  Deprecated methods have been removed.
 
 1.3.2
 -----

DependencyInjection/Configuration.php

@@ -325,9 +325,9 @@ private function addProxyClientSection(ArrayNodeDefinition $rootNode)
                                     ->defaultNull()
                                     ->info('Default host name and optional path for path based invalidation.')
                                 ->end()
-                                ->scalarNode('guzzle_client')
-                                    ->defaultNull()
-                                    ->info('Guzzle service to use for customizing the requests.')
+                                ->scalarNode('http_client')
+                                    ->defaultValue('httplug.client')
+                                    ->info('Httplug service to use for sending the requests.')
                                 ->end()
                             ->end()
                         ->end()
@@ -347,9 +347,9 @@ private function addProxyClientSection(ArrayNodeDefinition $rootNode)
                                     ->defaultNull()
                                     ->info('Default host name and optional path for path based invalidation.')
                                 ->end()
-                                ->scalarNode('guzzle_client')
-                                    ->defaultNull()
-                                    ->info('Guzzle service to use for customizing the requests.')
+                                ->scalarNode('http_client')
+                                    ->defaultValue('httplug.client')
+                                    ->info('Httplug service to use for sending the requests.')
                                 ->end()
                                 ->scalarNode('purge_location')
                                     ->defaultValue('')
@@ -373,9 +373,9 @@ private function addProxyClientSection(ArrayNodeDefinition $rootNode)
                                     ->defaultNull()
                                     ->info('Default host name and optional path for path based invalidation.')
                                 ->end()
-                                ->scalarNode('guzzle_client')
-                                    ->defaultNull()
-                                    ->info('Guzzle service to use for customizing the requests.')
+                                ->scalarNode('http_client')
+                                    ->defaultValue('httplug.client')
+                                    ->info('httplug service to use for sending the requests.')
                                 ->end()
                             ->end()
                         ->end()

DependencyInjection/FOSHttpCacheExtension.php

@@ -255,9 +255,7 @@ private function loadVarnish(ContainerBuilder $container, XmlFileLoader $loader,
         }
         $container->setParameter($this->getAlias().'.proxy_client.varnish.servers', $config['servers']);
         $container->setParameter($this->getAlias().'.proxy_client.varnish.base_url', $baseUrl);
-        if (!empty($config['guzzle_client'])) {
-            $container->setParameter($this->getAlias().'.proxy_client.varnish.guzzle_client', $config['guzzle_client']);
-        }
+        $container->setParameter($this->getAlias().'.proxy_client.varnish.http_client', $config['http_client']);
     }
 
     private function loadNginx(ContainerBuilder $container, XmlFileLoader $loader, array $config)
@@ -274,9 +272,7 @@ private function loadNginx(ContainerBuilder $container, XmlFileLoader $loader, a
         $container->setParameter($this->getAlias().'.proxy_client.nginx.servers', $config['servers']);
         $container->setParameter($this->getAlias().'.proxy_client.nginx.base_url', $baseUrl);
         $container->setParameter($this->getAlias().'.proxy_client.nginx.purge_location', $config['purge_location']);
-        if (!empty($config['guzzle_client'])) {
-            $container->setParameter($this->getAlias().'.proxy_client.nginx.guzzle_client', $config['guzzle_client']);
-        }
+        $container->setParameter($this->getAlias().'.proxy_client.nginx.http_client', $config['http_client']);
     }
 
     private function loadSymfony(ContainerBuilder $container, XmlFileLoader $loader, array $config)
@@ -293,9 +289,7 @@ private function loadSymfony(ContainerBuilder $container, XmlFileLoader $loader,
         }
         $container->setParameter($this->getAlias().'.proxy_client.symfony.servers', $config['servers']);
         $container->setParameter($this->getAlias().'.proxy_client.symfony.base_url', $baseUrl);
-        if (!empty($config['guzzle_client'])) {
-            $container->setParameter($this->getAlias().'.proxy_client.symfony.guzzle_client', $config['guzzle_client']);
-        }
+        $container->setParameter($this->getAlias().'.proxy_client.symfony.http_client', $config['http_client']);
     }
 
     private function loadCacheTagging(ContainerBuilder $container, XmlFileLoader $loader, array $config, $client)
@@ -327,7 +321,6 @@ private function loadTest(ContainerBuilder $container, XmlFileLoader $loader, ar
 
         if (isset($config['client']['varnish']['enabled'])
             || isset($config['client']['nginx']['enabled'])) {
-            $loader->load('test_client.xml');
 
             if ($config['client']['varnish']['enabled']) {
                 $loader->load('varnish_test_client.xml');

HttpCache.php

@@ -6,8 +6,11 @@
 
     <services>
         <service id="fos_http_cache.test.client.varnish"
-                 parent="fos_http_cache.test.client.abstract">
-            <argument index="0">%fos_http_cache.proxy_client.varnish.base_url%</argument>
+                 class="Http\Utils\HttpMethodsClient">
+            <argument id="%fos_http_cache.proxy_client.varnish.http_client%" type="service"/>
+            <argument type="collection"/> <!-- setup options like base_url
+                <argument index="0">%fos_http_cache.proxy_client.varnish.base_url%</argument>
+             -->
         </service>
     </services>
 

Resources/config/test_client.xml

@@ -63,7 +63,7 @@ To refresh paths and routes, you can use ``refreshPath($path, $headers)`` and
 
     If you want to add a header (such as ``Authorization``) to *all*
     invalidation requests, you can use a
-    :ref:`custom Guzzle client <custom guzzle client>` instead.
+    :ref:`custom HTTP client <custom HTTP client>` instead.
 
 .. _invalidation configuration:
 

Resources/config/varnish_test_client.xml

@@ -11,16 +11,15 @@ This bundle is available on Packagist_. You can install it using Composer:
     $ composer require friendsofsymfony/http-cache-bundle
 
 Note that the FOSHttpCache_ 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``.
-
-When on PHP 5.5+, use the following line instead:
+and ``php-http/client-implementation``. If your project does not contain one,
+composer will complain that it did not find ``psr/http-message-implementation``:
 
 .. code-block:: bash
 
-    $ composer require friendsofsymfony/http-cache-bundle:~2.0 guzzlehttp/psr7:^1.0 php-http/guzzle6-adapter:^0.1.0
+    $ composer require friendsofsymfony/http-cache-bundle:~2.0 guzzlehttp/psr7:^1.0 php-http/guzzle6-adapter:^1.0.0
 
-On PHP 5.4, the ``php-http/guzzle5-adapter:^0.1.0`` works fine.
+If you want to use something else than Guzzle 6, see packagist
+for a list of available `client implementations`_.
 
 Then add the bundle to your application:
 
@@ -115,3 +114,4 @@ This bundle is released under the MIT license.
 .. _SensioFrameworkExtraBundle: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
 .. _ExpressionLanguage: http://symfony.com/doc/current/components/expression_language/introduction.html
 .. _Symfony: http://symfony.com/doc/current/book/http_cache.html#the-cache-control-header
+.. _client implementations: https://packagist.org/providers/php-http/client-implementation

Resources/doc/features/invalidation.rst

@@ -126,22 +126,14 @@ The default proxy client that will be used by the cache manager. You can
 *configure Nginx, Varnish and Symfony proxy clients in parallel*. There is
 however only one cache manager and it will only use the default client.
 
-Custom Guzzle Client
---------------------
-
-By default, the proxy client instantiates a `Guzzle client`_ to talk with the
-caching proxy. If you need to customize the requests, for example to send a
-basic authentication header, you can configure a service and specify that in
-the ``guzzle_client`` option of any of the cache proxy clients. A sample
-service definition for using basic authentication looks like this:
-
-.. code-block:: yaml
-
-    # app/config/config.yml
-    acme.varnish.guzzle.client:
-        class: Guzzle\Service\Client
-        calls:
-            - [setDefaultOption, [auth, [%caching_proxy.username%, %caching_proxy.password%, basic ]]]
+Custom HTTP Client
+------------------
+
+The proxy client uses a ``Http\Client\Utils\HttpMethodsClient`` wrapping a
+``Http\Client\HttpClient`` instance. If you need to customize the requests, for
+example to send a basic authentication header with each request, you can
+configure a service for the ``HttpClient`` and specify that in the
+``http_client`` option of any of the cache proxy clients.
 
 Caching Proxy Configuration
 ---------------------------