Skip to content

Commit 25707fb

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Add missing dots at the end of exception messages [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict) Fix bad merge Add missing dots at the end of exception messages
2 parents 4d2b2d9 + 94ae6e0 commit 25707fb

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

Firewall/ExceptionListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ private function startAuthentication(Request $request, AuthenticationException $
216216
if (!$response instanceof Response) {
217217
$given = \is_object($response) ? \get_class($response) : \gettype($response);
218218

219-
throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned)', \get_class($this->authenticationEntryPoint), $given));
219+
throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned).', \get_class($this->authenticationEntryPoint), $given));
220220
}
221221

222222
return $response;

Firewall/RemoteUserAuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
4141
protected function getPreAuthenticatedData(Request $request)
4242
{
4343
if (!$request->server->has($this->userKey)) {
44-
throw new BadCredentialsException(sprintf('User key was not found: %s', $this->userKey));
44+
throw new BadCredentialsException(sprintf('User key was not found: %s.', $this->userKey));
4545
}
4646

4747
return [$request->server->get($this->userKey), null];

Firewall/X509AuthenticationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected function getPreAuthenticatedData(Request $request)
5252
}
5353

5454
if (null === $user) {
55-
throw new BadCredentialsException(sprintf('SSL credentials not found: %s, %s', $this->userKey, $this->credentialKey));
55+
throw new BadCredentialsException(sprintf('SSL credentials not found: %s, %s.', $this->userKey, $this->credentialKey));
5656
}
5757

5858
return [$user, $request->server->get($this->credentialKey, '')];

RememberMe/AbstractRememberMeServices.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ protected function encodeCookie(array $cookieParts)
258258
{
259259
foreach ($cookieParts as $cookiePart) {
260260
if (false !== strpos($cookiePart, self::COOKIE_DELIMITER)) {
261-
throw new \InvalidArgumentException(sprintf('$cookieParts should not contain the cookie delimiter "%s"', self::COOKIE_DELIMITER));
261+
throw new \InvalidArgumentException(sprintf('$cookieParts should not contain the cookie delimiter "%s".', self::COOKIE_DELIMITER));
262262
}
263263
}
264264

Session/SessionAuthenticationStrategy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function onAuthentication(Request $request, TokenInterface $token)
5959
return;
6060

6161
default:
62-
throw new \RuntimeException(sprintf('Invalid session authentication strategy "%s"', $this->strategy));
62+
throw new \RuntimeException(sprintf('Invalid session authentication strategy "%s".', $this->strategy));
6363
}
6464
}
6565
}

Tests/Firewall/ExceptionListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function testExceptionWhenEntryPointReturnsBadValue()
8383
$listener->onKernelException($event);
8484
// the exception has been replaced by our LogicException
8585
$this->assertInstanceOf('LogicException', $event->getThrowable());
86-
$this->assertStringEndsWith('start() method must return a Response object (string returned)', $event->getThrowable()->getMessage());
86+
$this->assertStringEndsWith('start() method must return a Response object (string returned).', $event->getThrowable()->getMessage());
8787
}
8888

8989
/**

0 commit comments

Comments
 (0)