Merge branch '2.5' into 2.6

fabpot · fabpot · commit 8f5150090d69 · 2014-12-05T13:00:15.000+01:00
* 2.5:
  CS fixes
  [2.3] More cs fixes
  Removed unused imports
  CS fixes
  bumped Symfony version to 2.5.9
  updated VERSION for 2.5.8
  update CONTRIBUTORS for 2.5.8
  updated CHANGELOG for 2.5.8
  bumped Symfony version to 2.3.24
  updated VERSION for 2.3.23
  update CONTRIBUTORS for 2.3.23
  updated CHANGELOG for 2.3.23

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressBar.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Http/HttpUtils.php
	src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
diff --git a/ConstraintValidator.php b/ConstraintValidator.php
@@ -77,8 +77,8 @@ protected function buildViolation($message, array $parameters = array())
      * supports the 2.4 context API.
      *
      * @param ExecutionContextInterface $context    The context to use
-     * @param string                          $message    The violation message
-     * @param array                           $parameters The message parameters
+     * @param string                    $message    The violation message
+     * @param array                     $parameters The message parameters
      *
      * @return ConstraintViolationBuilderInterface The violation builder
      *
@@ -126,9 +126,9 @@ protected function formatTypeOf($value)
      * won't know what an "object", "array" or "resource" is and will be
      * confused by the violation message.
      *
-     * @param mixed   $value  The value to format as string
-     * @param int     $format A bitwise combination of the format
-     *                        constants in this class
+     * @param mixed $value  The value to format as string
+     * @param int   $format A bitwise combination of the format
+     *                      constants in this class
      *
      * @return string The string representation of the passed value
      */
@@ -197,9 +197,9 @@ protected function formatValue($value, $format = 0)
      * Each of the values is converted to a string using
      * {@link formatValue()}. The values are then concatenated with commas.
      *
-     * @param array   $values A list of values
-     * @param int     $format A bitwise combination of the format
-     *                        constants in this class
+     * @param array $values A list of values
+     * @param int   $format A bitwise combination of the format
+     *                      constants in this class
      *
      * @return string The string representation of the value list
      *
