Skip to content

Commit 12ccba0

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: [Security] Document `FirewallListenerInterface` as a firewall listener type Remove unused and non-existent Factory attribute use fix: twigphp/Twig/issues/4647
2 parents a593f14 + 2da9a7d commit 12ccba0

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bundle\SecurityBundle\Security;
1313

1414
use Symfony\Component\Security\Http\Firewall\ExceptionListener;
15+
use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
1516
use Symfony\Component\Security\Http\Firewall\LogoutListener;
1617

1718
/**
@@ -23,7 +24,7 @@
2324
class FirewallContext
2425
{
2526
/**
26-
* @param iterable<mixed, callable> $listeners
27+
* @param iterable<mixed, callable|FirewallListenerInterface> $listeners
2728
*/
2829
public function __construct(
2930
private iterable $listeners,
@@ -39,7 +40,7 @@ public function getConfig(): ?FirewallConfig
3940
}
4041

4142
/**
42-
* @return iterable<mixed, callable>
43+
* @return iterable<mixed, callable|FirewallListenerInterface>
4344
*/
4445
public function getListeners(): iterable
4546
{

src/Symfony/Bundle/TwigBundle/Resources/config/twig.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
use Twig\Extension\OptimizerExtension;
4545
use Twig\Extension\StagingExtension;
4646
use Twig\ExtensionSet;
47+
use Twig\ExpressionParser\Infix\BinaryOperatorExpressionParser;
4748
use Twig\Loader\ChainLoader;
4849
use Twig\Loader\FilesystemLoader;
4950
use Twig\Profiler\Profile;
@@ -63,6 +64,7 @@
6364
->tag('container.preload', ['class' => EscaperExtension::class])
6465
->tag('container.preload', ['class' => OptimizerExtension::class])
6566
->tag('container.preload', ['class' => StagingExtension::class])
67+
->tag('container.preload', ['class' => BinaryOperatorExpressionParser::class])
6668
->tag('container.preload', ['class' => ExtensionSet::class])
6769
->tag('container.preload', ['class' => Template::class])
6870
->tag('container.preload', ['class' => TemplateWrapper::class])

src/Symfony/Component/DependencyInjection/Tests/Fixtures/StaticConstructorAutoconfigure.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
1313

1414
use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
15-
use Symfony\Component\DependencyInjection\Attribute\Factory;
1615

1716
#[Autoconfigure(bind: ['$foo' => 'foo'], constructor: 'create')]
1817
class StaticConstructorAutoconfigure

src/Symfony/Component/Security/Http/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
{

src/Symfony/Component/Security/Http/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)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy