A few more changes thanks to @iltar

weaverryan · weaverryan · commit 7de05be3f639 · 2015-09-20T19:24:21.000-04:00
diff --git a/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php b/src/Symfony/Component/Security/Guard/Firewall/GuardAuthenticationListener.php
@@ -36,7 +36,7 @@ class GuardAuthenticationListener implements ListenerInterface
      * @param GuardAuthenticatorInterface[]  $guardAuthenticators   The authenticators, with keys that match what's passed to GuardAuthenticationProvider
      * @param LoggerInterface                $logger                A LoggerInterface instance
      */
-    public function __construct(GuardAuthenticatorHandler $guardHandler, AuthenticationManagerInterface $authenticationManager, $providerKey, $guardAuthenticators, LoggerInterface $logger = null)
+    public function __construct(GuardAuthenticatorHandler $guardHandler, AuthenticationManagerInterface $authenticationManager, $providerKey, array $guardAuthenticators, LoggerInterface $logger = null)
     {
         if (empty($providerKey)) {
             throw new \InvalidArgumentException('$providerKey must not be empty.');
@@ -57,7 +57,7 @@ public function __construct(GuardAuthenticatorHandler $guardHandler, Authenticat
     public function handle(GetResponseEvent $event)
     {
         if (null !== $this->logger) {
-            $this->logger->info('Checking for guard authentication credentials', array('firewall_key' => $this->providerKey, 'authenticators' => count($this->guardAuthenticators)));
+            $this->logger->info('Checking for guard authentication credentials.', array('firewall_key' => $this->providerKey, 'authenticators' => count($this->guardAuthenticators)));
         }
 
         foreach ($this->guardAuthenticators as $key => $guardAuthenticator) {
@@ -121,13 +121,13 @@ private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorIn
         $response = $this->guardHandler->handleAuthenticationSuccess($token, $request, $guardAuthenticator, $this->providerKey);
         if ($response instanceof Response) {
             if (null !== $this->logger) {
-                $this->logger->info('Guard authenticator set success response', array('response' => $response, 'authenticator' => get_class($guardAuthenticator)));
+                $this->logger->info('Guard authenticator set success response.', array('response' => $response, 'authenticator' => get_class($guardAuthenticator)));
             }
 
             $event->setResponse($response);
         } else {
             if (null !== $this->logger) {
-                $this->logger->info('Guard authenticator set no success response: request continues', array('authenticator' => get_class($guardAuthenticator)));
+                $this->logger->info('Guard authenticator set no success response: request continues.', array('authenticator' => get_class($guardAuthenticator)));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class GuardAuthenticationListener implements ListenerInterface`
`36`	`36`	`* @param GuardAuthenticatorInterface[] $guardAuthenticators The authenticators, with keys that match what's passed to GuardAuthenticationProvider`
`37`	`37`	`* @param LoggerInterface $logger A LoggerInterface instance`
`38`	`38`	`*/`
`39`		`- public function __construct(GuardAuthenticatorHandler $guardHandler, AuthenticationManagerInterface $authenticationManager, $providerKey, $guardAuthenticators, LoggerInterface $logger = null)`
	`39`	`+ public function __construct(GuardAuthenticatorHandler $guardHandler, AuthenticationManagerInterface $authenticationManager, $providerKey, array $guardAuthenticators, LoggerInterface $logger = null)`
`40`	`40`	`{`
`41`	`41`	`if (empty($providerKey)) {`
`42`	`42`	`throw new \InvalidArgumentException('$providerKey must not be empty.');`
`@@ -57,7 +57,7 @@ public function __construct(GuardAuthenticatorHandler $guardHandler, Authenticat`
`57`	`57`	`public function handle(GetResponseEvent $event)`
`58`	`58`	`{`
`59`	`59`	`if (null !== $this->logger) {`
`60`		`- $this->logger->info('Checking for guard authentication credentials', array('firewall_key' => $this->providerKey, 'authenticators' => count($this->guardAuthenticators)));`
	`60`	`+ $this->logger->info('Checking for guard authentication credentials.', array('firewall_key' => $this->providerKey, 'authenticators' => count($this->guardAuthenticators)));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`foreach ($this->guardAuthenticators as $key => $guardAuthenticator) {`
`@@ -121,13 +121,13 @@ private function executeGuardAuthenticator($uniqueGuardKey, GuardAuthenticatorIn`
`121`	`121`	`$response = $this->guardHandler->handleAuthenticationSuccess($token, $request, $guardAuthenticator, $this->providerKey);`
`122`	`122`	`if ($response instanceof Response) {`
`123`	`123`	`if (null !== $this->logger) {`
`124`		`- $this->logger->info('Guard authenticator set success response', array('response' => $response, 'authenticator' => get_class($guardAuthenticator)));`
	`124`	`+ $this->logger->info('Guard authenticator set success response.', array('response' => $response, 'authenticator' => get_class($guardAuthenticator)));`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`$event->setResponse($response);`
`128`	`128`	`} else {`
`129`	`129`	`if (null !== $this->logger) {`
`130`		`- $this->logger->info('Guard authenticator set no success response: request continues', array('authenticator' => get_class($guardAuthenticator)));`
	`130`	`+ $this->logger->info('Guard authenticator set no success response: request continues.', array('authenticator' => get_class($guardAuthenticator)));`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`