summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
authorPascal Borreli <pascal@borreli.com>2013-11-24 06:12:30 +0000
committerPascal Borreli <pascal@borreli.com>2013-11-24 06:12:30 +0000
commitad591f170365bef1a963e9c876aa48adbf4c312c (patch)
tree48e1850c23b1bf294fbb6bcfa2bd673638ac8a6c /Core
parentc9228af9c932a15ab46b74be5bbd756bc69fda59 (diff)
downloadsymfony-security-ad591f170365bef1a963e9c876aa48adbf4c312c.zip
symfony-security-ad591f170365bef1a963e9c876aa48adbf4c312c.tar.gz
symfony-security-ad591f170365bef1a963e9c876aa48adbf4c312c.tar.bz2
Fixed typos/CS/PHPDoc
Diffstat (limited to 'Core')
-rw-r--r--Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php21
-rw-r--r--Core/Authorization/Voter/ExpressionVoter.php4
-rw-r--r--Core/Encoder/BasePasswordEncoder.php2
3 files changed, 15 insertions, 12 deletions
diff --git a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
index 3affd78..f4d0959 100644
--- a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
+++ b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -47,23 +47,22 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
$this->providerKey = $providerKey;
}
- /**
- * {@inheritdoc}
- */
- public function authenticate(TokenInterface $token)
- {
- if (!$this->supports($token)) {
- return null;
- }
-
+ /**
+ * {@inheritdoc}
+ */
+ public function authenticate(TokenInterface $token)
+ {
+ if (!$this->supports($token)) {
+ return null;
+ }
if (!$user = $token->getUser()) {
throw new BadCredentialsException('No pre-authenticated principal found in request.');
}
-/*
+ /*
if (null === $token->getCredentials()) {
throw new BadCredentialsException('No pre-authenticated credentials found in request.');
}
-*/
+ */
$user = $this->userProvider->loadUserByUsername($user);
$this->userChecker->checkPostAuth($user);
diff --git a/Core/Authorization/Voter/ExpressionVoter.php b/Core/Authorization/Voter/ExpressionVoter.php
index 09953ac..bf6683d 100644
--- a/Core/Authorization/Voter/ExpressionVoter.php
+++ b/Core/Authorization/Voter/ExpressionVoter.php
@@ -32,7 +32,9 @@ class ExpressionVoter implements VoterInterface
/**
* Constructor.
*
- * @param ExpressionLanguage $expressionLanguage
+ * @param ExpressionLanguage $expressionLanguage
+ * @param AuthenticationTrustResolverInterface $trustResolver
+ * @param RoleHierarchyInterface $roleHierarchy
*/
public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null)
{
diff --git a/Core/Encoder/BasePasswordEncoder.php b/Core/Encoder/BasePasswordEncoder.php
index b83eb30..aa29876 100644
--- a/Core/Encoder/BasePasswordEncoder.php
+++ b/Core/Encoder/BasePasswordEncoder.php
@@ -89,6 +89,8 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
/**
* Checks if the password is too long.
*
+ * @param string $password The password
+ *
* @return Boolean true if the password is too long, false otherwise
*/
protected function isPasswordTooLong($password)