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

Acl/Dbal/AclProvider.php

@@ -374,7 +374,7 @@ protected function getSelectObjectIdentityIdSql(ObjectIdentityInterface $oid)
      * Returns the primary key of the passed object identity.
      *
      * @param ObjectIdentityInterface $oid
-     * @return integer
+     * @return int
      */
     final protected function retrieveObjectIdentityPrimaryKey(ObjectIdentityInterface $oid)
     {

Acl/Dbal/MutableAclProvider.php

@@ -737,7 +737,7 @@ private function createObjectIdentity(ObjectIdentityInterface $oid)
      * If the type does not yet exist in the database, it will be created.
      *
      * @param string $classType
-     * @return integer
+     * @return int
      */
     private function createOrRetrieveClassId($classType)
     {
@@ -757,7 +757,7 @@ private function createOrRetrieveClassId($classType)
      * created.
      *
      * @param SecurityIdentityInterface $sid
-     * @return integer
+     * @return int
      */
     private function createOrRetrieveSecurityIdentityId(SecurityIdentityInterface $sid)
     {

Acl/Domain/PermissionGrantingStrategy.php

@@ -130,7 +130,7 @@ public function isFieldGranted(AclInterface $acl, $field, array $masks, array $s
      * @param SecurityIdentityInterface[] $sids               An array of SecurityIdentityInterface implementations
      * @param bool                        $administrativeMode True turns off audit logging
      *
-     * @return Boolean true, or false; either granting, or denying access respectively.
+     * @return bool    true, or false; either granting, or denying access respectively.
      *
      * @throws NoAceFoundException
      */
@@ -191,7 +191,7 @@ private function hasSufficientPermissions(AclInterface $acl, array $aces, array
      * @param int            $requiredMask
      * @param EntryInterface $ace
      *
-     * @return Boolean
+     * @return bool
      *
      * @throws \RuntimeException if the ACE strategy is not supported
      */

Acl/Model/AclInterface.php

@@ -72,7 +72,7 @@ public function getParentAcl();
     /**
      * Whether this ACL is inheriting ACEs from a parent ACL.
      *
-     * @return Boolean
+     * @return bool
      */
     public function isEntriesInheriting();
 
@@ -83,7 +83,7 @@ public function isEntriesInheriting();
      * @param array   $masks
      * @param array   $securityIdentities
      * @param bool    $administrativeMode
-     * @return Boolean
+     * @return bool
      */
     public function isFieldGranted($field, array $masks, array $securityIdentities, $administrativeMode = false);
 
@@ -94,15 +94,15 @@ public function isFieldGranted($field, array $masks, array $securityIdentities,
      * @param array   $masks
      * @param array   $securityIdentities
      * @param bool    $administrativeMode
-     * @return Boolean
+     * @return bool
      */
     public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false);
 
     /**
      * Whether the ACL has loaded ACEs for all of the passed security identities
      *
      * @param mixed $securityIdentities an implementation of SecurityIdentityInterface, or an array thereof
-     * @return Boolean
+     * @return bool
      */
     public function isSidLoaded($securityIdentities);
 }

Acl/Model/AuditableEntryInterface.php

@@ -21,14 +21,14 @@ interface AuditableEntryInterface extends EntryInterface
     /**
      * Whether auditing for successful grants is turned on
      *
-     * @return Boolean
+     * @return bool
      */
     public function isAuditFailure();
 
     /**
      * Whether auditing for successful denies is turned on
      *
-     * @return Boolean
+     * @return bool
      */
     public function isAuditSuccess();
 }

Acl/Model/EntryInterface.php

@@ -31,14 +31,14 @@ public function getAcl();
     /**
      * The primary key of this ACE
      *
-     * @return integer
+     * @return int
      */
     public function getId();
 
     /**
      * The permission mask of this ACE
      *
-     * @return integer
+     * @return int
      */
     public function getMask();
 
@@ -59,7 +59,7 @@ public function getStrategy();
     /**
      * Returns whether this ACE is granting, or denying
      *
-     * @return Boolean
+     * @return bool
      */
     public function isGranting();
 }

Acl/Model/MutableAclInterface.php

@@ -54,7 +54,7 @@ public function deleteObjectFieldAce($index, $field);
     /**
      * Returns the primary key of this ACL
      *
-     * @return integer
+     * @return int
      */
     public function getId();
 

Acl/Model/ObjectIdentityInterface.php

@@ -28,7 +28,7 @@ interface ObjectIdentityInterface
      * Example for Object Equality: $object1->getId() === $object2->getId()
      *
      * @param ObjectIdentityInterface $identity
-     * @return Boolean
+     * @return bool
      */
     public function equals(ObjectIdentityInterface $identity);
 

Acl/Model/PermissionGrantingStrategyInterface.php

@@ -25,7 +25,7 @@ interface PermissionGrantingStrategyInterface
      * @param array        $masks
      * @param array        $sids
      * @param bool         $administrativeMode
-     * @return Boolean
+     * @return bool
      */
     public function isGranted(AclInterface $acl, array $masks, array $sids, $administrativeMode = false);
 
@@ -38,7 +38,7 @@ public function isGranted(AclInterface $acl, array $masks, array $sids, $adminis
      * @param array        $sids
      * @param bool         $administrativeMode
      *
-     * @return Boolean
+     * @return bool
      */
     public function isFieldGranted(AclInterface $acl, $field, array $masks, array $sids, $administrativeMode = false);
 }

Acl/Permission/MaskBuilder.php

@@ -104,7 +104,7 @@ public function add($mask)
     /**
      * Returns the mask of this permission
      *
-     * @return integer
+     * @return int
      */
     public function get()
     {

Acl/Permission/PermissionMapInterface.php

@@ -34,7 +34,7 @@ public function getMasks($permission, $object);
      * Whether this map contains the given permission
      *
      * @param string $permission
-     * @return Boolean
+     * @return bool
      */
     public function contains($permission);
 }

Acl/Voter/AclVoter.php

@@ -134,7 +134,7 @@ public function vote(TokenInterface $token, $object, array $attributes)
      *
      * @param string $class The class name
      *
-     * @return Boolean
+     * @return bool
      */
     public function supportsClass($class)
     {

Core/Authentication/AuthenticationTrustResolverInterface.php

@@ -28,7 +28,7 @@ interface AuthenticationTrustResolverInterface
      *
      * @param TokenInterface $token
      *
-     * @return Boolean
+     * @return bool
      */
     public function isAnonymous(TokenInterface $token = null);
 
@@ -38,7 +38,7 @@ public function isAnonymous(TokenInterface $token = null);
      *
      * @param TokenInterface $token
      *
-     * @return Boolean
+     * @return bool
      */
     public function isRememberMe(TokenInterface $token = null);
 
@@ -47,7 +47,7 @@ public function isRememberMe(TokenInterface $token = null);
      *
      * @param TokenInterface $token
      *
-     * @return Boolean
+     * @return bool
      */
     public function isFullFledged(TokenInterface $token = null);
 }

Core/Authentication/Provider/AuthenticationProviderInterface.php

@@ -29,7 +29,7 @@ interface AuthenticationProviderInterface extends AuthenticationManagerInterface
      *
      * @param TokenInterface $token A TokenInterface instance
      *
-     * @return Boolean true if the implementation supports the Token, false otherwise
+     * @return bool    true if the implementation supports the Token, false otherwise
      */
      public function supports(TokenInterface $token);
 }

Core/Authentication/Token/AbstractToken.php

@@ -188,7 +188,7 @@ public function setAttributes(array $attributes)
      *
      * @param string $name The attribute name
      *
-     * @return Boolean true if the attribute exists, false otherwise
+     * @return bool    true if the attribute exists, false otherwise
      */
     public function hasAttribute($name)
     {

Core/Authentication/Token/TokenInterface.php

@@ -69,7 +69,7 @@ public function getUsername();
     /**
      * Returns whether the user is authenticated or not.
      *
-     * @return Boolean true if the token has been authenticated, false otherwise
+     * @return bool    true if the token has been authenticated, false otherwise
      */
     public function isAuthenticated();
 
@@ -104,7 +104,7 @@ public function setAttributes(array $attributes);
      *
      * @param string $name The attribute name
      *
-     * @return Boolean true if the attribute exists, false otherwise
+     * @return bool    true if the attribute exists, false otherwise
      */
     public function hasAttribute($name);
 

Core/Authorization/AccessDecisionManagerInterface.php

@@ -27,7 +27,7 @@ interface AccessDecisionManagerInterface
      * @param array          $attributes An array of attributes associated with the method being invoked
      * @param object         $object     The object to secure
      *
-     * @return Boolean true if the access is granted, false otherwise
+     * @return bool    true if the access is granted, false otherwise
      */
     public function decide(TokenInterface $token, array $attributes, $object = null);
 
@@ -36,7 +36,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)
      *
      * @param string $attribute An attribute
      *
-     * @return Boolean true if this decision manager supports the attribute, false otherwise
+     * @return bool    true if this decision manager supports the attribute, false otherwise
      */
     public function supportsAttribute($attribute);
 

Core/Authorization/Voter/VoterInterface.php

@@ -29,7 +29,7 @@ interface VoterInterface
      *
      * @param string $attribute An attribute
      *
-     * @return Boolean true if this Voter supports the attribute, false otherwise
+     * @return bool    true if this Voter supports the attribute, false otherwise
      */
     public function supportsAttribute($attribute);
 
@@ -38,7 +38,7 @@ public function supportsAttribute($attribute);
      *
      * @param string $class A class name
      *
-     * @return Boolean true if this Voter can process the class
+     * @return bool    true if this Voter can process the class
      */
     public function supportsClass($class);
 
@@ -52,7 +52,7 @@ public function supportsClass($class);
      * @param object         $object     The object to secure
      * @param array          $attributes An array of attributes associated with the method being invoked
      *
-     * @return integer either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED
+     * @return int     either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED
      */
     public function vote(TokenInterface $token, $object, array $attributes);
 }

