diff options
Diffstat (limited to 'Acl/Domain')
-rw-r--r-- | Acl/Domain/Acl.php | 51 | ||||
-rw-r--r-- | Acl/Domain/DoctrineAclCache.php | 3 | ||||
-rw-r--r-- | Acl/Domain/Entry.php | 6 | ||||
-rw-r--r-- | Acl/Domain/ObjectIdentity.php | 2 | ||||
-rw-r--r-- | Acl/Domain/PermissionGrantingStrategy.php | 2 | ||||
-rw-r--r-- | Acl/Domain/UserSecurityIdentity.php | 2 |
6 files changed, 40 insertions, 26 deletions
diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php index d3aecfb..c237448 100644 --- a/Acl/Domain/Acl.php +++ b/Acl/Domain/Acl.php @@ -391,8 +391,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Deletes an ACE * - * @param string $property - * @param int $index + * @param string $property + * @param int $index + * * @throws \OutOfBoundsException */ private function deleteAce($property, $index) @@ -407,7 +408,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged $this->$property = array_values($this->$property); $this->onPropertyChanged($property, $oldValue, $this->$property); - for ($i = $index,$c = count($this->$property); $i<$c; $i++) { + for ($i = $index, $c = count($this->$property); $i<$c; $i++) { $this->onEntryPropertyChanged($aces[$i], 'aceOrder', $i+1, $i); } } @@ -415,9 +416,10 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Deletes a field-based ACE * - * @param string $property - * @param int $index - * @param string $field + * @param string $property + * @param int $index + * @param string $field + * * @throws \OutOfBoundsException */ private function deleteFieldAce($property, $index, $field) @@ -432,7 +434,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged $aces[$field] = array_values($aces[$field]); $this->onPropertyChanged($property, $oldValue, $this->$property); - for ($i = $index,$c = count($aces[$field]); $i<$c; $i++) { + for ($i = $index, $c = count($aces[$field]); $i<$c; $i++) { $this->onEntryPropertyChanged($aces[$field][$i], 'aceOrder', $i+1, $i); } } @@ -446,6 +448,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param SecurityIdentityInterface $sid * @param bool $granting * @param string $strategy + * * @throws \OutOfBoundsException * @throws \InvalidArgumentException */ @@ -476,7 +479,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged array_slice($this->$property, $index) ); - for ($i = $index,$c = count($this->$property)-1; $i<$c; $i++) { + for ($i = $index, $c = count($this->$property)-1; $i<$c; $i++) { $this->onEntryPropertyChanged($aces[$i+1], 'aceOrder', $i, $i+1); } } @@ -495,6 +498,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param SecurityIdentityInterface $sid * @param bool $granting * @param string $strategy + * * @throws \InvalidArgumentException * @throws \OutOfBoundsException */ @@ -533,7 +537,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged array_slice($aces[$field], $index) ); - for ($i = $index,$c = count($aces[$field])-1; $i<$c; $i++) { + for ($i = $index, $c = count($aces[$field])-1; $i<$c; $i++) { $this->onEntryPropertyChanged($aces[$field][$i+1], 'aceOrder', $i, $i+1); } } @@ -545,10 +549,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Updates an ACE * - * @param string $property - * @param int $index - * @param int $mask - * @param string $strategy + * @param string $property + * @param int $index + * @param int $mask + * @param string $strategy + * * @throws \OutOfBoundsException */ private function updateAce($property, $index, $mask, $strategy = null) @@ -572,10 +577,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Updates auditing for an ACE * - * @param array &$aces - * @param int $index - * @param bool $auditSuccess - * @param bool $auditFailure + * @param array &$aces + * @param int $index + * @param bool $auditSuccess + * @param bool $auditFailure + * * @throws \OutOfBoundsException */ private function updateAuditing(array &$aces, $index, $auditSuccess, $auditFailure) @@ -598,11 +604,12 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged /** * Updates a field-based ACE * - * @param string $property - * @param int $index - * @param string $field - * @param int $mask - * @param string $strategy + * @param string $property + * @param int $index + * @param string $field + * @param int $mask + * @param string $strategy + * * @throws \InvalidArgumentException * @throws \OutOfBoundsException */ diff --git a/Acl/Domain/DoctrineAclCache.php b/Acl/Domain/DoctrineAclCache.php index 0c69773..00864f0 100644 --- a/Acl/Domain/DoctrineAclCache.php +++ b/Acl/Domain/DoctrineAclCache.php @@ -147,6 +147,7 @@ class DoctrineAclCache implements AclCacheInterface * Unserializes the ACL. * * @param string $serialized + * * @return AclInterface */ private function unserializeAcl($serialized) @@ -205,6 +206,7 @@ class DoctrineAclCache implements AclCacheInterface * Returns the key for the object identity * * @param ObjectIdentityInterface $oid + * * @return string */ private function getDataKeyByIdentity(ObjectIdentityInterface $oid) @@ -217,6 +219,7 @@ class DoctrineAclCache implements AclCacheInterface * Returns the alias key for the object identity key * * @param string $aclId + * * @return string */ private function getAliasKeyForIdentity($aclId) diff --git a/Acl/Domain/Entry.php b/Acl/Domain/Entry.php index b5eb28b..a487c96 100644 --- a/Acl/Domain/Entry.php +++ b/Acl/Domain/Entry.php @@ -125,7 +125,7 @@ class Entry implements AuditableEntryInterface * Do never call this method directly. Use the respective methods on the * AclInterface instead. * - * @param bool $boolean + * @param bool $boolean */ public function setAuditFailure($boolean) { @@ -138,7 +138,7 @@ class Entry implements AuditableEntryInterface * Do never call this method directly. Use the respective methods on the * AclInterface instead. * - * @param bool $boolean + * @param bool $boolean */ public function setAuditSuccess($boolean) { @@ -151,7 +151,7 @@ class Entry implements AuditableEntryInterface * Do never call this method directly. Use the respective methods on the * AclInterface instead. * - * @param int $mask + * @param int $mask */ public function setMask($mask) { diff --git a/Acl/Domain/ObjectIdentity.php b/Acl/Domain/ObjectIdentity.php index cf10330..1111089 100644 --- a/Acl/Domain/ObjectIdentity.php +++ b/Acl/Domain/ObjectIdentity.php @@ -51,7 +51,9 @@ final class ObjectIdentity implements ObjectIdentityInterface * Constructs an ObjectIdentity for the given domain object * * @param object $domainObject + * * @throws InvalidDomainObjectException + * * @return ObjectIdentity */ public static function fromDomainObject($domainObject) diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php index 81ed9d8..5d91f61 100644 --- a/Acl/Domain/PermissionGrantingStrategy.php +++ b/Acl/Domain/PermissionGrantingStrategy.php @@ -130,7 +130,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface * @param SecurityIdentityInterface[] $sids An array of SecurityIdentityInterface implementations * @param bool $administrativeMode True turns off audit logging * - * @return bool true, or false; either granting, or denying access respectively. + * @return bool true, or false; either granting, or denying access respectively. * * @throws NoAceFoundException */ diff --git a/Acl/Domain/UserSecurityIdentity.php b/Acl/Domain/UserSecurityIdentity.php index 9418c81..a5b3d77 100644 --- a/Acl/Domain/UserSecurityIdentity.php +++ b/Acl/Domain/UserSecurityIdentity.php @@ -51,6 +51,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface * Creates a user security identity from a UserInterface * * @param UserInterface $user + * * @return UserSecurityIdentity */ public static function fromAccount(UserInterface $user) @@ -62,6 +63,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface * Creates a user security identity from a TokenInterface * * @param TokenInterface $token + * * @return UserSecurityIdentity */ public static function fromToken(TokenInterface $token) |