Merge pull request #280 from FriendsOfSymfony/fix-build

fix test setup now that puli composer plugin is not required by discovery anmyore

Author: dbu

composer.json

@@ -36,7 +36,8 @@
         "php-http/guzzle6-adapter": "^1.0.0",
         "php-http/mock-client": "~0.1",
         "symfony/process": "^2.3||^3.0",
-        "symfony/http-kernel": "^2.3||^3.0"
+        "symfony/http-kernel": "^2.3||^3.0",
+        "puli/composer-plugin": "^1.0.0-beta9@beta"
     },
     "suggest": {
         "php-http/discovery": "When not explicitly instantiating the php-http client for the proxy client",

doc/user-context.rst

@@ -25,7 +25,7 @@ information), rather than individually.
     want the clients to cache pages. Because ``VARY`` is used for the control
     of the caching proxy, it is not available to control clients. Often, the
     best solution is to disable intermediary caches by setting the cache control
-    header s-maxage to 0 and using the *custom TTL* mechanism (see the
+    header ``s-maxage`` to 0 and using the *custom TTL* mechanism (see the
     documentation for :ref:`Varnish <varnish_customttl>` or the
     :ref:`Symfony HttpCache <symfonycache_customttl>`). If you want to use the
     ``private`` cache control instruction instead, you need to adjust your