bug #644 Fix FC/BC layer for EventDispatcher (nicolas-grekas, chalasr)

This PR was merged into the 2.x-dev branch.

Discussion
----------

Fix FC/BC layer for EventDispatcher

Fix #637

Having Contracts 1.1 doesn't mean EventDispatcher 4.3 is installed ;)

ping @chalasr

Commits
-------

0d564b3 Re-add needed use statements
7d47084 Fix FC/BC layer for EventDispatcher

Event/Event.php

@@ -3,9 +3,11 @@
 namespace Lexik\Bundle\JWTAuthenticationBundle\Event;
 
 use Symfony\Component\EventDispatcher\Event as BaseEvent;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Contracts\EventDispatcher\Event as ContractsBaseEvent;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
-if (class_exists(ContractsBaseEvent::class)) {
+if (is_subclass_of(EventDispatcher::class, EventDispatcherInterface::class)) {
     class Event extends ContractsBaseEvent
     {
     }

Security/Guard/JWTTokenAuthenticator.php

@@ -178,7 +178,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
             $eventName = Events::JWT_INVALID;
         }
 
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($this->dispatcher instanceof ContractsEventDispatcherInterface) {
             $this->dispatcher->dispatch($event, $eventName);
         } else {
             $this->dispatcher->dispatch($eventName, $event);
@@ -205,7 +205,7 @@ public function start(Request $request, AuthenticationException $authException =
         $exception = new MissingTokenException('JWT Token not found', 0, $authException);
         $event     = new JWTNotFoundEvent($exception, new JWTAuthenticationFailureResponse($exception->getMessageKey()));
 
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($this->dispatcher instanceof ContractsEventDispatcherInterface) {
             $this->dispatcher->dispatch($event, Events::JWT_NOT_FOUND);
         } else {
             $this->dispatcher->dispatch(Events::JWT_NOT_FOUND, $event);
@@ -237,7 +237,7 @@ public function createAuthenticatedToken(UserInterface $user, $providerKey)
 
         $authToken = new JWTUserToken($user->getRoles(), $user, $preAuthToken->getCredentials(), $providerKey);
 
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($this->dispatcher instanceof ContractsEventDispatcherInterface) {
             $this->dispatcher->dispatch(new JWTAuthenticatedEvent($preAuthToken->getPayload(), $authToken), Events::JWT_AUTHENTICATED);
         } else {
             $this->dispatcher->dispatch(Events::JWT_AUTHENTICATED, new JWTAuthenticatedEvent($preAuthToken->getPayload(), $authToken));

Security/Http/Authentication/AuthenticationFailureHandler.php

@@ -38,7 +38,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
     {
         $event = new AuthenticationFailureEvent($exception, new JWTAuthenticationFailureResponse());
 
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($this->dispatcher instanceof ContractsEventDispatcherInterface) {
             $this->dispatcher->dispatch($event, Events::AUTHENTICATION_FAILURE);
         } else {
             $this->dispatcher->dispatch(Events::AUTHENTICATION_FAILURE, $event);

Security/Http/Authentication/AuthenticationSuccessHandler.php

@@ -46,7 +46,7 @@ public function handleAuthenticationSuccess(UserInterface $user, $jwt = null)
         $response = new JWTAuthenticationSuccessResponse($jwt);
         $event    = new AuthenticationSuccessEvent(['token' => $jwt], $user, $response);
 
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($this->dispatcher instanceof ContractsEventDispatcherInterface) {
             $this->dispatcher->dispatch($event, Events::AUTHENTICATION_SUCCESS);
         } else {
             $this->dispatcher->dispatch(Events::AUTHENTICATION_SUCCESS, $event);

Services/JWTManager.php

@@ -64,7 +64,7 @@ public function create(UserInterface $user)
         $this->addUserIdentityToPayload($user, $payload);
 
         $jwtCreatedEvent = new JWTCreatedEvent($payload, $user);
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($this->dispatcher instanceof ContractsEventDispatcherInterface) {
             $this->dispatcher->dispatch($jwtCreatedEvent, Events::JWT_CREATED);
         } else {
             $this->dispatcher->dispatch(Events::JWT_CREATED, $jwtCreatedEvent);
@@ -79,7 +79,7 @@ public function create(UserInterface $user)
 
         $jwtEncodedEvent = new JWTEncodedEvent($jwtString);
 
-        if (interface_exists(ContractsEventDispatcherInterface::class, false)) {
+        if ($this->dispatcher instanceof ContractsEventDispatcherInterface) {
             $this->dispatcher->dispatch($jwtEncodedEvent, Events::JWT_ENCODED);
         } else {
             $this->dispatcher->dispatch(Events::JWT_ENCODED, $jwtEncodedEvent);
@@ -98,7 +98,7 @@ public function decode(TokenInterface $token)
         }
 
         $event = new JWTDecodedEvent($payload);
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($this->dispatcher instanceof ContractsEventDispatcherInterface) {
             $this->dispatcher->dispatch($event, Events::JWT_DECODED);
         } else {
             $this->dispatcher->dispatch(Events::JWT_DECODED, $event);

Tests/Security/Guard/JWTTokenAuthenticatorTest.php

@@ -354,7 +354,7 @@ private function getUserProviderMock()
 
     private function expectEvent($eventName, $event, $dispatcher)
     {
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($dispatcher instanceof ContractsEventDispatcherInterface) {
             $dispatcher->expects($this->once())->method('dispatch')->with($event, $eventName);
 
             return;

Tests/Security/Http/Authentication/AuthenticationSuccessHandlerTest.php

@@ -129,7 +129,7 @@ private function getDispatcher()
             ->disableOriginalConstructor()
             ->getMock();
 
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($dispatcher instanceof ContractsEventDispatcherInterface) {
             $dispatcher
                 ->expects($this->once())
                 ->method('dispatch')

Tests/Services/JWTManagerTest.php

@@ -26,7 +26,7 @@ public function testCreate()
     {
         $dispatcher = $this->getEventDispatcherMock();
 
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($dispatcher instanceof ContractsEventDispatcherInterface) {
             $dispatcher
                 ->expects($this->at(0))
                 ->method('dispatch')
@@ -76,7 +76,7 @@ public function testDecode()
     {
         $dispatcher = $this->getEventDispatcherMock();
 
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($dispatcher instanceof ContractsEventDispatcherInterface) {
             $dispatcher
                 ->expects($this->once())
                 ->method('dispatch')
@@ -111,7 +111,7 @@ public function testIdentityField()
     {
         $dispatcher = $this->getEventDispatcherMock();
 
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($dispatcher instanceof ContractsEventDispatcherInterface) {
             $dispatcher
                 ->expects($this->at(0))
                 ->method('dispatch')
@@ -196,7 +196,7 @@ protected function getEventDispatcherMock()
 
     private function expectEvent($eventName, $eventClass, $dispatcher)
     {
-        if (interface_exists(ContractsEventDispatcherInterface::class)) {
+        if ($dispatcher instanceof ContractsEventDispatcherInterface) {
             $dispatcher->expects($this->once())->method('dispatch')->with($event, $eventName);
 
             return;