Skip to content

Commit b7182ed

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: [Security] Document `FirewallListenerInterface` as a firewall listener type Remove unused and non-existent Factory attribute use Move property accessor phpdoc to interface fix: twigphp/Twig/issues/4647
2 parents d3ceacd + 611d695 commit b7182ed

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

FirewallMap.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\HttpFoundation\Request;
1515
use Symfony\Component\HttpFoundation\RequestMatcherInterface;
1616
use Symfony\Component\Security\Http\Firewall\ExceptionListener;
17+
use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
1718
use Symfony\Component\Security\Http\Firewall\LogoutListener;
1819

1920
/**
@@ -25,12 +26,12 @@
2526
class FirewallMap implements FirewallMapInterface
2627
{
2728
/**
28-
* @var list<array{RequestMatcherInterface, list<callable>, ExceptionListener|null, LogoutListener|null}>
29+
* @var list<array{RequestMatcherInterface, list<callable|FirewallListenerInterface>, ExceptionListener|null, LogoutListener|null}>
2930
*/
3031
private array $map = [];
3132

3233
/**
33-
* @param list<callable> $listeners
34+
* @param list<callable|FirewallListenerInterface> $listeners
3435
*/
3536
public function add(?RequestMatcherInterface $requestMatcher = null, array $listeners = [], ?ExceptionListener $exceptionListener = null, ?LogoutListener $logoutListener = null): void
3637
{

FirewallMapInterface.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\HttpFoundation\Request;
1515
use Symfony\Component\Security\Http\Firewall\ExceptionListener;
16+
use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
1617
use Symfony\Component\Security\Http\Firewall\LogoutListener;
1718

1819
/**
@@ -35,7 +36,7 @@ interface FirewallMapInterface
3536
* If there is no logout listener, the third element of the outer array
3637
* must be null.
3738
*
38-
* @return array{iterable<mixed, callable>, ExceptionListener, LogoutListener}
39+
* @return array{iterable<mixed, callable|FirewallListenerInterface>, ExceptionListener, LogoutListener}
3940
*/
4041
public function getListeners(Request $request): array;
4142
}

0 commit comments

Comments
 (0)