10000 [EventDispatcher] Fix removing listeners when using first-class calla… · symfony/symfony@cb5dafb · GitHub
[go: up one dir, main page]
Skip to content

Commit cb5dafb

Browse files
javernicolas-grekas
javer
authored and
nicolas-grekas
committed
[EventDispatcher] Fix removing listeners when using first-class callable syntax
1 parent ce4a1a9 commit cb5dafb

File tree

6 files changed

+69
-6
lines changed

6 files changed

+69
-6
lines changed

‎src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function removeListener($eventName, $listener)
7575
{
7676
if (isset($this->wrappedListeners[$eventName])) {
7777
foreach ($this->wrappedListeners[$eventName] as $index => $wrappedListener) {
78-
if ($wrappedListener->getWrappedListener() === $listener) {
78+
if ($wrappedListener->getWrappedListener() === $listener || ($listener instanceof \Closure && $wrappedListener->getWrappedListener() == $listener)) {
7979
$listener = $wrappedListener;
8080
unset($this->wrappedListeners[$eventName][$index]);
8181
break;
@@ -110,8 +110,8 @@ public function getListenerPriority($eventName, $listener)
110110
// we might have wrapped listeners for the event (if called while dispatching)
111111
// in that case get the priority by wrapper
112112
if (isset($this->wrappedListeners[$eventName])) {
113-
foreach ($this->wrappedListeners[$eventName] as $index => $wrappedListener) {
114-
if ($wrappedListener->getWrappedListener() === $listener) {
113+
foreach ($this->wrappedListeners[$eventName] as $wrappedListener) {
114+
if ($wrappedListener->getWrappedListener() === $listener || ($listener instanceof \Closure && $wrappedListener->getWrappedListener() == $listener)) {
115115
return $this->dispatcher->getListenerPriority($eventName, $wrappedListener);
116116
}
117117
}

‎src/Symfony/Component/EventDispatcher/EventDispatcher.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function getListenerPriority($eventName, $listener)
122122
$v[0] = $v[0]();
123123
$v[1] = $v[1] ?? '__invoke';
124124
}
125-
if ($v === $listener) {
125+
if ($v === $listener || ($listener instanceof \Closure && $v == $listener)) {
126126
return $priority;
127127
}
128128
}
@@ -178,7 +178,7 @@ public function removeListener($eventName, $listener)
178178
$v[0] = $v[0]();
179179
$v[1] = $v[1] ?? '__invoke';
180180
}
181-
if ($v === $listener) {
181+
if ($v === $listener || ($listener instanceof \Closure && $v == $listener)) {
182182
unset($listeners[$k], $this->sorted[$eventName], $this->optimized[$eventName]);
183183
}
184184
}

‎src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,32 @@ public function testMutatingWhilePropagationIsStopped()
421421
$this->assertTrue($testLoaded);
422422
}
423423

424+
public function testNamedClosures()
425+
{
426+
$listener = new TestEventListener();
427+
428+
$callback1 = \Closure::fromCallable($listener);
429+
$callback2 = \Closure::fromCallable($listener);
430+
$callback3 = \Closure::fromCallable(new TestEventListener());
431+
432+
$this->assertNotSame($callback1, $callback2);
433+
$this->assertNotSame($callback1, $callback3);
434+
$this->assertNotSame($callback2, $callback3);
435+
$this->assertTrue($callback1 == $callback2);
436+
$this->assertFalse($callback1 == $callback3);
437+
438+
$this->dispatcher->addListener('foo', $callback1, 3);
439+
$this->dispatcher->addListener('foo', $callback2, 2);
440+
$this->dispatcher->addListener('foo', $callback3, 1);
441+
442+
$this->assertSame(3, $this->dispatcher->getListenerPriority('foo', $callback1));
443+
$this->assertSame(3, $this->dispatcher->getListenerPriority('foo', $callback2));
444+
445+
$this->dispatcher->removeListener('foo', $callback1);
446+
447+
$this->assertSame(['foo' => [$callback3]], $this->dispatcher->getListeners());
448+
}
449+
424450
/**
425451
* @group legacy
426452
* @expectedDeprecation Calling the "Symfony\Component\EventDispatcher\EventDispatcherInterface::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.

‎src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,30 @@ public function testWithPreviousNotStartedSession()
342342
$this->assertSame($usageIndex, $session->getUsageIndex());
343343
}
344344

345+
public function testOnKernelResponseRemoveListener()
346+
{
347+
$tokenStorage = new TokenStorage();
348+
$tokenStorage->setToken(new UsernamePasswordToken('test1', 'pass1', 'phpunit', ['ROLE_USER']));
349+
350+
$request = new Request();
351+
$request->attributes->set('_security_firewall_run', '_security_session');
352+
353+
$session = new Session(new MockArraySessionStorage());
354+
$request->setSession($session);
355+
356+
$dispatcher = new EventDispatcher();
357+
$httpKernel = $this->createMock(HttpKernelInterface::class);
358+
359+
$listener = new ContextListener($tokenStorage, [], 'session', null, $dispatcher, null, \Closure::fromCallable([$tokenStorage, 'getToken']));
360+
$this->assertEmpty($dispatcher->getListeners());
361+
362+
$listener(new RequestEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST));
363+
$this->assertNotEmpty($dispatcher->getListeners());
364+
365+
$listener->onKernelResponse(new ResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST, new Response()));
366+
$this->assertEmpty($dispatcher->getListeners());
367+
}
368+
345369
protected function runSessionOnKernelResponse($newToken, $original = null)
346370
{
347371
$session = new Session(new MockArraySessionStorage());

‎src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Security\Http\Tests\Firewall;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\EventDispatcher\EventDispatcher;
1516
use Symfony\Component\HttpFoundation\Request;
1617
use Symfony\Component\HttpFoundation\Response;
1718
use Symfony\Component\HttpKernel\Event\ExceptionEvent;
@@ -170,6 +171,18 @@ public function testLogoutException()
170171
$this->assertEquals(403, $event->getThrowable()->getStatusCode());
171172
}
172173

174+
public function testUnregister()
175+
{
176+
$listener = $this->createExceptionListener();
177+
$dispatcher = new EventDispatcher();
178+
179+
$listener->register($dispatcher);
180+
$this->assertNotEmpty($dispatcher->getListeners());
181+
182+
$listener->unregister($dispatcher);
183+
$this->assertEmpty($dispatcher->getListeners());
184+
}
185+
173186
public function getAccessDeniedExceptionProvider()
174187
{
175188
return [

‎src/Symfony/Component/Security/Http/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"psr/log": "^1|^2|^3"
3030
},
3131
"conflict": {
32-
"symfony/event-dispatcher": ">=5",
32+
"symfony/event-dispatcher": ">=5|<4.4.42",
3333
"symfony/security-csrf": "<3.4.11|~4.0,<4.0.11"
3434
},
3535
"suggest": {

0 commit comments

Comments
 (0)
0