summaryrefslogtreecommitdiffstats
path: root/Acl
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2012-07-09 14:50:58 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2012-07-09 14:54:20 +0200
commit1c06ef124bde94f6b29634801b84ea9fa9149c31 (patch)
treefa4af2ca5aeb42b2b14cb3a3e8213e0c8b864dce /Acl
parentf5719bac71c1b44dfdd48ccc9249edfde94c3204 (diff)
downloadsymfony-security-1c06ef124bde94f6b29634801b84ea9fa9149c31.zip
symfony-security-1c06ef124bde94f6b29634801b84ea9fa9149c31.tar.gz
symfony-security-1c06ef124bde94f6b29634801b84ea9fa9149c31.tar.bz2
fixed CS
Diffstat (limited to 'Acl')
-rw-r--r--Acl/Dbal/AclProvider.php2
-rw-r--r--Acl/Domain/Acl.php1
-rw-r--r--Acl/Domain/ObjectIdentity.php2
-rw-r--r--Acl/Domain/UserSecurityIdentity.php4
-rw-r--r--Acl/Model/AclCacheInterface.php12
-rw-r--r--Acl/Model/AclInterface.php20
-rw-r--r--Acl/Model/AclProviderInterface.php6
-rw-r--r--Acl/Model/AuditLoggerInterface.php2
-rw-r--r--Acl/Model/AuditableAclInterface.php8
-rw-r--r--Acl/Model/AuditableEntryInterface.php4
-rw-r--r--Acl/Model/DomainObjectInterface.php2
-rw-r--r--Acl/Model/EntryInterface.php12
-rw-r--r--Acl/Model/FieldEntryInterface.php2
-rw-r--r--Acl/Model/MutableAclInterface.php30
-rw-r--r--Acl/Model/MutableAclProviderInterface.php6
-rw-r--r--Acl/Model/ObjectIdentityInterface.php6
-rw-r--r--Acl/Model/ObjectIdentityRetrievalStrategyInterface.php2
-rw-r--r--Acl/Model/PermissionGrantingStrategyInterface.php4
-rw-r--r--Acl/Model/SecurityIdentityInterface.php2
-rw-r--r--Acl/Model/SecurityIdentityRetrievalStrategyInterface.php2
-rw-r--r--Acl/Permission/MaskBuilder.php2
-rw-r--r--Acl/Permission/PermissionMapInterface.php4
-rw-r--r--Acl/Resources/bin/generateSql.php1
23 files changed, 67 insertions, 69 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php
index 8413843..ada4f22 100644
--- a/Acl/Dbal/AclProvider.php
+++ b/Acl/Dbal/AclProvider.php
@@ -339,7 +339,7 @@ QUERY;
* @param ObjectIdentityInterface $oid
* @return integer
*/
- protected final function retrieveObjectIdentityPrimaryKey(ObjectIdentityInterface $oid)
+ final protected function retrieveObjectIdentityPrimaryKey(ObjectIdentityInterface $oid)
{
return $this->connection->executeQuery($this->getSelectObjectIdentityIdSql($oid))->fetchColumn();
}
diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php
index 6d53131..4665c0e 100644
--- a/Acl/Domain/Acl.php
+++ b/Acl/Domain/Acl.php
@@ -19,7 +19,6 @@ use Symfony\Component\Security\Acl\Model\ObjectIdentityInterface;
use Symfony\Component\Security\Acl\Model\PermissionGrantingStrategyInterface;
use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;
-
/**
* An ACL implementation.
*
diff --git a/Acl/Domain/ObjectIdentity.php b/Acl/Domain/ObjectIdentity.php
index e37e82b..da98f5e 100644
--- a/Acl/Domain/ObjectIdentity.php
+++ b/Acl/Domain/ObjectIdentity.php
@@ -52,7 +52,7 @@ final class ObjectIdentity implements ObjectIdentityInterface
* @throws \InvalidArgumentException
* @return ObjectIdentity
*/
- static public function fromDomainObject($domainObject)
+ public static function fromDomainObject($domainObject)
{
if (!is_object($domainObject)) {
throw new InvalidDomainObjectException('$domainObject must be an object.');
diff --git a/Acl/Domain/UserSecurityIdentity.php b/Acl/Domain/UserSecurityIdentity.php
index 040e43b..ebb0056 100644
--- a/Acl/Domain/UserSecurityIdentity.php
+++ b/Acl/Domain/UserSecurityIdentity.php
@@ -51,7 +51,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface
* @param UserInterface $user
* @return UserSecurityIdentity
*/
- static public function fromAccount(UserInterface $user)
+ public static function fromAccount(UserInterface $user)
{
return new self($user->getUsername(), ClassUtils::getRealClass($user));
}
@@ -62,7 +62,7 @@ final class UserSecurityIdentity implements SecurityIdentityInterface
* @param TokenInterface $token
* @return UserSecurityIdentity
*/
- static public function fromToken(TokenInterface $token)
+ public static function fromToken(TokenInterface $token)
{
$user = $token->getUser();
diff --git a/Acl/Model/AclCacheInterface.php b/Acl/Model/AclCacheInterface.php
index dd515ce..ea9604e 100644
--- a/Acl/Model/AclCacheInterface.php
+++ b/Acl/Model/AclCacheInterface.php
@@ -23,7 +23,7 @@ interface AclCacheInterface
*
* @param string $primaryKey a serialized primary key
*/
- function evictFromCacheById($primaryKey);
+ public function evictFromCacheById($primaryKey);
/**
* Removes an ACL from the cache
@@ -32,7 +32,7 @@ interface AclCacheInterface
*
* @param ObjectIdentityInterface $oid
*/
- function evictFromCacheByIdentity(ObjectIdentityInterface $oid);
+ public function evictFromCacheByIdentity(ObjectIdentityInterface $oid);
/**
* Retrieves an ACL for the given object identity primary key from the cache
@@ -40,7 +40,7 @@ interface AclCacheInterface
* @param integer $primaryKey
* @return AclInterface
*/
- function getFromCacheById($primaryKey);
+ public function getFromCacheById($primaryKey);
/**
* Retrieves an ACL for the given object identity from the cache
@@ -48,17 +48,17 @@ interface AclCacheInterface
* @param ObjectIdentityInterface $oid
* @return AclInterface
*/
- function getFromCacheByIdentity(ObjectIdentityInterface $oid);
+ public function getFromCacheByIdentity(ObjectIdentityInterface $oid);
/**
* Stores a new ACL in the cache
*
* @param AclInterface $acl
*/
- function putInCache(AclInterface $acl);
+ public function putInCache(AclInterface $acl);
/**
* Removes all ACLs from the cache
*/
- function clearCache();
+ public function clearCache();
}
diff --git a/Acl/Model/AclInterface.php b/Acl/Model/AclInterface.php
index 9094560..fffe591 100644
--- a/Acl/Model/AclInterface.php
+++ b/Acl/Model/AclInterface.php
@@ -28,7 +28,7 @@ interface AclInterface extends \Serializable
*
* @return array
*/
- function getClassAces();
+ public function getClassAces();
/**
* Returns all class-field-based ACEs associated with this ACL
@@ -36,14 +36,14 @@ interface AclInterface extends \Serializable
* @param string $field
* @return array
*/
- function getClassFieldAces($field);
+ public function getClassFieldAces($field);
/**
* Returns all object-based ACEs associated with this ACL
*
* @return array
*/
- function getObjectAces();
+ public function getObjectAces();
/**
* Returns all object-field-based ACEs associated with this ACL
@@ -51,28 +51,28 @@ interface AclInterface extends \Serializable
* @param string $field
* @return array
*/
- function getObjectFieldAces($field);
+ public function getObjectFieldAces($field);
/**
* Returns the object identity associated with this ACL
*
* @return ObjectIdentityInterface
*/
- function getObjectIdentity();
+ public function getObjectIdentity();
/**
* Returns the parent ACL, or null if there is none.
*
* @return AclInterface|null
*/
- function getParentAcl();
+ public function getParentAcl();
/**
* Whether this ACL is inheriting ACEs from a parent ACL.
*
* @return Boolean
*/
- function isEntriesInheriting();
+ public function isEntriesInheriting();
/**
* Determines whether field access is granted
@@ -83,7 +83,7 @@ interface AclInterface extends \Serializable
* @param Boolean $administrativeMode
* @return Boolean
*/
- function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false);
+ public function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false);
/**
* Determines whether access is granted
@@ -94,7 +94,7 @@ interface AclInterface extends \Serializable
* @param Boolean $administrativeMode
* @return Boolean
*/
- function isGranted(array $masks, array $securityIdentities, $administrativeMode = false);
+ public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false);
/**
* Whether the ACL has loaded ACEs for all of the passed security identities
@@ -102,5 +102,5 @@ interface AclInterface extends \Serializable
* @param mixed $securityIdentities an implementation of SecurityIdentityInterface, or an array thereof
* @return Boolean
*/
- function isSidLoaded($securityIdentities);
+ public function isSidLoaded($securityIdentities);
}
diff --git a/Acl/Model/AclProviderInterface.php b/Acl/Model/AclProviderInterface.php
index 2f878e1..bdb40b7 100644
--- a/Acl/Model/AclProviderInterface.php
+++ b/Acl/Model/AclProviderInterface.php
@@ -25,7 +25,7 @@ interface AclProviderInterface
* @param Boolean $directChildrenOnly
* @return array returns an array of child 'ObjectIdentity's
*/
- function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly = false);
+ public function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly = false);
/**
* Returns the ACL that belongs to the given object identity
@@ -35,7 +35,7 @@ interface AclProviderInterface
* @param array $sids
* @return AclInterface
*/
- function findAcl(ObjectIdentityInterface $oid, array $sids = array());
+ public function findAcl(ObjectIdentityInterface $oid, array $sids = array());
/**
* Returns the ACLs that belong to the given object identities
@@ -45,5 +45,5 @@ interface AclProviderInterface
* @param array $sids an array of SecurityIdentityInterface implementations
* @return \SplObjectStorage mapping the passed object identities to ACLs
*/
- function findAcls(array $oids, array $sids = array());
+ public function findAcls(array $oids, array $sids = array());
}
diff --git a/Acl/Model/AuditLoggerInterface.php b/Acl/Model/AuditLoggerInterface.php
index 7cab6f1..09bcbb8 100644
--- a/Acl/Model/AuditLoggerInterface.php
+++ b/Acl/Model/AuditLoggerInterface.php
@@ -25,5 +25,5 @@ interface AuditLoggerInterface
* @param Boolean $granted
* @param EntryInterface $ace
*/
- function logIfNeeded($granted, EntryInterface $ace);
+ public function logIfNeeded($granted, EntryInterface $ace);
}
diff --git a/Acl/Model/AuditableAclInterface.php b/Acl/Model/AuditableAclInterface.php
index 5da593e..14b4c04 100644
--- a/Acl/Model/AuditableAclInterface.php
+++ b/Acl/Model/AuditableAclInterface.php
@@ -25,7 +25,7 @@ interface AuditableAclInterface extends MutableAclInterface
* @param Boolean $auditSuccess
* @param Boolean $auditFailure
*/
- function updateClassAuditing($index, $auditSuccess, $auditFailure);
+ public function updateClassAuditing($index, $auditSuccess, $auditFailure);
/**
* Updates auditing for class-field-based ACE
@@ -35,7 +35,7 @@ interface AuditableAclInterface extends MutableAclInterface
* @param Boolean $auditSuccess
* @param Boolean $auditFailure
*/
- function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure);
+ public function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure);
/**
* Updates auditing for object-based ACE
@@ -44,7 +44,7 @@ interface AuditableAclInterface extends MutableAclInterface
* @param Boolean $auditSuccess
* @param Boolean $auditFailure
*/
- function updateObjectAuditing($index, $auditSuccess, $auditFailure);
+ public function updateObjectAuditing($index, $auditSuccess, $auditFailure);
/**
* Updates auditing for object-field-based ACE
@@ -54,5 +54,5 @@ interface AuditableAclInterface extends MutableAclInterface
* @param Boolean $auditSuccess
* @param Boolean $auditFailure
*/
- function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure);
+ public function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure);
}
diff --git a/Acl/Model/AuditableEntryInterface.php b/Acl/Model/AuditableEntryInterface.php
index 40c4484..e957965 100644
--- a/Acl/Model/AuditableEntryInterface.php
+++ b/Acl/Model/AuditableEntryInterface.php
@@ -23,12 +23,12 @@ interface AuditableEntryInterface extends EntryInterface
*
* @return Boolean
*/
- function isAuditFailure();
+ public function isAuditFailure();
/**
* Whether auditing for successful denies is turned on
*
* @return Boolean
*/
- function isAuditSuccess();
+ public function isAuditSuccess();
}
diff --git a/Acl/Model/DomainObjectInterface.php b/Acl/Model/DomainObjectInterface.php
index 50bc4c3..195cb4e 100644
--- a/Acl/Model/DomainObjectInterface.php
+++ b/Acl/Model/DomainObjectInterface.php
@@ -25,5 +25,5 @@ interface DomainObjectInterface
*
* @return string
*/
- function getObjectIdentifier();
+ public function getObjectIdentifier();
}
diff --git a/Acl/Model/EntryInterface.php b/Acl/Model/EntryInterface.php
index 6fe0dc8..98b754c 100644
--- a/Acl/Model/EntryInterface.php
+++ b/Acl/Model/EntryInterface.php
@@ -26,40 +26,40 @@ interface EntryInterface extends \Serializable
*
* @return AclInterface
*/
- function getAcl();
+ public function getAcl();
/**
* The primary key of this ACE
*
* @return integer
*/
- function getId();
+ public function getId();
/**
* The permission mask of this ACE
*
* @return integer
*/
- function getMask();
+ public function getMask();
/**
* The security identity associated with this ACE
*
* @return SecurityIdentityInterface
*/
- function getSecurityIdentity();
+ public function getSecurityIdentity();
/**
* The strategy for comparing masks
*
* @return string
*/
- function getStrategy();
+ public function getStrategy();
/**
* Returns whether this ACE is granting, or denying
*
* @return Boolean
*/
- function isGranting();
+ public function isGranting();
}
diff --git a/Acl/Model/FieldEntryInterface.php b/Acl/Model/FieldEntryInterface.php
index a35ddb4..8382ae1 100644
--- a/Acl/Model/FieldEntryInterface.php
+++ b/Acl/Model/FieldEntryInterface.php
@@ -23,5 +23,5 @@ interface FieldEntryInterface extends EntryInterface
*
* @return string
*/
- function getField();
+ public function getField();
}
diff --git a/Acl/Model/MutableAclInterface.php b/Acl/Model/MutableAclInterface.php
index f84e817..9028aa9 100644
--- a/Acl/Model/MutableAclInterface.php
+++ b/Acl/Model/MutableAclInterface.php
@@ -26,7 +26,7 @@ interface MutableAclInterface extends AclInterface
*
* @param integer $index
*/
- function deleteClassAce($index);
+ public function deleteClassAce($index);
/**
* Deletes a class-field-based ACE
@@ -34,14 +34,14 @@ interface MutableAclInterface extends AclInterface
* @param integer $index
* @param string $field
*/
- function deleteClassFieldAce($index, $field);
+ public function deleteClassFieldAce($index, $field);
/**
* Deletes an object-based ACE
*
* @param integer $index
*/
- function deleteObjectAce($index);
+ public function deleteObjectAce($index);
/**
* Deletes an object-field-based ACE
@@ -49,14 +49,14 @@ interface MutableAclInterface extends AclInterface
* @param integer $index
* @param string $field
*/
- function deleteObjectFieldAce($index, $field);
+ public function deleteObjectFieldAce($index, $field);
/**
* Returns the primary key of this ACL
*
* @return integer
*/
- function getId();
+ public function getId();
/**
* Inserts a class-based ACE
@@ -67,7 +67,7 @@ interface MutableAclInterface extends AclInterface
* @param Boolean $granting
* @param string $strategy
*/
- function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
+ public function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
/**
* Inserts a class-field-based ACE
@@ -79,7 +79,7 @@ interface MutableAclInterface extends AclInterface
* @param Boolean $granting
* @param string $strategy
*/
- function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
+ public function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
/**
* Inserts an object-based ACE
@@ -90,7 +90,7 @@ interface MutableAclInterface extends AclInterface
* @param Boolean $granting
* @param string $strategy
*/
- function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
+ public function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
/**
* Inserts an object-field-based ACE
@@ -102,14 +102,14 @@ interface MutableAclInterface extends AclInterface
* @param Boolean $granting
* @param string $strategy
*/
- function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
+ public function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null);
/**
* Sets whether entries are inherited
*
* @param Boolean $boolean
*/
- function setEntriesInheriting($boolean);
+ public function setEntriesInheriting($boolean);
/**
* Sets the parent ACL
@@ -117,7 +117,7 @@ interface MutableAclInterface extends AclInterface
* @param AclInterface|null $acl
* @return void
*/
- function setParentAcl(AclInterface $acl = null);
+ public function setParentAcl(AclInterface $acl = null);
/**
* Updates a class-based ACE
@@ -126,7 +126,7 @@ interface MutableAclInterface extends AclInterface
* @param integer $mask
* @param string $strategy if null the strategy should not be changed
*/
- function updateClassAce($index, $mask, $strategy = null);
+ public function updateClassAce($index, $mask, $strategy = null);
/**
* Updates a class-field-based ACE
@@ -136,7 +136,7 @@ interface MutableAclInterface extends AclInterface
* @param integer $mask
* @param string $strategy if null the strategy should not be changed
*/
- function updateClassFieldAce($index, $field, $mask, $strategy = null);
+ public function updateClassFieldAce($index, $field, $mask, $strategy = null);
/**
* Updates an object-based ACE
@@ -145,7 +145,7 @@ interface MutableAclInterface extends AclInterface
* @param integer $mask
* @param string $strategy if null the strategy should not be changed
*/
- function updateObjectAce($index, $mask, $strategy = null);
+ public function updateObjectAce($index, $mask, $strategy = null);
/**
* Updates an object-field-based ACE
@@ -155,5 +155,5 @@ interface MutableAclInterface extends AclInterface
* @param integer $mask
* @param string $strategy if null the strategy should not be changed
*/
- function updateObjectFieldAce($index, $field, $mask, $strategy = null);
+ public function updateObjectFieldAce($index, $field, $mask, $strategy = null);
}
diff --git a/Acl/Model/MutableAclProviderInterface.php b/Acl/Model/MutableAclProviderInterface.php
index 04cf237..cb34b72 100644
--- a/Acl/Model/MutableAclProviderInterface.php
+++ b/Acl/Model/MutableAclProviderInterface.php
@@ -26,7 +26,7 @@ interface MutableAclProviderInterface extends AclProviderInterface
* @param ObjectIdentityInterface $oid
* @return MutableAclInterface
*/
- function createAcl(ObjectIdentityInterface $oid);
+ public function createAcl(ObjectIdentityInterface $oid);
/**
* Deletes the ACL for a given object identity.
@@ -36,7 +36,7 @@ interface MutableAclProviderInterface extends AclProviderInterface
*
* @param ObjectIdentityInterface $oid
*/
- function deleteAcl(ObjectIdentityInterface $oid);
+ public function deleteAcl(ObjectIdentityInterface $oid);
/**
* Persists any changes which were made to the ACL, or any associated
@@ -46,5 +46,5 @@ interface MutableAclProviderInterface extends AclProviderInterface
*
* @param MutableAclInterface $acl
*/
- function updateAcl(MutableAclInterface $acl);
+ public function updateAcl(MutableAclInterface $acl);
}
diff --git a/Acl/Model/ObjectIdentityInterface.php b/Acl/Model/ObjectIdentityInterface.php
index 7e892bf..8ad0eba 100644
--- a/Acl/Model/ObjectIdentityInterface.php
+++ b/Acl/Model/ObjectIdentityInterface.php
@@ -30,7 +30,7 @@ interface ObjectIdentityInterface
* @param ObjectIdentityInterface $identity
* @return Boolean
*/
- function equals(ObjectIdentityInterface $identity);
+ public function equals(ObjectIdentityInterface $identity);
/**
* Obtains a unique identifier for this object. The identifier must not be
@@ -38,12 +38,12 @@ interface ObjectIdentityInterface
*
* @return string cannot return null
*/
- function getIdentifier();
+ public function getIdentifier();
/**
* Returns a type for the domain object. Typically, this is the PHP class name.
*
* @return string cannot return null
*/
- function getType();
+ public function getType();
}
diff --git a/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php b/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php
index e53c3da..b0f7f78 100644
--- a/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php
+++ b/Acl/Model/ObjectIdentityRetrievalStrategyInterface.php
@@ -24,5 +24,5 @@ interface ObjectIdentityRetrievalStrategyInterface
* @param object $domainObject
* @return ObjectIdentityInterface
*/
- function getObjectIdentity($domainObject);
+ public function getObjectIdentity($domainObject);
}
diff --git a/Acl/Model/PermissionGrantingStrategyInterface.php b/Acl/Model/PermissionGrantingStrategyInterface.php
index 7afdfac..7f8f81b 100644
--- a/Acl/Model/PermissionGrantingStrategyInterface.php
+++ b/Acl/Model/PermissionGrantingStrategyInterface.php
@@ -27,7 +27,7 @@ interface PermissionGrantingStrategyInterface
* @param Boolean $administrativeMode
* @return Boolean
*/
- function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false);
+ public function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false);
/**
* Determines whether access to a domain object's field is to be granted
@@ -40,5 +40,5 @@ interface PermissionGrantingStrategyInterface
*
* @return Boolean
*/
- function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false);
+ public function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false);
}
diff --git a/Acl/Model/SecurityIdentityInterface.php b/Acl/Model/SecurityIdentityInterface.php
index 5bf6189..0a24a54 100644
--- a/Acl/Model/SecurityIdentityInterface.php
+++ b/Acl/Model/SecurityIdentityInterface.php
@@ -26,5 +26,5 @@ interface SecurityIdentityInterface
*
* @param SecurityIdentityInterface $identity
*/
- function equals(SecurityIdentityInterface $identity);
+ public function equals(SecurityIdentityInterface $identity);
}
diff --git a/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php b/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php
index 3bbbaa4..c20f04b 100644
--- a/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php
+++ b/Acl/Model/SecurityIdentityRetrievalStrategyInterface.php
@@ -30,5 +30,5 @@ interface SecurityIdentityRetrievalStrategyInterface
* @param TokenInterface $token
* @return array of SecurityIdentityInterface implementations
*/
- function getSecurityIdentities(TokenInterface $token);
+ public function getSecurityIdentities(TokenInterface $token);
}
diff --git a/Acl/Permission/MaskBuilder.php b/Acl/Permission/MaskBuilder.php
index 6921558..df1fa7c 100644
--- a/Acl/Permission/MaskBuilder.php
+++ b/Acl/Permission/MaskBuilder.php
@@ -175,7 +175,7 @@ class MaskBuilder
* @throws \RuntimeException
* @return string
*/
- static public function getCode($mask)
+ public static function getCode($mask)
{
if (!is_int($mask)) {
throw new \InvalidArgumentException('$mask must be an integer.');
diff --git a/Acl/Permission/PermissionMapInterface.php b/Acl/Permission/PermissionMapInterface.php
index c2e49d5..44c15cc 100644
--- a/Acl/Permission/PermissionMapInterface.php
+++ b/Acl/Permission/PermissionMapInterface.php
@@ -28,7 +28,7 @@ interface PermissionMapInterface
* @param object $object
* @return array may return null if permission/object combination is not supported
*/
- function getMasks($permission, $object);
+ public function getMasks($permission, $object);
/**
* Whether this map contains the given permission
@@ -36,5 +36,5 @@ interface PermissionMapInterface
* @param string $permission
* @return Boolean
*/
- function contains($permission);
+ public function contains($permission);
}
diff --git a/Acl/Resources/bin/generateSql.php b/Acl/Resources/bin/generateSql.php
index 25ded7a..d65874b 100644
--- a/Acl/Resources/bin/generateSql.php
+++ b/Acl/Resources/bin/generateSql.php
@@ -25,7 +25,6 @@ $loader->registerNamespaces(array(
));
$loader->register();
-
$schema = new Schema(array(
'class_table_name' => 'acl_classes',
'entry_table_name' => 'acl_entries',