Skip to content

Commit 64a60f2

Browse files
committed
minor #43903 Fix more generic types (derrabus)
This PR was merged into the 5.4 branch. Discussion ---------- Fix more generic types | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A Some changes I wanted to push to #42471, but then it got merged already. 😇 Commits ------- c54d61e9af Fix more generic types
2 parents de22db0 + 5f7811f commit 64a60f2

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

Firewall/ContextListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ContextListener extends AbstractListener
5858
private $sessionTrackerEnabler;
5959

6060
/**
61-
* @param iterable<int, UserProviderInterface> $userProviders
61+
* @param iterable<mixed, UserProviderInterface> $userProviders
6262
*/
6363
public function __construct(TokenStorageInterface $tokenStorage, iterable $userProviders, string $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, AuthenticationTrustResolverInterface $trustResolver = null, callable $sessionTrackerEnabler = null)
6464
{

FirewallMap.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,14 @@
2424
*/
2525
class FirewallMap implements FirewallMapInterface
2626
{
27+
/**
28+
* @var list<array{RequestMatcherInterface, list<callable>, ExceptionListener|null, LogoutListener|null}>
29+
*/
2730
private $map = [];
2831

32+
/**
33+
* @param list<callable> $listeners
34+
*/
2935
public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = [], ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null)
3036
{
3137
$this->map[] = [$requestMatcher, $listeners, $exceptionListener, $logoutListener];

FirewallMapInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ interface FirewallMapInterface
3535
* If there is no logout listener, the third element of the outer array
3636
* must be null.
3737
*
38-
* @return array{list<callable>, ExceptionListener, LogoutListener}
38+
* @return array{iterable<mixed, callable>, ExceptionListener, LogoutListener}
3939
*/
4040
public function getListeners(Request $request);
4141
}

0 commit comments

Comments
 (0)