10000 [make:listener] use FQCN for kernel events · symfony/maker-bundle@fdc9ee3 · GitHub
[go: up one dir, main page]
Skip to content

Commit fdc9ee3

Browse files
kbondkbond
committed
[make:listener] use FQCN for kernel events
1 parent f863f50 commit fdc9ee3

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

‎src/Maker/MakeListener.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,12 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
153153
$eventFullClassName = $this->eventRegistry->getEventClassName($event);
154154
$eventClassName = $eventFullClassName ? Str::getShortClassName($eventFullClassName) : null;
155155

156-
if (null !== ($eventConstant = $this->getEventConstant($event))) {
157-
$useStatements->addUseStatement(KernelEvents::class);
158-
$eventName = $eventConstant;
159-
} else {
160-
$eventName = class_exists($event) ? \sprintf('%s::class', $eventClassName) : \sprintf('\'%s\'', $event);
156+
if ($this->getEventConstant($event)) {
157+
$event = $eventFullClassName;
161158
}
162159

160+
$eventName = class_exists($event) ? \sprintf('%s::class', $eventClassName) : \sprintf('\'%s\'', $event);
161+
163162
if (null !== $eventFullClassName) {
164163
$useStatements->addUseStatement($eventFullClassName);
165164
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44

55
use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
66
use Symfony\Component\HttpKernel\Event\RequestEvent;
7-
use Symfony\Component\HttpKernel\KernelEvents;
87

98
final class FooBarListener
109
{
11-
#[AsEventListener(event: KernelEvents::REQUEST)]
12-
public function onKernelRequest(RequestEvent $event): void
10+
#[AsEventListener]
11+
public function onRequestEvent(RequestEvent $event): void
1312
{
1413
// ...
1514
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44

55
use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
66
use Symfony\Component\HttpKernel\Event\RequestEvent;
7-
use Symfony\Component\HttpKernel\KernelEvents;
87

98
final class FooListener
109
{
11-
#[AsEventListener(event: KernelEvents::REQUEST)]
12-
public function onKernelRequest(RequestEvent $event): void
10+
#[AsEventListener]
11+
public function onRequestEvent(RequestEvent $event): void
1312
{
1413
// ...
1514
}

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

Lines changed: 2 additions & 3 deletions
8000
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44

55
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
66
use Symfony\Component\HttpKernel\Event\RequestEvent;
7-
use Symfony\Component\HttpKernel\KernelEvents;
87

98
class FooBarSubscriber implements EventSubscriberInterface
109
{
11-
public function onKernelRequest(RequestEvent $event): void
10+
public function onRequestEvent(RequestEvent $event): void
1211
{
1312
// ...
1413
}
1514

1615
public static function getSubscribedEvents(): array
1716
{
1817
return [
19-
KernelEvents::REQUEST => 'onKernelRequest',
18+
RequestEvent::class => 'onRequestEvent',
2019
];
2120
}
2221
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
< A0CF /td>
44

55
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
66
use Symfony\Component\HttpKernel\Event\RequestEvent;
7-
use Symfony\Component\HttpKernel\KernelEvents;
87

98
class FooSubscriber implements EventSubscriberInterface
109
{
11-
public function onKernelRequest(RequestEvent $event): void
10+
public function onRequestEvent(RequestEvent $event): void
1211
{
1312
// ...
1413
}
1514

1615
public static function getSubscribedEvents(): array
1716
{
1817
return [
19-
KernelEvents::REQUEST => 'onKernelRequest',
18+
RequestEvent::class => 'onRequestEvent',
2019
];
2120
}
2221
}

0 commit comments

Comments
 (0)
0