Merge branch '2.4'

fabpot · fabpot · commit a22cc4922be2 · 2014-01-24T15:36:35.000+01:00
* 2.4: (35 commits)
  Update validators.ro.xlf
  add non-standard port to HTTP_HOST
  fixed attribute "source-language" for translations
  [Process] clarify idle timeout
  [Security] fix DI for SimpleFormAuthenticationListener
  Update PluralizationRules.php
  Update validators.pt_BR.xlf
  Translated remaining items (57-72)
  Updated Vietnamese translation
  allow null value in fragment handler
  added missing dot in translation
  updated Arabic translations
  Update validators.id.xlf
  [Validator] Translate validator messages into Brazilian Portuguese
  Added more Swedish validator translations
  Update validators.ca.xlf
  fixed typos in Welsh translation
  Added missing Croatian translations
  [Form] fixed allow render 0 and 0.0 numeric input values
  Fixed validators.nl.xlf
  ...

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
diff --git a/Authentication/Provider/RememberMeAuthenticationProvider.php b/Authentication/Provider/RememberMeAuthenticationProvider.php
@@ -22,13 +22,23 @@ class RememberMeAuthenticationProvider implements AuthenticationProviderInterfac
     private $key;
     private $providerKey;
 
+    /**
+     * Constructor.
+     *
+     * @param UserCheckerInterface $userChecker An UserCheckerInterface interface
+     * @param string               $key         A key
+     * @param string               $providerKey A provider key
+     */
     public function __construct(UserCheckerInterface $userChecker, $key, $providerKey)
     {
         $this->userChecker = $userChecker;
         $this->key = $key;
         $this->providerKey = $providerKey;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function authenticate(TokenInterface $token)
     {
         if (!$this->supports($token)) {
@@ -48,6 +58,9 @@ public function authenticate(TokenInterface $token)
         return $authenticatedToken;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function supports(TokenInterface $token)
     {
         return $token instanceof RememberMeToken && $token->getProviderKey() === $this->providerKey;
diff --git a/Authentication/RememberMe/InMemoryTokenProvider.php b/Authentication/RememberMe/InMemoryTokenProvider.php
@@ -22,6 +22,9 @@ class InMemoryTokenProvider implements TokenProviderInterface
 {
     private $tokens = array();
 
+    /**
+     * {@inheritdoc}
+     */
     public function loadTokenBySeries($series)
     {
         if (!isset($this->tokens[$series])) {
@@ -31,6 +34,9 @@ public function loadTokenBySeries($series)
         return $this->tokens[$series];
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function updateToken($series, $tokenValue, \DateTime $lastUsed)
     {
         if (!isset($this->tokens[$series])) {
@@ -47,11 +53,17 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed)
         $this->tokens[$series] = $token;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function deleteTokenBySeries($series)
     {
         unset($this->tokens[$series]);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function createNewToken(PersistentTokenInterface $token)
     {
         $this->tokens[$token->getSeries()] = $token;
diff --git a/Authentication/RememberMe/PersistentToken.php b/Authentication/RememberMe/PersistentToken.php
@@ -58,49 +58,39 @@ public function __construct($class, $username, $series, $tokenValue, \DateTime $
     }
 
     /**
-     * Returns the class of the user
-     *
-     * @return string
+     * {@inheritdoc}
      */
     public function getClass()
     {
         return $this->class;
     }
 
     /**
-     * Returns the username
-     *
-     * @return string
+     * {@inheritdoc}
      */
     public function getUsername()
     {
         return $this->username;
     }
 
     /**
-     * Returns the series
-     *
-     * @return string
+     * {@inheritdoc}
      */
     public function getSeries()
     {
         return $this->series;
     }
 
     /**
-     * Returns the token value
-     *
-     * @return string
+     * {@inheritdoc}
      */
     public function getTokenValue()
     {
         return $this->tokenValue;
     }
 
     /**
-     * Returns the time the token was last used
-     *
-     * @return \DateTime
+     * {@inheritdoc}
      */
     public function getLastUsed()
     {
diff --git a/Authentication/RememberMe/PersistentTokenInterface.php b/Authentication/RememberMe/PersistentTokenInterface.php
@@ -20,31 +20,36 @@
 interface PersistentTokenInterface
 {
     /**
-     * Returns the class of the user
+     * Returns the class of the user.
+     *
      * @return string
      */
     public function getClass();
 
     /**
-     * Returns the username
+     * Returns the username.
+     *
      * @return string
      */
     public function getUsername();
 
     /**
-     * Returns the series
+     * Returns the series.
+     *
      * @return string
      */
     public function getSeries();
 
     /**
-     * Returns the token value
+     * Returns the token value.
+     *
      * @return string
      */
     public function getTokenValue();
 
     /**
-     * Returns the last time the cookie was used
+     * Returns the time the token was last used.
+     *
      * @return \DateTime
      */
     public function getLastUsed();
diff --git a/Authentication/Token/AbstractToken.php b/Authentication/Token/AbstractToken.php
@@ -70,6 +70,9 @@ public function getUsername()
         return (string) $this->user;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getUser()
     {
         return $this->user;
diff --git a/Authentication/Token/AnonymousToken.php b/Authentication/Token/AnonymousToken.php
@@ -18,7 +18,6 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-
 class AnonymousToken extends AbstractToken
 {
     private $key;
diff --git a/Authentication/Token/PreAuthenticatedToken.php b/Authentication/Token/PreAuthenticatedToken.php
@@ -41,11 +41,19 @@ public function __construct($user, $credentials, $providerKey, array $roles = ar
         }
     }
 
+    /**
+     * Returns the provider key.
+     *
+     * @return string The provider key
+     */
     public function getProviderKey()
     {
         return $this->providerKey;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getCredentials()
     {
         return $this->credentials;
@@ -61,11 +69,17 @@ public function eraseCredentials()
         $this->credentials = null;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function serialize()
     {
         return serialize(array($this->credentials, $this->providerKey, parent::serialize()));
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function unserialize($str)
     {
         list($this->credentials, $this->providerKey, $parentStr) = unserialize($str);
diff --git a/Authentication/Token/RememberMeToken.php b/Authentication/Token/RememberMeToken.php
@@ -51,6 +51,9 @@ public function __construct(UserInterface $user, $providerKey, $key)
         parent::setAuthenticated(true);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function setAuthenticated($authenticated)
     {
         if ($authenticated) {
@@ -60,16 +63,29 @@ public function setAuthenticated($authenticated)
         parent::setAuthenticated(false);
     }
 
+    /**
+     * Returns the provider key.
+     *
+     * @return string The provider key
+     */
     public function getProviderKey()
     {
         return $this->providerKey;
     }
 
+    /**
+     * Returns the key.
+     *
+     * @return string The Key
+     */
     public function getKey()
     {
         return $this->key;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getCredentials()
     {
         return '';
diff --git a/Authentication/Token/UsernamePasswordToken.php b/Authentication/Token/UsernamePasswordToken.php
@@ -60,11 +60,19 @@ public function setAuthenticated($isAuthenticated)
         parent::setAuthenticated(false);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getCredentials()
     {
         return $this->credentials;
     }
 
+    /**
+     * Returns the provider key.
+     *
+     * @return string The provider key
+     */
     public function getProviderKey()
     {
         return $this->providerKey;
diff --git a/Role/RoleHierarchy.php b/Role/RoleHierarchy.php
@@ -34,11 +34,7 @@ public function __construct(array $hierarchy)
     }
 
     /**
-     * Returns an array of all roles reachable by the given ones.
-     *
-     * @param RoleInterface[] $roles An array of RoleInterface instances
-     *
-     * @return RoleInterface[] An array of RoleInterface instances
+     * {@inheritdoc}
      */
     public function getReachableRoles(array $roles)
     {
diff --git a/Role/RoleHierarchyInterface.php b/Role/RoleHierarchyInterface.php
@@ -19,7 +19,7 @@
 interface RoleHierarchyInterface
 {
     /**
-     * Returns an array of all reachable roles.
+     * Returns an array of all reachable roles by the given ones.
      *
      * Reachable roles are the roles directly assigned but also all roles that
      * are transitively reachable from them in the role hierarchy.
diff --git a/SecurityContext.php b/SecurityContext.php
@@ -46,14 +46,9 @@ public function __construct(AuthenticationManagerInterface $authenticationManage
     }
 
     /**
-     * Checks if the attributes are granted against the current token.
+     * {@inheritdoc}
      *
      * @throws AuthenticationCredentialsNotFoundException when the security context has no authentication token.
-     *
-     * @param mixed      $attributes
-     * @param mixed|null $object
-     *
-     * @return Boolean
      */
     final public function isGranted($attributes, $object = null)
     {
@@ -73,19 +68,15 @@ final public function isGranted($attributes, $object = null)
     }
 
     /**
-     * Gets the currently authenticated token.
-     *
-     * @return TokenInterface|null A TokenInterface instance or null if no authentication information is available
+     * {@inheritdoc}
      */
     public function getToken()
     {
         return $this->token;
     }
 
     /**
-     * Sets the currently authenticated token.
-     *
-     * @param TokenInterface $token A TokenInterface token, or null if no further authentication information should be stored
+     * {@inheritdoc}
      */
     public function setToken(TokenInterface $token = null)
     {
diff --git a/SecurityContextInterface.php b/SecurityContextInterface.php
@@ -34,14 +34,14 @@ public function getToken();
     /**
      * Sets the authentication token.
      *
-     * @param TokenInterface $token
+     * @param TokenInterface $token A TokenInterface token, or null if no further authentication information should be stored
      */
     public function setToken(TokenInterface $token = null);
 
     /**
      * Checks if the attributes are granted against the current authentication token and optionally supplied object.
      *
-     * @param array $attributes
+     * @param mixed $attributes
      * @param mixed $object
      *
      * @return Boolean
diff --git a/Validator/Constraints/UserPassword.php b/Validator/Constraints/UserPassword.php
@@ -21,6 +21,9 @@ class UserPassword extends Constraint
     public $message = 'This value should be the user current password.';
     public $service = 'security.validator.user_password';
 
+    /**
+     * {@inheritdoc}
+     */
     public function validatedBy()
     {
         return $this->service;
diff --git a/Validator/Constraints/UserPasswordValidator.php b/Validator/Constraints/UserPasswordValidator.php
@@ -29,6 +29,9 @@ public function __construct(SecurityContextInterface $securityContext, EncoderFa
         $this->encoderFactory = $encoderFactory;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function validate($password, Constraint $constraint)
     {
         $user = $this->securityContext->getToken()->getUser();

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ class InMemoryTokenProvider implements TokenProviderInterface`
`22`	`22`	`{`
`23`	`23`	`private $tokens = array();`
`24`	`24`
	`25`	`+ /**`
	`26`	`+ * {@inheritdoc}`
	`27`	`+ */`
`25`	`28`	`public function loadTokenBySeries($series)`
`26`	`29`	`{`
`27`	`30`	`if (!isset($this->tokens[$series])) {`
`@@ -31,6 +34,9 @@ public function loadTokenBySeries($series)`
`31`	`34`	`return $this->tokens[$series];`
`32`	`35`	`}`
`33`	`36`
	`37`	`+ /**`
	`38`	`+ * {@inheritdoc}`
	`39`	`+ */`
`34`	`40`	`public function updateToken($series, $tokenValue, \DateTime $lastUsed)`
`35`	`41`	`{`
`36`	`42`	`if (!isset($this->tokens[$series])) {`
`@@ -47,11 +53,17 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed)`
`47`	`53`	`$this->tokens[$series] = $token;`
`48`	`54`	`}`
`49`	`55`
	`56`	`+ /**`
	`57`	`+ * {@inheritdoc}`
	`58`	`+ */`
`50`	`59`	`public function deleteTokenBySeries($series)`
`51`	`60`	`{`
`52`	`61`	`unset($this->tokens[$series]);`
`53`	`62`	`}`
`54`	`63`
	`64`	`+ /**`
	`65`	`+ * {@inheritdoc}`
	`66`	`+ */`
`55`	`67`	`public function createNewToken(PersistentTokenInterface $token)`
`56`	`68`	`{`
`57`	`69`	`$this->tokens[$token->getSeries()] = $token;`
Original file line number	Diff line number	Diff line change
`@@ -58,49 +58,39 @@ public function __construct($class, $username, $series, $tokenValue, \DateTime $`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/**`
`61`		`- * Returns the class of the user`
`62`		`- *`
`63`		`- * @return string`
	`61`	`+ * {@inheritdoc}`
`64`	`62`	`*/`
`65`	`63`	`public function getClass()`
`66`	`64`	`{`
`67`	`65`	`return $this->class;`
`68`	`66`	`}`
`69`	`67`
`70`	`68`	`/**`
`71`		`- * Returns the username`
`72`		`- *`
`73`		`- * @return string`
	`69`	`+ * {@inheritdoc}`
`74`	`70`	`*/`
`75`	`71`	`public function getUsername()`
`76`	`72`	`{`
`77`	`73`	`return $this->username;`
`78`	`74`	`}`
`79`	`75`
`80`	`76`	`/**`
`81`		`- * Returns the series`
`82`		`- *`
`83`		`- * @return string`
	`77`	`+ * {@inheritdoc}`
`84`	`78`	`*/`
`85`	`79`	`public function getSeries()`
`86`	`80`	`{`
`87`	`81`	`return $this->series;`
`88`	`82`	`}`
`89`	`83`
`90`	`84`	`/**`
`91`		`- * Returns the token value`
`92`		`- *`
`93`		`- * @return string`
	`85`	`+ * {@inheritdoc}`
`94`	`86`	`*/`
`95`	`87`	`public function getTokenValue()`
`96`	`88`	`{`
`97`	`89`	`return $this->tokenValue;`
`98`	`90`	`}`
`99`	`91`
`100`	`92`	`/**`
`101`		`- * Returns the time the token was last used`
`102`		`- *`
`103`		`- * @return \DateTime`
	`93`	`+ * {@inheritdoc}`
`104`	`94`	`*/`
`105`	`95`	`public function getLastUsed()`
`106`	`96`	`{`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ public function getUsername()`
`70`	`70`	`return (string) $this->user;`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ /**`
	`74`	`+ * {@inheritdoc}`
	`75`	`+ */`
`73`	`76`	`public function getUser()`
`74`	`77`	`{`
`75`	`78`	`return $this->user;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`*`
`19`	`19`	`* @author Fabien Potencier <[email protected]>`
`20`	`20`	`*/`
`21`		`-`
`22`	`21`	`class AnonymousToken extends AbstractToken`
`23`	`22`	`{`
`24`	`23`	`private $key;`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,19 @@ public function __construct($user, $credentials, $providerKey, array $roles = ar`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ /**`
	`45`	`+ * Returns the provider key.`
	`46`	`+ *`
	`47`	`+ * @return string The provider key`
	`48`	`+ */`
`44`	`49`	`public function getProviderKey()`
`45`	`50`	`{`
`46`	`51`	`return $this->providerKey;`
`47`	`52`	`}`
`48`	`53`
	`54`	`+ /**`
	`55`	`+ * {@inheritdoc}`
	`56`	`+ */`
`49`	`57`	`public function getCredentials()`
`50`	`58`	`{`
`51`	`59`	`return $this->credentials;`
`@@ -61,11 +69,17 @@ public function eraseCredentials()`
`61`	`69`	`$this->credentials = null;`
`62`	`70`	`}`
`63`	`71`
	`72`	`+ /**`
	`73`	`+ * {@inheritdoc}`
	`74`	`+ */`
`64`	`75`	`public function serialize()`
`65`	`76`	`{`
`66`	`77`	`return serialize(array($this->credentials, $this->providerKey, parent::serialize()));`
`67`	`78`	`}`
`68`	`79`
	`80`	`+ /**`
	`81`	`+ * {@inheritdoc}`
	`82`	`+ */`
`69`	`83`	`public function unserialize($str)`
`70`	`84`	`{`
`71`	`85`	`list($this->credentials, $this->providerKey, $parentStr) = unserialize($str);`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ public function __construct(UserInterface $user, $providerKey, $key)`
`51`	`51`	`parent::setAuthenticated(true);`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ /**`
	`55`	`+ * {@inheritdoc}`
	`56`	`+ */`
`54`	`57`	`public function setAuthenticated($authenticated)`
`55`	`58`	`{`
`56`	`59`	`if ($authenticated) {`
`@@ -60,16 +63,29 @@ public function setAuthenticated($authenticated)`
`60`	`63`	`parent::setAuthenticated(false);`
`61`	`64`	`}`
`62`	`65`
	`66`	`+ /**`
	`67`	`+ * Returns the provider key.`
	`68`	`+ *`
	`69`	`+ * @return string The provider key`
	`70`	`+ */`
`63`	`71`	`public function getProviderKey()`
`64`	`72`	`{`
`65`	`73`	`return $this->providerKey;`
`66`	`74`	`}`
`67`	`75`
	`76`	`+ /**`
	`77`	`+ * Returns the key.`
	`78`	`+ *`
	`79`	`+ * @return string The Key`
	`80`	`+ */`
`68`	`81`	`public function getKey()`
`69`	`82`	`{`
`70`	`83`	`return $this->key;`
`71`	`84`	`}`
`72`	`85`
	`86`	`+ /**`
	`87`	`+ * {@inheritdoc}`
	`88`	`+ */`
`73`	`89`	`public function getCredentials()`
`74`	`90`	`{`
`75`	`91`	`return '';`
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,19 @@ public function setAuthenticated($isAuthenticated)`
`60`	`60`	`parent::setAuthenticated(false);`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ /**`
	`64`	`+ * {@inheritdoc}`
	`65`	`+ */`
`63`	`66`	`public function getCredentials()`
`64`	`67`	`{`
`65`	`68`	`return $this->credentials;`
`66`	`69`	`}`
`67`	`70`
	`71`	`+ /**`
	`72`	`+ * Returns the provider key.`
	`73`	`+ *`
	`74`	`+ * @return string The provider key`
	`75`	`+ */`
`68`	`76`	`public function getProviderKey()`
`69`	`77`	`{`
`70`	`78`	`return $this->providerKey;`
Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,7 @@ public function __construct(array $hierarchy)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
`37`		`- * Returns an array of all roles reachable by the given ones.`
`38`		`- *`
`39`		`- * @param RoleInterface[] $roles An array of RoleInterface instances`
`40`		`- *`
`41`		`- * @return RoleInterface[] An array of RoleInterface instances`
	`37`	`+ * {@inheritdoc}`
`42`	`38`	`*/`
`43`	`39`	`public function getReachableRoles(array $roles)`
`44`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`interface RoleHierarchyInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * Returns an array of all reachable roles.`
	`22`	`+ * Returns an array of all reachable roles by the given ones.`
`23`	`23`	`*`
`24`	`24`	`* Reachable roles are the roles directly assigned but also all roles that`
`25`	`25`	`* are transitively reachable from them in the role hierarchy.`
Original file line number	Diff line number	Diff line change
`@@ -46,14 +46,9 @@ public function __construct(AuthenticationManagerInterface $authenticationManage`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
`49`		`- * Checks if the attributes are granted against the current token.`
	`49`	`+ * {@inheritdoc}`
`50`	`50`	`*`
`51`	`51`	`* @throws AuthenticationCredentialsNotFoundException when the security context has no authentication token.`
`52`		`- *`
`53`		`- * @param mixed $attributes`
`54`		`- * @param mixed\|null $object`
`55`		`- *`
`56`		`- * @return Boolean`
`57`	`52`	`*/`
`58`	`53`	`final public function isGranted($attributes, $object = null)`
`59`	`54`	`{`
`@@ -73,19 +68,15 @@ final public function isGranted($attributes, $object = null)`
`73`	`68`	`}`
`74`	`69`
`75`	`70`	`/**`
`76`		`- * Gets the currently authenticated token.`
`77`		`- *`
`78`		`- * @return TokenInterface\|null A TokenInterface instance or null if no authentication information is available`
	`71`	`+ * {@inheritdoc}`
`79`	`72`	`*/`
`80`	`73`	`public function getToken()`
`81`	`74`	`{`
`82`	`75`	`return $this->token;`
`83`	`76`	`}`
`84`	`77`
`85`	`78`	`/**`
`86`		`- * Sets the currently authenticated token.`
`87`		`- *`
`88`		`- * @param TokenInterface $token A TokenInterface token, or null if no further authentication information should be stored`
	`79`	`+ * {@inheritdoc}`
`89`	`80`	`*/`
`90`	`81`	`public function setToken(TokenInterface $token = null)`
`91`	`82`	`{`