Merge branch '6.1' into 6.2

* 6.1:
  Emphasise where a method is returning a value.
  Minor tweak
  Fix bad copy/paste
  Update security.rst
  Update custom_constraint.rst
  Update security.rst
  Remove old `versionadded` directive
  Merging "list" into text
  Remove Magali from CARE

Author: javiereguiluz

contributing/code_of_conduct/care_team.rst

@@ -37,12 +37,6 @@ of them at once by emailing ** care@symfony.com **.
   * *SymfonyConnect*: `zanbaldwin <https://connect.symfony.com/profile/zanbaldwin>`_
   * *SymfonySlack*: `@Zan <https://symfony-devs.slack.com/team/UBHGRU3NW>`_
 
-* **Magali Milbergue**
-
-  * *E-mail*: magali.milbergue [at] gmail.com
-  * *Twitter*: `@magalimilbergue <https://twitter.com/magalimilbergue>`_
-  * *SymfonyConnect*: `magali_milbergue <https://connect.symfony.com/profile/magali_milbergue>`_
-
 * **Tobias Nyholm**
 
   * *E-mail*: tobias.nyholm [at] gmail.com

controller.rst

@@ -351,7 +351,7 @@ object. To access it in your controller, add it as an argument and
     use Symfony\Component\HttpFoundation\Response;
     // ...
 
-    public function index(Request $request, string $firstName, string $lastName): Response
+    public function index(Request $request): Response
     {
         $page = $request->query->get('page', 1);
 

security.rst

@@ -197,7 +197,7 @@ from the `MakerBundle`_:
         }
 
         /**
-         * Returning a salt is only needed, if you are not using a modern
+         * Returning a salt is only needed if you are not using a modern
          * hashing algorithm (e.g. bcrypt or sodium) in your security.yaml.
          *
          * @see UserInterface
@@ -1988,12 +1988,9 @@ database and every user is *always* given at least one role: ``ROLE_USER``::
     }
 
 This is a nice default, but you can do *whatever* you want to determine which roles
-a user should have. Here are a few guidelines:
-
-* Every role **must start with** ``ROLE_`` (otherwise, things won't work as expected)
-
-* Other than the above rule, a role is just a string and you can invent what you
-  need (e.g. ``ROLE_PRODUCT_ADMIN``).
+a user should have. The only rule is that every role **must start with** the
+``ROLE_`` prefix - otherwise, things won't work as expected. Other than that,
+a role is just a string and you can invent whatever you need (e.g. ``ROLE_PRODUCT_ADMIN``).
 
 You'll use these roles next to grant access to specific sections of your site.
 

testing.rst

@@ -247,7 +247,7 @@ Retrieving Services in the Test
 
 In your integration tests, you often need to fetch the service from the
 service container to call a specific method. After booting the kernel,
-the container is stored in ``static::getContainer()``::
+the container is returned by ``static::getContainer()``::
 
     // tests/Service/NewsletterGeneratorTest.php
     namespace App\Tests\Service;
@@ -273,7 +273,7 @@ the container is stored in ``static::getContainer()``::
         }
     }
 
-The container in ``static::getContainer()`` is actually a special test container.
+The container from ``static::getContainer()`` is actually a special test container.
 It gives you access to both the public services and the non-removed
 :ref:`private services <container-public>`.
 

validation/custom_constraint.rst

@@ -267,9 +267,7 @@ email. First, create a constraint and override the ``getTargets()`` method::
 
     use Symfony\Component\Validator\Constraint;
 
-    /**
-     * @Annotation
-     */
+    #[\Attribute]
     class ConfirmedPaymentReceipt extends Constraint
     {
         public string $userDoesNotMatchMessage = 'User\'s e-mail address does not match that of the receipt';