diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:29:52 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-22 17:29:52 +0100 |
| commit | 20711216c818e8a57cdb5d3bc1b2fc8bc34757c9 (patch) | |
| tree | eda128b755c8438f9f5ae3f7c5049a08f01386e1 /Core/Authentication | |
| parent | 4fb29cc3a28770e1045e400fd740fc6028ae6df3 (diff) | |
| parent | a542abcf38b95de8e8f01f42b6127e7fffc645a8 (diff) | |
| download | symfony-security-20711216c818e8a57cdb5d3bc1b2fc8bc34757c9.zip symfony-security-20711216c818e8a57cdb5d3bc1b2fc8bc34757c9.tar.gz symfony-security-20711216c818e8a57cdb5d3bc1b2fc8bc34757c9.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
[2.3] CS And DocBlock Fixes
[2.3] CS Fixes
Conflicts:
src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
src/Symfony/Component/Form/FormError.php
src/Symfony/Component/HttpFoundation/Request.php
src/Symfony/Component/HttpFoundation/Response.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/Process/ProcessUtils.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
src/Symfony/Component/Validator/Constraints/GroupSequence.php
src/Symfony/Component/Validator/Mapping/ClassMetadata.php
src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
src/Symfony/Component/Validator/Mapping/MemberMetadata.php
src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
Diffstat (limited to 'Core/Authentication')
4 files changed, 4 insertions, 4 deletions
diff --git a/Core/Authentication/AuthenticationTrustResolver.php b/Core/Authentication/AuthenticationTrustResolver.php index d030459..c66661a 100644 --- a/Core/Authentication/AuthenticationTrustResolver.php +++ b/Core/Authentication/AuthenticationTrustResolver.php @@ -24,7 +24,7 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac private $rememberMeClass; /** - * Constructor + * Constructor. * * @param string $anonymousClass * @param string $rememberMeClass diff --git a/Core/Authentication/RememberMe/PersistentToken.php b/Core/Authentication/RememberMe/PersistentToken.php index 5df71ec..92fcb4f 100644 --- a/Core/Authentication/RememberMe/PersistentToken.php +++ b/Core/Authentication/RememberMe/PersistentToken.php @@ -25,7 +25,7 @@ final class PersistentToken implements PersistentTokenInterface private $lastUsed; /** - * Constructor + * Constructor. * * @param string $class * @param string $username diff --git a/Core/Authentication/RememberMe/PersistentTokenInterface.php b/Core/Authentication/RememberMe/PersistentTokenInterface.php index ad52753..ba31ffa 100644 --- a/Core/Authentication/RememberMe/PersistentTokenInterface.php +++ b/Core/Authentication/RememberMe/PersistentTokenInterface.php @@ -13,7 +13,7 @@ namespace Symfony\Component\Security\Core\Authentication\RememberMe; /** * Interface to be implemented by persistent token classes (such as - * Doctrine entities representing a remember-me token) + * Doctrine entities representing a remember-me token). * * @author Johannes M. Schmitt <schmittjoh@gmail.com> */ diff --git a/Core/Authentication/RememberMe/TokenProviderInterface.php b/Core/Authentication/RememberMe/TokenProviderInterface.php index 67d0bdd..c2d860e 100644 --- a/Core/Authentication/RememberMe/TokenProviderInterface.php +++ b/Core/Authentication/RememberMe/TokenProviderInterface.php @@ -14,7 +14,7 @@ namespace Symfony\Component\Security\Core\Authentication\RememberMe; use Symfony\Component\Security\Core\Exception\TokenNotFoundException; /** - * Interface for TokenProviders + * Interface for TokenProviders. * * @author Johannes M. Schmitt <schmittjoh@gmail.com> */ |