Permalink
Browse files

fixed CS

  • Loading branch information...
1 parent f5719ba commit 1c06ef124bde94f6b29634801b84ea9fa9149c31 @fabpot fabpot committed Jul 9, 2012
Showing with 143 additions and 150 deletions.
  1. +1 −1 Acl/Dbal/AclProvider.php
  2. +0 −1 Acl/Domain/Acl.php
  3. +1 −1 Acl/Domain/ObjectIdentity.php
  4. +2 −2 Acl/Domain/UserSecurityIdentity.php
  5. +6 −6 Acl/Model/AclCacheInterface.php
  6. +10 −10 Acl/Model/AclInterface.php
  7. +3 −3 Acl/Model/AclProviderInterface.php
  8. +1 −1 Acl/Model/AuditLoggerInterface.php
  9. +4 −4 Acl/Model/AuditableAclInterface.php
  10. +2 −2 Acl/Model/AuditableEntryInterface.php
  11. +1 −1 Acl/Model/DomainObjectInterface.php
  12. +6 −6 Acl/Model/EntryInterface.php
  13. +1 −1 Acl/Model/FieldEntryInterface.php
  14. +15 −15 Acl/Model/MutableAclInterface.php
  15. +3 −3 Acl/Model/MutableAclProviderInterface.php
  16. +3 −3 Acl/Model/ObjectIdentityInterface.php
  17. +1 −1 Acl/Model/ObjectIdentityRetrievalStrategyInterface.php
  18. +2 −2 Acl/Model/PermissionGrantingStrategyInterface.php
  19. +1 −1 Acl/Model/SecurityIdentityInterface.php
  20. +1 −1 Acl/Model/SecurityIdentityRetrievalStrategyInterface.php
  21. +1 −1 Acl/Permission/MaskBuilder.php
  22. +2 −2 Acl/Permission/PermissionMapInterface.php
  23. +0 −1 Acl/Resources/bin/generateSql.php
  24. +1 −1 Core/Authentication/AuthenticationManagerInterface.php
  25. +3 −3 Core/Authentication/AuthenticationTrustResolverInterface.php
  26. +5 −5 Core/Authentication/RememberMe/PersistentTokenInterface.php
  27. +4 −4 Core/Authentication/RememberMe/TokenProviderInterface.php
  28. +14 −14 Core/Authentication/Token/TokenInterface.php
  29. +3 −3 Core/Authorization/AccessDecisionManagerInterface.php
  30. +3 −3 Core/Authorization/Voter/VoterInterface.php
  31. +0 −2 Core/Encoder/EncoderFactory.php
  32. +1 −1 Core/Encoder/EncoderFactoryInterface.php
  33. +2 −2 Core/Encoder/PasswordEncoderInterface.php
  34. +1 −1 Core/Role/RoleHierarchyInterface.php
  35. +1 −1 Core/Role/RoleInterface.php
  36. +1 −1 Core/SecurityContext.php
  37. +3 −3 Core/SecurityContextInterface.php
  38. +4 −4 Core/User/AdvancedUserInterface.php
  39. +1 −1 Core/User/EquatableInterface.php
  40. +2 −2 Core/User/UserCheckerInterface.php
  41. +5 −5 Core/User/UserInterface.php
  42. +3 −3 Core/User/UserProviderInterface.php
  43. +1 −1 Http/AccessMapInterface.php
  44. +1 −1 Http/Authentication/AuthenticationFailureHandlerInterface.php
  45. +1 −1 Http/Authentication/AuthenticationSuccessHandlerInterface.php
  46. +1 −1 Http/Authorization/AccessDeniedHandlerInterface.php
  47. +1 −1 Http/EntryPoint/AuthenticationEntryPointInterface.php
  48. +1 −1 Http/Firewall/AbstractAuthenticationListener.php
  49. +1 −1 Http/Firewall/AbstractPreAuthenticatedListener.php
  50. +1 −1 Http/Firewall/ListenerInterface.php
  51. +1 −1 Http/FirewallMapInterface.php
  52. +1 −1 Http/Logout/LogoutHandlerInterface.php
  53. +1 −1 Http/Logout/LogoutSuccessHandlerInterface.php
  54. +4 −4 Http/RememberMe/AbstractRememberMeServices.php
  55. +3 −3 Http/RememberMe/RememberMeServicesInterface.php
  56. +1 −1 Http/Session/SessionAuthenticationStrategyInterface.php
  57. +0 −2 Tests/Acl/Domain/SecurityIdentityRetrievalStrategyTest.php
  58. +0 −1 Tests/Core/Authentication/Provider/DaoAuthenticationProviderTest.php
