Merge branch '4.1' into 4.2

* 4.1:
  Minor reword in the testing article
  Clarify a sentence
  Update serializer.rst
  Fix typos and improve wording for the Lock component documentation
  More precision about the log directory permissions
  Added some missing steps in the main form login article

Author: javiereguiluz

components/http_kernel.rst

@@ -549,7 +549,7 @@ below for more details).
     There are two main listeners to ``kernel.exception`` when using the
     Symfony Framework.
 
-    **ExceptionListener in HttpKernel**
+    **ExceptionListener in the HttpKernel Component**
 
     The first comes core to the HttpKernel component
     and is called :class:`Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener`.
@@ -578,7 +578,7 @@ below for more details).
        controller to render is passed as a constructor argument to this listener.
        This controller will return the final ``Response`` for this error page.
 
-    **ExceptionListener in Security**
+    **ExceptionListener in the Security Component**
 
     The other important listener is the
     :class:`Symfony\\Component\\Security\\Http\\Firewall\\ExceptionListener`.

components/lock.rst

@@ -106,7 +106,7 @@ with the ``release()`` method.
 
 The trickiest part when working with expiring locks is choosing the right TTL.
 If it's too short, other processes could acquire the lock before finishing the
-job; it it's too long and the process crashes before calling the ``release()``
+job; if it's too long and the process crashes before calling the ``release()``
 method, the resource will stay locked until the timeout::
 
     // ...
@@ -455,8 +455,8 @@ Some file systems (such as some types of NFS) do not support locking.
     always be locked on the same machine or to use a well configured shared file
     system.
 
-Files on file system can be removed during a maintenance operation. For instance
-to cleanup the ``/tmp`` directory or after a reboot of the machine when directory
+Files on the file system can be removed during a maintenance operation. For instance,
+to clean up the ``/tmp`` directory or after a reboot of the machine when a directory
 uses tmpfs. It's not an issue if the lock is released when the process ended, but
 it is in case of ``Lock`` reused between requests.
 
@@ -485,7 +485,7 @@ needs space to add new items.
 
 .. caution::
 
-    Number of items stored in the Memcached must be under control. If it's not
+    The number of items stored in Memcached must be under control. If it's not
     possible, LRU should be disabled and Lock should be stored in a dedicated
     Memcached service away from Cache.
 

components/serializer.rst

@@ -185,7 +185,7 @@ when constructing the normalizer::
     $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
     $normalizer = new ObjectNormalizer($classMetadataFactory);
     $serializer = new Serializer([$normalizer]);
-    $person = $serializer->deserialize($data, 'Acme\Person', 'xml', [
+    $person = $serializer->deserialize($data, 'App\Model\Person', 'xml', [
         'allow_extra_attributes' => false,
     ]);
 

security/form_login_setup.rst

@@ -40,11 +40,11 @@ and your generated code may be slightly different:
 .. versionadded:: 1.8
     Support for login form authentication was added to ``make:auth`` in MakerBundle 1.8.
 
-This generates three things: (1) a login route & controller, (2) a template that
-renders the login form and (3) a :doc:`Guard authenticator </security/guard_authentication>`
-class that processes the login submit.
+This generates the following: 1) a login route & controller, 2) a template that
+renders the login form, 3) a :doc:`Guard authenticator </security/guard_authentication>`
+class that processes the login submit and 4) updates the main security config file.
 
-The ``/login`` route & controller::
+**Step 1.** The ``/login`` route & controller::
 
     // src/Controller/SecurityController.php
     namespace App\Controller;
@@ -73,8 +73,8 @@ The ``/login`` route & controller::
         }
     }
 
-The template has very little to do with security: it just generates a traditional
-HTML form that submits to ``/login``:
+**Step 2.** The template has very little to do with security: it just generates
+a traditional HTML form that submits to ``/login``:
 
 .. code-block:: twig
 
@@ -115,7 +115,7 @@ HTML form that submits to ``/login``:
     </form>
     {% endblock %}
 
-The Guard authenticator processes the form submit::
+**Step 3.** The Guard authenticator processes the form submit::
 
     // src/Security/LoginFormAuthenticator.php
     namespace App\Security;
@@ -212,6 +212,63 @@ The Guard authenticator processes the form submit::
         }
     }
 
+**Step 4.** Updates the main security config file to enable the Guard authenticator:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # config/packages/security.yaml
+        security:
+            # ...
+
+            firewalls:
+                main:
+                    # ...
+                    guard:
+                        authenticators:
+                            - App\Security\LoginFormAuthenticator
+
+    .. code-block:: xml
+
+        <!-- config/packages/security.xml -->
+        <?xml version="1.0" charset="UTF-8" ?>
+        <srv:container xmlns="http://symfony.com/schema/dic/security"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:srv="http://symfony.com/schema/dic/services"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <config>
+                <!-- ... -->
+                <firewall name="main">
+                    <!-- ... -->
+                    <guard>
+                        <authenticator class="App\Security\LoginFormAuthenticator" />
+                    </guard>
+                </firewall>
+            </config>
+        </srv:container>
+
+    .. code-block:: php
+
+        // app/config/security.php
+        use App\Security\LoginFormAuthenticator;
+
+        $container->loadFromExtension('security', [
+            // ...
+            'firewalls' => [
+                'main' => [
+                    // ...,
+                    'guard' => [
+                        'authenticators' => [
+                            LoginFormAuthenticator::class,
+                        ]
+                    ],
+                ],
+            ],
+        ]);
+
 Finishing the Login Form
 ------------------------
 

setup/file_permissions.rst

@@ -11,9 +11,7 @@ was writable. But that is no longer true! In Symfony 4, everything works automat
   is ``0``), as long as you run ``php bin/console cache:warmup``, no cache files
   will need to be written to disk at runtime.
 
-.. note::
-
-    If you decide to store log files on disk, you *will* need to make sure your
-    logs directory (e.g. ``var/log/``) is writable by your web server user and
-    terminal user. One way this can be done is by using ``chmod -R 777 var/log/``.
-    Be aware that your logs are readable by any user on your production system.
+* In all environments, the log directory (``var/log/`` by default) must exist
+  and be writable by your web server user and terminal user. One way this can
+  be done is by using ``chmod -R 777 var/log/``. Be aware that your logs are
+  readable by any user on your production system.

testing.rst

@@ -59,7 +59,7 @@ want to test the overall behavior of your application, see the section about
 
 Writing Symfony unit tests is no different from writing standard PHPUnit
 unit tests. Suppose, for example, that you have an *incredibly* simple class
-called ``Calculator`` in the ``Util/`` directory of the app bundle::
+called ``Calculator`` in the ``src/Util/`` directory of the app::
 
     // src/Util/Calculator.php
     namespace App\Util;