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 /Http/RememberMe | |
| 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 'Http/RememberMe')
| -rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 10 | ||||
| -rw-r--r-- | Http/RememberMe/PersistentTokenBasedRememberMeServices.php | 2 | ||||
| -rw-r--r-- | Http/RememberMe/TokenBasedRememberMeServices.php | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php index b868dae..659510a 100644 --- a/Http/RememberMe/AbstractRememberMeServices.php +++ b/Http/RememberMe/AbstractRememberMeServices.php @@ -25,7 +25,7 @@ use Symfony\Component\HttpFoundation\Cookie; use Psr\Log\LoggerInterface; /** - * Base class implementing the RememberMeServicesInterface + * Base class implementing the RememberMeServicesInterface. * * @author Johannes M. Schmitt <schmittjoh@gmail.com> */ @@ -251,7 +251,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface } /** - * Decodes the raw cookie value + * Decodes the raw cookie value. * * @param string $rawCookie * @@ -263,7 +263,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface } /** - * Encodes the cookie parts + * Encodes the cookie parts. * * @param array $cookieParts * @@ -275,7 +275,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface } /** - * Deletes the remember-me cookie + * Deletes the remember-me cookie. * * @param Request $request */ @@ -289,7 +289,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface } /** - * Checks whether remember-me capabilities were requested + * Checks whether remember-me capabilities were requested. * * @param Request $request * diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index 12478dc..d0a70b7 100644 --- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -52,7 +52,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * Sets the token provider + * Sets the token provider. * * @param TokenProviderInterface $tokenProvider */ diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php index f6b5c6a..9042963 100644 --- a/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/Http/RememberMe/TokenBasedRememberMeServices.php @@ -110,7 +110,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices } /** - * Generates a hash for the cookie to ensure it is not being tempered with + * Generates a hash for the cookie to ensure it is not being tempered with. * * @param string $class * @param string $username The username |