diff options
Diffstat (limited to 'Core')
-rw-r--r-- | Core/Authentication/Provider/AuthenticationProviderInterface.php | 2 | ||||
-rw-r--r-- | Core/Authentication/RememberMe/TokenProviderInterface.php | 1 | ||||
-rw-r--r-- | Core/Authentication/Token/AbstractToken.php | 3 | ||||
-rw-r--r-- | Core/Authentication/Token/TokenInterface.php | 8 | ||||
-rw-r--r-- | Core/Authorization/AccessDecisionManagerInterface.php | 4 | ||||
-rw-r--r-- | Core/Authorization/Voter/VoterInterface.php | 6 | ||||
-rw-r--r-- | Core/Encoder/BCryptPasswordEncoder.php | 4 | ||||
-rw-r--r-- | Core/Encoder/BasePasswordEncoder.php | 2 | ||||
-rw-r--r-- | Core/Encoder/MessageDigestPasswordEncoder.php | 6 | ||||
-rw-r--r-- | Core/Encoder/PasswordEncoderInterface.php | 2 | ||||
-rw-r--r-- | Core/Encoder/Pbkdf2PasswordEncoder.php | 8 | ||||
-rw-r--r-- | Core/Encoder/PlaintextPasswordEncoder.php | 2 | ||||
-rw-r--r-- | Core/Tests/Authorization/AccessDecisionManagerTest.php | 4 | ||||
-rw-r--r-- | Core/User/AdvancedUserInterface.php | 8 | ||||
-rw-r--r-- | Core/Util/SecureRandomInterface.php | 2 | ||||
-rw-r--r-- | Core/Util/StringUtils.php | 2 |
16 files changed, 33 insertions, 31 deletions
diff --git a/Core/Authentication/Provider/AuthenticationProviderInterface.php b/Core/Authentication/Provider/AuthenticationProviderInterface.php index 23724db..401df6d 100644 --- a/Core/Authentication/Provider/AuthenticationProviderInterface.php +++ b/Core/Authentication/Provider/AuthenticationProviderInterface.php @@ -29,7 +29,7 @@ interface AuthenticationProviderInterface extends AuthenticationManagerInterface * * @param TokenInterface $token A TokenInterface instance * - * @return bool true if the implementation supports the Token, false otherwise + * @return bool true if the implementation supports the Token, false otherwise */ public function supports(TokenInterface $token); } diff --git a/Core/Authentication/RememberMe/TokenProviderInterface.php b/Core/Authentication/RememberMe/TokenProviderInterface.php index 93ed8d3..67d0bdd 100644 --- a/Core/Authentication/RememberMe/TokenProviderInterface.php +++ b/Core/Authentication/RememberMe/TokenProviderInterface.php @@ -44,6 +44,7 @@ interface TokenProviderInterface * @param string $series * @param string $tokenValue * @param \DateTime $lastUsed + * * @throws TokenNotFoundException if the token is not found */ public function updateToken($series, $tokenValue, \DateTime $lastUsed); diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php index 75d177f..c6bf09f 100644 --- a/Core/Authentication/Token/AbstractToken.php +++ b/Core/Authentication/Token/AbstractToken.php @@ -85,6 +85,7 @@ abstract class AbstractToken implements TokenInterface * a __toString method or the username as a regular string. * * @param string|object $user The user + * * @throws \InvalidArgumentException */ public function setUser($user) @@ -188,7 +189,7 @@ abstract class AbstractToken implements TokenInterface * * @param string $name The attribute name * - * @return bool true if the attribute exists, false otherwise + * @return bool true if the attribute exists, false otherwise */ public function hasAttribute($name) { diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php index 8f7d03f..fb9fd14 100644 --- a/Core/Authentication/Token/TokenInterface.php +++ b/Core/Authentication/Token/TokenInterface.php @@ -48,7 +48,7 @@ interface TokenInterface extends \Serializable * Returns a user representation. * * @return mixed either returns an object which implements __toString(), or - * a primitive string is returned. + * a primitive string is returned. */ public function getUser(); @@ -69,14 +69,14 @@ interface TokenInterface extends \Serializable /** * Returns whether the user is authenticated or not. * - * @return bool true if the token has been authenticated, false otherwise + * @return bool true if the token has been authenticated, false otherwise */ public function isAuthenticated(); /** * Sets the authenticated flag. * - * @param bool $isAuthenticated The authenticated flag + * @param bool $isAuthenticated The authenticated flag */ public function setAuthenticated($isAuthenticated); @@ -104,7 +104,7 @@ interface TokenInterface extends \Serializable * * @param string $name The attribute name * - * @return bool true if the attribute exists, false otherwise + * @return bool true if the attribute exists, false otherwise */ public function hasAttribute($name); diff --git a/Core/Authorization/AccessDecisionManagerInterface.php b/Core/Authorization/AccessDecisionManagerInterface.php index ec82800..16209ba 100644 --- a/Core/Authorization/AccessDecisionManagerInterface.php +++ b/Core/Authorization/AccessDecisionManagerInterface.php @@ -27,7 +27,7 @@ interface AccessDecisionManagerInterface * @param array $attributes An array of attributes associated with the method being invoked * @param object $object The object to secure * - * @return bool true if the access is granted, false otherwise + * @return bool true if the access is granted, false otherwise */ public function decide(TokenInterface $token, array $attributes, $object = null); @@ -36,7 +36,7 @@ interface AccessDecisionManagerInterface * * @param string $attribute An attribute * - * @return bool true if this decision manager supports the attribute, false otherwise + * @return bool true if this decision manager supports the attribute, false otherwise */ public function supportsAttribute($attribute); diff --git a/Core/Authorization/Voter/VoterInterface.php b/Core/Authorization/Voter/VoterInterface.php index f955e65..d00ff1c 100644 --- a/Core/Authorization/Voter/VoterInterface.php +++ b/Core/Authorization/Voter/VoterInterface.php @@ -29,7 +29,7 @@ interface VoterInterface * * @param string $attribute An attribute * - * @return bool true if this Voter supports the attribute, false otherwise + * @return bool true if this Voter supports the attribute, false otherwise */ public function supportsAttribute($attribute); @@ -38,7 +38,7 @@ interface VoterInterface * * @param string $class A class name * - * @return bool true if this Voter can process the class + * @return bool true if this Voter can process the class */ public function supportsClass($class); @@ -52,7 +52,7 @@ interface VoterInterface * @param object|null $object The object to secure * @param array $attributes An array of attributes associated with the method being invoked * - * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED + * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED */ public function vote(TokenInterface $token, $object, array $attributes); } diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php index 27a7334..f62e8f5 100644 --- a/Core/Encoder/BCryptPasswordEncoder.php +++ b/Core/Encoder/BCryptPasswordEncoder.php @@ -27,9 +27,9 @@ class BCryptPasswordEncoder extends BasePasswordEncoder /** * Constructor. * - * @param int $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 \RuntimeException When no BCrypt encoder is available * @throws \InvalidArgumentException if cost is out of range */ public function __construct($cost) diff --git a/Core/Encoder/BasePasswordEncoder.php b/Core/Encoder/BasePasswordEncoder.php index 0d29631..1c9ada1 100644 --- a/Core/Encoder/BasePasswordEncoder.php +++ b/Core/Encoder/BasePasswordEncoder.php @@ -79,7 +79,7 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface * @param string $password1 The first password * @param string $password2 The second password * - * @return bool true if the two passwords are the same, false otherwise + * @return bool true if the two passwords are the same, false otherwise */ protected function comparePasswords($password1, $password2) { diff --git a/Core/Encoder/MessageDigestPasswordEncoder.php b/Core/Encoder/MessageDigestPasswordEncoder.php index 9aa240a..03de228 100644 --- a/Core/Encoder/MessageDigestPasswordEncoder.php +++ b/Core/Encoder/MessageDigestPasswordEncoder.php @@ -27,9 +27,9 @@ class MessageDigestPasswordEncoder extends BasePasswordEncoder /** * Constructor. * - * @param string $algorithm The digest algorithm to use - * @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 string $algorithm The digest algorithm to use + * @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/PasswordEncoderInterface.php b/Core/Encoder/PasswordEncoderInterface.php index 23acaf3..8c018be 100644 --- a/Core/Encoder/PasswordEncoderInterface.php +++ b/Core/Encoder/PasswordEncoderInterface.php @@ -35,7 +35,7 @@ interface PasswordEncoderInterface * @param string $raw A raw password * @param string $salt The salt * - * @return bool true if the password is valid, false otherwise + * @return bool true if the password is valid, false otherwise */ public function isPasswordValid($encoded, $raw, $salt); } diff --git a/Core/Encoder/Pbkdf2PasswordEncoder.php b/Core/Encoder/Pbkdf2PasswordEncoder.php index 55b5261..dac1cad 100644 --- a/Core/Encoder/Pbkdf2PasswordEncoder.php +++ b/Core/Encoder/Pbkdf2PasswordEncoder.php @@ -36,10 +36,10 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder /** * Constructor. * - * @param string $algorithm The digest algorithm to use - * @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 + * @param string $algorithm The digest algorithm to use + * @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 bdb058a..09059f6 100644 --- a/Core/Encoder/PlaintextPasswordEncoder.php +++ b/Core/Encoder/PlaintextPasswordEncoder.php @@ -25,7 +25,7 @@ class PlaintextPasswordEncoder extends BasePasswordEncoder /** * Constructor. * - * @param bool $ignorePasswordCase Compare password case-insensitive + * @param bool $ignorePasswordCase Compare password case-insensitive */ public function __construct($ignorePasswordCase = false) { diff --git a/Core/Tests/Authorization/AccessDecisionManagerTest.php b/Core/Tests/Authorization/AccessDecisionManagerTest.php index bf0ad11..ae5894d 100644 --- a/Core/Tests/Authorization/AccessDecisionManagerTest.php +++ b/Core/Tests/Authorization/AccessDecisionManagerTest.php @@ -107,8 +107,8 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase $voter->expects($this->exactly(2)) ->method('vote') ->will($this->returnValueMap(array( - array($token, null, array("ROLE_FOO"),$vote1), - array($token, null, array("ROLE_BAR"),$vote2), + array($token, null, array("ROLE_FOO"), $vote1), + array($token, null, array("ROLE_BAR"), $vote2), ))) ; diff --git a/Core/User/AdvancedUserInterface.php b/Core/User/AdvancedUserInterface.php index 19775c0..087c3c6 100644 --- a/Core/User/AdvancedUserInterface.php +++ b/Core/User/AdvancedUserInterface.php @@ -43,7 +43,7 @@ interface AdvancedUserInterface extends UserInterface * Internally, if this method returns false, the authentication system * will throw an AccountExpiredException and prevent login. * - * @return bool true if the user's account is non expired, false otherwise + * @return bool true if the user's account is non expired, false otherwise * * @see AccountExpiredException */ @@ -55,7 +55,7 @@ interface AdvancedUserInterface extends UserInterface * Internally, if this method returns false, the authentication system * will throw a LockedException and prevent login. * - * @return bool true if the user is not locked, false otherwise + * @return bool true if the user is not locked, false otherwise * * @see LockedException */ @@ -67,7 +67,7 @@ interface AdvancedUserInterface extends UserInterface * Internally, if this method returns false, the authentication system * will throw a CredentialsExpiredException and prevent login. * - * @return bool true if the user's credentials are non expired, false otherwise + * @return bool true if the user's credentials are non expired, false otherwise * * @see CredentialsExpiredException */ @@ -79,7 +79,7 @@ interface AdvancedUserInterface extends UserInterface * Internally, if this method returns false, the authentication system * will throw a DisabledException and prevent login. * - * @return bool true if the user is enabled, false otherwise + * @return bool true if the user is enabled, false otherwise * * @see DisabledException */ diff --git a/Core/Util/SecureRandomInterface.php b/Core/Util/SecureRandomInterface.php index 2cf7779..87d3ace 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 int $nbBytes + * @param int $nbBytes * * @return string */ diff --git a/Core/Util/StringUtils.php b/Core/Util/StringUtils.php index 01441cb..f326fe0 100644 --- a/Core/Util/StringUtils.php +++ b/Core/Util/StringUtils.php @@ -34,7 +34,7 @@ class StringUtils * @param string $knownString The string of known length to compare against * @param string $userInput The string that the user can control * - * @return bool true if the two strings are the same, false otherwise + * @return bool true if the two strings are the same, false otherwise */ public static function equals($knownString, $userInput) { |