diff options
68 files changed, 313 insertions, 242 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php index 5d45655..6097702 100644 --- a/Acl/Dbal/AclProvider.php +++ b/Acl/Dbal/AclProvider.php @@ -62,7 +62,7 @@ class AclProvider implements AclProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly = false) { @@ -77,7 +77,7 @@ class AclProvider implements AclProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function findAcl(ObjectIdentityInterface $oid, array $sids = array()) { @@ -85,7 +85,7 @@ class AclProvider implements AclProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function findAcls(array $oids, array $sids = array()) { @@ -316,7 +316,7 @@ SELECTCLAUSE; * object identities. * * @param ObjectIdentityInterface $oid - * @param Boolean $directChildrenOnly + * @param bool $directChildrenOnly * @return string */ protected function getFindChildrenSql(ObjectIdentityInterface $oid, $directChildrenOnly) @@ -552,7 +552,7 @@ QUERY; $oidCache[$oidLookupKey] = new ObjectIdentity($objectIdentifier, $classType); } - $acl = new Acl((integer) $aclId, $oidCache[$oidLookupKey], $permissionGrantingStrategy, $emptyArray, !!$entriesInheriting); + $acl = new Acl((int) $aclId, $oidCache[$oidLookupKey], $permissionGrantingStrategy, $emptyArray, !!$entriesInheriting); // keep a local, and global reference to this ACL $loadedAcls[$classType][$objectIdentifier] = $acl; @@ -594,9 +594,9 @@ QUERY; } if (null === $fieldName) { - $loadedAces[$aceId] = new Entry((integer) $aceId, $acl, $sids[$key], $grantingStrategy, (integer) $mask, !!$granting, !!$auditFailure, !!$auditSuccess); + $loadedAces[$aceId] = new Entry((int) $aceId, $acl, $sids[$key], $grantingStrategy, (int) $mask, !!$granting, !!$auditFailure, !!$auditSuccess); } else { - $loadedAces[$aceId] = new FieldEntry((integer) $aceId, $acl, $fieldName, $sids[$key], $grantingStrategy, (integer) $mask, !!$granting, !!$auditFailure, !!$auditSuccess); + $loadedAces[$aceId] = new FieldEntry((int) $aceId, $acl, $fieldName, $sids[$key], $grantingStrategy, (int) $mask, !!$granting, !!$auditFailure, !!$auditSuccess); } } $ace = $loadedAces[$aceId]; diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php index 29d3cfd..482f443 100644 --- a/Acl/Dbal/MutableAclProvider.php +++ b/Acl/Dbal/MutableAclProvider.php @@ -36,7 +36,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf private $propertyChanges; /** - * {@inheritDoc} + * {@inheritdoc} */ public function __construct(Connection $connection, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $options, AclCacheInterface $cache = null) { @@ -46,7 +46,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf } /** - * {@inheritDoc} + * {@inheritdoc} */ public function createAcl(ObjectIdentityInterface $oid) { @@ -73,7 +73,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf } /** - * {@inheritDoc} + * {@inheritdoc} */ public function deleteAcl(ObjectIdentityInterface $oid) { @@ -109,7 +109,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf } /** - * {@inheritDoc} + * {@inheritdoc} */ public function findAcls(array $oids, array $sids = array()) { @@ -216,7 +216,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf } /** - * {@inheritDoc} + * {@inheritdoc} */ public function updateAcl(MutableAclInterface $acl) { @@ -354,7 +354,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf /** * Constructs the SQL for deleting access control entries. * - * @param integer $oidPK + * @param int $oidPK * @return string */ protected function getDeleteAccessControlEntriesSql($oidPK) @@ -369,7 +369,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf /** * Constructs the SQL for deleting a specific ACE. * - * @param integer $acePK + * @param int $acePK * @return string */ protected function getDeleteAccessControlEntrySql($acePK) @@ -384,7 +384,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf /** * Constructs the SQL for deleting an object identity. * - * @param integer $pk + * @param int $pk * @return string */ protected function getDeleteObjectIdentitySql($pk) @@ -399,7 +399,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf /** * Constructs the SQL for deleting relation entries. * - * @param integer $pk + * @param int $pk * @return string */ protected function getDeleteObjectIdentityRelationsSql($pk) @@ -414,16 +414,16 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf /** * Constructs the SQL for inserting an ACE. * - * @param integer $classId - * @param integer|null $objectIdentityId + * @param int $classId + * @param int|null $objectIdentityId * @param string|null $field - * @param integer $aceOrder - * @param integer $securityIdentityId + * @param int $aceOrder + * @param int $securityIdentityId * @param string $strategy - * @param integer $mask - * @param Boolean $granting - * @param Boolean $auditSuccess - * @param Boolean $auditFailure + * @param int $mask + * @param bool $granting + * @param bool $auditSuccess + * @param bool $auditFailure * @return string */ protected function getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $aceOrder, $securityIdentityId, $strategy, $mask, $granting, $auditSuccess, $auditFailure) @@ -478,8 +478,8 @@ QUERY; /** * Constructs the SQL for inserting a relation entry. * - * @param integer $objectIdentityId - * @param integer $ancestorId + * @param int $objectIdentityId + * @param int $ancestorId * @return string */ protected function getInsertObjectIdentityRelationSql($objectIdentityId, $ancestorId) @@ -496,8 +496,8 @@ QUERY; * Constructs the SQL for inserting an object identity. * * @param string $identifier - * @param integer $classId - * @param Boolean $entriesInheriting + * @param int $classId + * @param bool $entriesInheriting * @return string */ protected function getInsertObjectIdentitySql($identifier, $classId, $entriesInheriting) @@ -546,10 +546,10 @@ QUERY; /** * Constructs the SQL for selecting an ACE. * - * @param integer $classId - * @param integer $oid + * @param int $classId + * @param int $oid * @param string $field - * @param integer $order + * @param int $order * @return string */ protected function getSelectAccessControlEntryIdSql($classId, $oid, $field, $order) @@ -614,7 +614,7 @@ QUERY; /** * Constructs the SQL for updating an object identity. * - * @param integer $pk + * @param int $pk * @param array $changes * @throws \InvalidArgumentException * @return string @@ -636,7 +636,7 @@ QUERY; /** * Constructs the SQL for updating an ACE. * - * @param integer $pk + * @param int $pk * @param array $sets * @throws \InvalidArgumentException * @return string @@ -709,7 +709,7 @@ QUERY; /** * Deletes all ACEs for the given object identity primary key. * - * @param integer $oidPK + * @param int $oidPK */ private function deleteAccessControlEntries($oidPK) { @@ -719,7 +719,7 @@ QUERY; /** * Deletes the object identity from the database. * - * @param integer $pk + * @param int $pk */ private function deleteObjectIdentity($pk) { @@ -729,7 +729,7 @@ QUERY; /** * Deletes all entries from the relations table from the database. * - * @param integer $pk + * @param int $pk */ private function deleteObjectIdentityRelations($pk) { 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) { diff --git a/Acl/Model/AclCacheInterface.php b/Acl/Model/AclCacheInterface.php index ea9604e..4673e01 100644 --- a/Acl/Model/AclCacheInterface.php +++ b/Acl/Model/AclCacheInterface.php @@ -37,7 +37,7 @@ interface AclCacheInterface /** * Retrieves an ACL for the given object identity primary key from the cache * - * @param integer $primaryKey + * @param int $primaryKey * @return AclInterface */ public function getFromCacheById($primaryKey); diff --git a/Acl/Model/AclInterface.php b/Acl/Model/AclInterface.php index 02bbd00..800eaa8 100644 --- a/Acl/Model/AclInterface.php +++ b/Acl/Model/AclInterface.php @@ -82,7 +82,7 @@ interface AclInterface extends \Serializable * @param string $field * @param array $masks * @param array $securityIdentities - * @param Boolean $administrativeMode + * @param bool $administrativeMode * @return Boolean */ public function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false); @@ -93,7 +93,7 @@ interface AclInterface extends \Serializable * @throws NoAceFoundException when no ACE was applicable for this request * @param array $masks * @param array $securityIdentities - * @param Boolean $administrativeMode + * @param bool $administrativeMode * @return Boolean */ public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false); diff --git a/Acl/Model/AclProviderInterface.php b/Acl/Model/AclProviderInterface.php index 615cf14..dd8fb19 100644 --- a/Acl/Model/AclProviderInterface.php +++ b/Acl/Model/AclProviderInterface.php @@ -24,7 +24,7 @@ interface AclProviderInterface * Retrieves all child object identities from the database * * @param ObjectIdentityInterface $parentOid - * @param Boolean $directChildrenOnly + * @param bool $directChildrenOnly * * @return array returns an array of child 'ObjectIdentity's */ diff --git a/Acl/Model/AuditLoggerInterface.php b/Acl/Model/AuditLoggerInterface.php index 09bcbb8..11fe7f5 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 bool $granted * @param EntryInterface $ace */ public function logIfNeeded($granted, EntryInterface $ace); diff --git a/Acl/Model/AuditableAclInterface.php b/Acl/Model/AuditableAclInterface.php index 14b4c04..f5ed9dd 100644 --- a/Acl/Model/AuditableAclInterface.php +++ b/Acl/Model/AuditableAclInterface.php @@ -21,38 +21,38 @@ interface AuditableAclInterface extends MutableAclInterface /** * Updates auditing for class-based ACE * - * @param integer $index - * @param Boolean $auditSuccess - * @param Boolean $auditFailure + * @param int $index + * @param bool $auditSuccess + * @param bool $auditFailure */ public function updateClassAuditing($index, $auditSuccess, $auditFailure); /** * Updates auditing for class-field-based ACE * - * @param integer $index + * @param int $index * @param string $field - * @param Boolean $auditSuccess - * @param Boolean $auditFailure + * @param bool $auditSuccess + * @param bool $auditFailure */ public function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure); /** * Updates auditing for object-based ACE * - * @param integer $index - * @param Boolean $auditSuccess - * @param Boolean $auditFailure + * @param int $index + * @param bool $auditSuccess + * @param bool $auditFailure */ public function updateObjectAuditing($index, $auditSuccess, $auditFailure); /** * Updates auditing for object-field-based ACE * - * @param integer $index + * @param int $index * @param string $field - * @param Boolean $auditSuccess - * @param Boolean $auditFailure + * @param bool $auditSuccess + * @param bool $auditFailure */ public function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure); } diff --git a/Acl/Model/MutableAclInterface.php b/Acl/Model/MutableAclInterface.php index 365a779..d76c598 100644 --- a/Acl/Model/MutableAclInterface.php +++ b/Acl/Model/MutableAclInterface.php @@ -24,14 +24,14 @@ interface MutableAclInterface extends AclInterface /** * Deletes a class-based ACE * - * @param integer $index + * @param int $index */ public function deleteClassAce($index); /** * Deletes a class-field-based ACE * - * @param integer $index + * @param int $index * @param string $field */ public function deleteClassFieldAce($index, $field); @@ -39,14 +39,14 @@ interface MutableAclInterface extends AclInterface /** * Deletes an object-based ACE * - * @param integer $index + * @param int $index */ public function deleteObjectAce($index); /** * Deletes an object-field-based ACE * - * @param integer $index + * @param int $index * @param string $field */ public function deleteObjectFieldAce($index, $field); @@ -62,9 +62,9 @@ interface MutableAclInterface extends AclInterface * Inserts a class-based ACE * * @param SecurityIdentityInterface $sid - * @param integer $mask - * @param integer $index - * @param Boolean $granting + * @param int $mask + * @param int $index + * @param bool $granting * @param string $strategy */ public function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -74,9 +74,9 @@ interface MutableAclInterface extends AclInterface * * @param string $field * @param SecurityIdentityInterface $sid - * @param integer $mask - * @param integer $index - * @param Boolean $granting + * @param int $mask + * @param int $index + * @param bool $granting * @param string $strategy */ public function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -85,9 +85,9 @@ interface MutableAclInterface extends AclInterface * Inserts an object-based ACE * * @param SecurityIdentityInterface $sid - * @param integer $mask - * @param integer $index - * @param Boolean $granting + * @param int $mask + * @param int $index + * @param bool $granting * @param string $strategy */ public function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -97,9 +97,9 @@ interface MutableAclInterface extends AclInterface * * @param string $field * @param SecurityIdentityInterface $sid - * @param integer $mask - * @param integer $index - * @param Boolean $granting + * @param int $mask + * @param int $index + * @param bool $granting * @param string $strategy */ public function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -107,7 +107,7 @@ interface MutableAclInterface extends AclInterface /** * Sets whether entries are inherited * - * @param Boolean $boolean + * @param bool $boolean */ public function setEntriesInheriting($boolean); @@ -121,8 +121,8 @@ interface MutableAclInterface extends AclInterface /** * Updates a class-based ACE * - * @param integer $index - * @param integer $mask + * @param int $index + * @param int $mask * @param string $strategy if null the strategy should not be changed */ public function updateClassAce($index, $mask, $strategy = null); @@ -130,9 +130,9 @@ interface MutableAclInterface extends AclInterface /** * Updates a class-field-based ACE * - * @param integer $index + * @param int $index * @param string $field - * @param integer $mask + * @param int $mask * @param string $strategy if null the strategy should not be changed */ public function updateClassFieldAce($index, $field, $mask, $strategy = null); @@ -140,8 +140,8 @@ interface MutableAclInterface extends AclInterface /** * Updates an object-based ACE * - * @param integer $index - * @param integer $mask + * @param int $index + * @param int $mask * @param string $strategy if null the strategy should not be changed */ public function updateObjectAce($index, $mask, $strategy = null); @@ -149,9 +149,9 @@ interface MutableAclInterface extends AclInterface /** * Updates an object-field-based ACE * - * @param integer $index + * @param int $index * @param string $field - * @param integer $mask + * @param int $mask * @param string $strategy if null the strategy should not be changed */ public function updateObjectFieldAce($index, $field, $mask, $strategy = null); diff --git a/Acl/Model/PermissionGrantingStrategyInterface.php b/Acl/Model/PermissionGrantingStrategyInterface.php index 7f8f81b..def5fd1 100644 --- a/Acl/Model/PermissionGrantingStrategyInterface.php +++ b/Acl/Model/PermissionGrantingStrategyInterface.php @@ -24,7 +24,7 @@ interface PermissionGrantingStrategyInterface * @param AclInterface $acl * @param array $masks * @param array $sids - * @param Boolean $administrativeMode + * @param bool $administrativeMode * @return Boolean */ public function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false); @@ -36,7 +36,7 @@ interface PermissionGrantingStrategyInterface * @param string $field * @param array $masks * @param array $sids - * @param Boolean $administrativeMode + * @param bool $administrativeMode * * @return Boolean */ diff --git a/Acl/Permission/BasicPermissionMap.php b/Acl/Permission/BasicPermissionMap.php index 97157f1..30d801f 100644 --- a/Acl/Permission/BasicPermissionMap.php +++ b/Acl/Permission/BasicPermissionMap.php @@ -87,7 +87,7 @@ class BasicPermissionMap implements PermissionMapInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMasks($permission, $object) { @@ -99,7 +99,7 @@ class BasicPermissionMap implements PermissionMapInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function contains($permission) { diff --git a/Acl/Permission/MaskBuilder.php b/Acl/Permission/MaskBuilder.php index 017e7c0..c0d21ac 100644 --- a/Acl/Permission/MaskBuilder.php +++ b/Acl/Permission/MaskBuilder.php @@ -72,7 +72,7 @@ class MaskBuilder /** * Constructor * - * @param integer $mask optional; defaults to 0 + * @param int $mask optional; defaults to 0 * * @throws \InvalidArgumentException */ @@ -178,7 +178,7 @@ class MaskBuilder /** * Returns the code for the passed mask * - * @param integer $mask + * @param int $mask * @throws \InvalidArgumentException * @throws \RuntimeException * @return string diff --git a/Core/Authentication/AuthenticationProviderManager.php b/Core/Authentication/AuthenticationProviderManager.php index 8b7474b..f713e8f 100644 --- a/Core/Authentication/AuthenticationProviderManager.php +++ b/Core/Authentication/AuthenticationProviderManager.php @@ -38,7 +38,7 @@ class AuthenticationProviderManager implements AuthenticationManagerInterface * Constructor. * * @param AuthenticationProviderInterface[] $providers An array of AuthenticationProviderInterface instances - * @param Boolean $eraseCredentials Whether to erase credentials after authentication or not + * @param bool $eraseCredentials Whether to erase credentials after authentication or not * * @throws \InvalidArgumentException */ @@ -49,7 +49,7 @@ class AuthenticationProviderManager implements AuthenticationManagerInterface } $this->providers = $providers; - $this->eraseCredentials = (Boolean) $eraseCredentials; + $this->eraseCredentials = (bool) $eraseCredentials; } public function setEventDispatcher(EventDispatcherInterface $dispatcher) diff --git a/Core/Authentication/AuthenticationTrustResolver.php b/Core/Authentication/AuthenticationTrustResolver.php index 9b3ff3d..d030459 100644 --- a/Core/Authentication/AuthenticationTrustResolver.php +++ b/Core/Authentication/AuthenticationTrustResolver.php @@ -36,7 +36,7 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac } /** - * {@inheritDoc} + * {@inheritdoc} */ public function isAnonymous(TokenInterface $token = null) { @@ -48,7 +48,7 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac } /** - * {@inheritDoc} + * {@inheritdoc} */ public function isRememberMe(TokenInterface $token = null) { @@ -60,7 +60,7 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac } /** - * {@inheritDoc} + * {@inheritdoc} */ public function isFullFledged(TokenInterface $token = null) { diff --git a/Core/Authentication/Provider/DaoAuthenticationProvider.php b/Core/Authentication/Provider/DaoAuthenticationProvider.php index a9a2205..4913be8 100644 --- a/Core/Authentication/Provider/DaoAuthenticationProvider.php +++ b/Core/Authentication/Provider/DaoAuthenticationProvider.php @@ -38,7 +38,7 @@ class DaoAuthenticationProvider extends UserAuthenticationProvider * @param UserCheckerInterface $userChecker An UserCheckerInterface instance * @param string $providerKey The provider key * @param EncoderFactoryInterface $encoderFactory An EncoderFactoryInterface instance - * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not + * @param bool $hideUserNotFoundExceptions Whether to hide user not found exception or not */ public function __construct(UserProviderInterface $userProvider, UserCheckerInterface $userChecker, $providerKey, EncoderFactoryInterface $encoderFactory, $hideUserNotFoundExceptions = true) { diff --git a/Core/Authentication/Provider/UserAuthenticationProvider.php b/Core/Authentication/Provider/UserAuthenticationProvider.php index 18c3e70..14fbdda 100644 --- a/Core/Authentication/Provider/UserAuthenticationProvider.php +++ b/Core/Authentication/Provider/UserAuthenticationProvider.php @@ -37,7 +37,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter * * @param UserCheckerInterface $userChecker An UserCheckerInterface interface * @param string $providerKey A provider key - * @param Boolean $hideUserNotFoundExceptions Whether to hide user not found exception or not + * @param bool $hideUserNotFoundExceptions Whether to hide user not found exception or not * * @throws \InvalidArgumentException */ diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php index 5160fc5..84a92f1 100644 --- a/Core/Authentication/Token/AbstractToken.php +++ b/Core/Authentication/Token/AbstractToken.php @@ -127,7 +127,7 @@ abstract class AbstractToken implements TokenInterface */ public function setAuthenticated($authenticated) { - $this->authenticated = (Boolean) $authenticated; + $this->authenticated = (bool) $authenticated; } /** @@ -225,7 +225,7 @@ abstract class AbstractToken implements TokenInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function __toString() { @@ -247,7 +247,7 @@ abstract class AbstractToken implements TokenInterface } if ($this->user instanceof EquatableInterface) { - return ! (Boolean) $this->user->isEqualTo($user); + return ! (bool) $this->user->isEqualTo($user); } if ($this->user->getPassword() !== $user->getPassword()) { diff --git a/Core/Authentication/Token/AnonymousToken.php b/Core/Authentication/Token/AnonymousToken.php index d39fec8..571816c 100644 --- a/Core/Authentication/Token/AnonymousToken.php +++ b/Core/Authentication/Token/AnonymousToken.php @@ -57,7 +57,7 @@ class AnonymousToken extends AbstractToken } /** - * {@inheritDoc} + * {@inheritdoc} */ public function serialize() { @@ -65,7 +65,7 @@ class AnonymousToken extends AbstractToken } /** - * {@inheritDoc} + * {@inheritdoc} */ public function unserialize($serialized) { diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php index 11f69da..a909469 100644 --- a/Core/Authentication/Token/TokenInterface.php +++ b/Core/Authentication/Token/TokenInterface.php @@ -76,7 +76,7 @@ interface TokenInterface extends \Serializable /** * Sets the authenticated flag. * - * @param Boolean $isAuthenticated The authenticated flag + * @param bool $isAuthenticated The authenticated flag */ public function setAuthenticated($isAuthenticated); diff --git a/Core/Authorization/AccessDecisionManager.php b/Core/Authorization/AccessDecisionManager.php index 18c3569..726f62e 100644 --- a/Core/Authorization/AccessDecisionManager.php +++ b/Core/Authorization/AccessDecisionManager.php @@ -32,8 +32,8 @@ class AccessDecisionManager implements AccessDecisionManagerInterface * * @param VoterInterface[] $voters An array of VoterInterface instances * @param string $strategy The vote strategy - * @param Boolean $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not - * @param Boolean $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals + * @param bool $allowIfAllAbstainDecisions Whether to grant access if all voters abstained or not + * @param bool $allowIfEqualGrantedDeniedDecisions Whether to grant access if result are equals * * @throws \InvalidArgumentException */ @@ -50,8 +50,8 @@ class AccessDecisionManager implements AccessDecisionManagerInterface $this->voters = $voters; $this->strategy = $strategyMethod; - $this->allowIfAllAbstainDecisions = (Boolean) $allowIfAllAbstainDecisions; - $this->allowIfEqualGrantedDeniedDecisions = (Boolean) $allowIfEqualGrantedDeniedDecisions; + $this->allowIfAllAbstainDecisions = (bool) $allowIfAllAbstainDecisions; + $this->allowIfEqualGrantedDeniedDecisions = (bool) $allowIfEqualGrantedDeniedDecisions; } /** diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php index 5a0f122..1dcf3a6 100644 --- a/Core/Encoder/BCryptPasswordEncoder.php +++ b/Core/Encoder/BCryptPasswordEncoder.php @@ -27,7 +27,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder /** * Constructor. * - * @param integer $cost The algorithmic cost that should be used + * @param int $cost The algorithmic cost that should be used * * @throws \RuntimeException When no BCrypt encoder is available * @throws \InvalidArgumentException if cost is out of range diff --git a/Core/Encoder/EncoderFactory.php b/Core/Encoder/EncoderFactory.php index 8bad61f..0337380 100644 --- a/Core/Encoder/EncoderFactory.php +++ b/Core/Encoder/EncoderFactory.php @@ -26,7 +26,7 @@ class EncoderFactory implements EncoderFactoryInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function getEncoder($user) { diff --git a/Core/Encoder/MessageDigestPasswordEncoder.php b/Core/Encoder/MessageDigestPasswordEncoder.php index a7e5546..9aa240a 100644 --- a/Core/Encoder/MessageDigestPasswordEncoder.php +++ b/Core/Encoder/MessageDigestPasswordEncoder.php @@ -28,8 +28,8 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder * Constructor. * * @param string $algorithm The digest algorithm to use - * @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash - * @param integer $iterations The number of iterations to use to stretch the password hash + * @param bool $encodeHashAsBase64 Whether to base64 encode the password hash + * @param int $iterations The number of iterations to use to stretch the password hash */ public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 5000) { diff --git a/Core/Encoder/Pbkdf2PasswordEncoder.php b/Core/Encoder/Pbkdf2PasswordEncoder.php index 8a5a958..55b5261 100644 --- a/Core/Encoder/Pbkdf2PasswordEncoder.php +++ b/Core/Encoder/Pbkdf2PasswordEncoder.php @@ -37,9 +37,9 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder * Constructor. * * @param string $algorithm The digest algorithm to use - * @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash - * @param integer $iterations The number of iterations to use to stretch the password hash - * @param integer $length Length of derived key to create + * @param bool $encodeHashAsBase64 Whether to base64 encode the password hash + * @param int $iterations The number of iterations to use to stretch the password hash + * @param int $length Length of derived key to create */ public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 1000, $length = 40) { diff --git a/Core/Encoder/PlaintextPasswordEncoder.php b/Core/Encoder/PlaintextPasswordEncoder.php index 22f3da4..bdb058a 100644 --- a/Core/Encoder/PlaintextPasswordEncoder.php +++ b/Core/Encoder/PlaintextPasswordEncoder.php @@ -25,7 +25,7 @@ class PlaintextPasswordEncoder extends BasePasswordEncoder /** * Constructor. * - * @param Boolean $ignorePasswordCase Compare password case-insensitive + * @param bool $ignorePasswordCase Compare password case-insensitive */ public function __construct($ignorePasswordCase = false) { diff --git a/Core/Exception/AccountExpiredException.php b/Core/Exception/AccountExpiredException.php index a5618ce..4a71263 100644 --- a/Core/Exception/AccountExpiredException.php +++ b/Core/Exception/AccountExpiredException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class AccountExpiredException extends AccountStatusException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/AccountStatusException.php b/Core/Exception/AccountStatusException.php index 7819e4d..9b29f63 100644 --- a/Core/Exception/AccountStatusException.php +++ b/Core/Exception/AccountStatusException.php @@ -45,7 +45,7 @@ abstract class AccountStatusException extends AuthenticationException } /** - * {@inheritDoc} + * {@inheritdoc} */ public function serialize() { @@ -56,7 +56,7 @@ abstract class AccountStatusException extends AuthenticationException } /** - * {@inheritDoc} + * {@inheritdoc} */ public function unserialize($str) { diff --git a/Core/Exception/AuthenticationCredentialsNotFoundException.php b/Core/Exception/AuthenticationCredentialsNotFoundException.php index 633b2be..8595bed 100644 --- a/Core/Exception/AuthenticationCredentialsNotFoundException.php +++ b/Core/Exception/AuthenticationCredentialsNotFoundException.php @@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception; class AuthenticationCredentialsNotFoundException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/AuthenticationServiceException.php b/Core/Exception/AuthenticationServiceException.php index 758a4f0..66f051d 100644 --- a/Core/Exception/AuthenticationServiceException.php +++ b/Core/Exception/AuthenticationServiceException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class AuthenticationServiceException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/BadCredentialsException.php b/Core/Exception/BadCredentialsException.php index 5deecca..be061c7 100644 --- a/Core/Exception/BadCredentialsException.php +++ b/Core/Exception/BadCredentialsException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class BadCredentialsException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/CookieTheftException.php b/Core/Exception/CookieTheftException.php index 8d9e154..af97168 100644 --- a/Core/Exception/CookieTheftException.php +++ b/Core/Exception/CookieTheftException.php @@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception; class CookieTheftException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/CredentialsExpiredException.php b/Core/Exception/CredentialsExpiredException.php index b9bf2d1..bcc1267 100644 --- a/Core/Exception/CredentialsExpiredException.php +++ b/Core/Exception/CredentialsExpiredException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class CredentialsExpiredException extends AccountStatusException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/DisabledException.php b/Core/Exception/DisabledException.php index 5571ab1..e9b784f 100644 --- a/Core/Exception/DisabledException.php +++ b/Core/Exception/DisabledException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class DisabledException extends AccountStatusException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/InsufficientAuthenticationException.php b/Core/Exception/InsufficientAuthenticationException.php index 74fc2b9..e33ef6a 100644 --- a/Core/Exception/InsufficientAuthenticationException.php +++ b/Core/Exception/InsufficientAuthenticationException.php @@ -22,7 +22,7 @@ namespace Symfony\Component\Security\Core\Exception; class InsufficientAuthenticationException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/InvalidCsrfTokenException.php b/Core/Exception/InvalidCsrfTokenException.php index ce0e1f4..84be855 100644 --- a/Core/Exception/InvalidCsrfTokenException.php +++ b/Core/Exception/InvalidCsrfTokenException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class InvalidCsrfTokenException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/LockedException.php b/Core/Exception/LockedException.php index 6532f70..fffae74 100644 --- a/Core/Exception/LockedException.php +++ b/Core/Exception/LockedException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class LockedException extends AccountStatusException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/NonceExpiredException.php b/Core/Exception/NonceExpiredException.php index 2f6681f..998e987 100644 --- a/Core/Exception/NonceExpiredException.php +++ b/Core/Exception/NonceExpiredException.php @@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception; class NonceExpiredException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/ProviderNotFoundException.php b/Core/Exception/ProviderNotFoundException.php index ea2b1fd..af2e1b5 100644 --- a/Core/Exception/ProviderNotFoundException.php +++ b/Core/Exception/ProviderNotFoundException.php @@ -21,7 +21,7 @@ namespace Symfony\Component\Security\Core\Exception; class ProviderNotFoundException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/SessionUnavailableException.php b/Core/Exception/SessionUnavailableException.php index 4b47b18..90b858a 100644 --- a/Core/Exception/SessionUnavailableException.php +++ b/Core/Exception/SessionUnavailableException.php @@ -26,7 +26,7 @@ namespace Symfony\Component\Security\Core\Exception; class SessionUnavailableException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/TokenNotFoundException.php b/Core/Exception/TokenNotFoundException.php index fb85abf..b050302 100644 --- a/Core/Exception/TokenNotFoundException.php +++ b/Core/Exception/TokenNotFoundException.php @@ -20,7 +20,7 @@ namespace Symfony\Component\Security\Core\Exception; class TokenNotFoundException extends AuthenticationException { /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { diff --git a/Core/Exception/UsernameNotFoundException.php b/Core/Exception/UsernameNotFoundException.php index f656bac..11607d3 100644 --- a/Core/Exception/UsernameNotFoundException.php +++ b/Core/Exception/UsernameNotFoundException.php @@ -22,7 +22,7 @@ class UsernameNotFoundException extends AuthenticationException private $username; /** - * {@inheritDoc} + * {@inheritdoc} */ public function getMessageKey() { @@ -50,7 +50,7 @@ class UsernameNotFoundException extends AuthenticationException } /** - * {@inheritDoc} + * {@inheritdoc} */ public function serialize() { @@ -61,7 +61,7 @@ class UsernameNotFoundException extends AuthenticationException } /** - * {@inheritDoc} + * {@inheritdoc} */ public function unserialize($str) { diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php index c55cecf..0326f1d 100644 --- a/Core/SecurityContext.php +++ b/Core/SecurityContext.php @@ -36,7 +36,7 @@ class SecurityContext implements SecurityContextInterface * * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManager instance * @param AccessDecisionManagerInterface|null $accessDecisionManager An AccessDecisionManager instance - * @param Boolean $alwaysAuthenticate + * @param bool $alwaysAuthenticate */ public function __construct(AuthenticationManagerInterface $authenticationManager, AccessDecisionManagerInterface $accessDecisionManager, $alwaysAuthenticate = false) { diff --git a/Core/User/ChainUserProvider.php b/Core/User/ChainUserProvider.php index fc72074..6e14a4f 100644 --- a/Core/User/ChainUserProvider.php +++ b/Core/User/ChainUserProvider.php @@ -40,7 +40,7 @@ class ChainUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function loadUserByUsername($username) { @@ -58,7 +58,7 @@ class ChainUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function refreshUser(UserInterface $user) { @@ -85,7 +85,7 @@ class ChainUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function supportsClass($class) { diff --git a/Core/User/InMemoryUserProvider.php b/Core/User/InMemoryUserProvider.php index 074c21e..624eb3d 100644 --- a/Core/User/InMemoryUserProvider.php +++ b/Core/User/InMemoryUserProvider.php @@ -81,7 +81,7 @@ class InMemoryUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function refreshUser(UserInterface $user) { @@ -93,7 +93,7 @@ class InMemoryUserProvider implements UserProviderInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function supportsClass($class) { diff --git a/Core/Util/SecureRandomInterface.php b/Core/Util/SecureRandomInterface.php index 2c35a72..2cf7779 100644 --- a/Core/Util/SecureRandomInterface.php +++ b/Core/Util/SecureRandomInterface.php @@ -21,7 +21,7 @@ interface SecureRandomInterface /** * Generates the specified number of secure random bytes. * - * @param integer $nbBytes + * @param int $nbBytes * * @return string */ diff --git a/Http/AccessMap.php b/Http/AccessMap.php index dc2e66a..116874a 100644 --- a/Http/AccessMap.php +++ b/Http/AccessMap.php @@ -37,7 +37,7 @@ class AccessMap implements AccessMapInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function getPatterns(Request $request) { diff --git a/Http/Authentication/DefaultAuthenticationFailureHandler.php b/Http/Authentication/DefaultAuthenticationFailureHandler.php index 70dcd1e..f106a4a 100644 --- a/Http/Authentication/DefaultAuthenticationFailureHandler.php +++ b/Http/Authentication/DefaultAuthenticationFailureHandler.php @@ -58,7 +58,7 @@ class DefaultAuthenticationFailureHandler implements AuthenticationFailureHandle } /** - * {@inheritDoc} + * {@inheritdoc} */ public function onAuthenticationFailure(Request $request, AuthenticationException $exception) { diff --git a/Http/Authentication/DefaultAuthenticationSuccessHandler.php b/Http/Authentication/DefaultAuthenticationSuccessHandler.php index 0c084b9..54d6fc1 100644 --- a/Http/Authentication/DefaultAuthenticationSuccessHandler.php +++ b/Http/Authentication/DefaultAuthenticationSuccessHandler.php @@ -48,7 +48,7 @@ class DefaultAuthenticationSuccessHandler implements AuthenticationSuccessHandle } /** - * {@inheritDoc} + * {@inheritdoc} */ public function onAuthenticationSuccess(Request $request, TokenInterface $token) { diff --git a/Http/EntryPoint/FormAuthenticationEntryPoint.php b/Http/EntryPoint/FormAuthenticationEntryPoint.php index b78f0a9..c734db0 100644 --- a/Http/EntryPoint/FormAuthenticationEntryPoint.php +++ b/Http/EntryPoint/FormAuthenticationEntryPoint.php @@ -34,14 +34,14 @@ class FormAuthenticationEntryPoint implements AuthenticationEntryPointInterface * @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 bool $useForward Whether to forward or redirect to the login form */ public function __construct(HttpKernelInterface $kernel, HttpUtils $httpUtils, $loginPath, $useForward = false) { $this->httpKernel = $kernel; $this->httpUtils = $httpUtils; $this->loginPath = $loginPath; - $this->useForward = (Boolean) $useForward; + $this->useForward = (bool) $useForward; } /** diff --git a/Http/Firewall.php b/Http/Firewall.php index 392da0b..7bad47a 100644 --- a/Http/Firewall.php +++ b/Http/Firewall.php @@ -85,7 +85,7 @@ class Firewall implements EventSubscriberInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public static function getSubscribedEvents() { diff --git a/Http/FirewallMap.php b/Http/FirewallMap.php index 0554bed..1bb73bd 100644 --- a/Http/FirewallMap.php +++ b/Http/FirewallMap.php @@ -36,7 +36,7 @@ class FirewallMap implements FirewallMapInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function getListeners(Request $request) { diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php index 422c8ce..e78935e 100644 --- a/Http/HttpUtils.php +++ b/Http/HttpUtils.php @@ -53,7 +53,7 @@ class HttpUtils * * @param Request $request A Request instance * @param string $path A path (an absolute path (/foo), an absolute URL (http://...), or a route name (foo)) - * @param integer $status The status code + * @param int $status The status code * * @return RedirectResponse A RedirectResponse instance */ diff --git a/Http/Logout/DefaultLogoutSuccessHandler.php b/Http/Logout/DefaultLogoutSuccessHandler.php index 70f15cf..48626b0 100644 --- a/Http/Logout/DefaultLogoutSuccessHandler.php +++ b/Http/Logout/DefaultLogoutSuccessHandler.php @@ -37,7 +37,7 @@ class DefaultLogoutSuccessHandler implements LogoutSuccessHandlerInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function onLogoutSuccess(Request $request) { diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index 6500bfd..12478dc 100644 --- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -62,7 +62,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * {@inheritDoc} + * {@inheritdoc} */ protected function cancelCookie(Request $request) { @@ -79,7 +79,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * {@inheritDoc} + * {@inheritdoc} */ protected function processAutoLoginCookie(array $cookieParts, Request $request) { @@ -117,7 +117,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * {@inheritDoc} + * {@inheritdoc} */ protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token) { diff --git a/Http/RememberMe/ResponseListener.php b/Http/RememberMe/ResponseListener.php index 6087587..2253c5d 100644 --- a/Http/RememberMe/ResponseListener.php +++ b/Http/RememberMe/ResponseListener.php @@ -36,7 +36,7 @@ class ResponseListener implements EventSubscriberInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public static function getSubscribedEvents() { diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php index 571abbe..79b8a89 100644 --- a/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/Http/RememberMe/TokenBasedRememberMeServices.php @@ -27,7 +27,7 @@ use Symfony\Component\Security\Core\User\UserInterface; class TokenBasedRememberMeServices extends AbstractRememberMeServices { /** - * {@inheritDoc} + * {@inheritdoc} */ protected function processAutoLoginCookie(array $cookieParts, Request $request) { @@ -90,7 +90,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * {@inheritDoc} + * {@inheritdoc} */ protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token) { @@ -116,7 +116,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices * * @param string $class * @param string $username The username - * @param integer $expires The Unix timestamp when the cookie expires + * @param int $expires The Unix timestamp when the cookie expires * @param string $password The encoded password * * @throws \RuntimeException if username contains invalid chars @@ -138,7 +138,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices * * @param string $class * @param string $username The username - * @param integer $expires The Unix timestamp when the cookie expires + * @param int $expires The Unix timestamp when the cookie expires * @param string $password The encoded password * * @throws \RuntimeException when the private key is empty diff --git a/Http/Session/SessionAuthenticationStrategy.php b/Http/Session/SessionAuthenticationStrategy.php index e9c9826..17160a1 100644 --- a/Http/Session/SessionAuthenticationStrategy.php +++ b/Http/Session/SessionAuthenticationStrategy.php @@ -38,7 +38,7 @@ class SessionAuthenticationStrategy implements SessionAuthenticationStrategyInte } /** - * {@inheritDoc} + * {@inheritdoc} */ public function onAuthentication(Request $request, TokenInterface $token) { diff --git a/Resources/translations/security.th.xlf b/Resources/translations/security.th.xlf new file mode 100644 index 0000000..a8cb8d5 --- /dev/null +++ b/Resources/translations/security.th.xlf @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"> + <file source-language="en" datatype="plaintext" original="file.ext"> + <body> + <trans-unit id="1"> + <source>An authentication exception occurred.</source> + <target>พบความผิดพลาดในการรับรองตัวตน</target> + </trans-unit> + <trans-unit id="2"> + <source>Authentication credentials could not be found.</source> + <target>ไม่พบข้อมูลในการรับรองตัวตน (credentials) </target> + </trans-unit> + <trans-unit id="3"> + <source>Authentication request could not be processed due to a system problem.</source> + <target>คำร้องในการรับรองตัวตนไม่สามารถดำเนินการได้ เนื่องมาจากปัญหาของระบบ</target> + </trans-unit> + <trans-unit id="4"> + <source>Invalid credentials.</source> + <target>ข้อมูลการรับรองตัวตนไม่ถูกต้อง</target> + </trans-unit> + <trans-unit id="5"> + <source>Cookie has already been used by someone else.</source> + <target>Cookie ถูกใช้งานไปแล้วด้วยผู้อื่น</target> + </trans-unit> + <trans-unit id="6"> + <source>Not privileged to request the resource.</source> + <target>ไม่ได้รับสิทธิ์ให้ใช้งานส่วนนี้ได้</target> + </trans-unit> + <trans-unit id="7"> + <source>Invalid CSRF token.</source> + <target>CSRF token ไม่ถูกต้อง</target> + </trans-unit> + <trans-unit id="8"> + <source>Digest nonce has expired.</source> + <target>Digest nonce หมดอายุ</target> + </trans-unit> + <trans-unit id="9"> + <source>No authentication provider found to support the authentication token.</source> + <target>ไม่พบ authentication provider ที่รองรับสำหรับ authentication token</target> + </trans-unit> + <trans-unit id="10"> + <source>No session available, it either timed out or cookies are not enabled.</source> + <target>ไม่มี session ที่พร้อมใช้งาน, Session หมดอายุไปแล้วหรือ cookies ไม่ถูกเปิดใช้งาน</target> + </trans-unit> + <trans-unit id="11"> + <source>No token could be found.</source> + <target>ไม่พบ token</target> + </trans-unit> + <trans-unit id="12"> + <source>Username could not be found.</source> + <target>ไม่พบ Username</target> + </trans-unit> + <trans-unit id="13"> + <source>Account has expired.</source> + <target>บัญชีหมดอายุไปแล้ว</target> + </trans-unit> + <trans-unit id="14"> + <source>Credentials have expired.</source> + <target>ข้อมูลการระบุตัวตนหมดอายุแล้ว</target> + </trans-unit> + <trans-unit id="15"> + <source>Account is disabled.</source> + <target>บัญชีถูกระงับแล้ว</target> + </trans-unit> + <trans-unit id="16"> + <source>Account is locked.</source> + <target>บัญชีถูกล็อกแล้ว</target> + </trans-unit> + </body> + </file> +</xliff> |