Merge remote-tracking branch 'origin/1.3' into update-from-1.3

Conflicts:
	DependencyInjection/Configuration.php
	EventListener/UserContextSubscriber.php

Author: dbu

Resources/doc/features/symfony-http-cache.rst

@@ -76,6 +76,26 @@ To register subscribers that you need to instantiate yourself, overwrite
         return $subscribers;
     }
 
+.. warning::
+
+    Since Symfony 2.8, the class cache (``classes.php``) is compiled even in
+    console mode by an optional warmer (``ClassCacheCacheWarmer``). This can
+    produce conflicting results with the regular web entry points, because the
+    class cache may contain definitions (such as the subscribers above) that
+    are loaded before the class cache itself; leading to redeclaration fatal
+    errors.
+
+    There are two workarounds:
+
+    * Disable class cache warming in console mode with e.g. a compiler pass::
+
+        $container->getDefinition('kernel.class_cache.cache_warmer')->clearTag('kernel.cache_warmer');
+
+    * Force loading of all classes and interfaced used by the ``HttpCache`` in
+      ``app/console`` to make the class cache omit those classes. The simplest
+      way to achieve this is to call ``class_exists`` resp. ``interface_exists``
+      with each of them.
+
 Subscribers
 ~~~~~~~~~~~
 

Resources/doc/features/user-context.rst

@@ -49,7 +49,7 @@ You need to configure a route for the context hash. It does not specify any
 controller, as the request listener will abort the request right after the
 firewall has been applied, but the route definition must exist. Use the same
 path as you specified in the caching proxy and make sure that this path is
-covered by your
+allowed for anonymous users and covered by your
 `firewall configuration <http://symfony.com/doc/current/book/security.html>`_:
 
 .. code-block:: yaml
@@ -58,6 +58,17 @@ covered by your
     user_context_hash:
         path: /_fos_user_context_hash
 
+If your access rules limit the whole site to logged in users, make sure to
+handle the user context URL like the login page:
+
+.. code-block:: yaml
+
+    # app/config/security.yml
+    access_control:
+        - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/_fos_user_context_hash, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
+        - { path: ^/, roles: ROLE_USER }
+
 Finally, enable the subscriber with the default settings:
 
 .. code-block:: yaml

Resources/doc/spelling_word_list.txt

@@ -14,4 +14,5 @@ lookup
 lookups
 TTL
 multi
+login
 logout