Merge branch '6.1' into 6.2

* 6.1:
  Add some needed internal reference
  Replace annotations by attributes in Serializer and Controller

Author: javiereguiluz

components/property_info.rst

@@ -453,7 +453,7 @@ SerializerExtractor
 
     This extractor depends on the `symfony/serializer`_ library.
 
-Using :ref:`groups metadata <serializer-using-serialization-groups-annotations>`
+Using :ref:`groups metadata <serializer-using-serialization-groups-attributes>`
 from the :doc:`Serializer component </components/serializer>`,
 the :class:`Symfony\\Component\\PropertyInfo\\Extractor\\SerializerExtractor`
 provides list information. This extractor is *not* registered automatically

controller.rst

@@ -33,9 +33,7 @@ class::
 
     class LuckyController
     {
-        /**
-         * @Route("/lucky/number/{max}", name="app_lucky_number")
-         */
+        #[Route('/lucky/number/{max}', name: 'app_lucky_number')]
         public function number(int $max): Response
         {
             $number = random_int(0, $max);
@@ -73,8 +71,8 @@ Mapping a URL to a Controller
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In order to *view* the result of this controller, you need to map a URL to it via
-a route. This was done above with the ``@Route("/lucky/number/{max}")``
-:ref:`route annotation <annotation-routes>`.
+a route. This was done above with the ``#[Route('/lucky/number/{max}')]``
+:ref:`route attribute <annotation-routes>`.
 
 To see your page, go to this URL in your browser: http://localhost:8000/lucky/number/100
 
@@ -205,9 +203,7 @@ If you need a service in a controller, type-hint an argument with its class
     use Symfony\Component\HttpFoundation\Response;
     // ...
 
-    /**
-     * @Route("/lucky/number/{max}")
-     */
+    #[Route('/lucky/number/{max}')]
     public function number(int $max, LoggerInterface $logger): Response
     {
         $logger->info('We are logging!');

reference/configuration/framework.rst

@@ -2691,7 +2691,7 @@ If this option is enabled, serialization groups can be defined using annotations
 
 .. seealso::
 
-    For more information, see :ref:`serializer-using-serialization-groups-annotations`.
+    For more information, see :ref:`serializer-using-serialization-groups-attributes`.
 
 .. _reference-serializer-name_converter:
 

serializer.rst

@@ -198,17 +198,12 @@ You can also :doc:`create your context builders </serializer/custom_context_buil
 to have autocompletion, validation, and documentation for your custom context values.
 
 .. _serializer-using-serialization-groups-annotations:
+.. _serializer-using-serialization-groups-attributes:
 
-Using Serialization Groups Annotations
---------------------------------------
+Using Serialization Groups Attributes
+-------------------------------------
 
-To use annotations, first add support for them via the SensioFrameworkExtraBundle:
-
-.. code-block:: terminal
-
-    $ composer require sensio/framework-extra-bundle
-
-Next, add the :ref:`@Groups annotations <component-serializer-attributes-groups-annotations>`
+You can add :ref:`#[Groups] attributes <component-serializer-attributes-groups-annotations>`
 to your class::
 
     // src/Entity/Product.php
@@ -217,29 +212,21 @@ to your class::
     use Doctrine\ORM\Mapping as ORM;
     use Symfony\Component\Serializer\Annotation\Groups;
 
-    /**
-     * @ORM\Entity()
-     */
+    #[ORM\Entity]
     class Product
     {
-        /**
-         * @ORM\Id
-         * @ORM\GeneratedValue
-         * @ORM\Column(type="integer")
-         * @Groups({"show_product", "list_product"})
-         */
+        #[ORM\Id]
+        #[ORM\GeneratedValue]
+        #[ORM\Column(type: 'integer')]
+        #[Groups(['show_product', 'list_product'])]
         private $id;
 
-        /**
-         * @ORM\Column(type="string", length=255)
-         * @Groups({"show_product", "list_product"})
-         */
+        #[ORM\Column(type: 'string', length: 255)]
+        #[Groups(['show_product', 'list_product'])]
         private $name;
 
-        /**
-         * @ORM\Column(type="integer")
-         * @Groups({"show_product"})
-         */
+        #[ORM\Column(type: 'integer')]
+        #[Groups(['show_product'])]
         private $description;
     }
 
@@ -257,7 +244,7 @@ You can now choose which groups to use when serializing::
 
     The value of the ``groups`` key can be a single string, or an array of strings.
 
-In addition to the ``@Groups`` annotation, the Serializer component also
+In addition to the ``#[Groups]`` attribute, the Serializer component also
 supports YAML or XML files. These files are automatically loaded when being
 stored in one of the following locations: