Merge branch '2.6' into 2.7

* 2.6:
  [2.3] CS And DocBlock Fixes
  [2.3] CS Fixes
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.

Conflicts:
	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php

7 files changed, 8 insertions, 7 deletions

diff --git a/Http/Firewall/AbstractAuthenticationListener.php b/Http/Firewall/AbstractAuthenticationListener.php
index d89785e..39c6951 100644
--- a/Http/Firewall/AbstractAuthenticationListener.php
+++ b/Http/Firewall/AbstractAuthenticationListener.php
@@ -109,7 +109,7 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
     }
 
     /**
-     * Sets the RememberMeServices implementation to use
+     * Sets the RememberMeServices implementation to use.
      *
      * @param RememberMeServicesInterface $rememberMeServices
      */
diff --git a/Http/Firewall/AbstractPreAuthenticatedListener.php b/Http/Firewall/AbstractPreAuthenticatedListener.php
index 94ae901..895df53 100644
--- a/Http/Firewall/AbstractPreAuthenticatedListener.php
+++ b/Http/Firewall/AbstractPreAuthenticatedListener.php
@@ -96,7 +96,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface
     }
 
     /**
-     * Clears a PreAuthenticatedToken for this provider (if present)
+     * Clears a PreAuthenticatedToken for this provider (if present).
      *
      * @param AuthenticationException $exception
      */
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php
index e61907e..f703c9c 100644
--- a/Http/Firewall/ContextListener.php
+++ b/Http/Firewall/ContextListener.php
@@ -134,7 +134,7 @@ class ContextListener implements ListenerInterface
     }
 
     /**
-     * Refreshes the user by reloading it from the user provider
+     * Refreshes the user by reloading it from the user provider.
      *
      * @param TokenInterface $token
      *
diff --git a/Http/Firewall/ExceptionListener.php b/Http/Firewall/ExceptionListener.php
index e224ea3..ef0b893 100644
--- a/Http/Firewall/ExceptionListener.php
+++ b/Http/Firewall/ExceptionListener.php
@@ -172,6 +172,7 @@ class ExceptionListener
      * @param AuthenticationException $authException
      *
      * @return Response
+     *
      * @throws AuthenticationException
      */
     private function startAuthentication(Request $request, AuthenticationException $authException)
diff --git a/Http/Firewall/ListenerInterface.php b/Http/Firewall/ListenerInterface.php
index b670474..0fc8d11 100644
--- a/Http/Firewall/ListenerInterface.php
+++ b/Http/Firewall/ListenerInterface.php
@@ -14,7 +14,7 @@ namespace Symfony\Component\Security\Http\Firewall;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
 /**
- * Interface that must be implemented by firewall listeners
+ * Interface that must be implemented by firewall listeners.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php
index 84d1604..3a45e37 100644
--- a/Http/Firewall/LogoutListener.php
+++ b/Http/Firewall/LogoutListener.php
@@ -69,7 +69,7 @@ class LogoutListener implements ListenerInterface
     }
 
     /**
-     * Adds a logout handler
+     * Adds a logout handler.
      *
      * @param LogoutHandlerInterface $handler
      */
@@ -79,7 +79,7 @@ class LogoutListener implements ListenerInterface
     }
 
     /**
-     * Performs the logout if requested
+     * Performs the logout if requested.
      *
      * If a CsrfTokenManagerInterface instance is available, it will be used to
      * validate the request.
diff --git a/Http/Firewall/RememberMeListener.php b/Http/Firewall/RememberMeListener.php
index 44000d3..7ec73e7 100644
--- a/Http/Firewall/RememberMeListener.php
+++ b/Http/Firewall/RememberMeListener.php
@@ -22,7 +22,7 @@ use Symfony\Component\Security\Http\SecurityEvents;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * RememberMeListener implements authentication capabilities via a cookie
+ * RememberMeListener implements authentication capabilities via a cookie.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */