Skip to content

Commit 97bb57c

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: [Bridge][Monolog] Add intruction about 'ResetLoggersWorkerSubscriber deprecation' in main UPGRADE-5.4.md [Security] Move TraceableAuthenticator to security-http [Form] Check the type of the constraints option Fixed default behavior
2 parents 01590f1 + 8f59196 commit 97bb57c

File tree

6 files changed

+4
-189
lines changed

6 files changed

+4
-189
lines changed

Debug/Authenticator/TraceableAuthenticator.php

Lines changed: 0 additions & 104 deletions
This file was deleted.

Debug/Authenticator/TraceableAuthenticatorManagerListener.php

Lines changed: 0 additions & 81 deletions
This file was deleted.

Debug/TraceableFirewallListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Debug;
1313

14-
use Symfony\Bundle\SecurityBundle\Debug\Authenticator\TraceableAuthenticatorManagerListener;
1514
use Symfony\Bundle\SecurityBundle\EventListener\FirewallListener;
1615
use Symfony\Bundle\SecurityBundle\Security\FirewallContext;
1716
use Symfony\Bundle\SecurityBundle\Security\LazyFirewallContext;
1817
use Symfony\Component\HttpKernel\Event\RequestEvent;
18+
use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticatorManagerListener;
1919
use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
2020

2121
/**

Debug/TraceableListenerTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Debug;
1313

14-
use Symfony\Bundle\SecurityBundle\Debug\Authenticator\TraceableAuthenticatorManagerListener;
14+
use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticatorManagerListener;
1515
use Symfony\Component\VarDumper\Caster\ClassStub;
1616

1717
/**

DependencyInjection/SecurityExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\SecurityBundle\DependencyInjection;
1313

1414
use Symfony\Bridge\Twig\Extension\LogoutUrlExtension;
15-
use Symfony\Bundle\SecurityBundle\Debug\Authenticator\TraceableAuthenticatorManagerListener;
1615
use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AuthenticatorFactoryInterface;
1716
use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\FirewallListenerFactoryInterface;
1817
use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
@@ -41,6 +40,7 @@
4140
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
4241
use Symfony\Component\Security\Core\User\ChainUserProvider;
4342
use Symfony\Component\Security\Core\User\UserProviderInterface;
43+
use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticatorManagerListener;
4444
use Symfony\Component\Security\Http\Event\CheckPassportEvent;
4545

4646
/**

Tests/Debug/TraceableFirewallListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bundle\SecurityBundle\Tests\Debug;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Bundle\SecurityBundle\Debug\Authenticator\TraceableAuthenticatorManagerListener;
1615
use Symfony\Bundle\SecurityBundle\Debug\TraceableFirewallListener;
1716
use Symfony\Bundle\SecurityBundle\Security\FirewallMap;
1817
use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -23,6 +22,7 @@
2322
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
2423
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
2524
use Symfony\Component\Security\Http\Authentication\AuthenticatorManager;
25+
use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticatorManagerListener;
2626
use Symfony\Component\Security\Http\Authenticator\InteractiveAuthenticatorInterface;
2727
use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
2828
use Symfony\Component\Security\Http\Authenticator\Passport\Passport;

0 commit comments

Comments
 (0)