Merge branch '6.1' into 6.2

* 6.1:
  [Form] Add doc link
  Fix type in alert comment about accessing session in constructor
  docs: fix links to phpunit docs
  Adding that you cannot access a session inside a constructor
  Remove annotations from constraint examples added in 6.1
  add missing attributes code block
  Shortening code block for PHP
  Clarify which branch should be chosen for a patch

Author: xabbuh

best_practices.rst

@@ -455,4 +455,4 @@ you must set up a redirection.
 .. _`feature toggles`: https://en.wikipedia.org/wiki/Feature_toggle
 .. _`smoke testing`: https://en.wikipedia.org/wiki/Smoke_testing_(software)
 .. _`Webpack`: https://webpack.js.org/
-.. _`PHPUnit data providers`: https://phpunit.readthedocs.io/en/stable/writing-tests-for-phpunit.html#data-providers
+.. _`PHPUnit data providers`: https://phpunit.readthedocs.io/en/9.5/writing-tests-for-phpunit.html#data-providers

contributing/code/pull_requests.rst

@@ -124,10 +124,11 @@ Choose the right Branch
 Before working on a PR, you must determine on which branch you need to
 work:
 
-* ``4.4``, if you are fixing a bug for an existing feature or want to make a
-  change that falls into the :doc:`list of acceptable changes in patch versions
-  </contributing/code/maintenance>` (you may have to choose a higher branch if
-  the feature you are fixing was introduced in a later version);
+* If you are fixing a bug for an existing feature or want to make a change
+  that falls into the :doc:`list of acceptable changes in patch versions
+  </contributing/code/maintenance>`, pick the oldest concerned maintained
+  branch (you can find them on the `Symfony releases page`_). E.g. if you
+  found a bug introduced in ``v5.1.10``, you need to work on ``5.4``.
 
 * ``6.2``, if you are adding a new feature.
 
@@ -520,6 +521,7 @@ before merging.
 .. _GitHub: https://github.com/join
 .. _`GitHub's documentation`: https://help.github.com/github/using-git/ignoring-files
 .. _Symfony repository: https://github.com/symfony/symfony
+.. _Symfony releases page: https://symfony.com/releases#maintained-symfony-branches
 .. _`documentation repository`: https://github.com/symfony/symfony-docs
 .. _`fabbot`: https://fabbot.io
 .. _`Psalm`: https://psalm.dev/

create_framework/unit_testing.rst

@@ -220,6 +220,6 @@ Symfony code.
 Now that we are confident (again) about the code we have written, we can
 safely think about the next batch of features we want to add to our framework.
 
-.. _`PHPUnit`: https://phpunit.readthedocs.io/en/stable/
-.. _`test doubles`: https://phpunit.readthedocs.io/en/stable/test-doubles.html
+.. _`PHPUnit`: https://phpunit.readthedocs.io/en/9.5/
+.. _`test doubles`: https://phpunit.readthedocs.io/en/9.5/test-doubles.html
 .. _`XDebug`: https://xdebug.org/

form/unit_testing.rst