diff --git a/Constraints/GroupSequence.php b/Constraints/GroupSequence.php
@@ -110,9 +110,9 @@ public function getIterator()
     /**
      * Returns whether the given offset exists in the sequence.
      *
-     * @param int     $offset The offset
+     * @param int $offset The offset
      *
-     * @return bool    Whether the offset exists
+     * @return bool Whether the offset exists
      *
      * @deprecated Implemented for backwards compatibility with Symfony < 2.5.
      *             To be removed in Symfony 3.0.
@@ -125,7 +125,7 @@ public function offsetExists($offset)
     /**
      * Returns the group at the given offset.
      *
-     * @param int     $offset The offset
+     * @param int $offset The offset
      *
      * @return string The group a the given offset
      *
@@ -149,8 +149,8 @@ public function offsetGet($offset)
     /**
      * Sets the group at the given offset.
      *
-     * @param int     $offset The offset
-     * @param string  $value  The group name
+     * @param int    $offset The offset
+     * @param string $value  The group name
      *
      * @deprecated Implemented for backwards compatibility with Symfony < 2.5.
      *             To be removed in Symfony 3.0.
@@ -169,7 +169,7 @@ public function offsetSet($offset, $value)
     /**
      * Removes the group at the given offset.
      *
-     * @param int     $offset The offset
+     * @param int $offset The offset
      *
      * @deprecated Implemented for backwards compatibility with Symfony < 2.5.
      *             To be removed in Symfony 3.0.
@@ -182,7 +182,7 @@ public function offsetUnset($offset)
     /**
      * Returns the number of groups in the sequence.
      *
-     * @return int     The number of groups
+     * @return int The number of groups
      *
      * @deprecated Implemented for backwards compatibility with Symfony < 2.5.
      *             To be removed in Symfony 3.0.
diff --git a/Context/ExecutionContext.php b/Context/ExecutionContext.php
@@ -131,13 +131,13 @@ class ExecutionContext implements ExecutionContextInterface
     /**
      * Creates a new execution context.
      *
-     * @param ValidatorInterface    $validator         The validator
-     * @param mixed                 $root              The root value of the
-     *                                                 validated object graph
-     * @param TranslatorInterface   $translator        The translator
-     * @param string|null           $translationDomain The translation domain to
-     *                                                 use for translating
-     *                                                 violation messages
+     * @param ValidatorInterface  $validator         The validator
+     * @param mixed               $root              The root value of the
+     *                                               validated object graph
+     * @param TranslatorInterface $translator        The translator
+     * @param string|null         $translationDomain The translation domain to
+     *                                               use for translating
+     *                                               violation messages
      *
      * @internal Called by {@link ExecutionContextFactory}. Should not be used
      *           in user code.
diff --git a/Context/ExecutionContextFactory.php b/Context/ExecutionContextFactory.php
@@ -38,10 +38,10 @@ class ExecutionContextFactory implements ExecutionContextFactoryInterface
     /**
      * Creates a new context factory.
      *
-     * @param TranslatorInterface   $translator        The translator
-     * @param string|null           $translationDomain The translation domain to
-     *                                                 use for translating
-     *                                                 violation messages
+     * @param TranslatorInterface $translator        The translator
+     * @param string|null         $translationDomain The translation domain to
+     *                                               use for translating
+     *                                               violation messages
      */
     public function __construct(TranslatorInterface $translator, $translationDomain = null)
     {
diff --git a/Context/ExecutionContextInterface.php b/Context/ExecutionContextInterface.php
@@ -150,9 +150,9 @@ public function setConstraint(Constraint $constraint);
     /**
      * Marks an object as validated in a specific validation group.
      *
-     * @param string $cacheKey The hash of the object
-     * @param string $groupHash  The group's name or hash, if it is group
-     *                           sequence
+     * @param string $cacheKey  The hash of the object
+     * @param string $groupHash The group's name or hash, if it is group
+     *                          sequence
      *
      * @internal Used by the validator engine. Should not be called by user
      *           code.
@@ -162,12 +162,12 @@ public function markGroupAsValidated($cacheKey, $groupHash);
     /**
      * Returns whether an object was validated in a specific validation group.
      *
-     * @param string $cacheKey The hash of the object
-     * @param string $groupHash  The group's name or hash, if it is group
-     *                           sequence
+     * @param string $cacheKey  The hash of the object
+     * @param string $groupHash The group's name or hash, if it is group
+     *                          sequence
      *
-     * @return bool    Whether the object was already validated for that
-     *                 group
+     * @return bool Whether the object was already validated for that
+     *              group
      *
      * @internal Used by the validator engine. Should not be called by user
      *           code.
@@ -177,7 +177,7 @@ public function isGroupValidated($cacheKey, $groupHash);
     /**
      * Marks a constraint as validated for an object.
      *
-     * @param string $cacheKey     The hash of the object
+     * @param string $cacheKey       The hash of the object
      * @param string $constraintHash The hash of the constraint
      *
      * @internal Used by the validator engine. Should not be called by user
@@ -188,10 +188,10 @@ public function markConstraintAsValidated($cacheKey, $constraintHash);
     /**
      * Returns whether a constraint was validated for an object.
      *
-     * @param string $cacheKey     The hash of the object
+     * @param string $cacheKey       The hash of the object
      * @param string $constraintHash The hash of the constraint
      *
-     * @return bool    Whether the constraint was already validated
+     * @return bool Whether the constraint was already validated
      *
      * @internal Used by the validator engine. Should not be called by user
      *           code.
diff --git a/Mapping/ClassMetadataInterface.php b/Mapping/ClassMetadataInterface.php
@@ -46,7 +46,7 @@ public function getConstrainedProperties();
      *
      * If it is, you can access the group sequence with {@link getGroupSequence()}.
      *
-     * @return bool    Returns true if the "Default" group is overridden
+     * @return bool Returns true if the "Default" group is overridden
      *
      * @see \Symfony\Component\Validator\Constraints\GroupSequence
      */
@@ -71,8 +71,8 @@ public function getGroupSequence();
      * This interface will be used to obtain the group sequence when an object
      * of this class is validated.
      *
-     * @return bool    Returns true if the "Default" group is overridden by
-     *                 a dynamic group sequence
+     * @return bool Returns true if the "Default" group is overridden by
+     *              a dynamic group sequence
      *
      * @see \Symfony\Component\Validator\GroupSequenceProviderInterface
      */
diff --git a/Mapping/MetadataInterface.php b/Mapping/MetadataInterface.php
@@ -34,7 +34,7 @@ interface MetadataInterface extends LegacyMetadataInterface
     /**
      * Returns the strategy for cascading objects.
      *
-     * @return int     The cascading strategy
+     * @return int The cascading strategy
      *
      * @see CascadingStrategy
      */
@@ -43,7 +43,7 @@ public function getCascadingStrategy();
     /**
      * Returns the strategy for traversing traversable objects.
      *
-     * @return int     The traversal strategy
+     * @return int The traversal strategy
      *
      * @see TraversalStrategy
      */
diff --git a/Tests/Constraints/ChoiceValidatorTest.php b/Tests/Constraints/ChoiceValidatorTest.php
@@ -95,7 +95,7 @@ public function testValidChoiceCallbackClosure()
     {
         $constraint = new Choice(array('callback' => function () {
             return array('foo', 'bar');
-        }, ));
+        }));
 
         $this->validator->validate('bar', $constraint);
 
