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

Commit e1bcabd

Browse files
Merge branch '2.8' into 3.4
* 2.8: [Serializer] optims and cleanup fix accessing request values [Form] Add translations for Tagalog
2 parents e930ba9 + 1f7913a commit e1bcabd

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Http/Firewall/SimpleFormAuthenticationListener.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,13 @@ protected function attemptAuthentication(Request $request)
9999
}
100100
}
101101

102-
$requestBag = $this->options['post_only'] ? $request->request : $request;
103-
$username = ParameterBagUtils::getParameterBagValue($requestBag, $this->options['username_parameter']);
104-
$password = ParameterBagUtils::getParameterBagValue($requestBag, $this->options['password_parameter']);
102+
if ($this->options['post_only']) {
103+
$username = ParameterBagUtils::getParameterBagValue($request->request, $this->options['username_parameter']);
104+
$password = ParameterBagUtils::getParameterBagValue($request->request, $this->options['password_parameter']);
105+
} else {
106+
$username = ParameterBagUtils::getRequestParameterValue($request, $this->options['username_parameter']);
107+
$password = ParameterBagUtils::getRequestParameterValue($request, $this->options['password_parameter']);
108+
}
105109

106110
if (!\is_string($username) || (\is_object($username) && !\method_exists($username, '__toString'))) {
107111
throw new BadRequestHttpException(sprintf('The key "%s" must be a string, "%s" given.', $this->options['username_parameter'], \gettype($username)));

0 commit comments

Comments
 (0)