Merge branch 'master' into adjust-php-http

Author: ddeboer

README.md

@@ -1,7 +1,7 @@
 FOSHttpCache
 ============
-[![Build Status](https://travis-ci.org/FriendsOfSymfony/FOSHttpCache.svg?branch=master)](https://travis-ci.org/FriendsOfSymfony/FOSHttpCache) 
-[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSHttpCache/badges/quality-score.png?s=bc263d4deb45becdb1469b71e8630c5e65efdcf4)](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSHttpCache/) 
+[![Build Status](https://travis-ci.org/FriendsOfSymfony/FOSHttpCache.svg?branch=master)](https://travis-ci.org/FriendsOfSymfony/FOSHttpCache)
+[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSHttpCache/badges/quality-score.png?s=bc263d4deb45becdb1469b71e8630c5e65efdcf4)](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSHttpCache/)
 [![Code Coverage](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSHttpCache/badges/coverage.png?s=a19df7bb7e830642fb937891aebe8c3e1c9f59c0)](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSHttpCache/)
 [![Latest Stable Version](https://poser.pugx.org/friendsofsymfony/http-cache/v/stable.svg)](https://packagist.org/packages/friendsofsymfony/http-cache)
 
@@ -15,10 +15,10 @@ and to test your caching and invalidation code against a Varnish setup.
 It does this by abstracting some caching concepts and attempting to make sure these
 can be supported across Varnish, Nginx and Symfony HttpCache.
 
-If you use Symfony2, have a look at the
+If you use Symfony, have a look at the
 [FOSHttpCacheBundle](https://github.com/FriendsOfSymfony/FOSHttpCacheBundle).
 The bundle provides the invalidator as a service, along with a number of
-Symfony2-specific features to help with caching and caching proxies.
+Symfony-specific features to help with caching and caching proxies.
 
 Features
 --------
@@ -27,7 +27,7 @@ Features
   with minimal impact on performance.
 * Cache tagging abstraction, uses BAN with Varnish and allows tagging support for other caching proxies in the future.
 * Use the built-in support for [Varnish](http://foshttpcache.readthedocs.org/en/stable/varnish-configuration.html)
-  3 and 4, [NGINX](http://foshttpcache.readthedocs.org/en/stable/nginx-configuration.html), the 
+  3 and 4, [NGINX](http://foshttpcache.readthedocs.org/en/stable/nginx-configuration.html), the
   [Symfony reverse proxy from the http-kernel component](http://foshttpcache.readthedocs.org/en/stable/symfony-cache-configuration.html)
   or easily implement your own caching proxy client.
 * [Test your application](http://foshttpcache.readthedocs.org/en/stable/testing-your-application.html)

composer.json

@@ -23,17 +23,17 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.8",
-        "symfony/event-dispatcher": "~2.3",
-        "symfony/options-resolver": "~2.3",
+        "symfony/event-dispatcher": "^2.3||^3.0",
+        "symfony/options-resolver": "^2.3||^3.0",
         "php-http/client-implementation": "^1.0.0",
         "php-http/discovery": "^0.3.0"
     },
     "require-dev": {
         "mockery/mockery": "~0.9.1",
         "monolog/monolog": "~1.0",
         "php-http/guzzle6-adapter": "^0.2.0",
-        "symfony/process": "~2.3",
-        "symfony/http-kernel": "~2.3"
+        "symfony/process": "^2.3||^3.0",
+        "symfony/http-kernel": "^2.3||^3.0"
     },
     "suggest": {
         "monolog/monolog": "For logging issues while invalidating"

doc/index.rst

@@ -13,9 +13,9 @@ Varnish, NGINX or the Symfony HttpCache class. Use this library to send
 invalidation requests from your application to the caching proxy and to test
 your caching and invalidation setup.
 
-If you use the Symfony2 full stack framework, have a look at the FOSHttpCacheBundle_.
+If you use the Symfony full stack framework, have a look at the FOSHttpCacheBundle_.
 The bundle provides the Invalidator as a service, support for the built-in cache
-kernel of Symfony and a number of Symfony2-specific features to help with caching and
+kernel of Symfony and a number of Symfony-specific features to help with caching and
 caching proxies.
 
 Contents:

doc/invalidation-introduction.rst

@@ -99,7 +99,7 @@ Cache invalidation has two possible downsides:
   changed, a lot more is involved in invalidating all of its representations.
   In other words, invalidation adds a layer of complexity to your application.
   This library tries to help reduce complexity, for instance by
-  :ref:`tagging <tags>` cached content. Additionally, if you use Symfony2, we
+  :ref:`tagging <tags>` cached content. Additionally, if you use Symfony, we
   recommend you use the FOSHttpCacheBundle_.
   which provides additional functionality to make invalidation easier.
 * Invalidation is done through requests to your caching proxy. Sending these

doc/user-context.rst

@@ -127,7 +127,7 @@ It is up to you to return the user context hash in response to the hash request
     // 406 Not acceptable in case of an incorrect accept header
     header('HTTP/1.1 406');
 
-If you use Symfony2, the FOSHttpCacheBundle_ will set the correct response
+If you use Symfony, the FOSHttpCacheBundle_ will set the correct response
 headers for you.
 
 Caching the Hash Response

doc/varnish-configuration.rst

@@ -202,7 +202,7 @@ User Context
 
 Feature: :doc:`user context hashing <user-context>`
 
-The ``fos_user_context.vcl`` needs the ``user_context_hash_url`` subroutine that sets a URL to the request lookup URL. The default URL is ``/_fos_user_context_hash`` and you can simply include ``resources/config/varnish-[version]/fos_user_context_url.vcl`` in your configuration to provide this. If you need a different URL, include a custom file implementing the ``user_context_hash_url`` subroutine. 
+The ``fos_user_context.vcl`` needs the ``user_context_hash_url`` subroutine that sets a URL to the request lookup URL. The default URL is ``/_fos_user_context_hash`` and you can simply include ``resources/config/varnish-[version]/fos_user_context_url.vcl`` in your configuration to provide this. If you need a different URL, include a custom file implementing the ``user_context_hash_url`` subroutine.
 
 
 To enable support add the following to ``your_varnish.vcl``:
@@ -267,7 +267,7 @@ request with :ref:`a proper user hash <return context hash>`.
     We do not use ``X-Original-Url`` here, as the header will be sent to the
     backend and the header has semantical meaning for some applications, which
     would lead to problems. For example, the Microsoft IIS rewriting module
-    uses it, and consequently Symfony2 also looks into it to support IIS.
+    uses it, and consequently Symfony also looks into it to support IIS.
 
 .. tip::
 
@@ -365,15 +365,15 @@ To enable support add the following to ``your_varnish.vcl``:
     .. code-block:: varnish4
 
         include "path-to-config/varnish-4/fos_debug.vcl";
-        
+
         sub vcl_deliver {
             call fos_debug_deliver;
         }
 
     .. code-block:: varnish3
 
         include "path-to-config/varnish-3/fos_debug.vcl";
-        
+
         sub vcl_deliver {
             call fos_debug_deliver;
         }

src/Test/Proxy/VarnishProxy.php

@@ -57,7 +57,7 @@ public function start()
 
         $this->runCommand($this->getBinary(), $args);
 
-        $this->waitFor($this->ip, $this->getPort(), 2000);
+        $this->waitFor($this->ip, $this->getPort(), 5000);
     }
 
     /**
@@ -72,7 +72,7 @@ public function stop()
                 // Ignore if command fails when Varnish wasn't running
             }
             unlink($this->pid);
-            $this->waitUntil($this->ip, $this->getPort(), 2000);
+            $this->waitUntil($this->ip, $this->getPort(), 5000);
         }
     }