summaryrefslogtreecommitdiffstats
path: root/Acl/Domain
diff options
context:
space:
mode:
Diffstat (limited to 'Acl/Domain')
-rw-r--r--Acl/Domain/Acl.php92
-rw-r--r--Acl/Domain/AuditLogger.php4
-rw-r--r--Acl/Domain/DoctrineAclCache.php12
-rw-r--r--Acl/Domain/Entry.php32
-rw-r--r--Acl/Domain/FieldEntry.php16
-rw-r--r--Acl/Domain/ObjectIdentity.php6
-rw-r--r--Acl/Domain/ObjectIdentityRetrievalStrategy.php2
-rw-r--r--Acl/Domain/PermissionGrantingStrategy.php8
-rw-r--r--Acl/Domain/RoleSecurityIdentity.php2
-rw-r--r--Acl/Domain/SecurityIdentityRetrievalStrategy.php2
-rw-r--r--Acl/Domain/UserSecurityIdentity.php2
11 files changed, 89 insertions, 89 deletions
diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php
index dd3e8d4..5be5831 100644
--- a/Acl/Domain/Acl.php
+++ b/Acl/Domain/Acl.php
@@ -49,11 +49,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
/**
* Constructor
*
- * @param integer $id
+ * @param int $id
* @param ObjectIdentityInterface $objectIdentity
* @param PermissionGrantingStrategyInterface $permissionGrantingStrategy
* @param array $loadedSids
- * @param Boolean $entriesInheriting
+ * @param bool $entriesInheriting
*/
public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids = array(), $entriesInheriting)
{
@@ -75,7 +75,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function deleteClassAce($index)
{
@@ -83,7 +83,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function deleteClassFieldAce($index, $field)
{
@@ -91,7 +91,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function deleteObjectAce($index)
{
@@ -99,7 +99,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function deleteObjectFieldAce($index, $field)
{
@@ -107,7 +107,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getClassAces()
{
@@ -115,7 +115,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getClassFieldAces($field)
{
@@ -123,7 +123,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getObjectAces()
{
@@ -131,7 +131,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getObjectFieldAces($field)
{
@@ -139,7 +139,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getId()
{
@@ -147,7 +147,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getObjectIdentity()
{
@@ -155,7 +155,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getParentAcl()
{
@@ -163,7 +163,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null)
{
@@ -171,7 +171,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null)
{
@@ -179,7 +179,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null)
{
@@ -187,7 +187,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null)
{
@@ -195,7 +195,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function isEntriesInheriting()
{
@@ -203,7 +203,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false)
{
@@ -211,7 +211,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false)
{
@@ -219,7 +219,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function isSidLoaded($sids)
{
@@ -291,7 +291,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function setEntriesInheriting($boolean)
{
@@ -302,7 +302,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function setParentAcl(AclInterface $acl = null)
{
@@ -317,7 +317,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function updateClassAce($index, $mask, $strategy = null)
{
@@ -325,7 +325,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function updateClassFieldAce($index, $field, $mask, $strategy = null)
{
@@ -333,7 +333,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function updateObjectAce($index, $mask, $strategy = null)
{
@@ -341,7 +341,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function updateObjectFieldAce($index, $field, $mask, $strategy = null)
{
@@ -349,7 +349,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function updateClassAuditing($index, $auditSuccess, $auditFailure)
{
@@ -357,7 +357,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure)
{
@@ -369,7 +369,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function updateObjectAuditing($index, $auditSuccess, $auditFailure)
{
@@ -377,7 +377,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure)
{
@@ -392,7 +392,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Deletes an ACE
*
* @param string $property
- * @param integer $index
+ * @param int $index
* @throws \OutOfBoundsException
*/
private function deleteAce($property, $index)
@@ -416,7 +416,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Deletes a field-based ACE
*
* @param string $property
- * @param integer $index
+ * @param int $index
* @param string $field
* @throws \OutOfBoundsException
*/
@@ -441,10 +441,10 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Inserts an ACE
*
* @param string $property
- * @param integer $index
- * @param integer $mask
+ * @param int $index
+ * @param int $mask
* @param SecurityIdentityInterface $sid
- * @param Boolean $granting
+ * @param bool $granting
* @param string $strategy
* @throws \OutOfBoundsException
* @throws \InvalidArgumentException
@@ -489,11 +489,11 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Inserts a field-based ACE
*
* @param string $property
- * @param integer $index
+ * @param int $index
* @param string $field
- * @param integer $mask
+ * @param int $mask
* @param SecurityIdentityInterface $sid
- * @param Boolean $granting
+ * @param bool $granting
* @param string $strategy
* @throws \InvalidArgumentException
* @throws \OutOfBoundsException
@@ -546,8 +546,8 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Updates an ACE
*
* @param string $property
- * @param integer $index
- * @param integer $mask
+ * @param int $index
+ * @param int $mask
* @param string $strategy
* @throws \OutOfBoundsException
*/
@@ -573,9 +573,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Updates auditing for an ACE
*
* @param array &$aces
- * @param integer $index
- * @param Boolean $auditSuccess
- * @param Boolean $auditFailure
+ * @param int $index
+ * @param bool $auditSuccess
+ * @param bool $auditFailure
* @throws \OutOfBoundsException
*/
private function updateAuditing(array &$aces, $index, $auditSuccess, $auditFailure)
@@ -599,9 +599,9 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
* Updates a field-based ACE
*
* @param string $property
- * @param integer $index
+ * @param int $index
* @param string $field
- * @param integer $mask
+ * @param int $mask
* @param string $strategy
* @throws \InvalidArgumentException
* @throws \OutOfBoundsException
diff --git a/Acl/Domain/AuditLogger.php b/Acl/Domain/AuditLogger.php
index 8174873..feb2c42 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 bool $granted
* @param EntryInterface $ace
*/
public function logIfNeeded($granted, EntryInterface $ace)
@@ -44,7 +44,7 @@ abstract class AuditLogger implements AuditLoggerInterface
/**
* This method is only called when logging is needed
*
- * @param Boolean $granted
+ * @param bool $granted
* @param EntryInterface $ace
*/
abstract protected function doLog($granted, EntryInterface $ace);
diff --git a/Acl/Domain/DoctrineAclCache.php b/Acl/Domain/DoctrineAclCache.php
index bfc5452..b680fb1 100644
--- a/Acl/Domain/DoctrineAclCache.php
+++ b/Acl/Domain/DoctrineAclCache.php
@@ -51,7 +51,7 @@ class DoctrineAclCache implements AclCacheInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function clearCache()
{
@@ -59,7 +59,7 @@ class DoctrineAclCache implements AclCacheInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function evictFromCacheById($aclId)
{
@@ -77,7 +77,7 @@ class DoctrineAclCache implements AclCacheInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function evictFromCacheByIdentity(ObjectIdentityInterface $oid)
{
@@ -90,7 +90,7 @@ class DoctrineAclCache implements AclCacheInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getFromCacheById($aclId)
{
@@ -110,7 +110,7 @@ class DoctrineAclCache implements AclCacheInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getFromCacheByIdentity(ObjectIdentityInterface $oid)
{
@@ -123,7 +123,7 @@ class DoctrineAclCache implements AclCacheInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function putInCache(AclInterface $acl)
{
diff --git a/Acl/Domain/Entry.php b/Acl/Domain/Entry.php
index 42449c4..b5eb28b 100644
--- a/Acl/Domain/Entry.php
+++ b/Acl/Domain/Entry.php
@@ -34,14 +34,14 @@ class Entry implements AuditableEntryInterface
/**
* Constructor
*
- * @param integer $id
+ * @param int $id
* @param AclInterface $acl
* @param SecurityIdentityInterface $sid
* @param string $strategy
- * @param integer $mask
- * @param Boolean $granting
- * @param Boolean $auditFailure
- * @param Boolean $auditSuccess
+ * @param int $mask
+ * @param bool $granting
+ * @param bool $auditFailure
+ * @param bool $auditSuccess
*/
public function __construct($id, AclInterface $acl, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
{
@@ -56,7 +56,7 @@ class Entry implements AuditableEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getAcl()
{
@@ -64,7 +64,7 @@ class Entry implements AuditableEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getMask()
{
@@ -72,7 +72,7 @@ class Entry implements AuditableEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getId()
{
@@ -80,7 +80,7 @@ class Entry implements AuditableEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getSecurityIdentity()
{
@@ -88,7 +88,7 @@ class Entry implements AuditableEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getStrategy()
{
@@ -96,7 +96,7 @@ class Entry implements AuditableEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function isAuditFailure()
{
@@ -104,7 +104,7 @@ class Entry implements AuditableEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function isAuditSuccess()
{
@@ -112,7 +112,7 @@ class Entry implements AuditableEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function isGranting()
{
@@ -125,7 +125,7 @@ class Entry implements AuditableEntryInterface
* Do never call this method directly. Use the respective methods on the
* AclInterface instead.
*
- * @param Boolean $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 Boolean $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 integer $mask
+ * @param int $mask
*/
public function setMask($mask)
{
diff --git a/Acl/Domain/FieldEntry.php b/Acl/Domain/FieldEntry.php
index f057367..2edc33d 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 int $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 int $mask
+ * @param bool $granting
+ * @param bool $auditFailure
+ * @param bool $auditSuccess
*/
public function __construct($id, AclInterface $acl, $field, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess)
{
@@ -45,7 +45,7 @@ class FieldEntry extends Entry implements FieldEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getField()
{
@@ -53,7 +53,7 @@ class FieldEntry extends Entry implements FieldEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function serialize()
{
@@ -64,7 +64,7 @@ class FieldEntry extends Entry implements FieldEntryInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function unserialize($serialized)
{
diff --git a/Acl/Domain/ObjectIdentity.php b/Acl/Domain/ObjectIdentity.php
index d7d5f84..cf10330 100644
--- a/Acl/Domain/ObjectIdentity.php
+++ b/Acl/Domain/ObjectIdentity.php
@@ -74,7 +74,7 @@ final class ObjectIdentity implements ObjectIdentityInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getIdentifier()
{
@@ -82,7 +82,7 @@ final class ObjectIdentity implements ObjectIdentityInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getType()
{
@@ -90,7 +90,7 @@ final class ObjectIdentity implements ObjectIdentityInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function equals(ObjectIdentityInterface $identity)
{
diff --git a/Acl/Domain/ObjectIdentityRetrievalStrategy.php b/Acl/Domain/ObjectIdentityRetrievalStrategy.php
index acd3b2c..7dc552c 100644
--- a/Acl/Domain/ObjectIdentityRetrievalStrategy.php
+++ b/Acl/Domain/ObjectIdentityRetrievalStrategy.php
@@ -22,7 +22,7 @@ use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterfac
class ObjectIdentityRetrievalStrategy implements ObjectIdentityRetrievalStrategyInterface
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getObjectIdentity($domainObject)
{
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php
index d505843..d031b34 100644
--- a/Acl/Domain/PermissionGrantingStrategy.php
+++ b/Acl/Domain/PermissionGrantingStrategy.php
@@ -42,7 +42,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false)
{
@@ -74,7 +74,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false)
{
@@ -128,7 +128,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
* @param EntryInterface[] $aces An array of ACE to check against
* @param array $masks An array of permission masks
* @param SecurityIdentityInterface[] $sids An array of SecurityIdentityInterface implementations
- * @param Boolean $administrativeMode True turns off audit logging
+ * @param bool $administrativeMode True turns off audit logging
*
* @return Boolean true, or false; either granting, or denying access respectively.
*
@@ -188,7 +188,7 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface
* Strategy EQUAL:
* The ACE will be considered applicable when the bitmasks are equal.
*
- * @param integer $requiredMask
+ * @param int $requiredMask
* @param EntryInterface $ace
*
* @return Boolean
diff --git a/Acl/Domain/RoleSecurityIdentity.php b/Acl/Domain/RoleSecurityIdentity.php
index 0d3d0d2..64f864d 100644
--- a/Acl/Domain/RoleSecurityIdentity.php
+++ b/Acl/Domain/RoleSecurityIdentity.php
@@ -48,7 +48,7 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function equals(SecurityIdentityInterface $sid)
{
diff --git a/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/Acl/Domain/SecurityIdentityRetrievalStrategy.php
index dbc0530..b95fddc 100644
--- a/Acl/Domain/SecurityIdentityRetrievalStrategy.php
+++ b/Acl/Domain/SecurityIdentityRetrievalStrategy.php
@@ -42,7 +42,7 @@ class SecurityIdentityRetrievalStrategy implements SecurityIdentityRetrievalStra
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function getSecurityIdentities(TokenInterface $token)
{
diff --git a/Acl/Domain/UserSecurityIdentity.php b/Acl/Domain/UserSecurityIdentity.php
index 3166a1a..9418c81 100644
--- a/Acl/Domain/UserSecurityIdentity.php
+++ b/Acl/Domain/UserSecurityIdentity.php
@@ -96,7 +96,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function equals(SecurityIdentityInterface $sid)
{