Skip to content

Commit 329ac3c

Browse files
committed
Migrate to league/event:^3
1 parent fae6283 commit 329ac3c

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

src/Resources/config/services.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
use League\Bundle\OAuth2ServerBundle\Security\Authenticator\OAuth2Authenticator;
3838
use League\Bundle\OAuth2ServerBundle\Security\EventListener\CheckScopeListener;
3939
use League\Bundle\OAuth2ServerBundle\Service\SymfonyLeagueEventListenerProvider;
40-
use League\Event\Emitter;
4140
use League\OAuth2\Server\AuthorizationServer;
41+
use League\OAuth2\Server\EventEmitting\EventEmitter;
4242
use League\OAuth2\Server\Grant\AuthCodeGrant;
4343
use League\OAuth2\Server\Grant\ClientCredentialsGrant;
4444
use League\OAuth2\Server\Grant\ImplicitGrant;
@@ -128,8 +128,8 @@
128128
])
129129
->alias(SymfonyLeagueEventListenerProvider::class, 'league.oauth2_server.symfony_league_listener_provider')
130130

131-
->set('league.oauth2_server.emitter', Emitter::class)
132-
->call('useListenerProvider', [service('league.oauth2_server.symfony_league_listener_provider')])
131+
->set('league.oauth2_server.emitter', EventEmitter::class)
132+
->call('subscribeListenersFrom', [service('league.oauth2_server.symfony_league_listener_provider')])
133133

134134
->set('league.oauth2_server.authorization_server.grant_configurator', GrantConfigurator::class)
135135
->args([

src/Service/SymfonyLeagueEventListenerProvider.php

+8-10
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
namespace League\Bundle\OAuth2ServerBundle\Service;
66

7-
use League\Event\EventInterface;
8-
use League\Event\ListenerAcceptorInterface;
9-
use League\Event\ListenerProviderInterface;
7+
use League\Event\ListenerRegistry;
8+
use League\Event\ListenerSubscriber;
9+
use League\OAuth2\Server\RequestEvent;
1010
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
1111

12-
final class SymfonyLeagueEventListenerProvider implements ListenerProviderInterface
12+
final class SymfonyLeagueEventListenerProvider implements ListenerSubscriber
1313
{
1414
/**
1515
* @var EventDispatcherInterface
@@ -21,17 +21,15 @@ public function __construct(EventDispatcherInterface $eventDispatcher)
2121
$this->eventDispatcher = $eventDispatcher;
2222
}
2323

24-
public function provideListeners(ListenerAcceptorInterface $listenerAcceptor)
24+
public function subscribeListeners(ListenerRegistry $acceptor): void
2525
{
2626
$listener = \Closure::fromCallable([$this, 'dispatchLeagueEventWithSymfonyEventDispatcher']);
2727

28-
$listenerAcceptor->addListener('*', $listener);
29-
30-
return $this;
28+
$acceptor->subscribeTo(RequestEvent::class, $listener);
3129
}
3230

33-
private function dispatchLeagueEventWithSymfonyEventDispatcher(EventInterface $event): void
31+
private function dispatchLeagueEventWithSymfonyEventDispatcher(RequestEvent $event): void
3432
{
35-
$this->eventDispatcher->dispatch($event, $event->getName());
33+
$this->eventDispatcher->dispatch($event, $event->eventName());
3634
}
3735
}

0 commit comments

Comments
 (0)