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

15 files changed, 20 insertions, 19 deletions

diff --git a/Http/Authentication/AuthenticationSuccessHandlerInterface.php b/Http/Authentication/AuthenticationSuccessHandlerInterface.php
index 9ec64b4..d0b3cb6 100644
--- a/Http/Authentication/AuthenticationSuccessHandlerInterface.php
+++ b/Http/Authentication/AuthenticationSuccessHandlerInterface.php
@@ -16,7 +16,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
- * Interface for a custom authentication success handler
+ * Interface for a custom authentication success handler.
  *
  * If you want to customize the success handling process, instead of
  * overwriting the respective listener globally, you can set a custom success
diff --git a/Http/Event/InteractiveLoginEvent.php b/Http/Event/InteractiveLoginEvent.php
index 575352c..b5ac242 100644
--- a/Http/Event/InteractiveLoginEvent.php
+++ b/Http/Event/InteractiveLoginEvent.php
@@ -16,7 +16,7 @@ use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 /**
- * InteractiveLoginEvent
+ * InteractiveLoginEvent.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
diff --git a/Http/Event/SwitchUserEvent.php b/Http/Event/SwitchUserEvent.php
index a553154..7cf94a7 100644
--- a/Http/Event/SwitchUserEvent.php
+++ b/Http/Event/SwitchUserEvent.php
@@ -16,7 +16,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
- * SwitchUserEvent
+ * SwitchUserEvent.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
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>
  */
diff --git a/Http/Logout/SessionLogoutHandler.php b/Http/Logout/SessionLogoutHandler.php
index e91cf17..e036c5f 100644
--- a/Http/Logout/SessionLogoutHandler.php
+++ b/Http/Logout/SessionLogoutHandler.php
@@ -23,7 +23,7 @@ use Symfony\Component\HttpFoundation\Request;
 class SessionLogoutHandler implements LogoutHandlerInterface
 {
     /**
-     * Invalidate the current session
+     * Invalidate the current session.
      *
      * @param Request        $request
      * @param Response       $response
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
index b868dae..659510a 100644
--- a/Http/RememberMe/AbstractRememberMeServices.php
+++ b/Http/RememberMe/AbstractRememberMeServices.php
@@ -25,7 +25,7 @@ use Symfony\Component\HttpFoundation\Cookie;
 use Psr\Log\LoggerInterface;
 
 /**
- * Base class implementing the RememberMeServicesInterface
+ * Base class implementing the RememberMeServicesInterface.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
@@ -251,7 +251,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     }
 
     /**
-     * Decodes the raw cookie value
+     * Decodes the raw cookie value.
      *
      * @param string $rawCookie
      *
@@ -263,7 +263,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     }
 
     /**
-     * Encodes the cookie parts
+     * Encodes the cookie parts.
      *
      * @param array $cookieParts
      *
@@ -275,7 +275,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     }
 
     /**
-     * Deletes the remember-me cookie
+     * Deletes the remember-me cookie.
      *
      * @param Request $request
      */
@@ -289,7 +289,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
     }
 
     /**
-     * Checks whether remember-me capabilities were requested
+     * Checks whether remember-me capabilities were requested.
      *
      * @param Request $request
      *
diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
index 12478dc..d0a70b7 100644
--- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
+++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -52,7 +52,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices
     }
 
     /**
-     * Sets the token provider
+     * Sets the token provider.
      *
      * @param TokenProviderInterface $tokenProvider
      */
diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php
index f6b5c6a..9042963 100644
--- a/Http/RememberMe/TokenBasedRememberMeServices.php
+++ b/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -110,7 +110,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
     }
 
     /**
-     * Generates a hash for the cookie to ensure it is not being tempered with
+     * Generates a hash for the cookie to ensure it is not being tempered with.
      *
      * @param string $class
      * @param string $username The username
diff --git a/Http/Session/SessionAuthenticationStrategyInterface.php b/Http/Session/SessionAuthenticationStrategyInterface.php
index 2bc292b..9cb95d8 100644
--- a/Http/Session/SessionAuthenticationStrategyInterface.php
+++ b/Http/Session/SessionAuthenticationStrategyInterface.php
@@ -15,7 +15,7 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * SessionAuthenticationStrategyInterface
+ * SessionAuthenticationStrategyInterface.
  *
  * Implementation are responsible for updating the session after an interactive
  * authentication attempt was successful.