Merge branch '4.4' into 5.1

wouterj · wouterj · commit 00abcd24b3d8 · 2020-10-22T23:54:13.000+02:00
* 4.4:
  Removed duplicate method
  Some fixes in structure overriding:
diff --git a/configuration/override_dir_structure.rst b/configuration/override_dir_structure.rst
@@ -140,8 +140,8 @@ Override the Translations Directory
 -----------------------------------
 
 If your translation files are not stored in the default ``translations/``
-directory, use the :ref:`framework.translator.paths <reference-translator-paths>`
-configuration option to define your own translations directory (or directories):
+directory, use the :ref:`framework.translator.default_path <reference-translator-default_path>`
+configuration option to define your own translations directory (use :ref:`framework.translator.paths <reference-translator-paths>` for multiple directories):
 
 .. configuration-block::
 
@@ -151,7 +151,7 @@ configuration option to define your own translations directory (or directories):
         framework:
             translator:
                 # ...
-                paths: ["%kernel.project_dir%/i18n"]
+                default_path: "%kernel.project_dir%/i18n"
 
     .. code-block:: xml
 
@@ -167,7 +167,7 @@ configuration option to define your own translations directory (or directories):
 
             <framework:config>
                 <framework:translator>
-                    <framework:path>%kernel.project_dir%/i18n</framework:path>
+                    <framework:default-path>%kernel.project_dir%/i18n</framework:default-path>
                 </framework:translator>
             </framework:config>
 
@@ -178,9 +178,7 @@ configuration option to define your own translations directory (or directories):
         // config/packages/translation.php
         $container->loadFromExtension('framework', [
             'translator' => [
-                'paths' => [
-                    '%kernel.project_dir%/i18n',
-                ],
+                'default_path' => '%kernel.project_dir%/i18n',
             ],
         ]);
 
@@ -191,7 +189,7 @@ Override the Public Directory
 -----------------------------
 
 If you need to rename or move your ``public/`` directory, the only thing you
-need to guarantee is that the path to the ``var/`` directory is still correct in
+need to guarantee is that the path to the ``vendor/`` directory is still correct in
 your ``index.php`` front controller. If you renamed the directory, you're fine.
 But if you moved it in some way, you may need to modify these paths inside those
 files::
diff --git a/security/form_login_setup.rst b/security/form_login_setup.rst
@@ -77,14 +77,6 @@ class that processes the login submit and 4) updates the main security config fi
             return $this->render('security/login.html.twig', ['last_username' => $lastUsername, 'error' => $error]);
         }
 
-        /**
-         * @Route("/logout", name="app_logout")
-         */
-        public function logout()
-        {
-            throw new \Exception('This method can be blank - it will be intercepted by the logout key on your firewall');
-        }
-
         /**
          * @Route("/logout", name="app_logout")
          */