diff --git a/Validator/RecursiveContextualValidator.php b/Validator/RecursiveContextualValidator.php
@@ -313,17 +313,17 @@ protected function normalizeGroups($groups)
      * traversal, the object will be iterated and each nested object will be
      * validated instead.
      *
-     * @param object    $object            The object to cascade
-     * @param string    $propertyPath      The current property path
-     * @param string[]  $groups            The validated groups
-     * @param int       $traversalStrategy The strategy for traversing the
-     *                                     cascaded object
-     * @param ExecutionContextInterface $context The current execution context
+     * @param object                    $object            The object to cascade
+     * @param string                    $propertyPath      The current property path
+     * @param string[]                  $groups            The validated groups
+     * @param int                       $traversalStrategy The strategy for traversing the
+     *                                                     cascaded object
+     * @param ExecutionContextInterface $context           The current execution context
      *
-     * @throws NoSuchMetadataException If the object has no associated metadata
-     *                                 and does not implement {@link \Traversable}
-     *                                 or if traversal is disabled via the
-     *                                 $traversalStrategy argument
+     * @throws NoSuchMetadataException      If the object has no associated metadata
+     *                                      and does not implement {@link \Traversable}
+     *                                      or if traversal is disabled via the
+     *                                      $traversalStrategy argument
      * @throws UnsupportedMetadataException If the metadata returned by the
      *                                      metadata factory does not implement
      *                                      {@link ClassMetadataInterface}
