Merge branch '2.3' into 2.4

fabpot · fabpot · commit 6c0a45e5ea75 · 2014-04-16T12:34:31.000+02:00
* 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
diff --git a/Authentication/AuthenticationTrustResolverInterface.php b/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);
 }
diff --git a/Authentication/Provider/AuthenticationProviderInterface.php b/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);
 }
diff --git a/Authentication/Token/AbstractToken.php b/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)
     {
diff --git a/Authentication/Token/TokenInterface.php b/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);
 
diff --git a/Authorization/AccessDecisionManagerInterface.php b/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);
 
diff --git a/Authorization/Voter/VoterInterface.php b/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);
 }
diff --git a/Encoder/BasePasswordEncoder.php b/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)
     {
@@ -89,7 +89,7 @@ protected function comparePasswords($password1, $password2)
     /**
      * Checks if the password is too long.
      *
-     * @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)
     {
diff --git a/Encoder/PasswordEncoderInterface.php b/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);
 }
diff --git a/SecurityContextInterface.php b/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);
 }
diff --git a/User/AdvancedUserInterface.php b/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
      */
diff --git a/User/EquatableInterface.php b/User/EquatableInterface.php
@@ -31,7 +31,7 @@ interface EquatableInterface
      *
      * @param UserInterface $user
      *
-     * @return Boolean
+     * @return bool
      */
     public function isEqualTo(UserInterface $user);
 }
diff --git a/User/UserProviderInterface.php b/User/UserProviderInterface.php
@@ -70,7 +70,7 @@ public function refreshUser(UserInterface $user);
      *
      * @param string $class
      *
-     * @return Boolean
+     * @return bool
      */
     public function supportsClass($class);
 }