View
@@ -339,7 +339,7 @@ protected function getSelectObjectIdentityIdSql(ObjectIdentityInterface $oid)
* @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();
}
View
@@ -19,7 +19,6 @@
use Symfony\Component\Security\Acl\Model\PermissionGrantingStrategyInterface;
use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;
-
/**
* An ACL implementation.
*
@@ -52,7 +52,7 @@ public function __construct($identifier, $type)
* @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.');
@@ -51,7 +51,7 @@ public function __construct($username, $class)
* @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 @@ static public function fromAccount(UserInterface $user)
* @param TokenInterface $token
* @return UserSecurityIdentity
*/
- static public function fromToken(TokenInterface $token)
+ public static function fromToken(TokenInterface $token)
{
$user = $token->getUser();
@@ -23,7 +23,7 @@
*
* @param string $primaryKey a serialized primary key
*/
- function evictFromCacheById($primaryKey);
+ public function evictFromCacheById($primaryKey);
/**
* Removes an ACL from the cache
@@ -32,33 +32,33 @@ function evictFromCacheById($primaryKey);
*
* @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
*
* @param integer $primaryKey
* @return AclInterface
*/
- function getFromCacheById($primaryKey);
+ public function getFromCacheById($primaryKey);
/**
* Retrieves an ACL for the given object identity from the cache
*
* @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();
}
View
@@ -28,51 +28,51 @@
*
* @return array
*/
- function getClassAces();
+ public function getClassAces();
/**
* Returns all class-field-based ACEs associated with this ACL
*
* @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
*
* @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 @@ function isEntriesInheriting();
* @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,13 +94,13 @@ function isFieldGranted($field, array $masks, array $securityIdentities, $admini
* @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
*
* @param mixed $securityIdentities an implementation of SecurityIdentityInterface, or an array thereof
* @return Boolean
*/
- function isSidLoaded($securityIdentities);
+ public function isSidLoaded($securityIdentities);
}
@@ -25,7 +25,7 @@
* @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 @@ function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly =
* @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 @@ function findAcl(ObjectIdentityInterface $oid, array $sids = array());
* @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());
}
@@ -25,5 +25,5 @@
* @param Boolean $granted
* @param EntryInterface $ace
*/
- function logIfNeeded($granted, EntryInterface $ace);
+ public function logIfNeeded($granted, EntryInterface $ace);
}
@@ -25,7 +25,7 @@
* @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 @@ function updateClassAuditing($index, $auditSuccess, $auditFailure);
* @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 @@ function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure);
* @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 @@ function updateObjectAuditing($index, $auditSuccess, $auditFailure);
* @param Boolean $auditSuccess
* @param Boolean $auditFailure
*/
- function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure);
+ public function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure);
}
@@ -23,12 +23,12 @@
*
* @return Boolean
*/
- function isAuditFailure();
+ public function isAuditFailure();
/**
* Whether auditing for successful denies is turned on
*
* @return Boolean
*/
- function isAuditSuccess();
+ public function isAuditSuccess();
}
@@ -25,5 +25,5 @@
*
* @return string
*/
- function getObjectIdentifier();
+ public function getObjectIdentifier();
}
@@ -26,40 +26,40 @@
*
* @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();
}
@@ -23,5 +23,5 @@
*
* @return string
*/
- function getField();
+ public function getField();
}
Oops, something went wrong.

0 comments on commit 1c06ef1

Please sign in to comment.