diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 12:34:31 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 12:34:31 +0200 |
| commit | 9efff1d83d7b20d340c0abfcfe738640867882f6 (patch) | |
| tree | 49d48f2f6a2a2e137805e0517ddee78893ff6edf /Http/RememberMe | |
| parent | be954bbe63838d3d08885b96547e6081a0773757 (diff) | |
| parent | a6be31fc09c34a308c7a756b39e8a504a822694f (diff) | |
| download | symfony-security-9efff1d83d7b20d340c0abfcfe738640867882f6.zip symfony-security-9efff1d83d7b20d340c0abfcfe738640867882f6.tar.gz symfony-security-9efff1d83d7b20d340c0abfcfe738640867882f6.tar.bz2 | |
Merge branch '2.3' into 2.4
* 2.3:
fixed types in phpdocs
Conflicts:
src/Symfony/Bridge/Twig/TwigEngine.php
src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Stopwatch/StopwatchEvent.php
src/Symfony/Component/Templating/PhpEngine.php
Diffstat (limited to 'Http/RememberMe')
| -rw-r--r-- | Http/RememberMe/AbstractRememberMeServices.php | 2 | ||||
| -rw-r--r-- | Http/RememberMe/TokenBasedRememberMeServices.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php index 740d3d6..1e60db0 100644 --- a/Http/RememberMe/AbstractRememberMeServices.php +++ b/Http/RememberMe/AbstractRememberMeServices.php @@ -295,7 +295,7 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * * @param Request $request * - * @return Boolean + * @return bool */ protected function isRememberMeRequested(Request $request) { diff --git a/Http/RememberMe/TokenBasedRememberMeServices.php b/Http/RememberMe/TokenBasedRememberMeServices.php index 79b8a89..a6a4e66 100644 --- a/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/Http/RememberMe/TokenBasedRememberMeServices.php @@ -73,7 +73,7 @@ class TokenBasedRememberMeServices extends AbstractRememberMeServices * @param string $hash1 The first hash * @param string $hash2 The second hash * - * @return Boolean true if the two hashes are the same, false otherwise + * @return bool true if the two hashes are the same, false otherwise */ private function compareHashes($hash1, $hash2) { |