diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-05-18 19:41:48 +0200 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-05-18 19:42:42 +0200 |
commit | 2e14fc951fa2caba614ff6b220175b240229ea99 (patch) | |
tree | caf5d6adfd81259d6734404ad41454999d1d85af | |
parent | 7036686b05aced1fb163ee7af8897f7a0a1867f5 (diff) | |
download | symfony-security-2e14fc951fa2caba614ff6b220175b240229ea99.zip symfony-security-2e14fc951fa2caba614ff6b220175b240229ea99.tar.gz symfony-security-2e14fc951fa2caba614ff6b220175b240229ea99.tar.bz2 |
fixed CS
-rw-r--r-- | Acl/Dbal/MutableAclProvider.php | 36 | ||||
-rw-r--r-- | Acl/Dbal/Schema.php | 2 | ||||
-rw-r--r-- | Acl/Domain/Acl.php | 20 | ||||
-rw-r--r-- | Acl/Domain/PermissionGrantingStrategy.php | 8 | ||||
-rw-r--r-- | Acl/Model/AclProviderInterface.php | 4 | ||||
-rw-r--r-- | Acl/Model/AuditLoggerInterface.php | 2 | ||||
-rw-r--r-- | Acl/Model/AuditableAclInterface.php | 4 | ||||
-rw-r--r-- | Acl/Model/MutableAclInterface.php | 16 | ||||
-rw-r--r-- | Core/SecurityContext.php | 2 | ||||
-rw-r--r-- | Http/Authorization/AccessDeniedHandlerInterface.php | 4 | ||||
-rw-r--r-- | Http/EntryPoint/FormAuthenticationEntryPoint.php | 6 | ||||
-rw-r--r-- | Http/Firewall/AbstractAuthenticationListener.php | 16 | ||||
-rw-r--r-- | Http/Firewall/LogoutListener.php | 8 | ||||
-rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 2 | ||||
-rw-r--r-- | Http/RememberMe/TokenBasedRememberMeServices.php | 2 | ||||
-rw-r--r-- | Tests/Acl/Dbal/MutableAclProviderTest.php | 2 |
16 files changed, 67 insertions, 67 deletions
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php index 3ae08d3..0d46f3a 100644 --- a/Acl/Dbal/MutableAclProvider.php +++ b/Acl/Dbal/MutableAclProvider.php @@ -144,10 +144,10 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * This allows us to keep track of which values have been changed, so we don't * have to do a full introspection when ->updateAcl() is called. * - * @param mixed $sender + * @param mixed $sender * @param string $propertyName - * @param mixed $oldValue - * @param mixed $newValue + * @param mixed $oldValue + * @param mixed $newValue */ public function propertyChanged($sender, $propertyName, $oldValue, $newValue) { @@ -397,16 +397,16 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf /** * Constructs the SQL for inserting an ACE. * - * @param integer $classId + * @param integer $classId * @param integer|null $objectIdentityId - * @param string|null $field - * @param integer $aceOrder - * @param integer $securityIdentityId - * @param string $strategy - * @param integer $mask - * @param Boolean $granting - * @param Boolean $auditSuccess - * @param Boolean $auditFailure + * @param string|null $field + * @param integer $aceOrder + * @param integer $securityIdentityId + * @param string $strategy + * @param integer $mask + * @param Boolean $granting + * @param Boolean $auditSuccess + * @param Boolean $auditFailure * @return string */ protected function getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $aceOrder, $securityIdentityId, $strategy, $mask, $granting, $auditSuccess, $auditFailure) @@ -478,7 +478,7 @@ QUERY; /** * Constructs the SQL for inserting an object identity. * - * @param string $identifier + * @param string $identifier * @param integer $classId * @param Boolean $entriesInheriting * @return string @@ -531,7 +531,7 @@ QUERY; * * @param integer $classId * @param integer $oid - * @param string $field + * @param string $field * @param integer $order * @return string */ @@ -598,7 +598,7 @@ QUERY; * Constructs the SQL for updating an object identity. * * @param integer $pk - * @param array $changes + * @param array $changes * @throws \InvalidArgumentException * @return string */ @@ -620,7 +620,7 @@ QUERY; * Constructs the SQL for updating an ACE. * * @param integer $pk - * @param array $sets + * @param array $sets * @throws \InvalidArgumentException * @return string */ @@ -742,7 +742,7 @@ QUERY; * This processes changes on an ACE related property (classFieldAces, or objectFieldAces). * * @param string $name - * @param array $changes + * @param array $changes */ private function updateFieldAceProperty($name, array $changes) { @@ -798,7 +798,7 @@ QUERY; * This processes changes on an ACE related property (classAces, or objectAces). * * @param string $name - * @param array $changes + * @param array $changes */ private function updateAceProperty($name, array $changes) { diff --git a/Acl/Dbal/Schema.php b/Acl/Dbal/Schema.php index 0cb8755..fd25926 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/Acl.php b/Acl/Domain/Acl.php index a890bbe..6d53131 100644 --- a/Acl/Domain/Acl.php +++ b/Acl/Domain/Acl.php @@ -398,7 +398,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Deletes an ACE * - * @param string $property + * @param string $property * @param integer $index * @throws \OutOfBoundsException */ @@ -422,9 +422,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Deletes a field-based ACE * - * @param string $property + * @param string $property * @param integer $index - * @param string $field + * @param string $field * @throws \OutOfBoundsException */ private function deleteFieldAce($property, $index, $field) @@ -552,10 +552,10 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Updates an ACE * - * @param string $property + * @param string $property * @param integer $index * @param integer $mask - * @param string $strategy + * @param string $strategy * @throws \OutOfBoundsException */ private function updateAce($property, $index, $mask, $strategy = null) @@ -605,11 +605,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Updates a field-based ACE * - * @param string $property + * @param string $property * @param integer $index - * @param string $field + * @param string $field * @param integer $mask - * @param string $strategy + * @param string $strategy * @throws \InvalidArgumentException * @throws \OutOfBoundsException */ @@ -639,8 +639,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * Called when a property of the ACL changes * * @param string $name - * @param mixed $oldValue - * @param mixed $newValue + * @param mixed $oldValue + * @param mixed $newValue */ private function onPropertyChanged($name, $oldValue, $newValue) { diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php index c9464cf..c34db2a 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/Model/AclProviderInterface.php b/Acl/Model/AclProviderInterface.php index 12f55e0..2f878e1 100644 --- a/Acl/Model/AclProviderInterface.php +++ b/Acl/Model/AclProviderInterface.php @@ -22,7 +22,7 @@ interface AclProviderInterface * Retrieves all child object identities from the database * * @param ObjectIdentityInterface $parentOid - * @param Boolean $directChildrenOnly + * @param Boolean $directChildrenOnly * @return array returns an array of child 'ObjectIdentity's */ function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly = false); @@ -32,7 +32,7 @@ interface AclProviderInterface * * @throws AclNotFoundException when there is no ACL * @param ObjectIdentityInterface $oid - * @param array $sids + * @param array $sids * @return AclInterface */ function findAcl(ObjectIdentityInterface $oid, array $sids = array()); diff --git a/Acl/Model/AuditLoggerInterface.php b/Acl/Model/AuditLoggerInterface.php index 56fd12e..7cab6f1 100644 --- a/Acl/Model/AuditLoggerInterface.php +++ b/Acl/Model/AuditLoggerInterface.php @@ -22,7 +22,7 @@ interface AuditLoggerInterface * This method is called whenever access is granted, or denied, and * administrative mode is turned off. * - * @param Boolean $granted + * @param Boolean $granted * @param EntryInterface $ace */ function logIfNeeded($granted, EntryInterface $ace); diff --git a/Acl/Model/AuditableAclInterface.php b/Acl/Model/AuditableAclInterface.php index 9a95106..5da593e 100644 --- a/Acl/Model/AuditableAclInterface.php +++ b/Acl/Model/AuditableAclInterface.php @@ -31,7 +31,7 @@ interface AuditableAclInterface extends MutableAclInterface * Updates auditing for class-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @param Boolean $auditSuccess * @param Boolean $auditFailure */ @@ -50,7 +50,7 @@ interface AuditableAclInterface extends MutableAclInterface * Updates auditing for object-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @param Boolean $auditSuccess * @param Boolean $auditFailure */ diff --git a/Acl/Model/MutableAclInterface.php b/Acl/Model/MutableAclInterface.php index a846a9f..f84e817 100644 --- a/Acl/Model/MutableAclInterface.php +++ b/Acl/Model/MutableAclInterface.php @@ -32,7 +32,7 @@ interface MutableAclInterface extends AclInterface * Deletes a class-field-based ACE * * @param integer $index - * @param string $field + * @param string $field */ function deleteClassFieldAce($index, $field); @@ -47,7 +47,7 @@ interface MutableAclInterface extends AclInterface * Deletes an object-field-based ACE * * @param integer $index - * @param string $field + * @param string $field */ function deleteObjectFieldAce($index, $field); @@ -124,7 +124,7 @@ interface MutableAclInterface extends AclInterface * * @param integer $index * @param integer $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy if null the strategy should not be changed */ function updateClassAce($index, $mask, $strategy = null); @@ -132,9 +132,9 @@ interface MutableAclInterface extends AclInterface * Updates a class-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @param integer $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy if null the strategy should not be changed */ function updateClassFieldAce($index, $field, $mask, $strategy = null); @@ -143,7 +143,7 @@ interface MutableAclInterface extends AclInterface * * @param integer $index * @param integer $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy if null the strategy should not be changed */ function updateObjectAce($index, $mask, $strategy = null); @@ -151,9 +151,9 @@ interface MutableAclInterface extends AclInterface * Updates an object-field-based ACE * * @param integer $index - * @param string $field + * @param string $field * @param integer $mask - * @param string $strategy if null the strategy should not be changed + * @param string $strategy if null the strategy should not be changed */ function updateObjectFieldAce($index, $field, $mask, $strategy = null); } diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php index 0623140..bc6493b 100644 --- a/Core/SecurityContext.php +++ b/Core/SecurityContext.php @@ -50,7 +50,7 @@ class SecurityContext implements SecurityContextInterface * * @throws AuthenticationCredentialsNotFoundException when the security context has no authentication token. * - * @param mixed $attributes + * @param mixed $attributes * @param mixed|null $object * * @return Boolean diff --git a/Http/Authorization/AccessDeniedHandlerInterface.php b/Http/Authorization/AccessDeniedHandlerInterface.php index ae5b634..8670cbb 100644 --- a/Http/Authorization/AccessDeniedHandlerInterface.php +++ b/Http/Authorization/AccessDeniedHandlerInterface.php @@ -25,8 +25,8 @@ interface AccessDeniedHandlerInterface /** * Handles an access denied failure. * - * @param Request $request - * @param AccessDeniedException $accessDeniedException + * @param Request $request + * @param AccessDeniedException $accessDeniedException * * @return Response may return null */ diff --git a/Http/EntryPoint/FormAuthenticationEntryPoint.php b/Http/EntryPoint/FormAuthenticationEntryPoint.php index 2e26931..2170e9e 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 c8fa581..6d95314 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 AuthenticationSuccessHandlerInterface $successHandler + * @param AuthenticationFailureHandlerInterface $failureHandler + * @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) { diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php index 5a0d0d6..d145fa1 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 71f103e..d61a6ce 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 1f831d0..bd828f2 100644 --- a/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/Http/RememberMe/TokenBasedRememberMeServices.php @@ -136,7 +136,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices /** * Generates a hash for the cookie to ensure it is not being tempered with * - * @param string $class + * @param string $class * @param string $username The username * @param integer $expires The unixtime when the cookie expires * @param string $password The encoded password diff --git a/Tests/Acl/Dbal/MutableAclProviderTest.php b/Tests/Acl/Dbal/MutableAclProviderTest.php index df6a1cf..e264b6d 100644 --- a/Tests/Acl/Dbal/MutableAclProviderTest.php +++ b/Tests/Acl/Dbal/MutableAclProviderTest.php @@ -370,7 +370,7 @@ class MutableAclProviderTest extends \PHPUnit_Framework_TestCase * ) * * @param AclProvider $provider - * @param array $data + * @param array $data * @throws \InvalidArgumentException * @throws Exception */ |