diff --git a/Util/StringUtils.php b/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)
     {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ interface AuthenticationTrustResolverInterface`
`28`	`28`	`*`
`29`	`29`	`* @param TokenInterface $token`
`30`	`30`	`*`
`31`		`- * @return Boolean`
	`31`	`+ * @return bool`
`32`	`32`	`*/`
`33`	`33`	`public function isAnonymous(TokenInterface $token = null);`
`34`	`34`
`@@ -38,7 +38,7 @@ public function isAnonymous(TokenInterface $token = null);`
`38`	`38`	`*`
`39`	`39`	`* @param TokenInterface $token`
`40`	`40`	`*`
`41`		`- * @return Boolean`
	`41`	`+ * @return bool`
`42`	`42`	`*/`
`43`	`43`	`public function isRememberMe(TokenInterface $token = null);`
`44`	`44`
`@@ -47,7 +47,7 @@ public function isRememberMe(TokenInterface $token = null);`
`47`	`47`	`*`
`48`	`48`	`* @param TokenInterface $token`
`49`	`49`	`*`
`50`		`- * @return Boolean`
	`50`	`+ * @return bool`
`51`	`51`	`*/`
`52`	`52`	`public function isFullFledged(TokenInterface $token = null);`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ interface AuthenticationProviderInterface extends AuthenticationManagerInterface`
`29`	`29`	`*`
`30`	`30`	`* @param TokenInterface $token A TokenInterface instance`
`31`	`31`	`*`
`32`		`- * @return Boolean true if the implementation supports the Token, false otherwise`
	`32`	`+ * @return bool true if the implementation supports the Token, false otherwise`
`33`	`33`	`*/`
`34`	`34`	`public function supports(TokenInterface $token);`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public function setAttributes(array $attributes)`
`188`	`188`	`*`
`189`	`189`	`* @param string $name The attribute name`
`190`	`190`	`*`
`191`		`- * @return Boolean true if the attribute exists, false otherwise`
	`191`	`+ * @return bool true if the attribute exists, false otherwise`
`192`	`192`	`*/`
`193`	`193`	`public function hasAttribute($name)`
`194`	`194`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function getUsername();`
`69`	`69`	`/**`
`70`	`70`	`* Returns whether the user is authenticated or not.`
`71`	`71`	`*`
`72`		`- * @return Boolean true if the token has been authenticated, false otherwise`
	`72`	`+ * @return bool true if the token has been authenticated, false otherwise`
`73`	`73`	`*/`
`74`	`74`	`public function isAuthenticated();`
`75`	`75`
`@@ -104,7 +104,7 @@ public function setAttributes(array $attributes);`
`104`	`104`	`*`
`105`	`105`	`* @param string $name The attribute name`
`106`	`106`	`*`
`107`		`- * @return Boolean true if the attribute exists, false otherwise`
	`107`	`+ * @return bool true if the attribute exists, false otherwise`
`108`	`108`	`*/`
`109`	`109`	`public function hasAttribute($name);`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ interface AccessDecisionManagerInterface`
`27`	`27`	`* @param array $attributes An array of attributes associated with the method being invoked`
`28`	`28`	`* @param object $object The object to secure`
`29`	`29`	`*`
`30`		`- * @return Boolean true if the access is granted, false otherwise`
	`30`	`+ * @return bool true if the access is granted, false otherwise`
`31`	`31`	`*/`
`32`	`32`	`public function decide(TokenInterface $token, array $attributes, $object = null);`
`33`	`33`
`@@ -36,7 +36,7 @@ public function decide(TokenInterface $token, array $attributes, $object = null)`
`36`	`36`	`*`
`37`	`37`	`* @param string $attribute An attribute`
`38`	`38`	`*`
`39`		`- * @return Boolean true if this decision manager supports the attribute, false otherwise`
	`39`	`+ * @return bool true if this decision manager supports the attribute, false otherwise`
`40`	`40`	`*/`
`41`	`41`	`public function supportsAttribute($attribute);`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ interface VoterInterface`
`29`	`29`	`*`
`30`	`30`	`* @param string $attribute An attribute`
`31`	`31`	`*`
`32`		`- * @return Boolean true if this Voter supports the attribute, false otherwise`
	`32`	`+ * @return bool true if this Voter supports the attribute, false otherwise`
`33`	`33`	`*/`
`34`	`34`	`public function supportsAttribute($attribute);`
`35`	`35`
`@@ -38,7 +38,7 @@ public function supportsAttribute($attribute);`
`38`	`38`	`*`
`39`	`39`	`* @param string $class A class name`
`40`	`40`	`*`
`41`		`- * @return Boolean true if this Voter can process the class`
	`41`	`+ * @return bool true if this Voter can process the class`
`42`	`42`	`*/`
`43`	`43`	`public function supportsClass($class);`
`44`	`44`
`@@ -52,7 +52,7 @@ public function supportsClass($class);`
`52`	`52`	`* @param object $object The object to secure`
`53`	`53`	`* @param array $attributes An array of attributes associated with the method being invoked`
`54`	`54`	`*`
`55`		`- * @return integer either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED`
	`55`	`+ * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED`
`56`	`56`	`*/`
`57`	`57`	`public function vote(TokenInterface $token, $object, array $attributes);`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ protected function mergePasswordAndSalt($password, $salt)`
`79`	`79`	`* @param string $password1 The first password`
`80`	`80`	`* @param string $password2 The second password`
`81`	`81`	`*`
`82`		`- * @return Boolean true if the two passwords are the same, false otherwise`
	`82`	`+ * @return bool true if the two passwords are the same, false otherwise`
`83`	`83`	`*/`
`84`	`84`	`protected function comparePasswords($password1, $password2)`
`85`	`85`	`{`
`@@ -89,7 +89,7 @@ protected function comparePasswords($password1, $password2)`
`89`	`89`	`/**`
`90`	`90`	`* Checks if the password is too long.`
`91`	`91`	`*`
`92`		`- * @return Boolean true if the password is too long, false otherwise`
	`92`	`+ * @return bool true if the password is too long, false otherwise`
`93`	`93`	`*/`
`94`	`94`	`protected function isPasswordTooLong($password)`
`95`	`95`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function encodePassword($raw, $salt);`
`35`	`35`	`* @param string $raw A raw password`
`36`	`36`	`* @param string $salt The salt`
`37`	`37`	`*`
`38`		`- * @return Boolean true if the password is valid, false otherwise`
	`38`	`+ * @return bool true if the password is valid, false otherwise`
`39`	`39`	`*/`
`40`	`40`	`public function isPasswordValid($encoded, $raw, $salt);`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function setToken(TokenInterface $token = null);`
`44`	`44`	`* @param mixed $attributes`
`45`	`45`	`* @param mixed $object`
`46`	`46`	`*`
`47`		`- * @return Boolean`
	`47`	`+ * @return bool`
`48`	`48`	`*/`
`49`	`49`	`public function isGranted($attributes, $object = null);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ interface AdvancedUserInterface extends UserInterface`
`43`	`43`	`* Internally, if this method returns false, the authentication system`
`44`	`44`	`* will throw an AccountExpiredException and prevent login.`
`45`	`45`	`*`
`46`		`- * @return Boolean true if the user's account is non expired, false otherwise`
	`46`	`+ * @return bool true if the user's account is non expired, false otherwise`
`47`	`47`	`*`
`48`	`48`	`* @see AccountExpiredException`
`49`	`49`	`*/`
`@@ -55,7 +55,7 @@ public function isAccountNonExpired();`
`55`	`55`	`* Internally, if this method returns false, the authentication system`
`56`	`56`	`* will throw a LockedException and prevent login.`
`57`	`57`	`*`
`58`		`- * @return Boolean true if the user is not locked, false otherwise`
	`58`	`+ * @return bool true if the user is not locked, false otherwise`
`59`	`59`	`*`
`60`	`60`	`* @see LockedException`
`61`	`61`	`*/`
`@@ -67,7 +67,7 @@ public function isAccountNonLocked();`
`67`	`67`	`* Internally, if this method returns false, the authentication system`
`68`	`68`	`* will throw a CredentialsExpiredException and prevent login.`
`69`	`69`	`*`
`70`		`- * @return Boolean true if the user's credentials are non expired, false otherwise`
	`70`	`+ * @return bool true if the user's credentials are non expired, false otherwise`
`71`	`71`	`*`
`72`	`72`	`* @see CredentialsExpiredException`
`73`	`73`	`*/`
`@@ -79,7 +79,7 @@ public function isCredentialsNonExpired();`
`79`	`79`	`* Internally, if this method returns false, the authentication system`
`80`	`80`	`* will throw a DisabledException and prevent login.`
`81`	`81`	`*`
`82`		`- * @return Boolean true if the user is enabled, false otherwise`
	`82`	`+ * @return bool true if the user is enabled, false otherwise`
`83`	`83`	`*`
`84`	`84`	`* @see DisabledException`
`85`	`85`	`*/`