merged 2.0

7 files changed, 13 insertions, 2 deletions

diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php
index 452bf1d..96b8f07 100644
--- a/Http/Firewall/ContextListener.php
+++ b/Http/Firewall/ContextListener.php
@@ -98,7 +98,7 @@ class ContextListener implements ListenerInterface
         if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
             return;
         }
-        
+
         if (!$event->getRequest()->hasSession()) {
             return;
         }
diff --git a/Http/FirewallMapInterface.php b/Http/FirewallMapInterface.php
index 99bac06..0630a86 100644
--- a/Http/FirewallMapInterface.php
+++ b/Http/FirewallMapInterface.php
@@ -31,6 +31,7 @@ interface FirewallMapInterface
      * must be null.
      *
      * @param Request $request
+     *
      * @return array of the format array(array(AuthenticationListener), ExceptionListener)
      */
     function getListeners(Request $request);
diff --git a/Http/Logout/CookieClearingLogoutHandler.php b/Http/Logout/CookieClearingLogoutHandler.php
index dd3d293..6838be5 100644
--- a/Http/Logout/CookieClearingLogoutHandler.php
+++ b/Http/Logout/CookieClearingLogoutHandler.php
@@ -25,7 +25,8 @@ class CookieClearingLogoutHandler implements LogoutHandlerInterface
     private $cookies;
 
     /**
-     * Constructor
+     * Constructor.
+     *
      * @param array $cookies An array of cookie names to unset
      */
     public function __construct(array $cookies)
diff --git a/Http/Logout/LogoutSuccessHandlerInterface.php b/Http/Logout/LogoutSuccessHandlerInterface.php
index 8080cf5..5c6c2b6 100644
--- a/Http/Logout/LogoutSuccessHandlerInterface.php
+++ b/Http/Logout/LogoutSuccessHandlerInterface.php
@@ -30,6 +30,7 @@ interface LogoutSuccessHandlerInterface
      * Creates a Response object to send upon a successful logout.
      *
      * @param Request $request
+     *
      * @return Response never null
      */
     function onLogoutSuccess(Request $request);
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
index 556fb6a..2bf8734 100644
--- a/Http/RememberMe/AbstractRememberMeServices.php
+++ b/Http/RememberMe/AbstractRememberMeServices.php
@@ -88,6 +88,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
      * cookie was set, decodes it, and hands it to subclasses for further processing.
      *
      * @param Request $request
+     *
      * @return TokenInterface
      */
     public final function autoLogin(Request $request)
@@ -200,6 +201,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
      *
      * @param array   $cookieParts
      * @param Request $request
+     *
      * @return TokenInterface
      */
     abstract protected function processAutoLoginCookie(array $cookieParts, Request $request);
@@ -234,6 +236,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
      * Decodes the raw cookie value
      *
      * @param string $rawCookie
+     *
      * @return array
      */
     protected function decodeCookie($rawCookie)
@@ -245,6 +248,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
      * Encodes the cookie parts
      *
      * @param array $cookieParts
+     *
      * @return string
      */
     protected function encodeCookie(array $cookieParts)
@@ -270,6 +274,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
      * Checks whether remember-me capabilities where requested
      *
      * @param Request $request
+     *
      * @return Boolean
      */
     protected function isRememberMeRequested(Request $request)
diff --git a/Http/RememberMe/RememberMeServicesInterface.php b/Http/RememberMe/RememberMeServicesInterface.php
index c01b8f6..0497c69 100644
--- a/Http/RememberMe/RememberMeServicesInterface.php
+++ b/Http/RememberMe/RememberMeServicesInterface.php
@@ -48,6 +48,7 @@ interface RememberMeServicesInterface
      * result in a call to loginFail() and therefore an invalidation of the cookie.
      *
      * @param Request $request
+     *
      * @return TokenInterface
      */
     function autoLogin(Request $request);
diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php
index bc23d31..44140f7 100644
--- a/Http/RememberMe/TokenBasedRememberMeServices.php
+++ b/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -140,7 +140,9 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
      * @param string $username The username
      * @param integer $expires The unixtime when the cookie expires
      * @param string $password The encoded password
+     *
      * @throws \RuntimeException when the private key is empty
+     *
      * @return string
      */
     protected function generateCookieHash($class, $username, $expires, $password)