Merge remote-tracking branch 'origin/1.3'

Author: dbu

.travis.yml

@@ -14,12 +14,14 @@ addons:
       - enchant
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
   - hhvm
 
+env:
+  - SYMFONY_VERSION='3.0.*'
+
 branches:
   only:
     - master
@@ -28,9 +30,12 @@ branches:
 matrix:
   include:
     - php: 5.4
-      env: COMPOSER_FLAGS="--prefer-lowest"
+      env:
+        - COMPOSER_FLAGS="--prefer-lowest"
+        - SYMFONY_VERSION='2.3.*'
     - php: 5.6
       env:
+        - SYMFONY_VERSION='2.4.*'
         - PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
         - COVERAGE=true
     - php: 5.6

Resources/doc/features/user-context.rst

@@ -78,6 +78,15 @@ Finally, enable the subscriber with the default settings:
         user_context:
             enabled: true
 
+.. note::
+
+    When using the FOSRestBundle ``format_listener`` configuration on all paths
+    of your site, the hash lookup will fail with "406 Not Acceptable - No
+    matching accepted Response format could be determined". To avoid this
+    problem, you can add a rule to the format listener configuration:
+
+    ``- { path: '^/_fos_user_context_hash', stop: true }``
+
 Generating Hashes
 -----------------