summaryrefslogtreecommitdiffstats
path: root/Http/RememberMe
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-04-16 10:02:57 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2014-04-16 10:02:57 +0200
commit3b378cf0eb09f4e34cfde24e29cda4f578fe6833 (patch)
tree3af3ef29ca707579cc8de674a8da0ff00e151701 /Http/RememberMe
parentef511d47c94ad92e37112b43efcbf7da8696a803 (diff)
parent74eaf535ddcd6cad834c68e7802cfcb08f400c1e (diff)
downloadsymfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.zip
symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.tar.gz
symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.tar.bz2
Merge branch '2.3' into 2.4
* 2.3: made {@inheritdoc} annotations consistent across the board fixed types in phpdocs made phpdoc types consistent with those defined in Hack Add support Thai translations made types consistent with those defined in Hack removed extra/unsupported arguments [HttpKernel] fixed an error message [TwigBundle] removed undefined argument [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM. Conflicts: src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpFoundation/StreamedResponse.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php src/Symfony/Component/Stopwatch/StopwatchPeriod.php src/Symfony/Component/Translation/TranslatorInterface.php src/Symfony/Component/Validator/ConstraintValidatorFactory.php
Diffstat (limited to 'Http/RememberMe')
-rw-r--r--Http/RememberMe/PersistentTokenBasedRememberMeServices.php6
-rw-r--r--Http/RememberMe/ResponseListener.php2
-rw-r--r--Http/RememberMe/TokenBasedRememberMeServices.php8
3 files changed, 8 insertions, 8 deletions
diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
index 6500bfd..12478dc 100644
--- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
+++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -62,7 +62,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
protected function cancelCookie(Request $request)
{
@@ -79,7 +79,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
protected function processAutoLoginCookie(array $cookieParts, Request $request)
{
@@ -117,7 +117,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token)
{
diff --git a/Http/RememberMe/ResponseListener.php b/Http/RememberMe/ResponseListener.php
index 6087587..2253c5d 100644
--- a/Http/RememberMe/ResponseListener.php
+++ b/Http/RememberMe/ResponseListener.php
@@ -36,7 +36,7 @@ class ResponseListener implements EventSubscriberInterface
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public static function getSubscribedEvents()
{
diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php
index 571abbe..79b8a89 100644
--- a/Http/RememberMe/TokenBasedRememberMeServices.php
+++ b/Http/RememberMe/TokenBasedRememberMeServices.php
@@ -27,7 +27,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
class TokenBasedRememberMeServices extends AbstractRememberMeServices
{
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
protected function processAutoLoginCookie(array $cookieParts, Request $request)
{
@@ -90,7 +90,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token)
{
@@ -116,7 +116,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
*
* @param string $class
* @param string $username The username
- * @param integer $expires The Unix timestamp when the cookie expires
+ * @param int $expires The Unix timestamp when the cookie expires
* @param string $password The encoded password
*
* @throws \RuntimeException if username contains invalid chars
@@ -138,7 +138,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices
*
* @param string $class
* @param string $username The username
- * @param integer $expires The Unix timestamp when the cookie expires
+ * @param int $expires The Unix timestamp when the cookie expires
* @param string $password The encoded password
*
* @throws \RuntimeException when the private key is empty