Core/Encoder/BasePasswordEncoder.php

@@ -79,7 +79,7 @@ protected function mergePasswordAndSalt($password, $salt)
      * @param string $password1 The first password
      * @param string $password2 The second password
      *
-     * @return Boolean true if the two passwords are the same, false otherwise
+     * @return bool    true if the two passwords are the same, false otherwise
      */
     protected function comparePasswords($password1, $password2)
     {
@@ -91,7 +91,7 @@ protected function comparePasswords($password1, $password2)
      *
      * @param string $password The password
      *
-     * @return Boolean true if the password is too long, false otherwise
+     * @return bool true if the password is too long, false otherwise
      */
     protected function isPasswordTooLong($password)
     {

Core/Encoder/PasswordEncoderInterface.php

@@ -35,7 +35,7 @@ public function encodePassword($raw, $salt);
      * @param string $raw     A raw password
      * @param string $salt    The salt
      *
-     * @return Boolean true if the password is valid, false otherwise
+     * @return bool    true if the password is valid, false otherwise
      */
     public function isPasswordValid($encoded, $raw, $salt);
 }

Core/SecurityContextInterface.php

@@ -44,7 +44,7 @@ public function setToken(TokenInterface $token = null);
      * @param mixed $attributes
      * @param mixed $object
      *
-     * @return Boolean
+     * @return bool
      */
     public function isGranted($attributes, $object = null);
 }

