summaryrefslogtreecommitdiffstats
path: root/Acl
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2012-05-18 19:37:58 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2012-05-18 19:37:58 +0200
commitf09e6217820114cf983ce26501d20bfe6095dec9 (patch)
treeadcadcb63ade970ee9afe88ee3621ead1fe688bc /Acl
parent7e660fe744c1a2ce2256e114641a3b9fdd4880a1 (diff)
downloadsymfony-security-f09e6217820114cf983ce26501d20bfe6095dec9.zip
symfony-security-f09e6217820114cf983ce26501d20bfe6095dec9.tar.gz
symfony-security-f09e6217820114cf983ce26501d20bfe6095dec9.tar.bz2
fixed CS
Diffstat (limited to 'Acl')
-rw-r--r--Acl/Dbal/MutableAclProvider.php36
-rw-r--r--Acl/Domain/Acl.php20
-rw-r--r--Acl/Domain/PermissionGrantingStrategy.php8
-rw-r--r--Acl/Model/AclProviderInterface.php4
-rw-r--r--Acl/Model/AuditLoggerInterface.php2
-rw-r--r--Acl/Model/AuditableAclInterface.php4
-rw-r--r--Acl/Model/MutableAclInterface.php16
7 files changed, 45 insertions, 45 deletions
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php
index c0a33da..242c2a9 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
* @return void
*/
public function propertyChanged($sender, $propertyName, $oldValue, $newValue)
@@ -398,16 +398,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)
@@ -479,7 +479,7 @@ QUERY;
/**
* Constructs the SQL for inserting an object identity.
*
- * @param string $identifier
+ * @param string $identifier
* @param integer $classId
* @param Boolean $entriesInheriting
* @return string
@@ -532,7 +532,7 @@ QUERY;
*
* @param integer $classId
* @param integer $oid
- * @param string $field
+ * @param string $field
* @param integer $order
* @return string
*/
@@ -599,7 +599,7 @@ QUERY;
* Constructs the SQL for updating an object identity.
*
* @param integer $pk
- * @param array $changes
+ * @param array $changes
* @throws \InvalidArgumentException
* @return string
*/
@@ -621,7 +621,7 @@ QUERY;
* Constructs the SQL for updating an ACE.
*
* @param integer $pk
- * @param array $sets
+ * @param array $sets
* @throws \InvalidArgumentException
* @return string
*/
@@ -748,7 +748,7 @@ QUERY;
* This processes changes on an ACE related property (classFieldAces, or objectFieldAces).
*
* @param string $name
- * @param array $changes
+ * @param array $changes
* @return void
*/
private function updateFieldAceProperty($name, array $changes)
@@ -805,7 +805,7 @@ QUERY;
* This processes changes on an ACE related property (classAces, or objectAces).
*
* @param string $name
- * @param array $changes
+ * @param array $changes
* @return void
*/
private function updateAceProperty($name, array $changes)
diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php
index bb088f8..c77dab1 100644
--- a/Acl/Domain/Acl.php
+++ b/Acl/Domain/Acl.php
@@ -401,7 +401,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
/**
* Deletes an ACE
*
- * @param string $property
+ * @param string $property
* @param integer $index
* @throws \OutOfBoundsException
* @return void
@@ -426,9 +426,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
* @return void
*/
@@ -559,10 +559,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
* @return void
*/
@@ -614,11 +614,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
* @return void
@@ -649,8 +649,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
* @return void
*/
private function onPropertyChanged($name, $oldValue, $newValue)
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php
index 1aab000..5fb8460 100644
--- a/Acl/Domain/PermissionGrantingStrategy.php
+++ b/Acl/Domain/PermissionGrantingStrategy.php
@@ -128,10 +128,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 dceb76b..f4a83b3 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
* @return void
*/
diff --git a/Acl/Model/AuditableAclInterface.php b/Acl/Model/AuditableAclInterface.php
index 2a6d619..8f473ff 100644
--- a/Acl/Model/AuditableAclInterface.php
+++ b/Acl/Model/AuditableAclInterface.php
@@ -32,7 +32,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
* @return void
@@ -54,7 +54,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
* @return void
diff --git a/Acl/Model/MutableAclInterface.php b/Acl/Model/MutableAclInterface.php
index 54a3f8e..b83c106 100644
--- a/Acl/Model/MutableAclInterface.php
+++ b/Acl/Model/MutableAclInterface.php
@@ -33,7 +33,7 @@ interface MutableAclInterface extends AclInterface
* Deletes a class-field-based ACE
*
* @param integer $index
- * @param string $field
+ * @param string $field
* @return void
*/
function deleteClassFieldAce($index, $field);
@@ -50,7 +50,7 @@ interface MutableAclInterface extends AclInterface
* Deletes an object-field-based ACE
*
* @param integer $index
- * @param string $field
+ * @param string $field
* @return void
*/
function deleteObjectFieldAce($index, $field);
@@ -133,7 +133,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
* @return void
*/
function updateClassAce($index, $mask, $strategy = null);
@@ -142,9 +142,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
* @return void
*/
function updateClassFieldAce($index, $field, $mask, $strategy = null);
@@ -154,7 +154,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
* @return void
*/
function updateObjectAce($index, $mask, $strategy = null);
@@ -163,9 +163,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
* @return void
*/
function updateObjectFieldAce($index, $field, $mask, $strategy = null);