Merge branch '7.0' into 7.1

* 7.0:
  Add attribute configuration block for reusable locator
  Reorder imports in code examples
  [Form] Fix an RST reference

Author: OskarStark

form/events.rst

@@ -62,7 +62,6 @@ A) The ``FormEvents::PRE_SET_DATA`` Event
 The ``FormEvents::PRE_SET_DATA`` event is dispatched at the beginning of the
 ``Form::setData()`` method. It is used to modify the data given during
 pre-population with
-:method:`PreSetData::setData() <Symfony\\Component\\Form\\Event\\PreSetDataEvent>`.
 The method :method:`Form::setData() <Symfony\\Component\\Form\\Form::setData>`
 is locked since the event is dispatched from it and will throw an exception
 if called from a listener.
@@ -274,10 +273,10 @@ method of the ``FormFactory``::
 
     // ...
 
+    use Symfony\Component\Form\Event\PreSubmitEvent;
     use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
     use Symfony\Component\Form\Extension\Core\Type\EmailType;
     use Symfony\Component\Form\Extension\Core\Type\TextType;
-    use Symfony\Component\Form\Event\PreSubmitEvent;
     use Symfony\Component\Form\FormEvents;
 
     $form = $formFactory->createBuilder()
@@ -311,9 +310,9 @@ callback for better readability::
     // src/Form/SubscriptionType.php
     namespace App\Form;
 
+    use Symfony\Component\Form\Event\PreSetDataEvent;
     use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
     use Symfony\Component\Form\Extension\Core\Type\TextType;
-    use Symfony\Component\Form\Event\PreSetDataEvent;
     use Symfony\Component\Form\FormEvents;
 
     // ...
@@ -352,9 +351,9 @@ Consider the following example of a form event subscriber::
     namespace App\Form\EventListener;
 
     use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-    use Symfony\Component\Form\Extension\Core\Type\EmailType;
     use Symfony\Component\Form\Event\PreSetDataEvent;
     use Symfony\Component\Form\Event\PreSubmitEvent;
+    use Symfony\Component\Form\Extension\Core\Type\EmailType;
     use Symfony\Component\Form\FormEvents;
 
     class AddEmailFieldListener implements EventSubscriberInterface

service_container/service_subscribers_locators.rst

@@ -554,6 +554,23 @@ Now you can inject the service locator in any other services:
 
 .. configuration-block::
 
+    .. code-block:: php-attributes
+
+        // src/CommandBus.php
+        namespace App;
+
+        use Psr\Container\ContainerInterface;
+        use Symfony\Component\DependencyInjection\Attribute\Autowire;
+
+        class CommandBus
+        {
+            public function __construct(
+                #[Autowire(service: 'app.command_handler_locator')]
+                private ContainerInterface $locator,
+            ) {
+            }
+        }
+
     .. code-block:: yaml
 
         # config/services.yaml