Core/User/AdvancedUserInterface.php

@@ -43,7 +43,7 @@ interface AdvancedUserInterface extends UserInterface
      * Internally, if this method returns false, the authentication system
      * will throw an AccountExpiredException and prevent login.
      *
-     * @return Boolean true if the user's account is non expired, false otherwise
+     * @return bool    true if the user's account is non expired, false otherwise
      *
      * @see AccountExpiredException
      */
@@ -55,7 +55,7 @@ public function isAccountNonExpired();
      * Internally, if this method returns false, the authentication system
      * will throw a LockedException and prevent login.
      *
-     * @return Boolean true if the user is not locked, false otherwise
+     * @return bool    true if the user is not locked, false otherwise
      *
      * @see LockedException
      */
@@ -67,7 +67,7 @@ public function isAccountNonLocked();
      * Internally, if this method returns false, the authentication system
      * will throw a CredentialsExpiredException and prevent login.
      *
-     * @return Boolean true if the user's credentials are non expired, false otherwise
+     * @return bool    true if the user's credentials are non expired, false otherwise
      *
      * @see CredentialsExpiredException
      */
@@ -79,7 +79,7 @@ public function isCredentialsNonExpired();
      * Internally, if this method returns false, the authentication system
      * will throw a DisabledException and prevent login.
      *
-     * @return Boolean true if the user is enabled, false otherwise
+     * @return bool    true if the user is enabled, false otherwise
      *
      * @see DisabledException
      */

Core/User/EquatableInterface.php

@@ -31,7 +31,7 @@ interface EquatableInterface
      *
      * @param UserInterface $user
      *
-     * @return Boolean
+     * @return bool
      */
     public function isEqualTo(UserInterface $user);
 }

Core/User/UserProviderInterface.php

@@ -70,7 +70,7 @@ public function refreshUser(UserInterface $user);
      *
      * @param string $class
      *
-     * @return Boolean
+     * @return bool
      */
     public function supportsClass($class);
 }

Core/Util/StringUtils.php

@@ -31,7 +31,7 @@ private function __construct() {}
      * @param string $knownString The string of known length to compare against
      * @param string $userInput   The string that the user can control
      *
-     * @return Boolean true if the two strings are the same, false otherwise
+     * @return bool    true if the two strings are the same, false otherwise
      */
     public static function equals($knownString, $userInput)
     {