Merge branch '4.2'

* 4.2:
  Add missing security guard sub-component
  Update unit_testing.rst
  [#11139] fix a minor typo
  removed blank line and space
  add missing brackets
  use "behavior" instead of "behaviour"
  Remove unnecessary backslash escape
  Improve now what sentence

Author: javiereguiluz

components/form.rst

@@ -157,7 +157,7 @@ the CSRF generator and validated when binding the form.
 
 You can disable CSRF protection per form using the ``csrf_protection`` option::
 
-    use Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType
+    use Symfony\Component\Form\Extension\Core\Type\FormType;
 
     $form = $formFactory->createBuilder(FormType::class, null, ['csrf_protection' => false])
         ->getForm();

components/phpunit_bridge.rst

@@ -605,11 +605,11 @@ If you have installed the bridge through Composer, you can run it by calling e.g
 
     It's also possible to set this env var in the ``phpunit.xml.dist`` file.
 
-Code coverage listener
+Code Coverage Listener
 ----------------------
 
 By default, the code coverage is computed with the following rule: if a line of
-code is executed, then it is marked as covered. And the test which executes a
+code is executed, then it is marked as covered. The test which executes a
 line of code is therefore marked as "covering the line of code". This can be
 misleading.
 
@@ -664,7 +664,7 @@ the ``Test`` part of the classname: ``My\Namespace\Tests\FooTest`` ->
 Installation
 ~~~~~~~~~~~~
 
-Add the following configuration to the ``phpunit.xml.dist`` file
+Add the following configuration to the ``phpunit.xml.dist`` file:
 
 .. code-block:: xml
 

components/security.rst

@@ -22,8 +22,8 @@ Alternatively, you can clone the `<https://github.com/symfony/security>`_ reposi
 
 .. include:: /components/require_autoload.rst.inc
 
-The Security component is divided into four smaller sub-components which can be
-used separately:
+The Security component is divided into several smaller sub-components which can
+be used separately:
 
 ``symfony/security-core``
     It provides all the common security features, from authentication to
@@ -36,6 +36,10 @@ used separately:
 ``symfony/security-csrf``
     It provides protection against `CSRF attacks`_.
 
+``symfony/security-guard``
+    It brings many layers of authentication together, allowing the creation
+    of complex authentication systems.
+
 .. seealso::
 
     This article explains how to use the Security features as an independent

components/using_components.rst

@@ -59,7 +59,7 @@ immediately::
 Now what?
 ---------
 
-Now that the component is installed and autoloaded, read the specific component's
+Now, the component is installed and autoloaded. Read the specific component's
 documentation to find out more about how to use it.
 
 And have fun!

create_framework/unit_testing.rst

@@ -57,13 +57,13 @@ resolver. Modify the framework to make use of them::
     class Framework
     {
         protected $matcher;
-        protected $resolver;
+        protected $controllerResolver;
         protected $argumentResolver;
 
         public function __construct(UrlMatcherInterface $matcher, ControllerResolverInterface $resolver, ArgumentResolverInterface $argumentResolver)
         {
             $this->matcher = $matcher;
-            $this->resolver = $resolver;
+            $this->controllerResolver = $resolver;
             $this->argumentResolver = $argumentResolver;
         }
 

form/form_customization.rst

@@ -396,7 +396,7 @@ Variable                Usage
 ``block_prefixes``      An array of all the names of the parent types.
 ``cache_key``           A unique key which is used for caching.
 ``compound``            Whether or not a field is actually a holder for a group of children fields
-                        (for example, a ``choice`` field, which is actually a group of checkboxes.
+                        (for example, a ``choice`` field, which is actually a group of checkboxes).
 ``data``                The normalized data of the type.
 ``disabled``            If ``true``, ``disabled="disabled"`` is added to the field.
 ``errors``              An array of any errors attached to *this* specific field (e.g. ``form.title.errors``).

quick_tour/flex_recipes.rst

@@ -95,6 +95,7 @@ Thanks to Flex, after one command, you can start using Twig immediately:
     +            'name' => $name,
     +        ]);
          }
+    }
 
 By extending ``AbstractController``, you now have access to a number of shortcut
 methods and tools, like ``render()``. Create the new template:

reference/configuration/security.rst

@@ -309,7 +309,6 @@ application:
     .. code-block:: yaml
 
         # config/packages/security.yaml
-
         security:
             # ...
             firewalls:

security/access_control.rst

@@ -82,7 +82,7 @@ Take the following ``access_control`` entries as an example:
                     'role' => 'ROLE_USER_PORT',
                     'ip' => '127.0.0.1',
                     'port' => '8080',
-                ),
+                ],
                 [
                     'path' => '^/admin',
                     'role' => 'ROLE_USER_HOST',

security/security_checker.rst

@@ -14,7 +14,7 @@ First, install the security checker in your project:
 .. code-block:: terminal
 
     # require at least the 5.0 version of the package because older versions
-    # checked the security vulnerabilities using an URL that is no longer available
+    # checked the security vulnerabilities using a URL that is no longer available
     $ composer require sensiolabs/security-checker:^5.0
 
 Then run this command: