summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2012-05-15 22:19:31 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2012-05-15 22:19:31 +0200
commit7036686b05aced1fb163ee7af8897f7a0a1867f5 (patch)
tree2b436b496afa6bb1da94649fb385c4d4e0723850
parent4599d931b04193b23d2cefc87a0bcea92585f071 (diff)
downloadsymfony-security-7036686b05aced1fb163ee7af8897f7a0a1867f5.zip
symfony-security-7036686b05aced1fb163ee7af8897f7a0a1867f5.tar.gz
symfony-security-7036686b05aced1fb163ee7af8897f7a0a1867f5.tar.bz2
fixed phpdoc @param alignment
-rw-r--r--Acl/Dbal/Schema.php2
-rw-r--r--Acl/Domain/AclCollectionCache.php2
-rw-r--r--Acl/Domain/PermissionGrantingStrategy.php8
-rw-r--r--Acl/Domain/UserSecurityIdentity.php2
-rw-r--r--Core/Authentication/Token/AbstractToken.php2
-rw-r--r--Core/Authentication/Token/TokenInterface.php2
-rw-r--r--Core/Encoder/BasePasswordEncoder.php2
-rw-r--r--Http/EntryPoint/FormAuthenticationEntryPoint.php6
-rw-r--r--Http/Firewall/AbstractAuthenticationListener.php14
-rw-r--r--Http/Firewall/LogoutListener.php8
-rw-r--r--Http/RememberMe/AbstractRememberMeServices.php2
-rw-r--r--Http/RememberMe/TokenBasedRememberMeServices.php6
12 files changed, 28 insertions, 28 deletions
diff --git a/Acl/Dbal/Schema.php b/Acl/Dbal/Schema.php
index 9ff3521..0cb8755 100644
--- a/Acl/Dbal/Schema.php
+++ b/Acl/Dbal/Schema.php
@@ -26,7 +26,7 @@ final class Schema extends BaseSchema
/**
* Constructor
*
- * @param array $options the names for tables
+ * @param array $options the names for tables
* @param Connection $connection
*/
public function __construct(array $options, Connection $connection = null)
diff --git a/Acl/Domain/AclCollectionCache.php b/Acl/Domain/AclCollectionCache.php
index 33825c1..be082c1 100644
--- a/Acl/Domain/AclCollectionCache.php
+++ b/Acl/Domain/AclCollectionCache.php
@@ -45,7 +45,7 @@ class AclCollectionCache
* of required queries considerably.
*
* @param mixed $collection anything that can be passed to foreach()
- * @param array $tokens an array of TokenInterface implementations
+ * @param array $tokens an array of TokenInterface implementations
*/
public function cache($collection, array $tokens = array())
{
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php
index c34db2a..c9464cf 100644
--- a/Acl/Domain/PermissionGrantingStrategy.php
+++ b/Acl/Domain/PermissionGrantingStrategy.php
@@ -127,10 +127,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)
diff --git a/Acl/Domain/UserSecurityIdentity.php b/Acl/Domain/UserSecurityIdentity.php
index 6bc1ba1..040e43b 100644
--- a/Acl/Domain/UserSecurityIdentity.php
+++ b/Acl/Domain/UserSecurityIdentity.php
@@ -30,7 +30,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface
* Constructor
*
* @param string $username the username representation
- * @param string $class the user's fully qualified class name
+ * @param string $class the user's fully qualified class name
*/
public function __construct($username, $class)
{
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php
index dc993ba..ed6e8de 100644
--- a/Core/Authentication/Token/AbstractToken.php
+++ b/Core/Authentication/Token/AbstractToken.php
@@ -178,7 +178,7 @@ abstract class AbstractToken implements TokenInterface
/**
* Returns true if the attribute exists.
*
- * @param string $name The attribute name
+ * @param string $name The attribute name
*
* @return Boolean true if the attribute exists, false otherwise
*/
diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php
index ceacf92..3dafccc 100644
--- a/Core/Authentication/Token/TokenInterface.php
+++ b/Core/Authentication/Token/TokenInterface.php
@@ -100,7 +100,7 @@ interface TokenInterface extends \Serializable
/**
* Returns true if the attribute exists.
*
- * @param string $name The attribute name
+ * @param string $name The attribute name
*
* @return Boolean true if the attribute exists, false otherwise
*/
diff --git a/Core/Encoder/BasePasswordEncoder.php b/Core/Encoder/BasePasswordEncoder.php
index 58c64db..ae1c7d4 100644
--- a/Core/Encoder/BasePasswordEncoder.php
+++ b/Core/Encoder/BasePasswordEncoder.php
@@ -47,7 +47,7 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
* Merges a password and a salt.
*
* @param string $password the password to be used
- * @param string $salt the salt to be used
+ * @param string $salt the salt to be used
*
* @return string a merged password and salt
*/
diff --git a/Http/EntryPoint/FormAuthenticationEntryPoint.php b/Http/EntryPoint/FormAuthenticationEntryPoint.php
index 2170e9e..2e26931 100644
--- a/Http/EntryPoint/FormAuthenticationEntryPoint.php
+++ b/Http/EntryPoint/FormAuthenticationEntryPoint.php
@@ -33,9 +33,9 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface
* Constructor
*
* @param HttpKernelInterface $kernel
- * @param HttpUtils $httpUtils An HttpUtils instance
- * @param string $loginPath The path to the login form
- * @param Boolean $useForward Whether to forward or redirect to the login form
+ * @param HttpUtils $httpUtils An HttpUtils instance
+ * @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, HttpUtils $httpUtils, $loginPath, $useForward = false)
{
diff --git a/Http/Firewall/AbstractAuthenticationListener.php b/Http/Firewall/AbstractAuthenticationListener.php
index 0e6f945..c8fa581 100644
--- a/Http/Firewall/AbstractAuthenticationListener.php
+++ b/Http/Firewall/AbstractAuthenticationListener.php
@@ -65,17 +65,17 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
/**
* Constructor.
*
- * @param SecurityContextInterface $securityContext A SecurityContext instance
- * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance
+ * @param SecurityContextInterface $securityContext A SecurityContext instance
+ * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance
* @param SessionAuthenticationStrategyInterface $sessionStrategy
- * @param HttpUtils $httpUtils An HttpUtilsInterface instance
+ * @param HttpUtils $httpUtils An HttpUtilsInterface instance
* @param string $providerKey
- * @param array $options An array of options for the processing of a
+ * @param array $options An array of options for the processing of a
* successful, or failed authentication attempt
* @param AuthenticationSuccessHandlerInterface $successHandler
* @param AuthenticationFailureHandlerInterface $failureHandler
- * @param LoggerInterface $logger A LoggerInterface instance
- * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
+ * @param LoggerInterface $logger A LoggerInterface instance
+ * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
*/
public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, SessionAuthenticationStrategyInterface $sessionStrategy, HttpUtils $httpUtils, $providerKey, array $options = array(), AuthenticationSuccessHandlerInterface $successHandler = null, AuthenticationFailureHandlerInterface $failureHandler = null, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
{
@@ -175,7 +175,7 @@ abstract class AbstractAuthenticationListener implements ListenerInterface
/**
* Performs authentication.
*
- * @param Request $request A Request instance
+ * @param Request $request A Request instance
*
* @return TokenInterface The authenticated token, or null if full authentication is not possible
*
diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php
index 59172dc..5a0d0d6 100644
--- a/Http/Firewall/LogoutListener.php
+++ b/Http/Firewall/LogoutListener.php
@@ -39,10 +39,10 @@ class LogoutListener implements ListenerInterface
* Constructor
*
* @param SecurityContextInterface $securityContext
- * @param HttpUtils $httpUtils An HttpUtilsInterface instance
- * @param array $options An array of options to process a logout attempt
- * @param LogoutSuccessHandlerInterface $successHandler A LogoutSuccessHandlerInterface instance
- * @param CsrfProviderInterface $csrfProvider A CsrfProviderInterface instance
+ * @param HttpUtils $httpUtils An HttpUtilsInterface instance
+ * @param array $options An array of options to process a logout attempt
+ * @param LogoutSuccessHandlerInterface $successHandler A LogoutSuccessHandlerInterface instance
+ * @param CsrfProviderInterface $csrfProvider A CsrfProviderInterface instance
*/
public function __construct(SecurityContextInterface $securityContext, HttpUtils $httpUtils, array $options = array(), LogoutSuccessHandlerInterface $successHandler = null, CsrfProviderInterface $csrfProvider = null)
{
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php
index d61a6ce..71f103e 100644
--- a/Http/RememberMe/AbstractRememberMeServices.php
+++ b/Http/RememberMe/AbstractRememberMeServices.php
@@ -168,7 +168,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface
*
* @param Request $request
* @param Response $response
- * @param TokenInterface $token The token that resulted in a successful authentication
+ * @param TokenInterface $token The token that resulted in a successful authentication
*/
public final function loginSuccess(Request $request, Response $response, TokenInterface $token)
{
diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php
index 71256c7..1f831d0 100644
--- a/Http/RememberMe/TokenBasedRememberMeServices.php
+++ b/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -137,9 +137,9 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
* Generates a hash for the cookie to ensure it is not being tempered with
*
* @param string $class
- * @param string $username The username
- * @param integer $expires The unixtime when the cookie expires
- * @param string $password The encoded password
+ * @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
*