Merge branch '5.4' into 6.3

OskarStark · OskarStark · commit cf7e9fdab3aa · 2023-08-17T23:27:00.000+02:00
* 5.4:
  [Routing] Fix xml and yaml example for forcing https
diff --git a/routing.rst b/routing.rst
@@ -2612,8 +2612,7 @@ defined as annotations:
         controllers:
             resource: '../../src/Controller/'
             type: annotation
-            defaults:
-                schemes: [https]
+            schemes: [https]
 
     .. code-block:: xml
 
@@ -2624,9 +2623,7 @@ defined as annotations:
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <import resource="../../src/Controller/" type="annotation">
-                <default key="schemes">HTTPS</default>
-            </import>
+            <import resource="../../src/Controller/" type="annotation" schemes="https"/>
         </routes>
 
     .. code-block:: php
