Migrate to league/event:^3

ajgarlag · Apr 22, 2024 · 329ac3c · 329ac3c
1 parent fae6283
commit 329ac3c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php
@@ -37,8 +37,8 @@
 use League\Bundle\OAuth2ServerBundle\Security\Authenticator\OAuth2Authenticator;
 use League\Bundle\OAuth2ServerBundle\Security\EventListener\CheckScopeListener;
 use League\Bundle\OAuth2ServerBundle\Service\SymfonyLeagueEventListenerProvider;
-use League\Event\Emitter;
 use League\OAuth2\Server\AuthorizationServer;
+use League\OAuth2\Server\EventEmitting\EventEmitter;
 use League\OAuth2\Server\Grant\AuthCodeGrant;
 use League\OAuth2\Server\Grant\ClientCredentialsGrant;
 use League\OAuth2\Server\Grant\ImplicitGrant;
@@ -128,8 +128,8 @@
         ])
         ->alias(SymfonyLeagueEventListenerProvider::class, 'league.oauth2_server.symfony_league_listener_provider')
 
-        ->set('league.oauth2_server.emitter', Emitter::class)
-        ->call('useListenerProvider', [service('league.oauth2_server.symfony_league_listener_provider')])
+        ->set('league.oauth2_server.emitter', EventEmitter::class)
+        ->call('subscribeListenersFrom', [service('league.oauth2_server.symfony_league_listener_provider')])
 
         ->set('league.oauth2_server.authorization_server.grant_configurator', GrantConfigurator::class)
             ->args([

diff --git a/src/Service/SymfonyLeagueEventListenerProvider.php b/src/Service/SymfonyLeagueEventListenerProvider.php
@@ -4,12 +4,12 @@
 
 namespace League\Bundle\OAuth2ServerBundle\Service;
 
-use League\Event\EventInterface;
-use League\Event\ListenerAcceptorInterface;
-use League\Event\ListenerProviderInterface;
+use League\Event\ListenerRegistry;
+use League\Event\ListenerSubscriber;
+use League\OAuth2\Server\RequestEvent;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
-final class SymfonyLeagueEventListenerProvider implements ListenerProviderInterface
+final class SymfonyLeagueEventListenerProvider implements ListenerSubscriber
 {
     /**
      * @var EventDispatcherInterface
@@ -21,17 +21,15 @@ public function __construct(EventDispatcherInterface $eventDispatcher)
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    public function provideListeners(ListenerAcceptorInterface $listenerAcceptor)
+    public function subscribeListeners(ListenerRegistry $acceptor): void
     {
         $listener = \Closure::fromCallable([$this, 'dispatchLeagueEventWithSymfonyEventDispatcher']);
 
-        $listenerAcceptor->addListener('*', $listener);
-
-        return $this;
+        $acceptor->subscribeTo(RequestEvent::class, $listener);
     }
 
-    private function dispatchLeagueEventWithSymfonyEventDispatcher(EventInterface $event): void
+    private function dispatchLeagueEventWithSymfonyEventDispatcher(RequestEvent $event): void
     {
-        $this->eventDispatcher->dispatch($event, $event->getName());
+        $this->eventDispatcher->dispatch($event, $event->eventName());
     }
 }