@@ -384,11 +384,11 @@ private function validateObject($object, $propertyPath, array $groups, $traversa
      * @param array|\Traversable        $collection    The collection
      * @param string                    $propertyPath  The current property path
      * @param string[]                  $groups        The validated groups
-     * @param bool    $stopRecursion                   Whether to disable
+     * @param bool                      $stopRecursion Whether to disable
      *                                                 recursive iteration. For
      *                                                 backwards compatibility
      *                                                 with Symfony < 2.5.
-     * @param ExecutionContextInterface $context      The current execution context
+     * @param ExecutionContextInterface $context       The current execution context
      *
      * @see ClassNode
      * @see CollectionNode
@@ -832,12 +832,12 @@ private function stepThroughGroupSequence($value, $object, $cacheKey, MetadataIn
     /**
      * Validates a node's value against all constraints in the given group.
      *
-     * @param mixed                     $value      The validated value
-     * @param string                    $cacheKey   The key for caching the
-     *                                              validated value
-     * @param MetadataInterface         $metadata   The metadata of the value
-     * @param string                    $group      The group to validate
-     * @param ExecutionContextInterface $context    The execution context
+     * @param mixed                     $value    The validated value
+     * @param string                    $cacheKey The key for caching the
+     *                                            validated value
+     * @param MetadataInterface         $metadata The metadata of the value
+     * @param string                    $group    The group to validate
+     * @param ExecutionContextInterface $context  The execution context
      */
     private function validateInGroup($value, $cacheKey, MetadataInterface $metadata, $group, ExecutionContextInterface $context)
     {
diff --git a/ValidatorBuilderInterface.php b/ValidatorBuilderInterface.php
@@ -174,7 +174,7 @@ public function setPropertyAccessor(PropertyAccessorInterface $propertyAccessor)
     /**
      * Sets the API version that the returned validator should support.
      *
-     * @param int     $apiVersion The required API version
+     * @param int $apiVersion The required API version
      *
      * @return ValidatorBuilderInterface The builder object
      *
diff --git a/Violation/ConstraintViolationBuilderInterface.php b/Violation/ConstraintViolationBuilderInterface.php
@@ -82,7 +82,7 @@ public function setInvalidValue($invalidValue);
      * Sets the number which determines how the plural form of the violation
      * message is chosen when it is translated.
      *
-     * @param int     $number The number for determining the plural form
+     * @param int $number The number for determining the plural form
      *
      * @return ConstraintViolationBuilderInterface This builder
      *

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ protected function buildViolation($message, array $parameters = array())`
`77`	`77`	`* supports the 2.4 context API.`
`78`	`78`	`*`
`79`	`79`	`* @param ExecutionContextInterface $context The context to use`
`80`		`- * @param string $message The violation message`
`81`		`- * @param array $parameters The message parameters`
	`80`	`+ * @param string $message The violation message`
	`81`	`+ * @param array $parameters The message parameters`
`82`	`82`	`*`
`83`	`83`	`* @return ConstraintViolationBuilderInterface The violation builder`
`84`	`84`	`*`
`@@ -126,9 +126,9 @@ protected function formatTypeOf($value)`
`126`	`126`	`* won't know what an "object", "array" or "resource" is and will be`
`127`	`127`	`* confused by the violation message.`
`128`	`128`	`*`
`129`		`- * @param mixed $value The value to format as string`
`130`		`- * @param int $format A bitwise combination of the format`
`131`		`- * constants in this class`
	`129`	`+ * @param mixed $value The value to format as string`
	`130`	`+ * @param int $format A bitwise combination of the format`
	`131`	`+ * constants in this class`
`132`	`132`	`*`
`133`	`133`	`* @return string The string representation of the passed value`
`134`	`134`	`*/`
`@@ -197,9 +197,9 @@ protected function formatValue($value, $format = 0)`
`197`	`197`	`* Each of the values is converted to a string using`
`198`	`198`	`* {@link formatValue()}. The values are then concatenated with commas.`
`199`	`199`	`*`
`200`		`- * @param array $values A list of values`
`201`		`- * @param int $format A bitwise combination of the format`
`202`		`- * constants in this class`
	`200`	`+ * @param array $values A list of values`
	`201`	`+ * @param int $format A bitwise combination of the format`
	`202`	`+ * constants in this class`
`203`	`203`	`*`
`204`	`204`	`* @return string The string representation of the value list`
`205`	`205`	`*`
Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,9 @@ public function getIterator()`
`110`	`110`	`/**`
`111`	`111`	`* Returns whether the given offset exists in the sequence.`
`112`	`112`	`*`
`113`		`- * @param int $offset The offset`
	`113`	`+ * @param int $offset The offset`
`114`	`114`	`*`
`115`		`- * @return bool Whether the offset exists`
	`115`	`+ * @return bool Whether the offset exists`
`116`	`116`	`*`
`117`	`117`	`* @deprecated Implemented for backwards compatibility with Symfony < 2.5.`
`118`	`118`	`* To be removed in Symfony 3.0.`
`@@ -125,7 +125,7 @@ public function offsetExists($offset)`
`125`	`125`	`/**`
`126`	`126`	`* Returns the group at the given offset.`
`127`	`127`	`*`
`128`		`- * @param int $offset The offset`
	`128`	`+ * @param int $offset The offset`
`129`	`129`	`*`
`130`	`130`	`* @return string The group a the given offset`
`131`	`131`	`*`
`@@ -149,8 +149,8 @@ public function offsetGet($offset)`
`149`	`149`	`/**`
`150`	`150`	`* Sets the group at the given offset.`
`151`	`151`	`*`
`152`		`- * @param int $offset The offset`
`153`		`- * @param string $value The group name`
	`152`	`+ * @param int $offset The offset`
	`153`	`+ * @param string $value The group name`
`154`	`154`	`*`
`155`	`155`	`* @deprecated Implemented for backwards compatibility with Symfony < 2.5.`
`156`	`156`	`* To be removed in Symfony 3.0.`
`@@ -169,7 +169,7 @@ public function offsetSet($offset, $value)`
`169`	`169`	`/**`
`170`	`170`	`* Removes the group at the given offset.`
`171`	`171`	`*`
`172`		`- * @param int $offset The offset`
	`172`	`+ * @param int $offset The offset`
`173`	`173`	`*`
`174`	`174`	`* @deprecated Implemented for backwards compatibility with Symfony < 2.5.`
`175`	`175`	`* To be removed in Symfony 3.0.`
`@@ -182,7 +182,7 @@ public function offsetUnset($offset)`
`182`	`182`	`/**`
`183`	`183`	`* Returns the number of groups in the sequence.`
`184`	`184`	`*`
`185`		`- * @return int The number of groups`
	`185`	`+ * @return int The number of groups`
`186`	`186`	`*`
`187`	`187`	`* @deprecated Implemented for backwards compatibility with Symfony < 2.5.`
`188`	`188`	`* To be removed in Symfony 3.0.`
Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,9 @@ public function setConstraint(Constraint $constraint);`
`150`	`150`	`/**`
`151`	`151`	`* Marks an object as validated in a specific validation group.`
`152`	`152`	`*`
`153`		`- * @param string $cacheKey The hash of the object`
`154`		`- * @param string $groupHash The group's name or hash, if it is group`
`155`		`- * sequence`
	`153`	`+ * @param string $cacheKey The hash of the object`
	`154`	`+ * @param string $groupHash The group's name or hash, if it is group`
	`155`	`+ * sequence`
`156`	`156`	`*`
`157`	`157`	`* @internal Used by the validator engine. Should not be called by user`
`158`	`158`	`* code.`
`@@ -162,12 +162,12 @@ public function markGroupAsValidated($cacheKey, $groupHash);`
`162`	`162`	`/**`
`163`	`163`	`* Returns whether an object was validated in a specific validation group.`
`164`	`164`	`*`
`165`		`- * @param string $cacheKey The hash of the object`
`166`		`- * @param string $groupHash The group's name or hash, if it is group`
`167`		`- * sequence`
	`165`	`+ * @param string $cacheKey The hash of the object`
	`166`	`+ * @param string $groupHash The group's name or hash, if it is group`
	`167`	`+ * sequence`
`168`	`168`	`*`
`169`		`- * @return bool Whether the object was already validated for that`
`170`		`- * group`
	`169`	`+ * @return bool Whether the object was already validated for that`
	`170`	`+ * group`
`171`	`171`	`*`
`172`	`172`	`* @internal Used by the validator engine. Should not be called by user`
`173`	`173`	`* code.`
`@@ -177,7 +177,7 @@ public function isGroupValidated($cacheKey, $groupHash);`
`177`	`177`	`/**`
`178`	`178`	`* Marks a constraint as validated for an object.`
`179`	`179`	`*`
`180`		`- * @param string $cacheKey The hash of the object`
	`180`	`+ * @param string $cacheKey The hash of the object`
`181`	`181`	`* @param string $constraintHash The hash of the constraint`
`182`	`182`	`*`
`183`	`183`	`* @internal Used by the validator engine. Should not be called by user`
`@@ -188,10 +188,10 @@ public function markConstraintAsValidated($cacheKey, $constraintHash);`
`188`	`188`	`/**`
`189`	`189`	`* Returns whether a constraint was validated for an object.`
`190`	`190`	`*`
`191`		`- * @param string $cacheKey The hash of the object`
	`191`	`+ * @param string $cacheKey The hash of the object`
`192`	`192`	`* @param string $constraintHash The hash of the constraint`
`193`	`193`	`*`
`194`		`- * @return bool Whether the constraint was already validated`
	`194`	`+ * @return bool Whether the constraint was already validated`
`195`	`195`	`*`
`196`	`196`	`* @internal Used by the validator engine. Should not be called by user`
`197`	`197`	`* code.`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function getConstrainedProperties();`
`46`	`46`	`*`
`47`	`47`	`* If it is, you can access the group sequence with {@link getGroupSequence()}.`
`48`	`48`	`*`
`49`		`- * @return bool Returns true if the "Default" group is overridden`
	`49`	`+ * @return bool Returns true if the "Default" group is overridden`
`50`	`50`	`*`
`51`	`51`	`* @see \Symfony\Component\Validator\Constraints\GroupSequence`
`52`	`52`	`*/`
`@@ -71,8 +71,8 @@ public function getGroupSequence();`
`71`	`71`	`* This interface will be used to obtain the group sequence when an object`
`72`	`72`	`* of this class is validated.`
`73`	`73`	`*`
`74`		`- * @return bool Returns true if the "Default" group is overridden by`
`75`		`- * a dynamic group sequence`
	`74`	`+ * @return bool Returns true if the "Default" group is overridden by`
	`75`	`+ * a dynamic group sequence`
`76`	`76`	`*`
`77`	`77`	`* @see \Symfony\Component\Validator\GroupSequenceProviderInterface`
`78`	`78`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ interface MetadataInterface extends LegacyMetadataInterface`
`34`	`34`	`/**`
`35`	`35`	`* Returns the strategy for cascading objects.`
`36`	`36`	`*`
`37`		`- * @return int The cascading strategy`
	`37`	`+ * @return int The cascading strategy`
`38`	`38`	`*`
`39`	`39`	`* @see CascadingStrategy`
`40`	`40`	`*/`
`@@ -43,7 +43,7 @@ public function getCascadingStrategy();`
`43`	`43`	`/**`
`44`	`44`	`* Returns the strategy for traversing traversable objects.`
`45`	`45`	`*`
`46`		`- * @return int The traversal strategy`
	`46`	`+ * @return int The traversal strategy`
`47`	`47`	`*`
`48`	`48`	`* @see TraversalStrategy`
`49`	`49`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function testValidChoiceCallbackClosure()`
`95`	`95`	`{`
`96`	`96`	`$constraint = new Choice(array('callback' => function () {`
`97`	`97`	`return array('foo', 'bar');`
`98`		`- }, ));`
	`98`	`+ }));`
`99`	`99`
`100`	`100`	`$this->validator->validate('bar', $constraint);`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public function setPropertyAccessor(PropertyAccessorInterface $propertyAccessor)`
`174`	`174`	`/**`
`175`	`175`	`* Sets the API version that the returned validator should support.`
`176`	`176`	`*`
`177`		`- * @param int $apiVersion The required API version`
	`177`	`+ * @param int $apiVersion The required API version`
`178`	`178`	`*`
`179`	`179`	`* @return ValidatorBuilderInterface The builder object`
`180`	`180`	`*`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function setInvalidValue($invalidValue);`
`82`	`82`	`* Sets the number which determines how the plural form of the violation`
`83`	`83`	`* message is chosen when it is translated.`
`84`	`84`	`*`
`85`		`- * @param int $number The number for determining the plural form`
	`85`	`+ * @param int $number The number for determining the plural form`
`86`	`86`	`*`
`87`	`87`	`* @return ConstraintViolationBuilderInterface This builder`
`88`	`88`	`*`