Merge branch '2.8' into 3.3

fabpot · fabpot · commit ef8babfeca1f · 2017-09-11T13:43:11.000-07:00
* 2.8:
  [CS] Apply phpdoc_annotation_without_dot
diff --git a/AbstractRendererEngine.php b/AbstractRendererEngine.php
@@ -139,14 +139,14 @@ abstract protected function loadResourceForBlockName($cacheKey, FormView $view,
      *
      * @see getResourceForBlockHierarchy()
      *
-     * @param string   $cacheKey           The cache key used for storing the
-     *                                     resource.
-     * @param FormView $view               The form view for finding the applying
-     *                                     themes.
-     * @param array    $blockNameHierarchy The block hierarchy, with the most
-     *                                     specific block name at the end.
-     * @param int      $hierarchyLevel     The level in the block hierarchy that
-     *                                     should be loaded.
+     * @param string   $cacheKey           the cache key used for storing the
+     *                                     resource
+     * @param FormView $view               the form view for finding the applying
+     *                                     themes
+     * @param array    $blockNameHierarchy the block hierarchy, with the most
+     *                                     specific block name at the end
+     * @param int      $hierarchyLevel     the level in the block hierarchy that
+     *                                     should be loaded
      *
      * @return bool True if the resource could be loaded, false otherwise
      */
diff --git a/Button.php b/Button.php
@@ -371,7 +371,7 @@ public function handleRequest($request = null)
      *
      * @return $this
      *
-     * @throws Exception\AlreadySubmittedException If the button has already been submitted.
+     * @throws Exception\AlreadySubmittedException if the button has already been submitted
      */
     public function submit($submittedData, $clearMissing = true)
     {
diff --git a/ButtonBuilder.php b/ButtonBuilder.php
@@ -58,7 +58,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
      * @param string $name    The name of the button
      * @param array  $options The button's options
      *
-     * @throws InvalidArgumentException If the name is empty.
+     * @throws InvalidArgumentException if the name is empty
      */
     public function __construct($name, array $options = array())
     {
diff --git a/ChoiceList/ArrayChoiceList.php b/ChoiceList/ArrayChoiceList.php
@@ -216,8 +216,8 @@ protected function flatten(array $choices, $value, &$choicesByValues, &$keysByVa
      * @param array      $choices The choices
      * @param array|null $cache   The cache for previously checked entries. Internal
      *
-     * @return bool Returns true if the choices can be cast to strings and
-     *              false otherwise.
+     * @return bool returns true if the choices can be cast to strings and
+     *              false otherwise
      */
     private function castableToString(array $choices, array &$cache = array())
     {
diff --git a/ChoiceList/Factory/CachingFactoryDecorator.php b/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -48,7 +48,7 @@ class CachingFactoryDecorator implements ChoiceListFactoryInterface
      *
      * @return string The SHA-256 hash
      *
-     * @internal Should not be used by user-land code.
+     * @internal should not be used by user-land code
      */
     public static function generateHash($value, $namespace = '')
     {
diff --git a/ChoiceList/View/ChoiceGroupView.php b/ChoiceList/View/ChoiceGroupView.php
@@ -36,8 +36,8 @@ class ChoiceGroupView implements \IteratorAggregate
      * Creates a new choice group view.
      *
      * @param string                         $label   The label of the group
-     * @param ChoiceGroupView[]|ChoiceView[] $choices The choice views in the
-     *                                                group.
+     * @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the
+     *                                                group
      */
     public function __construct($label, array $choices = array())
     {
diff --git a/ChoiceList/View/ChoiceListView.php b/ChoiceList/View/ChoiceListView.php
@@ -40,8 +40,8 @@ class ChoiceListView
      * Creates a new choice list view.
      *
      * @param ChoiceGroupView[]|ChoiceView[] $choices          The choice views
-     * @param ChoiceGroupView[]|ChoiceView[] $preferredChoices The preferred
-     *                                                         choice views.
+     * @param ChoiceGroupView[]|ChoiceView[] $preferredChoices the preferred
+     *                                                         choice views
      */
     public function __construct(array $choices = array(), array $preferredChoices = array())
     {
diff --git a/DataMapperInterface.php b/DataMapperInterface.php
@@ -22,7 +22,7 @@ interface DataMapperInterface
      * @param mixed                        $data  Structured data
      * @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
      *
-     * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported.
+     * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
      */
     public function mapDataToForms($data, $forms);
 
@@ -32,7 +32,7 @@ public function mapDataToForms($data, $forms);
      * @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
      * @param mixed                        $data  Structured data
      *
-     * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported.
+     * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
      */
     public function mapFormsToData($forms, &$data);
 }
diff --git a/DataTransformerInterface.php b/DataTransformerInterface.php
@@ -45,7 +45,7 @@ interface DataTransformerInterface
      *
      * @return mixed The value in the transformed representation
      *
-     * @throws TransformationFailedException When the transformation fails.
+     * @throws TransformationFailedException when the transformation fails
      */
     public function transform($value);
 
@@ -71,7 +71,7 @@ public function transform($value);
      *
      * @return mixed The value in the original representation
      *
-     * @throws TransformationFailedException When the transformation fails.
+     * @throws TransformationFailedException when the transformation fails
      */
     public function reverseTransform($value);
 }
diff --git a/Extension/Core/DataTransformer/BooleanToStringTransformer.php b/Extension/Core/DataTransformer/BooleanToStringTransformer.php
@@ -46,7 +46,7 @@ public function __construct($trueValue)
      *
      * @return string String value
      *
-     * @throws TransformationFailedException If the given value is not a Boolean.
+     * @throws TransformationFailedException if the given value is not a Boolean
      */
     public function transform($value)
     {
@@ -68,7 +68,7 @@ public function transform($value)
      *
      * @return bool Boolean value
      *
-     * @throws TransformationFailedException If the given value is not a string.
+     * @throws TransformationFailedException if the given value is not a string
      */
     public function reverseTransform($value)
     {
diff --git a/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
@@ -37,7 +37,7 @@ public function __construct(ChoiceListInterface $choiceList)
      *
      * @return array
      *
-     * @throws TransformationFailedException If the given value is not an array.
+     * @throws TransformationFailedException if the given value is not an array
      */
     public function transform($array)
     {
@@ -57,9 +57,9 @@ public function transform($array)
      *
      * @return array
      *
-     * @throws TransformationFailedException If the given value is not an array
+     * @throws TransformationFailedException if the given value is not an array
      *                                       or if no matching choice could be
-     *                                       found for some given value.
+     *                                       found for some given value
      */
     public function reverseTransform($array)
     {
diff --git a/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -74,8 +74,8 @@ public function __construct($inputTimezone = null, $outputTimezone = null, $date
      *
      * @return string|array Localized date string/array
      *
-     * @throws TransformationFailedException If the given value is not a \DateTimeInterface
-     *                                       or if the date could not be transformed.
+     * @throws TransformationFailedException if the given value is not a \DateTimeInterface
+     *                                       or if the date could not be transformed
      */
     public function transform($dateTime)
     {
@@ -151,11 +151,11 @@ public function reverseTransform($value)
     /**
      * Returns a preconfigured IntlDateFormatter instance.
      *
-     * @param bool $ignoreTimezone Use UTC regardless of the configured timezone.
+     * @param bool $ignoreTimezone use UTC regardless of the configured timezone
      *
      * @return \IntlDateFormatter
      *
-     * @throws TransformationFailedException in case the date formatter can not be constructed.
+     * @throws TransformationFailedException in case the date formatter can not be constructed
      */
     protected function getIntlDateFormatter($ignoreTimezone = false)
     {
diff --git a/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
@@ -49,8 +49,8 @@ public function __construct($scale = 2, $grouping = true, $roundingMode = self::
      *
      * @return string Localized money string
      *
-     * @throws TransformationFailedException If the given value is not numeric or
-     *                                       if the value can not be transformed.
+     * @throws TransformationFailedException if the given value is not numeric or
+     *                                       if the value can not be transformed
      */
     public function transform($value)
     {
@@ -72,8 +72,8 @@ public function transform($value)
      *
      * @return int|float Normalized number
      *
-     * @throws TransformationFailedException If the given value is not a string
-     *                                       or if the value can not be transformed.
+     * @throws TransformationFailedException if the given value is not a string
+     *                                       or if the value can not be transformed
      */
     public function reverseTransform($value)
     {
diff --git a/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -100,8 +100,8 @@ public function __construct($scale = null, $grouping = false, $roundingMode = se
      *
      * @return string Localized value
      *
-     * @throws TransformationFailedException If the given value is not numeric
-     *                                       or if the value can not be transformed.
+     * @throws TransformationFailedException if the given value is not numeric
+     *                                       or if the value can not be transformed
      */
     public function transform($value)
     {
@@ -133,8 +133,8 @@ public function transform($value)
      *
      * @return int|float The numeric value
      *
-     * @throws TransformationFailedException If the given value is not a string
-     *                                       or if the value can not be transformed.
+     * @throws TransformationFailedException if the given value is not a string
+     *                                       or if the value can not be transformed
      */
     public function reverseTransform($value)
     {
diff --git a/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -70,8 +70,8 @@ public function __construct($scale = null, $type = null)
      *
      * @return string Percentage value
      *
-     * @throws TransformationFailedException If the given value is not numeric or
-     *                                       if the value could not be transformed.
+     * @throws TransformationFailedException if the given value is not numeric or
+     *                                       if the value could not be transformed
      */
     public function transform($value)
     {
@@ -105,8 +105,8 @@ public function transform($value)
      *
      * @return int|float Normalized value
      *
-     * @throws TransformationFailedException If the given value is not a string or
-     *                                       if the value could not be transformed.
+     * @throws TransformationFailedException if the given value is not a string or
+     *                                       if the value could not be transformed
      */
     public function reverseTransform($value)
     {
diff --git a/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php b/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
@@ -51,8 +51,8 @@ public function transform($value)
      *
      * @return mixed The value
      *
-     * @throws TransformationFailedException If the given value is not an array or
-     *                                       if the given array can not be transformed.
+     * @throws TransformationFailedException if the given value is not an array or
+     *                                       if the given array can not be transformed
      */
     public function reverseTransform($array)
     {
diff --git a/Extension/Core/EventListener/MergeCollectionListener.php b/Extension/Core/EventListener/MergeCollectionListener.php
@@ -38,10 +38,10 @@ class MergeCollectionListener implements EventSubscriberInterface
     /**
      * Creates a new listener.
      *
-     * @param bool $allowAdd    Whether values might be added to the
-     *                          collection.
-     * @param bool $allowDelete Whether values might be removed from the
-     *                          collection.
+     * @param bool $allowAdd    whether values might be added to the
+     *                          collection
+     * @param bool $allowDelete whether values might be removed from the
+     *                          collection
      */
     public function __construct($allowAdd = false, $allowDelete = false)
     {
diff --git a/Extension/Validator/ValidatorTypeGuesser.php b/Extension/Validator/ValidatorTypeGuesser.php
@@ -250,8 +250,8 @@ public function guessPatternForConstraint(Constraint $constraint)
      * @param string   $property     The property for which to find constraints
      * @param \Closure $closure      The closure that returns a guess
      *                               for a given constraint
-     * @param mixed    $defaultValue The default value assumed if no other value
-     *                               can be guessed.
+     * @param mixed    $defaultValue the default value assumed if no other value
+     *                               can be guessed
      *
      * @return Guess|null The guessed value with the highest confidence
      */
diff --git a/Extension/Validator/ViolationMapper/ViolationMapperInterface.php b/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
@@ -24,10 +24,10 @@ interface ViolationMapperInterface
      * the given form.
      *
      * @param ConstraintViolation $violation            The violation to map
-     * @param FormInterface       $form                 The root form of the tree
-     *                                                  to map it to.
-     * @param bool                $allowNonSynchronized Whether to allow
-     *                                                  mapping to non-synchronized forms.
+     * @param FormInterface       $form                 the root form of the tree
+     *                                                  to map it to
+     * @param bool                $allowNonSynchronized whether to allow
+     *                                                  mapping to non-synchronized forms
      */
     public function mapViolation(ConstraintViolation $violation, FormInterface $form, $allowNonSynchronized = false);
 }
diff --git a/Extension/Validator/ViolationMapper/ViolationPath.php b/Extension/Validator/ViolationMapper/ViolationPath.php
@@ -48,8 +48,8 @@ class ViolationPath implements \IteratorAggregate, PropertyPathInterface
     /**
      * Creates a new violation path from a string.
      *
-     * @param string $violationPath The property path of a {@link \Symfony\Component\Validator\ConstraintViolation}
-     *                              object.
+     * @param string $violationPath the property path of a {@link \Symfony\Component\Validator\ConstraintViolation}
+     *                              object
      */
     public function __construct($violationPath)
     {
@@ -210,7 +210,7 @@ public function isIndex($index)
      *
      * @return bool Whether the element maps to a form
      *
-     * @throws OutOfBoundsException If the offset is invalid.
+     * @throws OutOfBoundsException if the offset is invalid
      */
     public function mapsForm($index)
     {
diff --git a/Form.php b/Form.php
@@ -944,7 +944,7 @@ public function offsetExists($name)
      *
      * @return FormInterface The child form
      *
-     * @throws \OutOfBoundsException If the named child does not exist.
+     * @throws \OutOfBoundsException if the named child does not exist
      */
     public function offsetGet($name)
     {
@@ -957,8 +957,8 @@ public function offsetGet($name)
      * @param string        $name  Ignored. The name of the child is used
      * @param FormInterface $child The child to be added
      *
-     * @throws AlreadySubmittedException If the form has already been submitted.
-     * @throws LogicException            When trying to add a child to a non-compound form.
+     * @throws AlreadySubmittedException if the form has already been submitted
+     * @throws LogicException            when trying to add a child to a non-compound form
      *
      * @see self::add()
      */
@@ -972,7 +972,7 @@ public function offsetSet($name, $child)
      *
      * @param string $name The name of the child to remove
      *
-     * @throws AlreadySubmittedException If the form has already been submitted.
+     * @throws AlreadySubmittedException if the form has already been submitted
      */
     public function offsetUnset($name)
     {
diff --git a/FormConfigBuilder.php b/FormConfigBuilder.php
@@ -185,8 +185,8 @@ class FormConfigBuilder implements FormConfigBuilderInterface
      * @param EventDispatcherInterface $dispatcher The event dispatcher
      * @param array                    $options    The form options
      *
-     * @throws InvalidArgumentException If the data class is not a valid class or if
-     *                                  the name contains invalid characters.
+     * @throws InvalidArgumentException if the data class is not a valid class or if
+     *                                  the name contains invalid characters
      */
     public function __construct($name, $dataClass, EventDispatcherInterface $dispatcher, array $options = array())
     {
@@ -852,8 +852,8 @@ public function getFormConfig()
      *
      * @param string|int $name The tested form name
      *
-     * @throws UnexpectedTypeException  If the name is not a string or an integer.
-     * @throws InvalidArgumentException If the name contains invalid characters.
+     * @throws UnexpectedTypeException  if the name is not a string or an integer
+     * @throws InvalidArgumentException if the name contains invalid characters
      */
     public static function validateName($name)
     {
diff --git a/FormConfigBuilderInterface.php b/FormConfigBuilderInterface.php
@@ -152,9 +152,8 @@ public function setRequired($required);
     /**
      * Sets the property path that the form should be mapped to.
      *
-     * @param null|string|PropertyPathInterface $propertyPath
-     *                                                        The property path or null if the path should be set
-     *                                                        automatically based on the form's name.
+     * @param null|string|PropertyPathInterface $propertyPath the property path or null if the path should be set
+     *                                                        automatically based on the form's name
      *
      * @return $this The configuration object
      */
@@ -173,8 +172,8 @@ public function setMapped($mapped);
     /**
      * Sets whether the form's data should be modified by reference.
      *
-     * @param bool $byReference Whether the data should be
-     *                          modified by reference.
+     * @param bool $byReference whether the data should be
+     *                          modified by reference
      *
      * @return $this The configuration object
      */
diff --git a/FormConfigInterface.php b/FormConfigInterface.php
diff --git a/FormErrorIterator.php b/FormErrorIterator.php
diff --git a/FormInterface.php b/FormInterface.php
diff --git a/FormRendererEngineInterface.php b/FormRendererEngineInterface.php
diff --git a/SubmitButton.php b/SubmitButton.php
diff --git a/Util/OrderedHashMapIterator.php b/Util/OrderedHashMapIterator.php

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ public function handleRequest($request = null)`
`371`	`371`	`*`
`372`	`372`	`* @return $this`
`373`	`373`	`*`
`374`		`- * @throws Exception\AlreadySubmittedException If the button has already been submitted.`
	`374`	`+ * @throws Exception\AlreadySubmittedException if the button has already been submitted`
`375`	`375`	`*/`
`376`	`376`	`public function submit($submittedData, $clearMissing = true)`
`377`	`377`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface`
`58`	`58`	`* @param string $name The name of the button`
`59`	`59`	`* @param array $options The button's options`
`60`	`60`	`*`
`61`		`- * @throws InvalidArgumentException If the name is empty.`
	`61`	`+ * @throws InvalidArgumentException if the name is empty`
`62`	`62`	`*/`
`63`	`63`	`public function __construct($name, array $options = array())`
`64`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,8 @@ protected function flatten(array $choices, $value, &$choicesByValues, &$keysByVa`
`216`	`216`	`* @param array $choices The choices`
`217`	`217`	`* @param array\|null $cache The cache for previously checked entries. Internal`
`218`	`218`	`*`
`219`		`- * @return bool Returns true if the choices can be cast to strings and`
`220`		`- * false otherwise.`
	`219`	`+ * @return bool returns true if the choices can be cast to strings and`
	`220`	`+ * false otherwise`
`221`	`221`	`*/`
`222`	`222`	`private function castableToString(array $choices, array &$cache = array())`
`223`	`223`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class CachingFactoryDecorator implements ChoiceListFactoryInterface`
`48`	`48`	`*`
`49`	`49`	`* @return string The SHA-256 hash`
`50`	`50`	`*`
`51`		`- * @internal Should not be used by user-land code.`
	`51`	`+ * @internal should not be used by user-land code`
`52`	`52`	`*/`
`53`	`53`	`public static function generateHash($value, $namespace = '')`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ class ChoiceGroupView implements \IteratorAggregate`
`36`	`36`	`* Creates a new choice group view.`
`37`	`37`	`*`
`38`	`38`	`* @param string $label The label of the group`
`39`		`- * @param ChoiceGroupView[]\|ChoiceView[] $choices The choice views in the`
`40`		`- * group.`
	`39`	`+ * @param ChoiceGroupView[]\|ChoiceView[] $choices the choice views in the`
	`40`	`+ * group`
`41`	`41`	`*/`
`42`	`42`	`public function __construct($label, array $choices = array())`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ class ChoiceListView`
`40`	`40`	`* Creates a new choice list view.`
`41`	`41`	`*`
`42`	`42`	`* @param ChoiceGroupView[]\|ChoiceView[] $choices The choice views`
`43`		`- * @param ChoiceGroupView[]\|ChoiceView[] $preferredChoices The preferred`
`44`		`- * choice views.`
	`43`	`+ * @param ChoiceGroupView[]\|ChoiceView[] $preferredChoices the preferred`
	`44`	`+ * choice views`
`45`	`45`	`*/`
`46`	`46`	`public function __construct(array $choices = array(), array $preferredChoices = array())`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ interface DataMapperInterface`
`22`	`22`	`* @param mixed $data Structured data`
`23`	`23`	`* @param FormInterface[]\|\Traversable $forms A list of {@link FormInterface} instances`
`24`	`24`	`*`
`25`		`- * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported.`
	`25`	`+ * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported`
`26`	`26`	`*/`
`27`	`27`	`public function mapDataToForms($data, $forms);`
`28`	`28`
`@@ -32,7 +32,7 @@ public function mapDataToForms($data, $forms);`
`32`	`32`	`* @param FormInterface[]\|\Traversable $forms A list of {@link FormInterface} instances`
`33`	`33`	`* @param mixed $data Structured data`
`34`	`34`	`*`
`35`		`- * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported.`
	`35`	`+ * @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported`
`36`	`36`	`*/`
`37`	`37`	`public function mapFormsToData($forms, &$data);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ interface DataTransformerInterface`
`45`	`45`	`*`
`46`	`46`	`* @return mixed The value in the transformed representation`
`47`	`47`	`*`
`48`		`- * @throws TransformationFailedException When the transformation fails.`
	`48`	`+ * @throws TransformationFailedException when the transformation fails`
`49`	`49`	`*/`
`50`	`50`	`public function transform($value);`
`51`	`51`
`@@ -71,7 +71,7 @@ public function transform($value);`
`71`	`71`	`*`
`72`	`72`	`* @return mixed The value in the original representation`
`73`	`73`	`*`
`74`		`- * @throws TransformationFailedException When the transformation fails.`
	`74`	`+ * @throws TransformationFailedException when the transformation fails`
`75`	`75`	`*/`
`76`	`76`	`public function reverseTransform($value);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function __construct($trueValue)`
`46`	`46`	`*`
`47`	`47`	`* @return string String value`
`48`	`48`	`*`
`49`		`- * @throws TransformationFailedException If the given value is not a Boolean.`
	`49`	`+ * @throws TransformationFailedException if the given value is not a Boolean`
`50`	`50`	`*/`
`51`	`51`	`public function transform($value)`
`52`	`52`	`{`
`@@ -68,7 +68,7 @@ public function transform($value)`
`68`	`68`	`*`
`69`	`69`	`* @return bool Boolean value`
`70`	`70`	`*`
`71`		`- * @throws TransformationFailedException If the given value is not a string.`
	`71`	`+ * @throws TransformationFailedException if the given value is not a string`
`72`	`72`	`*/`
`73`	`73`	`public function reverseTransform($value)`
`74`	`74`	`{`