Skip to content

Commit

Permalink
Merge branch '3.4' into 4.2
Browse files Browse the repository at this point in the history
* 3.4:
  fixed CS
  [HttpKernel] Remove TestEventDispatcher.
  • Loading branch information
fabpot committed Jun 13, 2019
2 parents 3e4b6fd + 15c29c5 commit 26df83c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Firewall/SimpleFormAuthenticationListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ protected function attemptAuthentication(Request $request)
$password = ParameterBagUtils::getRequestParameterValue($request, $this->options['password_parameter']);
}

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

Expand Down
2 changes: 1 addition & 1 deletion Firewall/UsernamePasswordFormAuthenticationListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected function attemptAuthentication(Request $request)
$password = ParameterBagUtils::getRequestParameterValue($request, $this->options['password_parameter']);
}

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

Expand Down

0 comments on commit 26df83c

Please # to comment.