Merge branch '2.4'

* 2.4:
  fixed types in phpdocs
  fixed types in phpdocs

Conflicts:
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ElementMetadata.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php

4 files changed, 4 insertions, 4 deletions

diff --git a/Csrf/CsrfTokenManagerInterface.php b/Csrf/CsrfTokenManagerInterface.php
index 2b9254b..050b6c1 100644
--- a/Csrf/CsrfTokenManagerInterface.php
+++ b/Csrf/CsrfTokenManagerInterface.php
@@ -62,7 +62,7 @@ interface CsrfTokenManagerInterface
      *
      * @param CsrfToken $token A CSRF token
      *
-     * @return Boolean Returns true if the token is valid, false otherwise
+     * @return bool    Returns true if the token is valid, false otherwise
      */
     public function isTokenValid(CsrfToken $token);
 }
diff --git a/Csrf/TokenGenerator/UriSafeTokenGenerator.php b/Csrf/TokenGenerator/UriSafeTokenGenerator.php
index 1bf72e5..122bc02 100644
--- a/Csrf/TokenGenerator/UriSafeTokenGenerator.php
+++ b/Csrf/TokenGenerator/UriSafeTokenGenerator.php
@@ -32,7 +32,7 @@ class UriSafeTokenGenerator implements TokenGeneratorInterface
     /**
      * The amount of entropy collected for each token (in bits).
      *
-     * @var integer
+     * @var int
      */
     private $entropy;
 
diff --git a/Csrf/TokenStorage/NativeSessionTokenStorage.php b/Csrf/TokenStorage/NativeSessionTokenStorage.php
index 8e9b280..af5931b 100644
--- a/Csrf/TokenStorage/NativeSessionTokenStorage.php
+++ b/Csrf/TokenStorage/NativeSessionTokenStorage.php
@@ -28,7 +28,7 @@ class NativeSessionTokenStorage implements TokenStorageInterface
     const SESSION_NAMESPACE = '_csrf';
 
     /**
-     * @var Boolean
+     * @var bool
      */
     private $sessionStarted = false;
 
diff --git a/Csrf/TokenStorage/TokenStorageInterface.php b/Csrf/TokenStorage/TokenStorageInterface.php
index 3fb3191..ea3a6a8 100644
--- a/Csrf/TokenStorage/TokenStorageInterface.php
+++ b/Csrf/TokenStorage/TokenStorageInterface.php
@@ -53,7 +53,7 @@ interface TokenStorageInterface
      *
      * @param string $tokenId The token ID
      *
-     * @return Boolean Whether a token exists with the given ID
+     * @return bool    Whether a token exists with the given ID
      */
     public function hasToken($tokenId);
 }