Merge branch '5.3' into 5.4

* 5.3:
  Remove unused param from LeapYearController::index
  Fix some line numbers in a code example
  Add Attributes code
  Update mercure.rst

Author: javiereguiluz

create_framework/http_kernel_httpkernel_class.rst

@@ -133,7 +133,7 @@ instead of a full Response object::
 
     class LeapYearController
     {
-        public function index(Request $request, $year)
+        public function index($year)
         {
             $leapYear = new LeapYear();
             if ($leapYear->isLeapYear($year)) {

mercure.rst

@@ -251,7 +251,7 @@ Subscribing to updates in JavaScript from a Twig template is straightforward:
         // Will be called every time an update is published by the server
         console.log(JSON.parse(event.data));
     }
-    <script>
+    </script>
 
 The ``mercure()`` Twig function will generate the URL of the Mercure hub
 according to the configuration. The URL will include the ``topic`` query
@@ -260,13 +260,15 @@ parameters corresponding to the topics passed as first argument.
 If you want to access to this URL from an external JavaScript file, generate the
 URL in a dedicated HTML element:
 
-.. code:: twig
+.. code-block:: twig
 
-    <script type="application/json" id="mercure-url">{{ mercure('https://example.com/books/1')|json_encode(constant('JSON_UNESCAPED_SLASHES') b-or constant('JSON_HEX_TAG'))|raw }}</script>
+    <script type="application/json" id="mercure-url">
+    {{ mercure('https://example.com/books/1')|json_encode(constant('JSON_UNESCAPED_SLASHES') b-or constant('JSON_HEX_TAG'))|raw }}
+    </script>
 
 Then retrieve it from your JS file:
 
-.. code:: javascript
+.. code-block:: javascript
 
     const url = JSON.parse(document.getElementById("mercure-url").textContent);
     const eventSource = new EventSource(url);

migration.rst

@@ -289,15 +289,15 @@ could look something like this::
 
 There are 2 major deviations from the original file:
 
-Line 15
+Line 18
   First of all, ``$kernel`` is made globally available. This allows you to use
   Symfony features inside your existing application and gives access to
   services configured in our Symfony application. This helps you prepare your
   own code to work better within the Symfony application before you transition
   it over. For instance, by replacing outdated or redundant libraries with
   Symfony components.
 
-Line 38 - 47
+Line 41 - 50
   Instead of sending the Symfony response directly, a ``LegacyBridge`` is
   called to decide whether the legacy application should be booted and used to
   create the response instead.

page_creation.rst

@@ -95,34 +95,53 @@ Annotation Routes
 -----------------
 
 Instead of defining your route in YAML, Symfony also allows you to use *annotation*
-routes. To do this, install the annotations package:
+or *attribute* routes. Attributes are built-in in PHP starting from PHP 8. In earlier
+PHP versions you can use annotations. To do this, install the annotations package:
 
 .. code-block:: terminal
 
     $ composer require annotations
 
 You can now add your route directly *above* the controller:
 
-.. code-block:: diff
+.. configuration-block::
 
-      // src/Controller/LuckyController.php
+    .. code-block:: php-annotations
 
-      // ...
-    + use Symfony\Component\Routing\Annotation\Route;
+        // src/Controller/LuckyController.php
 
-      class LuckyController
-      {
-    +     /**
-    +      * @Route("/lucky/number")
-    +      */
-          public function number()
-          {
-              // this looks exactly the same
-          }
-      }
+        // ...
+        + use Symfony\Component\Routing\Annotation\Route;
+
+        class LuckyController
+        {
+        +   /**
+        +    * @Route("/lucky/number")
+        +    */
+            public function number()
+            {
+                // this looks exactly the same
+            }
+        }
+
+    .. code-block:: php-attributes
+
+        // src/Controller/LuckyController.php
+
+        // ...
+        + use Symfony\Component\Routing\Annotation\Route;
+
+        class LuckyController
+        {
+        +   #[Route('/lucky/number')
+            public function number()
+            {
+                // this looks exactly the same
+            }
+        }
 
 That's it! The page - http://localhost:8000/lucky/number will work exactly
-like before! Annotations are the recommended way to configure routes.
+like before! Annotations/attributes are the recommended way to configure routes.
 
 .. _flex-quick-intro: