symfony/archived-maker-bundle
1
0
Fork 0
mirror of https://github.com/symfony/maker-bundle.git synced 2026-03-23 23:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kevin Bond
2025-04-25 12:37:53 -04:00
parent ebb00c76aa
commit cd1d90832e
9 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Maker/MakeListener.php
View File

@@ -153,13 +153,12 @@ final class MakeListener extends AbstractMaker
$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 @@ final class MakeListener extends AbstractMaker
[
'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),
]

2
templates/event/Listener.tpl.php
View File

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

2
tests/Maker/MakeSubscriberTest.php
View File

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

2
tests/fixtures/make-listener/tests/EventListener/BarListener.php vendored
View File

@@ -7,7 +7,7 @@ use Symfony\Component\HttpKernel\Event\RequestEvent;
final class BarListener
{
#[AsEventListener(event: RequestEvent::class)]
#[AsEventListener]
public function onRequestEvent(RequestEvent $event): void
{
// ...

2
tests/fixtures/make-listener/tests/EventListener/CustomListener.php vendored
View File

@@ -7,7 +7,7 @@ use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
final class CustomListener
{
#[AsEventListener(event: Generator::class)]
#[AsEventListener]
public function onGenerator(Generator $event): void
{
// ...

5
tests/fixtures/make-listener/tests/EventListener/FooBarListener.php vendored
View File

@@ -4,12 +4,11 @@ namespace App\EventListener;
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
{
// ...
}

5
tests/fixtures/make-listener/tests/EventListener/FooListener.php vendored
View File

@@ -4,12 +4,11 @@ namespace App\EventListener;
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
{
// ...
}

5
tests/fixtures/make-listener/tests/EventSubscriber/FooBarSubscriber.php vendored
View File

@@ -4,11 +4,10 @@ namespace App\EventSubscriber;
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
{
// ...
}
@@ -16,7 +15,7 @@ class FooBarSubscriber implements EventSubscriberInterface
public static function getSubscribedEvents(): array
{
return [
KernelEvents::REQUEST => 'onKernelRequest',
RequestEvent::class => 'onRequestEvent',
];
}
}

5
tests/fixtures/make-listener/tests/EventSubscriber/FooSubscriber.php vendored
View File

@@ -4,11 +4,10 @@ namespace App\EventSubscriber;
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
{
// ...
}
@@ -16,7 +15,7 @@ class FooSubscriber implements EventSubscriberInterface
public static function getSubscribedEvents(): array
{
return [
KernelEvents::REQUEST => 'onKernelRequest',
RequestEvent::class => 'onRequestEvent',
];
}
}