Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit dae4d86

Browse files
Merge branch '4.1' into 4.2
* 4.1: Fix typos in doc blocks [Debug] ignore underscore vs backslash namespaces in DebugClassLoader [TwigBridge][Form] Prevent multiple rendering of form collection prototypes [FrameworkBundle] fix describing routes with no controllers [DI] move RegisterServiceSubscribersPass before DecoratorServicePass Update ValidationListener.php [Yaml] ensures that the mb_internal_encoding is reset to its initial value [WebLink] Fixed documentation link [Security] getTargetPath of TargetPathTrait must return string or null [Hackday][Serializer] Deserialization ignores argument type hint from phpdoc for array in constructor argument Optimize perf by replacing call_user_func with dynamic vars [Routing] fix dumping same-path routes with placeholders [Security] defer log message in guard authenticator [Validator] Added IBAN format for Vatican City State merge conflicts filter out invalid Intl values filter out invalid language values [Validator] Fixed grouped composite constraints [Form] Filter arrays out of scalar form types Fix HeaderBag::get phpdoc
2 parents adbe113 + 08c49b2 commit dae4d86

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Guard/Firewall/GuardAuthenticationListener.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,22 @@ private function executeGuardAuthenticator($uniqueGuardKey, AuthenticatorInterfa
9696
$request = $event->getRequest();
9797
try {
9898
if (null !== $this->logger) {
99-
$this->logger->debug('Calling getCredentials() on guard authenticator.', array('firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)));
99+
$this->logger->debug('Checking support on guard authenticator.', array('firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)));
100100
}
101101

102102
// abort the execution of the authenticator if it doesn't support the request
103103
if (!$guardAuthenticator->supports($request)) {
104+
if (null !== $this->logger) {
105+
$this->logger->debug('Guard authenticator does not support the request.', array('firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)));
106+
}
107+
104108
return;
105109
}
106110

111+
if (null !== $this->logger) {
112+
$this->logger->debug('Calling getCredentials() on guard authenticator.', array('firewall_key' => $this->providerKey, 'authenticator' => \get_class($guardAuthenticator)));
113+
}
114+
107115
// allow the authenticator to fetch authentication info from the request
108116
$credentials = $guardAuthenticator->getCredentials($request);
109117

Http/Util/TargetPathTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private function saveTargetPath(SessionInterface $session, $providerKey, $uri)
3838
* @param SessionInterface $session
3939
* @param string $providerKey The name of your firewall
4040
*
41-
* @return string
41+
* @return string|null
4242
*/
4343
private function getTargetPath(SessionInterface $session, $providerKey)
4444
{

0 commit comments

Comments
 (0)