Merge branch '3.4' into 4.0

* 3.4:
  add missing logout_on_user_change options
  [HttpFoundation] Add immutable to setCache's PHPDoc

Author: chalasr

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml

@@ -28,6 +28,7 @@ security:
             security: false
 
         default:
+            logout_on_user_change: true
             form_login:
                 check_path: /login_check
                 default_target_path: /profile

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/FirewallEntryPoint/config.yml

@@ -16,10 +16,12 @@ services:
 security:
     firewalls:
         secure:
+            logout_on_user_change: true
             pattern: ^/secure/
             http_basic: { realm: "Secure Gateway API" }
             entry_point: firewall_entry_point.entry_point.stub
         default:
+            logout_on_user_change: true
             anonymous: ~
     access_control:
         - { path: ^/secure/, roles: ROLE_SECURE }

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/config.yml

@@ -13,6 +13,7 @@ security:
 
     firewalls:
         main:
+            logout_on_user_change: true
             pattern: ^/
             anonymous: true
             json_login:

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/JsonLogin/custom_handlers.yml

@@ -13,6 +13,7 @@ security:
 
     firewalls:
         main:
+            logout_on_user_change: true
             pattern: ^/
             anonymous: true
             json_login:

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/SecurityHelper/config.yml

@@ -15,4 +15,5 @@ security:
 
     firewalls:
         default:
+            logout_on_user_change: true
             anonymous: ~

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/config.yml

@@ -20,6 +20,7 @@ security:
             security: false
 
         default:
+            logout_on_user_change: true
             form_login:
                 check_path: /login_check
                 default_target_path: /profile
@@ -28,6 +29,7 @@ security:
 
         # This firewall is here just to check its the logout functionality
         second_area:
+            logout_on_user_change: true
             http_basic: ~
             anonymous: ~
             logout:

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/localized_form_failure_handler.yml

@@ -13,6 +13,7 @@ security:
 
     firewalls:
         default:
+            logout_on_user_change: true
             form_login:
                 login_path: localized_login_path
                 check_path: localized_check_path

src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/localized_routes.yml

@@ -13,6 +13,7 @@ security:
 
     firewalls:
         default:
+            logout_on_user_change: true
             form_login:
                 login_path: localized_login_path
                 check_path: localized_check_path

src/Symfony/Component/HttpFoundation/Response.php

@@ -913,7 +913,7 @@ public function setEtag(string $etag = null, bool $weak = false)
     /**
      * Sets the response's cache headers (validation and/or expiration).
      *
-     * Available options are: etag, last_modified, max_age, s_maxage, private, and public.
+     * Available options are: etag, last_modified, max_age, s_maxage, private, public and immutable.
      *
      * @return $this
      *