summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Acl/Dbal/AclProvider.php6
-rw-r--r--Acl/Domain/Acl.php2
-rw-r--r--Core/Authentication/RememberMe/TokenProviderInterface.php11
-rw-r--r--Core/Authentication/Token/RememberMeToken.php3
-rw-r--r--Core/Encoder/EncoderFactory.php1
-rw-r--r--Core/Encoder/EncoderFactoryInterface.php3
-rw-r--r--Core/SecurityContext.php2
-rw-r--r--Core/SecurityContextInterface.php1
-rw-r--r--Core/User/UserInterface.php1
-rw-r--r--Http/Firewall/ContextListener.php2
-rw-r--r--Http/FirewallMapInterface.php1
-rw-r--r--Http/Logout/CookieClearingLogoutHandler.php3
-rw-r--r--Http/Logout/LogoutSuccessHandlerInterface.php1
-rw-r--r--Http/RememberMe/AbstractRememberMeServices.php5
-rw-r--r--Http/RememberMe/RememberMeServicesInterface.php1
-rw-r--r--Http/RememberMe/TokenBasedRememberMeServices.php2
16 files changed, 34 insertions, 11 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php
index 6e05fa9..e57929e 100644
--- a/Acl/Dbal/AclProvider.php
+++ b/Acl/Dbal/AclProvider.php
@@ -374,6 +374,7 @@ QUERY;
* including the ids of parent ACLs.
*
* @param array $batch
+ *
* @return array
*/
private function getAncestorIds(array $batch)
@@ -394,7 +395,7 @@ QUERY;
* Does either overwrite the passed ACE, or saves it in the global identity
* map to ensure every ACE only gets instantiated once.
*
- * @param array $aces
+ * @param array &$aces
*/
private function doUpdateAceIdentityMap(array &$aces)
{
@@ -445,7 +446,8 @@ QUERY;
* @throws \RuntimeException
* @return \SplObjectStorage
*/
- private function hydrateObjectIdentities(Statement $stmt, array $oidLookup, array $sids) {
+ private function hydrateObjectIdentities(Statement $stmt, array $oidLookup, array $sids)
+ {
$parentIdToFill = new \SplObjectStorage();
$acls = $aces = $emptyArray = array();
$oidCache = $oidLookup;
diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php
index e5cb99d..4a4a2e2 100644
--- a/Acl/Domain/Acl.php
+++ b/Acl/Domain/Acl.php
@@ -579,7 +579,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
/**
* Updates auditing for an ACE
*
- * @param array $aces
+ * @param array &$aces
* @param integer $index
* @param Boolean $auditSuccess
* @param Boolean $auditFailure
diff --git a/Core/Authentication/RememberMe/TokenProviderInterface.php b/Core/Authentication/RememberMe/TokenProviderInterface.php
index b48bd4d..7f86e4e 100644
--- a/Core/Authentication/RememberMe/TokenProviderInterface.php
+++ b/Core/Authentication/RememberMe/TokenProviderInterface.php
@@ -19,23 +19,25 @@ namespace Symfony\Component\Security\Core\Authentication\RememberMe;
interface TokenProviderInterface
{
/**
- * Loads the active token for the given series
+ * Loads the active token for the given series.
*
* @throws TokenNotFoundException if the token is not found
*
* @param string $series
+ *
* @return PersistentTokenInterface
*/
function loadTokenBySeries($series);
/**
- * Deletes all tokens belonging to series
+ * Deletes all tokens belonging to series.
+ *
* @param string $series
*/
function deleteTokenBySeries($series);
/**
- * Updates the token according to this data
+ * Updates the token according to this data.
*
* @param string $series
* @param string $tokenValue
@@ -44,7 +46,8 @@ interface TokenProviderInterface
function updateToken($series, $tokenValue, \DateTime $lastUsed);
/**
- * Creates a new token
+ * Creates a new token.
+ *
* @param PersistentTokenInterface $token
*/
function createNewToken(PersistentTokenInterface $token);
diff --git a/Core/Authentication/Token/RememberMeToken.php b/Core/Authentication/Token/RememberMeToken.php
index fe30c21..de50e5c 100644
--- a/Core/Authentication/Token/RememberMeToken.php
+++ b/Core/Authentication/Token/RememberMeToken.php
@@ -30,7 +30,8 @@ class RememberMeToken extends AbstractToken
* @param string $providerKey
* @param string $key
*/
- public function __construct(UserInterface $user, $providerKey, $key) {
+ public function __construct(UserInterface $user, $providerKey, $key)
+ {
parent::__construct($user->getRoles());
if (empty($key)) {
diff --git a/Core/Encoder/EncoderFactory.php b/Core/Encoder/EncoderFactory.php
index d7ae32d..738706a 100644
--- a/Core/Encoder/EncoderFactory.php
+++ b/Core/Encoder/EncoderFactory.php
@@ -51,6 +51,7 @@ class EncoderFactory implements EncoderFactoryInterface
* Creates the actual encoder instance
*
* @param array $config
+ *
* @return PasswordEncoderInterface
*/
private function createEncoder(array $config)
diff --git a/Core/Encoder/EncoderFactoryInterface.php b/Core/Encoder/EncoderFactoryInterface.php
index 811c262..3ae07e6 100644
--- a/Core/Encoder/EncoderFactoryInterface.php
+++ b/Core/Encoder/EncoderFactoryInterface.php
@@ -21,9 +21,10 @@ use Symfony\Component\Security\Core\User\UserInterface;
interface EncoderFactoryInterface
{
/**
- * Returns the password encoder to use for the given account
+ * Returns the password encoder to use for the given account.
*
* @param UserInterface $user
+ *
* @return PasswordEncoderInterface never null
*/
function getEncoder(UserInterface $user);
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
index fc39407..12eedd1 100644
--- a/Core/SecurityContext.php
+++ b/Core/SecurityContext.php
@@ -49,8 +49,10 @@ class SecurityContext implements SecurityContextInterface
* Checks if the attributes are granted against the current token.
*
* @throws AuthenticationCredentialsNotFoundException when the security context has no authentication token.
+ *
* @param mixed $attributes
* @param mixed|null $object
+ *
* @return Boolean
*/
public final function isGranted($attributes, $object = null)
diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php
index 600f7b4..2fc27b0 100644
--- a/Core/SecurityContextInterface.php
+++ b/Core/SecurityContextInterface.php
@@ -52,6 +52,7 @@ interface SecurityContextInterface
*
* @param array $attributes
* @param mixed $object
+ *
* @return Boolean
*/
function isGranted($attributes, $object = null);
diff --git a/Core/User/UserInterface.php b/Core/User/UserInterface.php
index f6356fe..ed6ce0a 100644
--- a/Core/User/UserInterface.php
+++ b/Core/User/UserInterface.php
@@ -59,6 +59,7 @@ interface UserInterface
* are relevant for assessing whether re-authentication is required.
*
* @param UserInterface $user
+ *
* @return Boolean
*/
function equals(UserInterface $user);
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)
generated by cgit v1.1 at 2025-05-11 07:17:07 +0000