Merge branch '6.4' into 7.0

* 6.4:
  Add attribute configuration block for reusable locator
  Reorder imports in code examples
  [Form] Fix an RST reference
  Adding asset versioning to comparison table
  [Contributing] Remove references to symfony/website-skeleton
  [Form] Updating the generic `FormEvent` to specific event (e.g. `PreSetDataEvent`)
  [UID] Fix default versions in framework config

Author: OskarStark

components/uid.rst

@@ -90,10 +90,10 @@ configure the behavior of the factory using configuration files::
         # config/packages/uid.yaml
         framework:
             uid:
-                default_uuid_version: 7
+                default_uuid_version: 6
                 name_based_uuid_version: 5
                 name_based_uuid_namespace: 6ba7b810-9dad-11d1-80b4-00c04fd430c8
-                time_based_uuid_version: 7
+                time_based_uuid_version: 6
                 time_based_uuid_node: 121212121212
 
     .. code-block:: xml
@@ -109,10 +109,10 @@ configure the behavior of the factory using configuration files::
 
             <framework:config>
                 <framework:uid
-                    default_uuid_version="7"
+                    default_uuid_version="6"
                     name_based_uuid_version="5"
                     name_based_uuid_namespace="6ba7b810-9dad-11d1-80b4-00c04fd430c8"
-                    time_based_uuid_version="7"
+                    time_based_uuid_version="6"
                     time_based_uuid_node="121212121212"
                 />
             </framework:config>
@@ -131,10 +131,10 @@ configure the behavior of the factory using configuration files::
 
             $container->extension('framework', [
                 'uid' => [
-                    'default_uuid_version' => 7,
+                    'default_uuid_version' => 6,
                     'name_based_uuid_version' => 5,
                     'name_based_uuid_namespace' => '6ba7b810-9dad-11d1-80b4-00c04fd430c8',
-                    'time_based_uuid_version' => 7,
+                    'time_based_uuid_version' => 6,
                     'time_based_uuid_node' => 121212121212,
                 ],
             ]);
@@ -156,7 +156,7 @@ on the configuration you defined::
 
         public function generate(): void
         {
-            // This creates a UUID of the version given in the configuration file (v7 by default)
+            // This creates a UUID of the version given in the configuration file (v6 by default)
             $uuid = $this->uuidFactory->create();
 
             $nameBasedUuid = $this->uuidFactory->nameBased(/** ... */);

contributing/community/reviews.rst

@@ -59,15 +59,15 @@ The steps for the review are:
 #. **Is the Report Complete?**
 
    Good bug reports contain a link to a project (the "reproduction project")
-   created with the `Symfony skeleton`_ or the `Symfony website skeleton`_
-   that reproduces the bug. If it doesn't, the report should at least contain
-   enough information and code samples to reproduce the bug.
+   created with the `Symfony skeleton`_ that reproduces the bug. If it
+   doesn't, the report should at least contain enough information and code
+   samples to reproduce the bug.
 
 #. **Reproduce the Bug**
 
    Download the reproduction project and test whether the bug can be reproduced
    on your system. If the reporter did not provide a reproduction project,
-   create one based on one `Symfony skeleton`_ (or the `Symfony website skeleton`_).
+   create one based on one `Symfony skeleton`_.
 
 #. **Update the Issue Status**
 
@@ -134,9 +134,9 @@ Pick a pull request from the `PRs in need of review`_ and follow these steps:
 #. **Reproduce the Problem**
 
    Read the issue that the pull request is supposed to fix. Reproduce the
-   problem on a new project created with the `Symfony skeleton`_ (or the
-   `Symfony website skeleton`_) and try to understand why it exists. If the
-   linked issue already contains such a project, install it and run it on your system.
+   problem on a new project created with the `Symfony skeleton`_ and try to
+   understand why it exists. If the linked issue already contains such a
+   project, install it and run it on your system.
 
 #. **Review the Code**
 
@@ -212,7 +212,6 @@ Pick a pull request from the `PRs in need of review`_ and follow these steps:
 .. _GitHub: https://github.com
 .. _Symfony issue tracker: https://github.com/symfony/symfony/issues
 .. _`Symfony skeleton`: https://github.com/symfony/skeleton
-.. _`Symfony website skeleton`: https://github.com/symfony/website-skeleton
 .. _create a GitHub account: https://help.github.com/github/getting-started-with-github/signing-up-for-a-new-github-account
 .. _bug reports in need of review: https://github.com/symfony/symfony/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3A%22Bug%22+label%3A%22Status%3A+Needs+Review%22+
 .. _PRs in need of review: https://github.com/symfony/symfony/pulls?q=is%3Aopen+is%3Apr+label%3A%22Status%3A+Needs+Review%22

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:`FormEvent::setData() <Symfony\\Component\\Form\\FormEvent::setData>`.
 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,16 +273,16 @@ 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\FormEvent;
     use Symfony\Component\Form\FormEvents;
 
     $form = $formFactory->createBuilder()
         ->add('username', TextType::class)
         ->add('showEmail', CheckboxType::class)
-        ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event): void {
+        ->addEventListener(FormEvents::PRE_SUBMIT, function (PreSubmitEvent $event): void {
             $user = $event->getData();
             $form = $event->getForm();
 
@@ -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\FormEvent;
     use Symfony\Component\Form\FormEvents;
 
     // ...
@@ -331,7 +330,7 @@ callback for better readability::
             ;
         }
 
-        public function onPreSetData(FormEvent $event): void
+        public function onPreSetData(PreSetDataEvent $event): void
         {
             // ...
         }
@@ -352,8 +351,9 @@ Consider the following example of a form event subscriber::
     namespace App\Form\EventListener;
 
     use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+    use Symfony\Component\Form\Event\PreSetDataEvent;
+    use Symfony\Component\Form\Event\PreSubmitEvent;
     use Symfony\Component\Form\Extension\Core\Type\EmailType;
-    use Symfony\Component\Form\FormEvent;
     use Symfony\Component\Form\FormEvents;
 
     class AddEmailFieldListener implements EventSubscriberInterface
@@ -366,7 +366,7 @@ Consider the following example of a form event subscriber::
             ];
         }
 
-        public function onPreSetData(FormEvent $event): void
+        public function onPreSetData(PreSetDataEvent $event): void
         {
             $user = $event->getData();
             $form = $event->getForm();
@@ -378,7 +378,7 @@ Consider the following example of a form event subscriber::
             }
         }
 
-        public function onPreSubmit(FormEvent $event): void
+        public function onPreSubmit(PreSubmitEvent $event): void
         {
             $user = $event->getData();
             $form = $event->getForm();

frontend.rst

@@ -26,6 +26,7 @@ Supports `Stimulus/UX`_           yes                                 yes
 Supports Sass/Tailwind            :ref:`yes <asset-mapper-tailwind>`  yes
 Supports React, Vue, Svelte?      yes :ref:`[1] <ux-note-1>`          yes
 Supports TypeScript               :ref:`yes <asset-mapper-ts>`        yes
+Versioned assets                  always                              optional
 ================================  ==================================  ==========
 
 .. _ux-note-1:

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