Merge branch '6.2' into 6.3

* 6.2:
  Change the order of code blocks in the configuration block
  We need to use AsEntityListener instead of AsDoctrineListener
  Update getContainerExtension()
  [FrameworkBundle] Add support for route attributes in kernel controller methods

Author: javiereguiluz

bundles/extension.rst

@@ -54,10 +54,11 @@ method to return the instance of the extension::
 
     // ...
     use Acme\HelloBundle\DependencyInjection\UnconventionalExtensionClass;
+    use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
     class AcmeHelloBundle extends Bundle
     {
-        public function getContainerExtension()
+        public function getContainerExtension(): ?ExtensionInterface
         {
             return new UnconventionalExtensionClass();
         }

configuration/micro_kernel_trait.rst

@@ -20,55 +20,109 @@ via Composer:
       symfony/http-foundation symfony/routing \
       symfony/dependency-injection symfony/framework-bundle
 
-Next, create an ``index.php`` file that defines the kernel class and runs it::
+Next, create an ``index.php`` file that defines the kernel class and runs it:
 
-    // index.php
-    use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-    use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-    use Symfony\Component\HttpFoundation\JsonResponse;
-    use Symfony\Component\HttpFoundation\Request;
-    use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-    use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+.. configuration-block::
 
-    require __DIR__.'/vendor/autoload.php';
+    .. code-block:: php-attributes
 
-    class Kernel extends BaseKernel
-    {
-        use MicroKernelTrait;
+        // index.php
+        use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+        use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+        use Symfony\Component\HttpFoundation\JsonResponse;
+        use Symfony\Component\HttpFoundation\Request;
+        use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+        use Symfony\Component\Routing\Annotation\Route;
 
-        public function registerBundles(): array
-        {
-            return [
-                new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            ];
-        }
+        require __DIR__.'/vendor/autoload.php';
 
-        protected function configureContainer(ContainerConfigurator $c): void
+        class Kernel extends BaseKernel
         {
-            // PHP equivalent of config/packages/framework.yaml
-            $c->extension('framework', [
-                'secret' => 'S0ME_SECRET'
-            ]);
-        }
+            use MicroKernelTrait;
 
-        protected function configureRoutes(RoutingConfigurator $routes): void
-        {
-            $routes->add('random_number', '/random/{limit}')->controller([$this, 'randomNumber']);
+            public function registerBundles(): array
+            {
+                return [
+                    new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+                ];
+            }
+
+            protected function configureContainer(ContainerConfigurator $c): void
+            {
+                // PHP equivalent of config/packages/framework.yaml
+                $c->extension('framework', [
+                    'secret' => 'S0ME_SECRET'
+                ]);
+            }
+
+            #[Route('/random/{limit}', name='random_number')]
+            public function randomNumber(int $limit): JsonResponse
+            {
+                return new JsonResponse([
+                    'number' => random_int(0, $limit),
+                ]);
+            }
         }
 
-        public function randomNumber(int $limit): JsonResponse
+        $kernel = new Kernel('dev', true);
+        $request = Request::createFromGlobals();
+        $response = $kernel->handle($request);
+        $response->send();
+        $kernel->terminate($request, $response);
+
+    .. code-block:: php
+
+        // index.php
+        use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+        use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+        use Symfony\Component\HttpFoundation\JsonResponse;
+        use Symfony\Component\HttpFoundation\Request;
+        use Symfony\Component\HttpKernel\Kernel as BaseKernel;
+        use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+
+        require __DIR__.'/vendor/autoload.php';
+
+        class Kernel extends BaseKernel
         {
-            return new JsonResponse([
-                'number' => random_int(0, $limit),
-            ]);
+            use MicroKernelTrait;
+
+            public function registerBundles(): array
+            {
+                return [
+                    new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+                ];
+            }
+
+            protected function configureContainer(ContainerConfigurator $c): void
+            {
+                // PHP equivalent of config/packages/framework.yaml
+                $c->extension('framework', [
+                    'secret' => 'S0ME_SECRET'
+                ]);
+            }
+
+            protected function configureRoutes(RoutingConfigurator $routes): void
+            {
+                $routes->add('random_number', '/random/{limit}')->controller([$this, 'randomNumber']);
+            }
+
+            public function randomNumber(int $limit): JsonResponse
+            {
+                return new JsonResponse([
+                    'number' => random_int(0, $limit),
+                ]);
+            }
         }
-    }
 
-    $kernel = new Kernel('dev', true);
-    $request = Request::createFromGlobals();
-    $response = $kernel->handle($request);
-    $response->send();
-    $kernel->terminate($request, $response);
+        $kernel = new Kernel('dev', true);
+        $request = Request::createFromGlobals();
+        $response = $kernel->handle($request);
+        $response->send();
+        $kernel->terminate($request, $response);
+
+.. versionadded:: 6.1
+
+    The PHP attributes notation has been introduced in Symfony 6.1.
 
 That's it! To test it, start the :doc:`Symfony Local Web Server
 </setup/symfony_server>`:

doctrine/events.rst

@@ -255,7 +255,7 @@ First, define a PHP class that handles the ``postUpdate`` Doctrine event::
         }
     }
 
-Then, add the ``#[AsDoctrineListener]`` attribute to the class to enable it as
+Then, add the ``#[AsEntityListener]`` attribute to the class to enable it as
 a Doctrine entity listener in your application:
 
     .. code-block:: php
@@ -265,9 +265,10 @@ a Doctrine entity listener in your application:
 
         // ...
         use App\Entity\User;
-        use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
+        use Doctrine\Bundle\DoctrineBundle\Attribute\AsEntityListener;
+        use Doctrine\ORM\Events;
 
-        #[AsDoctrineListener(event: 'postUpdate',  method: 'postUpdate', entity: User::class)]
+        #[AsEntityListener(event: Events::postUpdate, method: 'postUpdate', entity: User::class)]
         class UserChangedNotifier
         {
             // ...