summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Acl/Dbal/AclProvider.php14
-rw-r--r--Acl/Domain/Acl.php36
-rw-r--r--Acl/Domain/AclCollectionCache.php6
-rw-r--r--Acl/Domain/AuditLogger.php2
-rw-r--r--Acl/Domain/DoctrineAclCache.php5
-rw-r--r--Acl/Domain/Entry.php14
-rw-r--r--Acl/Domain/FieldEntry.php16
-rw-r--r--Acl/Domain/ObjectIdentity.php2
-rw-r--r--Acl/Domain/PermissionGrantingStrategy.php10
-rw-r--r--Acl/Domain/SecurityIdentityRetrievalStrategy.php3
-rw-r--r--Acl/Model/AclInterface.php10
-rw-r--r--Acl/Model/MutableAclInterface.php36
-rw-r--r--Acl/Model/PermissionGrantingStrategyInterface.php9
-rw-r--r--Acl/Voter/AclVoter.php2
-rw-r--r--Core/Authentication/Provider/DaoAuthenticationProvider.php8
-rw-r--r--Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php5
-rw-r--r--Core/Authentication/Provider/UserAuthenticationProvider.php9
-rw-r--r--Core/Authentication/RememberMe/PersistentToken.php8
-rw-r--r--Core/Authentication/RememberMe/TokenProviderInterface.php4
-rw-r--r--Core/Authentication/Token/UsernamePasswordToken.php6
-rw-r--r--Core/Authorization/AccessDecisionManager.php7
-rw-r--r--Core/SecurityContext.php2
-rw-r--r--Core/User/InMemoryUserProvider.php1
-rw-r--r--Http/EntryPoint/FormAuthenticationEntryPoint.php4
-rw-r--r--Http/Firewall.php3
-rw-r--r--Http/Firewall/LogoutListener.php7
-rw-r--r--Http/Firewall/RememberMeListener.php8
-rw-r--r--Http/Logout/CookieClearingLogoutHandler.php4
-rw-r--r--Http/Logout/LogoutHandlerInterface.php4
-rw-r--r--Http/Logout/SessionLogoutHandler.php4
-rw-r--r--Http/RememberMe/AbstractRememberMeServices.php22
-rw-r--r--Http/RememberMe/RememberMeServicesInterface.php4
32 files changed, 147 insertions, 128 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php
index 210c7f1..956fdd7 100644
--- a/Acl/Dbal/AclProvider.php
+++ b/Acl/Dbal/AclProvider.php
@@ -46,12 +46,12 @@ class AclProvider implements AclProviderInterface
private $permissionGrantingStrategy;
/**
- * Constructor
+ * Constructor.
*
- * @param Connection $connection
+ * @param Connection $connection
* @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
- * @param array $options
- * @param AclCacheInterface $cache
+ * @param array $options
+ * @param AclCacheInterface $cache
*/
public function __construct(Connection $connection, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $options, AclCacheInterface $cache = null)
{
@@ -280,7 +280,7 @@ SELECTCLAUSE;
* object identities.
*
* @param ObjectIdentityInterface $oid
- * @param Boolean $directChildrenOnly
+ * @param Boolean $directChildrenOnly
* @return string
*/
protected function getFindChildrenSql(ObjectIdentityInterface $oid, $directChildrenOnly)
@@ -441,8 +441,8 @@ QUERY;
* performance of the entire ACL system.
*
* @param Statement $stmt
- * @param array $oidLookup
- * @param array $sids
+ * @param array $oidLookup
+ * @param array $sids
* @throws \RuntimeException
* @return \SplObjectStorage
*/
diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php
index 09bcb34..661b892 100644
--- a/Acl/Domain/Acl.php
+++ b/Acl/Domain/Acl.php
@@ -51,11 +51,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
/**
* Constructor
*
- * @param integer $id
- * @param ObjectIdentityInterface $objectIdentity
+ * @param integer $id
+ * @param ObjectIdentityInterface $objectIdentity
* @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
- * @param array $loadedSids
- * @param Boolean $entriesInheriting
+ * @param array $loadedSids
+ * @param Boolean $entriesInheriting
* @return void
*/
public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids = array(), $entriesInheriting)
@@ -453,12 +453,12 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
/**
* Inserts an ACE
*
- * @param string $property
- * @param integer $index
- * @param integer $mask
+ * @param string $property
+ * @param integer $index
+ * @param integer $mask
* @param SecurityIdentityInterface $sid
- * @param Boolean $granting
- * @param string $strategy
+ * @param Boolean $granting
+ * @param string $strategy
* @throws \OutOfBoundsException
* @throws \InvalidArgumentException
* @return void
@@ -502,13 +502,13 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
/**
* Inserts a field-based ACE
*
- * @param string $property
- * @param integer $index
- * @param string $field
- * @param integer $mask
+ * @param string $property
+ * @param integer $index
+ * @param string $field
+ * @param integer $mask
* @param SecurityIdentityInterface $sid
- * @param Boolean $granting
- * @param string $strategy
+ * @param Boolean $granting
+ * @param string $strategy
* @throws \InvalidArgumentException
* @throws \OutOfBoundsException
* @return void
@@ -665,9 +665,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Called when a property of an ACE associated with this ACL changes
*
* @param EntryInterface $entry
- * @param string $name
- * @param mixed $oldValue
- * @param mixed $newValue
+ * @param string $name
+ * @param mixed $oldValue
+ * @param mixed $newValue
* @return void
*/
private function onEntryPropertyChanged(EntryInterface $entry, $name, $oldValue, $newValue)
diff --git a/Acl/Domain/AclCollectionCache.php b/Acl/Domain/AclCollectionCache.php
index f3fe6f0..6614724 100644
--- a/Acl/Domain/AclCollectionCache.php
+++ b/Acl/Domain/AclCollectionCache.php
@@ -27,10 +27,10 @@ class AclCollectionCache
private $securityIdentityRetrievalStrategy;
/**
- * Constructor
+ * Constructor.
*
- * @param AclProviderInterface $aclProvider
- * @param ObjectIdentityRetrievalStrategy $oidRetrievalStrategy
+ * @param AclProviderInterface $aclProvider
+ * @param ObjectIdentityRetrievalStrategy $oidRetrievalStrategy
* @param SecurityIdentityRetrievalStrategy $sidRetrievalStrategy
* @return void
*/
diff --git a/Acl/Domain/AuditLogger.php b/Acl/Domain/AuditLogger.php
index 0a4773f..9f95d06 100644
--- a/Acl/Domain/AuditLogger.php
+++ b/Acl/Domain/AuditLogger.php
@@ -25,7 +25,7 @@ abstract class AuditLogger implements AuditLoggerInterface
/**
* Performs some checks if logging was requested
*
- * @param Boolean $granted
+ * @param Boolean $granted
* @param EntryInterface $ace
* @return void
*/
diff --git a/Acl/Domain/DoctrineAclCache.php b/Acl/Domain/DoctrineAclCache.php
index eb18986..64241e2 100644
--- a/Acl/Domain/DoctrineAclCache.php
+++ b/Acl/Domain/DoctrineAclCache.php
@@ -33,9 +33,10 @@ class DoctrineAclCache implements AclCacheInterface
/**
* Constructor
*
- * @param Cache $cache
+ * @param Cache $cache
* @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
- * @param string $prefix
+ * @param string $prefix
+ *
* @return void
*/
public function __construct(Cache $cache, PermissionGrantingStrategyInterface $permissionGrantingStrategy, $prefix = self::PREFIX)
diff --git a/Acl/Domain/Entry.php b/Acl/Domain/Entry.php
index 7498b03..c5226a4 100644
--- a/Acl/Domain/Entry.php
+++ b/Acl/Domain/Entry.php
@@ -35,14 +35,14 @@ class Entry implements AuditableEntryInterface
/**
* Constructor
*
- * @param integer $id
- * @param AclInterface $acl
+ * @param integer $id
+ * @param AclInterface $acl
* @param SecurityIdentityInterface $sid
- * @param string $strategy
- * @param integer $mask
- * @param Boolean $granting
- * @param Boolean $auditFailure
- * @param Boolean $auditSuccess
+ * @param string $strategy
+ * @param integer $mask
+ * @param Boolean $granting
+ * @param Boolean $auditFailure
+ * @param Boolean $auditSuccess
*/
public function __construct($id, AclInterface $acl, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
{
diff --git a/Acl/Domain/FieldEntry.php b/Acl/Domain/FieldEntry.php
index 1510df2..5ff6921 100644
--- a/Acl/Domain/FieldEntry.php
+++ b/Acl/Domain/FieldEntry.php
@@ -27,15 +27,15 @@ class FieldEntry extends Entry implements FieldEntryInterface
/**
* Constructor
*
- * @param integer $id
- * @param AclInterface $acl
- * @param string $field
+ * @param integer $id
+ * @param AclInterface $acl
+ * @param string $field
* @param SecurityIdentityInterface $sid
- * @param string $strategy
- * @param integer $mask
- * @param Boolean $granting
- * @param Boolean $auditFailure
- * @param Boolean $auditSuccess
+ * @param string $strategy
+ * @param integer $mask
+ * @param Boolean $granting
+ * @param Boolean $auditFailure
+ * @param Boolean $auditSuccess
* @return void
*/
public function __construct($id, AclInterface $acl, $field, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
diff --git a/Acl/Domain/ObjectIdentity.php b/Acl/Domain/ObjectIdentity.php
index 2cb1352..f55f8a5 100644
--- a/Acl/Domain/ObjectIdentity.php
+++ b/Acl/Domain/ObjectIdentity.php
@@ -26,7 +26,7 @@ class ObjectIdentity implements ObjectIdentityInterface
private $type;
/**
- * Constructor
+ * Constructor.
*
* @param string $identifier
* @param string $type
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php
index 37bbe4e..2cc23bd 100644
--- a/Acl/Domain/PermissionGrantingStrategy.php
+++ b/Acl/Domain/PermissionGrantingStrategy.php
@@ -129,10 +129,10 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
* access finally.
*
* @param AclInterface $acl
- * @param array $aces an array of ACE to check against
- * @param array $masks an array of permission masks
- * @param array $sids an array of SecurityIdentityInterface implementations
- * @param Boolean $administrativeMode true turns off audit logging
+ * @param array $aces An array of ACE to check against
+ * @param array $masks An array of permission masks
+ * @param array $sids An array of SecurityIdentityInterface implementations
+ * @param Boolean $administrativeMode True turns off audit logging
* @return Boolean true, or false; either granting, or denying access respectively.
*/
private function hasSufficientPermissions(AclInterface $acl, array $aces, array $masks, array $sids, $administrativeMode)
@@ -189,7 +189,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
* Strategy EQUAL:
* The ACE will be considered applicable when the bitmasks are equal.
*
- * @param integer $requiredMask
+ * @param integer $requiredMask
* @param EntryInterface $ace
* @return Boolean
*/
diff --git a/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/Acl/Domain/SecurityIdentityRetrievalStrategy.php
index 1252a0f..d16a978 100644
--- a/Acl/Domain/SecurityIdentityRetrievalStrategy.php
+++ b/Acl/Domain/SecurityIdentityRetrievalStrategy.php
@@ -33,8 +33,9 @@ class SecurityIdentityRetrievalStrategy implements SecurityIdentityRetrievalStra
/**
* Constructor
*
- * @param RoleHierarchyInterface $roleHierarchy
+ * @param RoleHierarchyInterface $roleHierarchy
* @param AuthenticationTrustResolver $authenticationTrustResolver
+ *
* @return void
*/
public function __construct(RoleHierarchyInterface $roleHierarchy, AuthenticationTrustResolver $authenticationTrustResolver)
diff --git a/Acl/Model/AclInterface.php b/Acl/Model/AclInterface.php
index a9cfc5a..e8119fe 100644
--- a/Acl/Model/AclInterface.php
+++ b/Acl/Model/AclInterface.php
@@ -77,9 +77,9 @@ interface AclInterface extends \Serializable
/**
* Determines whether field access is granted
*
- * @param string $field
- * @param array $masks
- * @param array $securityIdentities
+ * @param string $field
+ * @param array $masks
+ * @param array $securityIdentities
* @param Boolean $administrativeMode
* @return Boolean
*/
@@ -89,8 +89,8 @@ interface AclInterface extends \Serializable
* Determines whether access is granted
*
* @throws NoAceFoundException when no ACE was applicable for this request
- * @param array $masks
- * @param array $securityIdentities
+ * @param array $masks
+ * @param array $securityIdentities
* @param Boolean $administrativeMode
* @return Boolean
*/
diff --git a/Acl/Model/MutableAclInterface.php b/Acl/Model/MutableAclInterface.php
index fdd6712..9a64709 100644
--- a/Acl/Model/MutableAclInterface.php
+++ b/Acl/Model/MutableAclInterface.php
@@ -66,10 +66,10 @@ interface MutableAclInterface extends AclInterface
* Inserts a class-based ACE
*
* @param SecurityIdentityInterface $sid
- * @param integer $mask
- * @param integer $index
- * @param Boolean $granting
- * @param string $strategy
+ * @param integer $mask
+ * @param integer $index
+ * @param Boolean $granting
+ * @param string $strategy
* @return void
*/
function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -77,12 +77,12 @@ interface MutableAclInterface extends AclInterface
/**
* Inserts a class-field-based ACE
*
- * @param string $field
+ * @param string $field
* @param SecurityIdentityInterface $sid
- * @param integer $mask
- * @param integer $index
- * @param Boolean $granting
- * @param string $strategy
+ * @param integer $mask
+ * @param integer $index
+ * @param Boolean $granting
+ * @param string $strategy
* @return void
*/
function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -91,10 +91,10 @@ interface MutableAclInterface extends AclInterface
* Inserts an object-based ACE
*
* @param SecurityIdentityInterface $sid
- * @param integer $mask
- * @param integer $index
- * @param Boolean $granting
- * @param string $strategy
+ * @param integer $mask
+ * @param integer $index
+ * @param Boolean $granting
+ * @param string $strategy
* @return void
*/
function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
@@ -102,12 +102,12 @@ interface MutableAclInterface extends AclInterface
/**
* Inserts an object-field-based ACE
*
- * @param string $field
+ * @param string $field
* @param SecurityIdentityInterface $sid
- * @param integer $mask
- * @param integer $index
- * @param Boolean $granting
- * @param string $strategy
+ * @param integer $mask
+ * @param integer $index
+ * @param Boolean $granting
+ * @param string $strategy
* @return void
*/
function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
diff --git a/Acl/Model/PermissionGrantingStrategyInterface.php b/Acl/Model/PermissionGrantingStrategyInterface.php
index 5cf10e6..882eb08 100644
--- a/Acl/Model/PermissionGrantingStrategyInterface.php
+++ b/Acl/Model/PermissionGrantingStrategyInterface.php
@@ -33,10 +33,11 @@ interface PermissionGrantingStrategyInterface
* Determines whether access to a domain object's field is to be granted
*
* @param AclInterface $acl
- * @param string $field
- * @param array $masks
- * @param array $sids
- * @param Boolean $administrativeMode
+ * @param string $field
+ * @param array $masks
+ * @param array $sids
+ * @param Boolean $administrativeMode
+ *
* @return Boolean
*/
function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false);
diff --git a/Acl/Voter/AclVoter.php b/Acl/Voter/AclVoter.php
index 9ae4c04..7bd8610 100644
--- a/Acl/Voter/AclVoter.php
+++ b/Acl/Voter/AclVoter.php
@@ -138,6 +138,8 @@ class AclVoter implements VoterInterface
* You can override this method when writing a voter for a specific domain
* class.
*
+ * @param string $class The class name
+ *
* @return Boolean
*/
public function supportsClass($class)
diff --git a/Core/Authentication/Provider/DaoAuthenticationProvider.php b/Core/Authentication/Provider/DaoAuthenticationProvider.php
index fa08955..f9e8b38 100644
--- a/Core/Authentication/Provider/DaoAuthenticationProvider.php
+++ b/Core/Authentication/Provider/DaoAuthenticationProvider.php
@@ -35,9 +35,11 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider
/**
* Constructor.
*
- * @param UserProviderInterface $userProvider A UserProviderInterface instance
- * @param UserCheckerInterface $userChecker An UserCheckerInterface instance
- * @param EncoderFactoryInterface $encoderFactory A EncoderFactoryInterface instance
+ * @param UserProviderInterface $userProvider An UserProviderInterface instance
+ * @param UserCheckerInterface $userChecker An UserCheckerInterface instance
+ * @param string $providerKey The provider key
+ * @param EncoderFactoryInterface $encoderFactory An EncoderFactoryInterface instance
+ * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not
*/
public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey, EncoderFactoryInterface $encoderFactory, $hideUserNotFoundExceptions = true)
{
diff --git a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
index bf2df86..e4bf963 100644
--- a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
+++ b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -37,8 +37,9 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
/**
* Constructor.
*
- * @param UserProviderInterface $userProvider A UserProviderInterface instance
- * @param UserCheckerInterface $userChecker An UserCheckerInterface instance
+ * @param UserProviderInterface $userProvider An UserProviderInterface instance
+ * @param UserCheckerInterface $userChecker An UserCheckerInterface instance
+ * @param string $providerKey The provider key
*/
public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey)
{
diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php
index 7b6079d..8183c62 100644
--- a/Core/Authentication/Provider/UserAuthenticationProvider.php
+++ b/Core/Authentication/Provider/UserAuthenticationProvider.php
@@ -34,8 +34,9 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
/**
* Constructor.
*
- * @param UserCheckerInterface $userChecker An UserCheckerInterface interface
- * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not
+ * @param UserCheckerInterface $userChecker An UserCheckerInterface interface
+ * @param string $providerKey A provider key
+ * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not
*/
public function __construct(UserCheckerInterface $userChecker, $providerKey, $hideUserNotFoundExceptions = true)
{
@@ -110,8 +111,8 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
* Does additional checks on the user and token (like validating the
* credentials).
*
- * @param UserInterface $user The retrieved UserInterface instance
- * @param UsernamePasswordToken $token The UsernamePasswordToken token to be authenticated
+ * @param UserInterface $user The retrieved UserInterface instance
+ * @param UsernamePasswordToken $token The UsernamePasswordToken token to be authenticated
*
* @throws AuthenticationException if the credentials could not be validated
*/
diff --git a/Core/Authentication/RememberMe/PersistentToken.php b/Core/Authentication/RememberMe/PersistentToken.php
index 0e8f7d2..55e6b89 100644
--- a/Core/Authentication/RememberMe/PersistentToken.php
+++ b/Core/Authentication/RememberMe/PersistentToken.php
@@ -27,10 +27,10 @@ final class PersistentToken implements PersistentTokenInterface
/**
* Constructor
*
- * @param string $class
- * @param string $username
- * @param string $series
- * @param string $tokenValue
+ * @param string $class
+ * @param string $username
+ * @param string $series
+ * @param string $tokenValue
* @param DateTime $lastUsed
*/
public function __construct($class, $username, $series, $tokenValue, \DateTime $lastUsed)
diff --git a/Core/Authentication/RememberMe/TokenProviderInterface.php b/Core/Authentication/RememberMe/TokenProviderInterface.php
index 780a544..1ec9c80 100644
--- a/Core/Authentication/RememberMe/TokenProviderInterface.php
+++ b/Core/Authentication/RememberMe/TokenProviderInterface.php
@@ -37,8 +37,8 @@ interface TokenProviderInterface
/**
* Updates the token according to this data
*
- * @param string $series
- * @param string $tokenValue
+ * @param string $series
+ * @param string $tokenValue
* @param DateTime $lastUsed
*/
function updateToken($series, $tokenValue, \DateTime $lastUsed);
diff --git a/Core/Authentication/Token/UsernamePasswordToken.php b/Core/Authentication/Token/UsernamePasswordToken.php
index 67311db..6c6ed5b 100644
--- a/Core/Authentication/Token/UsernamePasswordToken.php
+++ b/Core/Authentication/Token/UsernamePasswordToken.php
@@ -24,8 +24,12 @@ class UsernamePasswordToken extends AbstractToken
/**
* Constructor.
*
- * @param string $user The username (like a nickname, email address, etc.)
+ * @param string $user The username (like a nickname, email address, etc.)
* @param string $credentials This usually is the password of the user
+ * @param string $providerKey The provider key
+ * @param array $roles An array of roles
+ *
+ * @throws \InvalidArgumentException
*/
public function __construct($user, $credentials, $providerKey, array $roles = array())
{
diff --git a/Core/Authorization/AccessDecisionManager.php b/Core/Authorization/AccessDecisionManager.php
index c1b643e..a8bb5cf 100644
--- a/Core/Authorization/AccessDecisionManager.php
+++ b/Core/Authorization/AccessDecisionManager.php
@@ -30,9 +30,10 @@ class AccessDecisionManager implements AccessDecisionManagerInterface
/**
* Constructor.
*
- * @param VoterInterface[] $voters An array of VoterInterface instances
- * @param string $strategy The vote strategy
- * @param Boolean $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not
+ * @param VoterInterface[] $voters An array of VoterInterface instances
+ * @param string $strategy The vote strategy
+ * @param Boolean $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not
+ * @param Boolean $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals
*/
public function __construct(array $voters, $strategy = 'affirmative', $allowIfAllAbstainDecisions = false, $allowIfEqualGrantedDeniedDecisions = true)
{
diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php
index 2910e3b..c88f54f 100644
--- a/Core/SecurityContext.php
+++ b/Core/SecurityContext.php
@@ -36,7 +36,9 @@ class SecurityContext implements SecurityContextInterface
/**
* Constructor.
*
+ * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance
* @param AccessDecisionManagerInterface|null $accessDecisionManager An AccessDecisionManager instance
+ * @param Boolean $alwaysAuthenticate
*/
public function __construct(AuthenticationManagerInterface $authenticationManager, AccessDecisionManagerInterface $accessDecisionManager, $alwaysAuthenticate = false)
{
diff --git a/Core/User/InMemoryUserProvider.php b/Core/User/InMemoryUserProvider.php
index 26b4080..e73eb95 100644
--- a/Core/User/InMemoryUserProvider.php
+++ b/Core/User/InMemoryUserProvider.php
@@ -33,7 +33,6 @@ class InMemoryUserProvider implements UserProviderInterface
* an array of attributes: 'password', 'enabled', and 'roles'.
*
* @param array $users An array of users
- * @param string $name
*/
public function __construct(array $users = array())
{
diff --git a/Http/EntryPoint/FormAuthenticationEntryPoint.php b/Http/EntryPoint/FormAuthenticationEntryPoint.php
index 2650a07..12f077f 100644
--- a/Http/EntryPoint/FormAuthenticationEntryPoint.php
+++ b/Http/EntryPoint/FormAuthenticationEntryPoint.php
@@ -33,8 +33,8 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface
* Constructor
*
* @param HttpKernelInterface $kernel
- * @param string $loginPath The path to the login form
- * @param Boolean $useForward Whether to forward or redirect to the login form
+ * @param string $loginPath The path to the login form
+ * @param Boolean $useForward Whether to forward or redirect to the login form
*/
public function __construct(HttpKernelInterface $kernel, $loginPath, $useForward = false)
{
diff --git a/Http/Firewall.php b/Http/Firewall.php
index d5af39b..774303d 100644
--- a/Http/Firewall.php
+++ b/Http/Firewall.php
@@ -35,7 +35,8 @@ class Firewall
/**
* Constructor.
*
- * @param FirewallMap $map A FirewallMap instance
+ * @param FirewallMap $map A FirewallMap instance
+ * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
*/
public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher)
{
diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php
index 67c43d5..8ff9c8b 100644
--- a/Http/Firewall/LogoutListener.php
+++ b/Http/Firewall/LogoutListener.php
@@ -36,9 +36,10 @@ class LogoutListener implements ListenerInterface
/**
* Constructor
*
- * @param SecurityContextInterface $securityContext
- * @param string $logoutPath The path that starts the logout process
- * @param string $targetUrl The URL to redirect to after logout
+ * @param SecurityContextInterface $securityContext
+ * @param string $logoutPath The path that starts the logout process
+ * @param string $targetUrl The URL to redirect to after logout
+ * @param LogoutSuccessHandlerInterface $successHandler
*/
public function __construct(SecurityContextInterface $securityContext, $logoutPath, $targetUrl = '/', LogoutSuccessHandlerInterface $successHandler = null)
{
diff --git a/Http/Firewall/RememberMeListener.php b/Http/Firewall/RememberMeListener.php
index db8910b..10ed8c6 100644
--- a/Http/Firewall/RememberMeListener.php
+++ b/Http/Firewall/RememberMeListener.php
@@ -43,11 +43,11 @@ class RememberMeListener implements ListenerInterface
/**
* Constructor
*
- * @param SecurityContext $securityContext
- * @param RememberMeServicesInterface $rememberMeServices
+ * @param SecurityContext $securityContext
+ * @param RememberMeServicesInterface $rememberMeServices
* @param AuthenticationManagerInterface $authenticationManager
- * @param LoggerInterface $logger
- * @param EventDispatcherInterface $dispatcher
+ * @param LoggerInterface $logger
+ * @param EventDispatcherInterface $dispatcher
*/
public function __construct(SecurityContext $securityContext, RememberMeServicesInterface $rememberMeServices, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
{
diff --git a/Http/Logout/CookieClearingLogoutHandler.php b/Http/Logout/CookieClearingLogoutHandler.php
index ebdcbed..65b45f2 100644
--- a/Http/Logout/CookieClearingLogoutHandler.php
+++ b/Http/Logout/CookieClearingLogoutHandler.php
@@ -36,8 +36,8 @@ class CookieClearingLogoutHandler implements LogoutHandlerInterface
/**
* Implementation for the LogoutHandlerInterface. Deletes all requested cookies.
*
- * @param Request $request
- * @param Response $response
+ * @param Request $request
+ * @param Response $response
* @param TokenInterface $token
* @return void
*/
diff --git a/Http/Logout/LogoutHandlerInterface.php b/Http/Logout/LogoutHandlerInterface.php
index 1d420b0..e3f0995 100644
--- a/Http/Logout/LogoutHandlerInterface.php
+++ b/Http/Logout/LogoutHandlerInterface.php
@@ -27,8 +27,8 @@ interface LogoutHandlerInterface
* to be logged out. Usually, you would unset session variables, or remove
* cookies, etc.
*
- * @param Request $request
- * @param Response $response
+ * @param Request $request
+ * @param Response $response
* @param TokenInterface $token
* @return void
*/
diff --git a/Http/Logout/SessionLogoutHandler.php b/Http/Logout/SessionLogoutHandler.php
index fad77da..bfb5ecd 100644
--- a/Http/Logout/SessionLogoutHandler.php
+++ b/Http/Logout/SessionLogoutHandler.php
@@ -25,8 +25,8 @@ class SessionLogoutHandler implements LogoutHandlerInterface
/**
* Invalidate the current session
*
- * @param Request $request
- * @param Response $response
+ * @param Request $request
+ * @param Response $response
* @param TokenInterface $token
* @return void
*/
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
index b090e24..a7c63ef 100644
--- a/Http/RememberMe/AbstractRememberMeServices.php
+++ b/Http/RememberMe/AbstractRememberMeServices.php
@@ -44,8 +44,10 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
/**
* Constructor
*
- * @param array $userProviders
- * @param array $options
+ * @param array $userProviders
+ * @param string $key
+ * @param string $providerKey
+ * @param array $options
* @param LoggerInterface $logger
*/
public function __construct(array $userProviders, $key, $providerKey, array $options = array(), LoggerInterface $logger = null)
@@ -140,8 +142,8 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
/**
* Implementation for LogoutHandlerInterface. Deletes the cookie.
*
- * @param Request $request
- * @param Response $response
+ * @param Request $request
+ * @param Response $response
* @param TokenInterface $token
* @return void
*/
@@ -167,9 +169,9 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
* Implementation for RememberMeServicesInterface. This is called when an
* authentication is successful.
*
- * @param Request $request
- * @param Response $response
- * @param TokenInterface $token The token that resulted in a successful authentication
+ * @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)
@@ -201,7 +203,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
* Subclasses should validate the cookie and do any additional processing
* that is required. This is called from autoLogin().
*
- * @param array $cookieParts
+ * @param array $cookieParts
* @param Request $request
* @return TokenInterface
*/
@@ -216,8 +218,8 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
* requested remember-me capabilities. The implementation usually sets a
* cookie and possibly stores a persistent record of it.
*
- * @param Request $request
- * @param Response $response
+ * @param Request $request
+ * @param Response $response
* @param TokenInterface $token
* @return void
*/
diff --git a/Http/RememberMe/RememberMeServicesInterface.php b/Http/RememberMe/RememberMeServicesInterface.php
index c740d28..5c56c18 100644
--- a/Http/RememberMe/RememberMeServicesInterface.php
+++ b/Http/RememberMe/RememberMeServicesInterface.php
@@ -74,8 +74,8 @@ interface RememberMeServicesInterface
* (such as a HTTP POST parameter) that indicates the browser has explicitly
* requested for the authentication to be remembered.
*
- * @param Request $request
- * @param Response $response
+ * @param Request $request
+ * @param Response $response
* @param TokenInterface $token
* @return void
*/