[make:listener] use FQCN for kernel events, fix adding unnecessary #[AsEventListener] arg

Author: kbond

src/Maker/MakeListener.php

@@ -153,13 +153,12 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         $eventFullClassName = $this->eventRegistry->getEventClassName($event);
         $eventClassName = $eventFullClassName ? Str::getShortClassName($eventFullClassName) : null;
 
-        if (null !== ($eventConstant = $this->getEventConstant($event))) {
-            $useStatements->addUseStatement(KernelEvents::class);
-            $eventName = $eventConstant;
-        } else {
-            $eventName = class_exists($event) ? \sprintf('%s::class', $eventClassName) : \sprintf('\'%s\'', $event);
+        if ($this->getEventConstant($event)) {
+            $event = $eventFullClassName;
         }
 
+        $eventName = class_exists($event) ? \sprintf('%s::class', $eventClassName) : \sprintf('\'%s\'', $event);
+
         if (null !== $eventFullClassName) {
             $useStatements->addUseStatement($eventFullClassName);
         }
@@ -230,6 +229,7 @@ private function generateListenerClass(InputInterface $input, ConsoleStyle $io,
             [
                 'use_statements' => $useStatements,
                 'event' => $eventName,
+                'class_event' => str_ends_with($eventName, '::class'),
                 'event_arg' => $eventClassName ? \sprintf('%s $event', $eventClassName) : '$event',
                 'method_name' => class_exists($event) ? Str::asEventMethod($eventClassName) : Str::asEventMethod($event),
             ]

templates/event/Listener.tpl.php

@@ -6,7 +6,7 @@
 
 final class <?= $class_name."\n" ?>
 {
-    #[AsEventListener(event: <?= $event ?>)]
+    #[AsEventListener<?php if (!$class_event): ?>(event: <?= $event ?>)<?php endif ?>]
     public function <?= $method_name ?>(<?= $event_arg ?>): void
     {
         // ...

tests/Maker/MakeSubscriberTest.php

@@ -39,7 +39,7 @@ public function getTestDetails(): \Generator
                 );
 
                 self::assertStringContainsString(
-                    'KernelEvents::REQUEST => \'onKernelRequest\'',
+                    'RequestEvent::class => \'onRequestEvent\'',
                     file_get_contents($runner->getPath('src/EventSubscriber/FooBarSubscriber.php'))
                 );
             }),

tests/fixtures/make-listener/tests/EventListener/BarListener.php

@@ -7,7 +7,7 @@
 
 final class BarListener
 {
-    #[AsEventListener(event: RequestEvent::class)]
+    #[AsEventListener]
     public function onRequestEvent(RequestEvent $event): void
     {
         // ...

tests/fixtures/make-listener/tests/EventListener/CustomListener.php

@@ -7,7 +7,7 @@
 
 final class CustomListener
 {
-    #[AsEventListener(event: Generator::class)]
+    #[AsEventListener]
     public function onGenerator(Generator $event): void
     {
         // ...

tests/fixtures/make-listener/tests/EventListener/FooBarListener.php

@@ -4,12 +4,11 @@
 
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
 
 final class FooBarListener
 {
-    #[AsEventListener(event: KernelEvents::REQUEST)]
-    public function onKernelRequest(RequestEvent $event): void
+    #[AsEventListener]
+    public function onRequestEvent(RequestEvent $event): void
     {
         // ...
     }

tests/fixtures/make-listener/tests/EventListener/FooListener.php

@@ -4,12 +4,11 @@
 
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
 
 final class FooListener
 {
-    #[AsEventListener(event: KernelEvents::REQUEST)]
-    public function onKernelRequest(RequestEvent $event): void
+    #[AsEventListener]
+    public function onRequestEvent(RequestEvent $event): void
     {
         // ...
     }

tests/fixtures/make-listener/tests/EventSubscriber/FooBarSubscriber.php

@@ -4,19 +4,18 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
 
 class FooBarSubscriber implements EventSubscriberInterface
 {
-    public function onKernelRequest(RequestEvent $event): void
+    public function onRequestEvent(RequestEvent $event): void
     {
         // ...
     }
 
     public static function getSubscribedEvents(): array
     {
         return [
-            KernelEvents::REQUEST => 'onKernelRequest',
+            RequestEvent::class => 'onRequestEvent',
         ];
     }
 }

tests/fixtures/make-listener/tests/EventSubscriber/FooSubscriber.php

@@ -4,19 +4,18 @@
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
 
 class FooSubscriber implements EventSubscriberInterface
 {
-    public function onKernelRequest(RequestEvent $event): void
+    public function onRequestEvent(RequestEvent $event): void
     {
         // ...
     }
 
     public static function getSubscribedEvents(): array
     {
         return [
-            KernelEvents::REQUEST => 'onKernelRequest',
+            RequestEvent::class => 'onRequestEvent',
         ];
     }
 }