diff options
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/Authentication/AuthenticationManagerInterface.php | 2 | ||||
| -rw-r--r-- | Core/Authentication/AuthenticationTrustResolverInterface.php | 6 | ||||
| -rw-r--r-- | Core/Authentication/RememberMe/PersistentTokenInterface.php | 10 | ||||
| -rw-r--r-- | Core/Authentication/RememberMe/TokenProviderInterface.php | 8 | ||||
| -rw-r--r-- | Core/Authentication/Token/TokenInterface.php | 28 | ||||
| -rw-r--r-- | Core/Authorization/AccessDecisionManagerInterface.php | 6 | ||||
| -rw-r--r-- | Core/Authorization/Voter/VoterInterface.php | 6 | ||||
| -rw-r--r-- | Core/Encoder/EncoderFactory.php | 2 | ||||
| -rw-r--r-- | Core/Encoder/EncoderFactoryInterface.php | 2 | ||||
| -rw-r--r-- | Core/Encoder/PasswordEncoderInterface.php | 4 | ||||
| -rw-r--r-- | Core/Role/RoleHierarchyInterface.php | 2 | ||||
| -rw-r--r-- | Core/Role/RoleInterface.php | 2 | ||||
| -rw-r--r-- | Core/SecurityContext.php | 2 | ||||
| -rw-r--r-- | Core/SecurityContextInterface.php | 6 | ||||
| -rw-r--r-- | Core/User/AdvancedUserInterface.php | 8 | ||||
| -rw-r--r-- | Core/User/EquatableInterface.php | 2 | ||||
| -rw-r--r-- | Core/User/UserCheckerInterface.php | 4 | ||||
| -rw-r--r-- | Core/User/UserInterface.php | 10 | ||||
| -rw-r--r-- | Core/User/UserProviderInterface.php | 6 |
19 files changed, 57 insertions, 59 deletions
diff --git a/Core/Authentication/AuthenticationManagerInterface.php b/Core/Authentication/AuthenticationManagerInterface.php index 36cdc92..d8f4716 100644 --- a/Core/Authentication/AuthenticationManagerInterface.php +++ b/Core/Authentication/AuthenticationManagerInterface.php @@ -31,5 +31,5 @@ interface AuthenticationManagerInterface * * @throws AuthenticationException if the authentication fails */ - function authenticate(TokenInterface $token); + public function authenticate(TokenInterface $token); } diff --git a/Core/Authentication/AuthenticationTrustResolverInterface.php b/Core/Authentication/AuthenticationTrustResolverInterface.php index adcef3c..ac07db0 100644 --- a/Core/Authentication/AuthenticationTrustResolverInterface.php +++ b/Core/Authentication/AuthenticationTrustResolverInterface.php @@ -30,7 +30,7 @@ interface AuthenticationTrustResolverInterface * * @return Boolean */ - function isAnonymous(TokenInterface $token = null); + public function isAnonymous(TokenInterface $token = null); /** * Resolves whether the passed token implementation is authenticated @@ -40,7 +40,7 @@ interface AuthenticationTrustResolverInterface * * @return Boolean */ - function isRememberMe(TokenInterface $token = null); + public function isRememberMe(TokenInterface $token = null); /** * Resolves whether the passed token implementation is fully authenticated. @@ -49,5 +49,5 @@ interface AuthenticationTrustResolverInterface * * @return Boolean */ - function isFullFledged(TokenInterface $token = null); + public function isFullFledged(TokenInterface $token = null); } diff --git a/Core/Authentication/RememberMe/PersistentTokenInterface.php b/Core/Authentication/RememberMe/PersistentTokenInterface.php index 38acbc3..6e9d891 100644 --- a/Core/Authentication/RememberMe/PersistentTokenInterface.php +++ b/Core/Authentication/RememberMe/PersistentTokenInterface.php @@ -23,29 +23,29 @@ interface PersistentTokenInterface * Returns the class of the user * @return string */ - function getClass(); + public function getClass(); /** * Returns the username * @return string */ - function getUsername(); + public function getUsername(); /** * Returns the series * @return string */ - function getSeries(); + public function getSeries(); /** * Returns the token value * @return string */ - function getTokenValue(); + public function getTokenValue(); /** * Returns the last time the cookie was used * @return \DateTime */ - function getLastUsed(); + public function getLastUsed(); } diff --git a/Core/Authentication/RememberMe/TokenProviderInterface.php b/Core/Authentication/RememberMe/TokenProviderInterface.php index db40a1c..c8cfbd1 100644 --- a/Core/Authentication/RememberMe/TokenProviderInterface.php +++ b/Core/Authentication/RememberMe/TokenProviderInterface.php @@ -27,14 +27,14 @@ interface TokenProviderInterface * * @return PersistentTokenInterface */ - function loadTokenBySeries($series); + public function loadTokenBySeries($series); /** * Deletes all tokens belonging to series. * * @param string $series */ - function deleteTokenBySeries($series); + public function deleteTokenBySeries($series); /** * Updates the token according to this data. @@ -43,12 +43,12 @@ interface TokenProviderInterface * @param string $tokenValue * @param DateTime $lastUsed */ - function updateToken($series, $tokenValue, \DateTime $lastUsed); + public function updateToken($series, $tokenValue, \DateTime $lastUsed); /** * Creates a new token. * * @param PersistentTokenInterface $token */ - function createNewToken(PersistentTokenInterface $token); + public function createNewToken(PersistentTokenInterface $token); } diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php index 3dafccc..dec31d5 100644 --- a/Core/Authentication/Token/TokenInterface.php +++ b/Core/Authentication/Token/TokenInterface.php @@ -26,21 +26,21 @@ interface TokenInterface extends \Serializable * * @return string */ - function __toString(); + public function __toString(); /** * Returns the user roles. * * @return Role[] An array of Role instances. */ - function getRoles(); + public function getRoles(); /** * Returns the user credentials. * * @return mixed The user credentials */ - function getCredentials(); + public function getCredentials(); /** * Returns a user representation. @@ -48,54 +48,54 @@ interface TokenInterface extends \Serializable * @return mixed either returns an object which implements __toString(), or * a primitive string is returned. */ - function getUser(); + public function getUser(); /** * Sets a user. * * @param mixed $user */ - function setUser($user); + public function setUser($user); /** * Returns the username. * * @return string */ - function getUsername(); + public function getUsername(); /** * Returns whether the user is authenticated or not. * * @return Boolean true if the token has been authenticated, false otherwise */ - function isAuthenticated(); + public function isAuthenticated(); /** * Sets the authenticated flag. * * @param Boolean $isAuthenticated The authenticated flag */ - function setAuthenticated($isAuthenticated); + public function setAuthenticated($isAuthenticated); /** * Removes sensitive information from the token. */ - function eraseCredentials(); + public function eraseCredentials(); /** * Returns the token attributes. * * @return array The token attributes */ - function getAttributes(); + public function getAttributes(); /** * Sets the token attributes. * * @param array $attributes The token attributes */ - function setAttributes(array $attributes); + public function setAttributes(array $attributes); /** * Returns true if the attribute exists. @@ -104,7 +104,7 @@ interface TokenInterface extends \Serializable * * @return Boolean true if the attribute exists, false otherwise */ - function hasAttribute($name); + public function hasAttribute($name); /** * Returns an attribute value. @@ -115,7 +115,7 @@ interface TokenInterface extends \Serializable * * @throws \InvalidArgumentException When attribute doesn't exist for this token */ - function getAttribute($name); + public function getAttribute($name); /** * Sets an attribute. @@ -123,5 +123,5 @@ interface TokenInterface extends \Serializable * @param string $name The attribute name * @param mixed $value The attribute value */ - function setAttribute($name, $value); + public function setAttribute($name, $value); } diff --git a/Core/Authorization/AccessDecisionManagerInterface.php b/Core/Authorization/AccessDecisionManagerInterface.php index 648047a..742ea74 100644 --- a/Core/Authorization/AccessDecisionManagerInterface.php +++ b/Core/Authorization/AccessDecisionManagerInterface.php @@ -29,7 +29,7 @@ interface AccessDecisionManagerInterface * * @return Boolean true if the access is granted, false otherwise */ - function decide(TokenInterface $token, array $attributes, $object = null); + public function decide(TokenInterface $token, array $attributes, $object = null); /** * Checks if the access decision manager supports the given attribute. @@ -38,7 +38,7 @@ interface AccessDecisionManagerInterface * * @return Boolean true if this decision manager supports the attribute, false otherwise */ - function supportsAttribute($attribute); + public function supportsAttribute($attribute); /** * Checks if the access decision manager supports the given class. @@ -47,5 +47,5 @@ interface AccessDecisionManagerInterface * * @return true if this decision manager can process the class */ - function supportsClass($class); + public function supportsClass($class); } diff --git a/Core/Authorization/Voter/VoterInterface.php b/Core/Authorization/Voter/VoterInterface.php index 41d9e64..1fc93e5 100644 --- a/Core/Authorization/Voter/VoterInterface.php +++ b/Core/Authorization/Voter/VoterInterface.php @@ -31,7 +31,7 @@ interface VoterInterface * * @return Boolean true if this Voter supports the attribute, false otherwise */ - function supportsAttribute($attribute); + public function supportsAttribute($attribute); /** * Checks if the voter supports the given class. @@ -40,7 +40,7 @@ interface VoterInterface * * @return true if this Voter can process the class */ - function supportsClass($class); + public function supportsClass($class); /** * Returns the vote for the given parameters. @@ -54,5 +54,5 @@ interface VoterInterface * * @return integer either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED */ - function vote(TokenInterface $token, $object, array $attributes); + public function vote(TokenInterface $token, $object, array $attributes); } diff --git a/Core/Encoder/EncoderFactory.php b/Core/Encoder/EncoderFactory.php index 7d34cc7..9429441 100644 --- a/Core/Encoder/EncoderFactory.php +++ b/Core/Encoder/EncoderFactory.php @@ -11,8 +11,6 @@ namespace Symfony\Component\Security\Core\Encoder; -use Symfony\Component\Security\Core\User\UserInterface; - /** * A generic encoder factory implementation * diff --git a/Core/Encoder/EncoderFactoryInterface.php b/Core/Encoder/EncoderFactoryInterface.php index 125e57b..f6b4a25 100644 --- a/Core/Encoder/EncoderFactoryInterface.php +++ b/Core/Encoder/EncoderFactoryInterface.php @@ -29,5 +29,5 @@ interface EncoderFactoryInterface * * @throws \RuntimeException when no password encoder could be found for the user */ - function getEncoder($user); + public function getEncoder($user); } diff --git a/Core/Encoder/PasswordEncoderInterface.php b/Core/Encoder/PasswordEncoderInterface.php index dae6c69..78b4e42 100644 --- a/Core/Encoder/PasswordEncoderInterface.php +++ b/Core/Encoder/PasswordEncoderInterface.php @@ -26,7 +26,7 @@ interface PasswordEncoderInterface * * @return string The encoded password */ - function encodePassword($raw, $salt); + public function encodePassword($raw, $salt); /** * Checks a raw password against an encoded password. @@ -37,5 +37,5 @@ interface PasswordEncoderInterface * * @return Boolean true if the password is valid, false otherwise */ - function isPasswordValid($encoded, $raw, $salt); + public function isPasswordValid($encoded, $raw, $salt); } diff --git a/Core/Role/RoleHierarchyInterface.php b/Core/Role/RoleHierarchyInterface.php index d873b80..c495a7f 100644 --- a/Core/Role/RoleHierarchyInterface.php +++ b/Core/Role/RoleHierarchyInterface.php @@ -28,5 +28,5 @@ interface RoleHierarchyInterface * * @return array An array of all reachable roles */ - function getReachableRoles(array $roles); + public function getReachableRoles(array $roles); } diff --git a/Core/Role/RoleInterface.php b/Core/Role/RoleInterface.php index debda3a..a3cb266 100644 --- a/Core/Role/RoleInterface.php +++ b/Core/Role/RoleInterface.php @@ -31,5 +31,5 @@ interface RoleInterface * * @return string|null A string representation of the role, or null */ - function getRole(); + public function getRole(); } diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php index bc6493b..1ec43e6 100644 --- a/Core/SecurityContext.php +++ b/Core/SecurityContext.php @@ -55,7 +55,7 @@ class SecurityContext implements SecurityContextInterface * * @return Boolean */ - public final function isGranted($attributes, $object = null) + final public function isGranted($attributes, $object = null) { if (null === $this->token) { throw new AuthenticationCredentialsNotFoundException('The security context contains no authentication token. One possible reason may be that there is no firewall configured for this URL.'); diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php index 77c5bf8..78d6477 100644 --- a/Core/SecurityContextInterface.php +++ b/Core/SecurityContextInterface.php @@ -29,14 +29,14 @@ interface SecurityContextInterface * * @return TokenInterface|null A TokenInterface instance or null if no authentication information is available */ - function getToken(); + public function getToken(); /** * Sets the authentication token. * * @param TokenInterface $token */ - function setToken(TokenInterface $token = null); + public function setToken(TokenInterface $token = null); /** * Checks if the attributes are granted against the current authentication token and optionally supplied object. @@ -46,5 +46,5 @@ interface SecurityContextInterface * * @return Boolean */ - function isGranted($attributes, $object = null); + public function isGranted($attributes, $object = null); } diff --git a/Core/User/AdvancedUserInterface.php b/Core/User/AdvancedUserInterface.php index e951c65..5b3a51a 100644 --- a/Core/User/AdvancedUserInterface.php +++ b/Core/User/AdvancedUserInterface.php @@ -47,7 +47,7 @@ interface AdvancedUserInterface extends UserInterface * * @see AccountExpiredException */ - function isAccountNonExpired(); + public function isAccountNonExpired(); /** * Checks whether the user is locked. @@ -59,7 +59,7 @@ interface AdvancedUserInterface extends UserInterface * * @see LockedException */ - function isAccountNonLocked(); + public function isAccountNonLocked(); /** * Checks whether the user's credentials (password) has expired. @@ -71,7 +71,7 @@ interface AdvancedUserInterface extends UserInterface * * @see CredentialsExpiredException */ - function isCredentialsNonExpired(); + public function isCredentialsNonExpired(); /** * Checks whether the user is enabled. @@ -83,5 +83,5 @@ interface AdvancedUserInterface extends UserInterface * * @see DisabledException */ - function isEnabled(); + public function isEnabled(); } diff --git a/Core/User/EquatableInterface.php b/Core/User/EquatableInterface.php index e2bde9e..645b77c 100644 --- a/Core/User/EquatableInterface.php +++ b/Core/User/EquatableInterface.php @@ -33,5 +33,5 @@ interface EquatableInterface * * @return Boolean */ - function isEqualTo(UserInterface $user); + public function isEqualTo(UserInterface $user); } diff --git a/Core/User/UserCheckerInterface.php b/Core/User/UserCheckerInterface.php index 61f0f6e..3dd8d51 100644 --- a/Core/User/UserCheckerInterface.php +++ b/Core/User/UserCheckerInterface.php @@ -25,12 +25,12 @@ interface UserCheckerInterface * * @param UserInterface $user a UserInterface instance */ - function checkPreAuth(UserInterface $user); + public function checkPreAuth(UserInterface $user); /** * Checks the user account after authentication. * * @param UserInterface $user a UserInterface instance */ - function checkPostAuth(UserInterface $user); + public function checkPostAuth(UserInterface $user); } diff --git a/Core/User/UserInterface.php b/Core/User/UserInterface.php index ce3b3a8..ed96ca9 100644 --- a/Core/User/UserInterface.php +++ b/Core/User/UserInterface.php @@ -47,7 +47,7 @@ interface UserInterface * * @return Role[] The user roles */ - function getRoles(); + public function getRoles(); /** * Returns the password used to authenticate the user. @@ -57,7 +57,7 @@ interface UserInterface * * @return string The password */ - function getPassword(); + public function getPassword(); /** * Returns the salt that was originally used to encode the password. @@ -66,14 +66,14 @@ interface UserInterface * * @return string The salt */ - function getSalt(); + public function getSalt(); /** * Returns the username used to authenticate the user. * * @return string The username */ - function getUsername(); + public function getUsername(); /** * Removes sensitive data from the user. @@ -83,5 +83,5 @@ interface UserInterface * * @return void */ - function eraseCredentials(); + public function eraseCredentials(); } diff --git a/Core/User/UserProviderInterface.php b/Core/User/UserProviderInterface.php index dbd7924..6669c43 100644 --- a/Core/User/UserProviderInterface.php +++ b/Core/User/UserProviderInterface.php @@ -48,7 +48,7 @@ interface UserProviderInterface * @throws UsernameNotFoundException if the user is not found * */ - function loadUserByUsername($username); + public function loadUserByUsername($username); /** * Refreshes the user for the account interface. @@ -63,7 +63,7 @@ interface UserProviderInterface * * @throws UnsupportedUserException if the account is not supported */ - function refreshUser(UserInterface $user); + public function refreshUser(UserInterface $user); /** * Whether this provider supports the given user class @@ -72,5 +72,5 @@ interface UserProviderInterface * * @return Boolean */ - function supportsClass($class); + public function supportsClass($class); } |