diff options
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/Firewall/ContextListener.php | 2 | ||||
| -rw-r--r-- | Http/Firewall/LogoutListener.php | 1 | ||||
| -rw-r--r-- | Http/FirewallMapInterface.php | 1 | ||||
| -rw-r--r-- | Http/Logout/CookieClearingLogoutHandler.php | 4 | ||||
| -rw-r--r-- | Http/Logout/LogoutHandlerInterface.php | 1 | ||||
| -rw-r--r-- | Http/Logout/LogoutSuccessHandlerInterface.php | 1 | ||||
| -rw-r--r-- | Http/Logout/SessionLogoutHandler.php | 1 | ||||
| -rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 10 | ||||
| -rw-r--r-- | Http/RememberMe/PersistentTokenBasedRememberMeServices.php | 1 | ||||
| -rw-r--r-- | Http/RememberMe/RememberMeServicesInterface.php | 3 | ||||
| -rw-r--r-- | Http/RememberMe/TokenBasedRememberMeServices.php | 2 |
11 files changed, 25 insertions, 2 deletions
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php index e86824d..d282452 100644 --- a/Http/Firewall/ContextListener.php +++ b/Http/Firewall/ContextListener.php @@ -91,7 +91,7 @@ class ContextListener implements ListenerInterface if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) { return; } - + if (!$event->getRequest()->hasSession()) { return; } diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php index cd8f9f6..4bfa7e1 100644 --- a/Http/Firewall/LogoutListener.php +++ b/Http/Firewall/LogoutListener.php @@ -56,6 +56,7 @@ class LogoutListener implements ListenerInterface * Adds a logout handler * * @param LogoutHandlerInterface $handler + * * @return void */ public function addHandler(LogoutHandlerInterface $handler) 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 65b45f2..ddb24e3 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) @@ -39,6 +40,7 @@ class CookieClearingLogoutHandler implements LogoutHandlerInterface * @param Request $request * @param Response $response * @param TokenInterface $token + * * @return void */ public function logout(Request $request, Response $response, TokenInterface $token) diff --git a/Http/Logout/LogoutHandlerInterface.php b/Http/Logout/LogoutHandlerInterface.php index 6d5c519..079cc00 100644 --- a/Http/Logout/LogoutHandlerInterface.php +++ b/Http/Logout/LogoutHandlerInterface.php @@ -30,6 +30,7 @@ interface LogoutHandlerInterface * @param Request $request * @param Response $response * @param TokenInterface $token + * * @return void */ function logout(Request $request, Response $response, TokenInterface $token); 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/Logout/SessionLogoutHandler.php b/Http/Logout/SessionLogoutHandler.php index 9fd49d1..0a7e5cd 100644 --- a/Http/Logout/SessionLogoutHandler.php +++ b/Http/Logout/SessionLogoutHandler.php @@ -28,6 +28,7 @@ class SessionLogoutHandler implements LogoutHandlerInterface * @param Request $request * @param Response $response * @param TokenInterface $token + * * @return void */ public function logout(Request $request, Response $response, TokenInterface $token) diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php index 22e9cd5..94f8830 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) @@ -143,6 +144,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token + * * @return void */ public function logout(Request $request, Response $response, TokenInterface $token) @@ -155,6 +157,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * an attempted authentication fails. * * @param Request $request + * * @return void */ public final function loginFail(Request $request) @@ -170,6 +173,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token The token that resulted in a successful authentication + * * @return void */ public final function loginSuccess(Request $request, Response $response, TokenInterface $token) @@ -203,6 +207,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * * @param array $cookieParts * @param Request $request + * * @return TokenInterface */ abstract protected function processAutoLoginCookie(array $cookieParts, Request $request); @@ -219,6 +224,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token + * * @return void */ abstract protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token); @@ -238,6 +244,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Decodes the raw cookie value * * @param string $rawCookie + * * @return array */ protected function decodeCookie($rawCookie) @@ -249,6 +256,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Encodes the cookie parts * * @param array $cookieParts + * * @return string */ protected function encodeCookie(array $cookieParts) @@ -260,6 +268,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Deletes the remember-me cookie * * @param Request $request + * * @return void */ protected function cancelCookie(Request $request) @@ -275,6 +284,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/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index 91105db..e9d22ba 100644 --- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -35,6 +35,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices * Sets the token provider * * @param TokenProviderInterface $tokenProvider + * * @return void */ public function setTokenProvider(TokenProviderInterface $tokenProvider) diff --git a/Http/RememberMe/RememberMeServicesInterface.php b/Http/RememberMe/RememberMeServicesInterface.php index c6b0ada..b824538 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); @@ -59,6 +60,7 @@ interface RememberMeServicesInterface * This method needs to take care of invalidating the cookie. * * @param Request $request + * * @return void */ function loginFail(Request $request); @@ -77,6 +79,7 @@ interface RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token + * * @return void */ function loginSuccess(Request $request, Response $response, TokenInterface $token); 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) |