@@ -244,4 +244,4 @@ guessers using the :method:`Symfony\\Component\\Form\\Test\\FormIntegrationTestC
 and :method:`Symfony\\Component\\Form\\Test\\FormIntegrationTestCase::getTypeGuessers`
 methods.
 
-.. _`PHPUnit data providers`: https://phpunit.readthedocs.io/en/stable/writing-tests-for-phpunit.html#data-providers
+.. _`PHPUnit data providers`: https://phpunit.readthedocs.io/en/9.5/writing-tests-for-phpunit.html#data-providers

reference/constraints/Collection.rst

@@ -184,6 +184,29 @@ you can do the following:
 
 .. configuration-block::
 
+    .. code-block:: php-attributes
+
+        // src/Entity/Author.php
+        namespace App\Entity;
+
+        use Symfony\Component\Validator\Constraints as Assert;
+
+        class Author
+        {
+            #[Assert\Collection(
+                fields: [
+                    'personal_email' => new Assert\Required([
+                        new Assert\NotBlank,
+                        new Assert\Email,
+                    ]),
+                    'alternate_email' => new Assert\Optional(
+                        new Assert\Email
+                    ),
+                ],
+            )]
+            protected $profileData = ['personal_email' => '[email protected]'];
+        }
+
     .. code-block:: php-attributes
 
         // src/Entity/Author.php

reference/constraints/ExpressionSyntax.rst

@@ -28,28 +28,6 @@ The following constraints ensure that:
 
 .. configuration-block::
 
-    .. code-block:: php-annotations
-
-        // src/Entity/Order.php
-        namespace App\Entity;
-
-        use Symfony\Component\Validator\Constraints as Assert;
-
-        class Order
-        {
-            /**
-             * @Assert\ExpressionSyntax
-             */
-            protected $promotion;
-
-            /**
-             * @Assert\ExpressionSyntax(
-             *     allowedVariables={"user", "shipping_centers"}
-             * )
-             */
-            protected $shippingOptions;
-        }
-
     .. code-block:: php-attributes
 
         // src/Entity/Order.php

reference/constraints/Unique.rst

@@ -109,21 +109,6 @@ collection::
 
 .. configuration-block::
 
-    .. code-block:: php-annotations
-
-        // src/Entity/Poi.php
-        namespace App\Entity;
-
-        use Symfony\Component\Validator\Constraints as Assert;
-
-        class Poi
-        {
-            /**
-             * @Assert\Unique(fields={"latitude", "longitude"})
-             */
-            protected $coordinates;
-        }
-
     .. code-block:: php-attributes
 
         // src/Entity/Poi.php

reference/forms/types/map.rst.inc

@@ -55,8 +55,8 @@ These types are part of the :doc:`Symfony UX initiative </frontend/ux>`:
 UID Fields
 ~~~~~~~~~~
 
-* UuidType
-* UlidType
+* :doc:`UuidType </reference/forms/types/uuid>`
+* :doc:`UlidType </reference/forms/types/ulid>`
 
 Field Groups
 ~~~~~~~~~~~~

security.rst

@@ -1393,14 +1393,10 @@ You must enable this using the ``login_throttling`` setting:
                     # by default, the feature allows 5 login attempts per minute
                     login_throttling: null
 
-                    # configure the maximum login attempts (per minute)
+                    # configure the maximum login attempts
                     login_throttling:
-                        max_attempts: 3
-
-                    # configure the maximum login attempts in a custom period of time
-                    login_throttling:
-                        max_attempts: 3
-                        interval: '15 minutes'
+                        max_attempts: 3          # per minute ...
+                        # interval: '15 minutes' # ... or in a custom period
 
                     # use a custom rate limiter via its service ID
                     login_throttling:
@@ -1423,13 +1419,9 @@ You must enable this using the ``login_throttling`` setting:
                 <!-- ... -->
 
                 <firewall name="main">
-                    <!-- by default, the feature allows 5 login attempts per minute -->
-                    <login-throttling/>
-
-                    <!-- configure the maximum login attempts (per minute) -->
-                    <login-throttling max-attempts="3"/>
-
-                    <!-- configure the maximum login attempts in a custom period of time -->
+                    <!-- by default, the feature allows 5 login attempts per minute
+                         max-attempts: (optional) You can configure the maximum attempts ...
+                         interval:     (optional) ... and the period of time. -->
                     <login-throttling max-attempts="3" interval="15 minutes"/>
 
                     <!-- use a custom rate limiter via its service ID -->
@@ -1449,17 +1441,9 @@ You must enable this using the ``login_throttling`` setting:
             $mainFirewall = $security->firewall('main');
 
             // by default, the feature allows 5 login attempts per minute
-            $mainFirewall->loginThrottling();
-
-            // configure the maximum login attempts (per minute)
-            $mainFirewall->loginThrottling()
-                ->maxAttempts(3)
-            ;
-
-            // configure the maximum login attempts in a custom period of time
             $mainFirewall->loginThrottling()
-                ->maxAttempts(3)
-                ->interval('15 minutes')
+                // ->maxAttempts(3)         // Optional: You can configure the maximum attempts ...
+                // ->interval('15 minutes') // ... and the period of time.
             ;
         };
 

session.rst

@@ -149,6 +149,10 @@ if you type-hint an argument with :class:`Symfony\\Component\\HttpFoundation\\Re
         public function __construct(RequestStack $requestStack)
         {
             $this->requestStack = $requestStack;
+
+            // Accessing the session in the constructor is *NOT* recommended, since
+            // it might not be accessible yet or lead to unwanted side-effects
+            // $this->session = $requestStack->getSession();
         }
 
         public function someMethod()