Merge branch '6.1' into 6.2

* 6.1:
  Replace Route annotations with attributes, remove Route annotation configuration block

Author: javiereguiluz

configuration/micro_kernel_trait.rst

@@ -297,9 +297,7 @@ has one file in it::
 
     class MicroController extends AbstractController
     {
-        /**
-         * @Route("/random/{limit}")
-         */
+        #[Route('/random/{limit}')]
         public function randomNumber(int $limit): Response
         {
             $number = random_int(0, $limit);

controller/service.rst

@@ -39,24 +39,6 @@ a service like: ``App\Controller\HelloController::index``:
 
 .. configuration-block::
 
-    .. code-block:: php-annotations
-
-        // src/Controller/HelloController.php
-        namespace App\Controller;
-
-        use Symfony\Component\Routing\Annotation\Route;
-
-        class HelloController
-        {
-            /**
-             * @Route("/hello", name="hello", methods={"GET"})
-             */
-            public function index()
-            {
-                // ...
-            }
-        }
-
     .. code-block:: php-attributes
 
         // src/Controller/HelloController.php
@@ -118,25 +100,6 @@ which is a common practice when following the `ADR pattern`_
 
 .. configuration-block::
 
-    .. code-block:: php-annotations
-
-        // src/Controller/Hello.php
-        namespace App\Controller;
-
-        use Symfony\Component\HttpFoundation\Response;
-        use Symfony\Component\Routing\Annotation\Route;
-
-        /**
-         * @Route("/hello/{name}", name="hello")
-         */
-        class Hello
-        {
-            public function __invoke($name = 'World')
-            {
-                return new Response(sprintf('Hello %s!', $name));
-            }
-        }
-
     .. code-block:: php-attributes
 
         // src/Controller/Hello.php

controller/soap_web_service.rst

@@ -71,9 +71,7 @@ can be retrieved via ``/soap?wsdl``::
 
     class HelloServiceController extends AbstractController
     {
-        /**
-         * @Route("/soap")
-         */
+        #[Route('/soap')]
         public function index(HelloService $helloService)
         {
             $soapServer = new \SoapServer('/path/to/hello.wsdl');

controller/upload_file.rst

@@ -133,9 +133,7 @@ Finally, you need to update the code of the controller that handles the form::
 
     class ProductController extends AbstractController
     {
-        /**
-         * @Route("/product/new", name="app_product_new")
-         */
+        #[Route('/product/new', name: 'app_product_new')]
         public function new(Request $request, SluggerInterface $slugger)
         {
             $product = new Product();

lock.rst

@@ -180,9 +180,7 @@ To lock the default resource, autowire the lock factory using
 
     class PdfController extends AbstractController
     {
-        /**
-         * @Route("/download/terms-of-use.pdf")
-         */
+        #[Route('/download/terms-of-use.pdf')]
         public function downloadPdf(LockFactory $factory, MyPdfGeneratorService $pdf)
         {
             $lock = $factory->createLock('pdf-creation');
@@ -221,9 +219,7 @@ processes asking for the same ``$version``::
 
     class PdfController extends AbstractController
     {
-        /**
-         * @Route("/download/{version}/terms-of-use.pdf")
-         */
+        #[Route('/download/{version}/terms-of-use.pdf')]
         public function downloadPdf($version, LockFactory $lockFactory, MyPdfGeneratorService $pdf)
         {
             $lock = $lockFactory->createLock($version);

notifier/chatters.rst

@@ -17,9 +17,7 @@ you to send messages to chat services like Slack or Telegram::
 
     class CheckoutController extends AbstractController
     {
-        /**
-         * @Route("/checkout/thankyou")
-         */
+        #[Route('/checkout/thankyou')]
         public function thankyou(ChatterInterface $chatter)
         {
             $message = (new ChatMessage('You got a new invoice for 15 EUR.'))

notifier/texters.rst

@@ -16,9 +16,7 @@ you to send SMS messages::
 
     class SecurityController
     {
-        /**
-         * @Route("/login/success")
-         */
+        #[Route('/login/success')]
         public function loginSuccess(TexterInterface $texter)
         {
             $sms = new SmsMessage(

page_creation.rst

@@ -106,24 +106,6 @@ You can now add your route directly *above* the controller:
 
 .. configuration-block::
 
-    .. code-block:: php-annotations
-
-        // src/Controller/LuckyController.php
-
-        // ...
-        + use Symfony\Component\Routing\Annotation\Route;
-
-        class LuckyController
-        {
-        +   /**
-        +    * @Route("/lucky/number")
-        +    */
-            public function number(): Response
-            {
-                // this looks exactly the same
-            }
-        }
-
     .. code-block:: php-attributes
 
         // src/Controller/LuckyController.php
@@ -257,9 +239,7 @@ variable so you can use it in Twig::
 
     class LuckyController extends AbstractController
     {
-        /**
-         * @Route("/lucky/number")
-         */
+        #[Route('/lucky/number')]
         public function number(): Response
         {
             $number = random_int(0, 100);

quick_tour/the_big_picture.rst

@@ -171,7 +171,7 @@ Instead, add the route *right above* the controller method:
            }
       }
 
-This works just like before! But by using annotations, the route and controller
+This works just like before! But by using attributes, the route and controller
 live right next to each other. Need another page? Add another route and method
 in ``DefaultController``::