Merge branch '3.4' into 4.4

* 3.4:
  Fix quotes in exception messages

Author: fabpot

Authentication/SimpleAuthenticationHandler.php

@@ -62,7 +62,7 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token)
             }
 
             if (null !== $response) {
-                throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null to use the default success handler, or a Response object.', \get_class($this->simpleAuthenticator)));
+                throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationSuccess()" method must return null to use the default success handler, or a Response object.', \get_class($this->simpleAuthenticator)));
             }
         }
 
@@ -89,7 +89,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
             }
 
             if (null !== $response) {
-                throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null to use the default failure handler, or a Response object.', \get_class($this->simpleAuthenticator)));
+                throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationFailure()" method must return null to use the default failure handler, or a Response object.', \get_class($this->simpleAuthenticator)));
             }
         }
 

Firewall/ExceptionListener.php

@@ -216,7 +216,7 @@ private function startAuthentication(Request $request, AuthenticationException $
         if (!$response instanceof Response) {
             $given = \is_object($response) ? \get_class($response) : \gettype($response);
 
-            throw new \LogicException(sprintf('The %s::start() method must return a Response object (%s returned).', \get_class($this->authenticationEntryPoint), $given));
+            throw new \LogicException(sprintf('The "%s::start()" method must return a Response object ("%s" returned).', \get_class($this->authenticationEntryPoint), $given));
         }
 
         return $response;

Firewall/RemoteUserAuthenticationListener.php

@@ -41,7 +41,7 @@ public function __construct(TokenStorageInterface $tokenStorage, AuthenticationM
     protected function getPreAuthenticatedData(Request $request)
     {
         if (!$request->server->has($this->userKey)) {
-            throw new BadCredentialsException(sprintf('User key was not found: %s.', $this->userKey));
+            throw new BadCredentialsException(sprintf('User key was not found: "%s".', $this->userKey));
         }
 
         return [$request->server->get($this->userKey), null];

Firewall/SimplePreAuthenticationListener.php

@@ -146,7 +146,7 @@ public function authenticate(RequestEvent $event)
                 if ($response instanceof Response) {
                     $event->setResponse($response);
                 } elseif (null !== $response) {
-                    throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationFailure method must return null or a Response object.', \get_class($this->simpleAuthenticator)));
+                    throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationFailure()" method must return null or a Response object.', \get_class($this->simpleAuthenticator)));
                 }
             }
 
@@ -158,7 +158,7 @@ public function authenticate(RequestEvent $event)
             if ($response instanceof Response) {
                 $event->setResponse($response);
             } elseif (null !== $response) {
-                throw new \UnexpectedValueException(sprintf('The %s::onAuthenticationSuccess method must return null or a Response object.', \get_class($this->simpleAuthenticator)));
+                throw new \UnexpectedValueException(sprintf('The "%s::onAuthenticationSuccess()" method must return null or a Response object.', \get_class($this->simpleAuthenticator)));
             }
         }
     }

Firewall/X509AuthenticationListener.php

@@ -52,7 +52,7 @@ protected function getPreAuthenticatedData(Request $request)
         }
 
         if (null === $user) {
-            throw new BadCredentialsException(sprintf('SSL credentials not found: %s, %s.', $this->userKey, $this->credentialKey));
+            throw new BadCredentialsException(sprintf('SSL credentials not found: "%s", "%s".', $this->userKey, $this->credentialKey));
         }
 
         return [$user, $request->server->get($this->credentialKey, '')];

Tests/Authentication/SimpleAuthenticationHandlerTest.php

@@ -84,7 +84,7 @@ public function testOnAuthenticationSuccessCallsSimpleAuthenticator()
     public function testOnAuthenticationSuccessThrowsAnExceptionIfNonResponseIsReturned()
     {
         $this->expectException('UnexpectedValueException');
-        $this->expectExceptionMessage('onAuthenticationSuccess method must return null to use the default success handler, or a Response object');
+        $this->expectExceptionMessage('onAuthenticationSuccess()" method must return null to use the default success handler, or a Response object');
         $this->successHandler->expects($this->never())
             ->method('onAuthenticationSuccess');
 
@@ -152,7 +152,7 @@ public function testOnAuthenticationFailureCallsSimpleAuthenticator()
     public function testOnAuthenticationFailureThrowsAnExceptionIfNonResponseIsReturned()
     {
         $this->expectException('UnexpectedValueException');
-        $this->expectExceptionMessage('onAuthenticationFailure method must return null to use the default failure handler, or a Response object');
+        $this->expectExceptionMessage('onAuthenticationFailure()" method must return null to use the default failure handler, or a Response object');
         $this->failureHandler->expects($this->never())
             ->method('onAuthenticationFailure');
 

Tests/Firewall/ExceptionListenerTest.php

@@ -83,7 +83,7 @@ public function testExceptionWhenEntryPointReturnsBadValue()
         $listener->onKernelException($event);
         // the exception has been replaced by our LogicException
         $this->assertInstanceOf('LogicException', $event->getThrowable());
-        $this->assertStringEndsWith('start() method must return a Response object (string returned).', $event->getThrowable()->getMessage());
+        $this->assertStringEndsWith('start()" method must return a Response object ("string" returned).', $event->getThrowable()->getMessage());
     }
 
     /**