Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 4d8760952897 · 2017-10-01T23:00:16.000+02:00
* 2.7: (22 commits)
  Tests and fix for issue in array model data in EntityType field with multiple=true
  [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
  removed useless PHPDoc
  [Form] Fix FormInterface::submit() annotation
  PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character &gt; 4
  HttpCache does not consider ESI resources in HEAD requests
  Fix translation for "This field was not expected"
  [Routing] Enhance Route(Collection) docblocks
  Added improvement for accuracy in MoneyToLocalizedStringTransformer.
  Removed unused private property
  Use correct verb form in the pull request template
  Use PHP_MAXPATHLEN in Filesystem.
  Added null as explicit return type (?TokenInterface)
  [FrameworkBundle] Fix Routing\DelegatingLoader
  Render all line breaks according to the exception message
  [Form] Fix phpdoc
  [DI] remove confusing code
  [Form] Fixed GroupSequence with "constraints" option
  [Validator] Clarify UUID validator behavior
  [Filesystem] Fixed makePathRelative
  ...
diff --git a/CallbackTransformer.php b/CallbackTransformer.php
@@ -31,8 +31,6 @@ class CallbackTransformer implements DataTransformerInterface
     private $reverseTransform;
 
     /**
-     * Constructor.
-     *
      * @param callable $transform        The forward transform callback
      * @param callable $reverseTransform The reverse transform callback
      *
diff --git a/Extension/Core/DataTransformer/BaseDateTimeTransformer.php b/Extension/Core/DataTransformer/BaseDateTimeTransformer.php
@@ -30,8 +30,6 @@ abstract class BaseDateTimeTransformer implements DataTransformerInterface
     protected $outputTimezone;
 
     /**
-     * Constructor.
-     *
      * @param string $inputTimezone  The name of the input timezone
      * @param string $outputTimezone The name of the output timezone
      *
diff --git a/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php b/Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php
@@ -30,8 +30,6 @@ class ChoiceToBooleanArrayTransformer implements DataTransformerInterface
     private $placeholderPresent;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      * @param bool                $placeholderPresent
      */
diff --git a/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
@@ -23,8 +23,6 @@ class ChoiceToValueTransformer implements DataTransformerInterface
     private $choiceList;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      */
     public function __construct(ChoiceListInterface $choiceList)
diff --git a/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
@@ -23,8 +23,6 @@ class ChoicesToValuesTransformer implements DataTransformerInterface
     private $choiceList;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      */
     public function __construct(ChoiceListInterface $choiceList)
diff --git a/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -27,8 +27,6 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
     private $fields;
 
     /**
-     * Constructor.
-     *
      * @param string $inputTimezone  The input timezone
      * @param string $outputTimezone The output timezone
      * @param array  $fields         The date fields
diff --git a/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -28,8 +28,6 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
     private $calendar;
 
     /**
-     * Constructor.
-     *
      * @see BaseDateTimeTransformer::formats for available format options
      *
      * @param string $inputTimezone  The name of the input timezone
diff --git a/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
@@ -54,12 +54,11 @@ public function __construct($scale = 2, $grouping = true, $roundingMode = self::
      */
     public function transform($value)
     {
-        if (null !== $value) {
+        if (null !== $value && 1 !== $this->divisor) {
             if (!is_numeric($value)) {
                 throw new TransformationFailedException('Expected a numeric.');
             }
-
-            $value /= $this->divisor;
+            $value = (string) ($value / $this->divisor);
         }
 
         return parent::transform($value);
@@ -78,9 +77,8 @@ public function transform($value)
     public function reverseTransform($value)
     {
         $value = parent::reverseTransform($value);
-
-        if (null !== $value) {
-            $value *= $this->divisor;
+        if (null !== $value && 1 !== $this->divisor) {
+            $value = (float) (string) ($value * $this->divisor);
         }
 
         return $value;
diff --git a/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php
@@ -36,8 +36,6 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface
     private $scale;
 
     /**
-     * Constructor.
-     *
      * @see self::$types for a list of supported types
      *
      * @param int    $scale The scale
@@ -119,6 +117,18 @@ public function reverseTransform($value)
         }
 
         $formatter = $this->getNumberFormatter();
+        $groupSep = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
+        $decSep = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
+        $grouping = $formatter->getAttribute(\NumberFormatter::GROUPING_USED);
+
+        if ('.' !== $decSep && (!$grouping || '.' !== $groupSep)) {
+            $value = str_replace('.', $decSep, $value);
+        }
+
+        if (',' !== $decSep && (!$grouping || ',' !== $groupSep)) {
+            $value = str_replace(',', $decSep, $value);
+        }
+
         // replace normal spaces so that the formatter can read them
         $value = $formatter->parse(str_replace(' ', "\xc2\xa0", $value));
 
diff --git a/Extension/Core/EventListener/FixCheckboxInputListener.php b/Extension/Core/EventListener/FixCheckboxInputListener.php
@@ -33,8 +33,6 @@ class FixCheckboxInputListener implements EventSubscriberInterface
     private $choiceList;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      */
     public function __construct(ChoiceListInterface $choiceList)
diff --git a/Extension/Core/EventListener/FixRadioInputListener.php b/Extension/Core/EventListener/FixRadioInputListener.php
@@ -34,8 +34,6 @@ class FixRadioInputListener implements EventSubscriberInterface
     private $placeholderPresent;
 
     /**
-     * Constructor.
-     *
      * @param ChoiceListInterface $choiceList
      * @param bool                $placeholderPresent
      */
diff --git a/Extension/Core/EventListener/FixUrlProtocolListener.php b/Extension/Core/EventListener/FixUrlProtocolListener.php
@@ -25,8 +25,6 @@ class FixUrlProtocolListener implements EventSubscriberInterface
     private $defaultProtocol;
 
     /**
-     * Constructor.
-     *
      * @param string|null $defaultProtocol The URL scheme to add when there is none or null to not modify the data
      */
     public function __construct($defaultProtocol = 'http')
diff --git a/Extension/Core/EventListener/MergeCollectionListener.php b/Extension/Core/EventListener/MergeCollectionListener.php
@@ -80,7 +80,7 @@ public function onSubmit(FormEvent $event)
             return;
         }
 
-        if (!$dataToMergeInto) {
+        if (null === $dataToMergeInto) {
             // No original data was set. Set it if allowed
             if ($this->allowAdd) {
                 $dataToMergeInto = $data;
diff --git a/Extension/Csrf/CsrfExtension.php b/Extension/Csrf/CsrfExtension.php
@@ -41,8 +41,6 @@ class CsrfExtension extends AbstractExtension
     private $translationDomain;
 
     /**
-     * Constructor.
-     *
      * @param CsrfTokenManagerInterface $tokenManager      The CSRF token manager
      * @param TranslatorInterface       $translator        The translator for translating error messages
      * @param null|string               $translationDomain The translation domain for translating
diff --git a/Extension/Validator/Constraints/FormValidator.php b/Extension/Validator/Constraints/FormValidator.php
@@ -66,32 +66,52 @@ public function validate($form, Constraint $constraint)
             // Validate the data against the constraints defined
             // in the form
             $constraints = $config->getOption('constraints', array());
-            foreach ($constraints as $constraint) {
-                // For the "Valid" constraint, validate the data in all groups
-                if ($constraint instanceof Valid) {
-                    if ($validator) {
-                        $validator->atPath('data')->validate($form->getData(), $constraint, $groups);
-                    } else {
-                        // 2.4 API
-                        $this->context->validateValue($form->getData(), $constraint, 'data', $groups);
-                    }
 
-                    continue;
-                }
+            if ($groups instanceof GroupSequence) {
+                if ($validator) {
+                    $validator->atPath('data')->validate($form->getData(), $constraints, $groups);
+                } else {
+                    // 2.4 API
+                    foreach ($groups as $group) {
+                        foreach ($constraints as $constraint) {
+                            if (in_array($group, $constraint->groups)) {
+                                $this->context->validateValue($form->getData(), $constraint, 'data', $group);
+                            }
+                        }
 
-                // Otherwise validate a constraint only once for the first
-                // matching group
-                foreach ($groups as $group) {
-                    if (in_array($group, $constraint->groups)) {
+                        if (count($this->context->getViolations()) > 0) {
+                            break;
+                        }
+                    }
+                }
+            } else {
+                foreach ($constraints as $constraint) {
+                    // For the "Valid" constraint, validate the data in all groups
+                    if ($constraint instanceof Valid) {
                         if ($validator) {
-                            $validator->atPath('data')->validate($form->getData(), $constraint, $group);
+                            $validator->atPath('data')->validate($form->getData(), $constraint, $groups);
                         } else {
                             // 2.4 API
-                            $this->context->validateValue($form->getData(), $constraint, 'data', $group);
+                            $this->context->validateValue($form->getData(), $constraint, 'data', $groups);
                         }
 
-                        // Prevent duplicate validation
-                        continue 2;
+                        continue;
+                    }
+
+                    // Otherwise validate a constraint only once for the first
+                    // matching group
+                    foreach ($groups as $group) {
+                        if (in_array($group, $constraint->groups)) {
+                            if ($validator) {
+                                $validator->atPath('data')->validate($form->getData(), $constraint, $group);
+                            } else {
+                                // 2.4 API
+                                $this->context->validateValue($form->getData(), $constraint, 'data', $group);
+                            }
+
+                            // Prevent duplicate validation
+                            continue 2;
+                        }
                     }
                 }
             }
diff --git a/FormConfigInterface.php b/FormConfigInterface.php
@@ -167,7 +167,7 @@ public function getData();
     /**
      * Returns the class of the form data or null if the data is scalar or an array.
      *
-     * @return string The data class or null
+     * @return null|string The data class or null
      */
     public function getDataClass();
 
diff --git a/FormError.php b/FormError.php
@@ -61,8 +61,6 @@ class FormError implements \Serializable
     private $origin;
 
     /**
-     * Constructor.
-     *
      * Any array key in $messageParameters will be used as a placeholder in
      * $messageTemplate.
      *
diff --git a/FormInterface.php b/FormInterface.php
@@ -269,10 +269,9 @@ public function handleRequest($request = null);
     /**
      * Submits data to the form, transforms and validates it.
      *
-     * @param null|string|array $submittedData The submitted data
-     * @param bool              $clearMissing  whether to set fields to NULL
-     *                                         when they are missing in the
-     *                                         submitted data
+     * @param mixed $submittedData The submitted data
+     * @param bool  $clearMissing  whether to set fields to NULL when they
+     *                             are missing in the submitted data
      *
      * @return $this
      *
diff --git a/FormRegistry.php b/FormRegistry.php
@@ -50,8 +50,6 @@ class FormRegistry implements FormRegistryInterface
     private $resolvedTypeFactory;
 
     /**
-     * Constructor.
-     *
      * @param FormExtensionInterface[]         $extensions          An array of FormExtensionInterface
      * @param ResolvedFormTypeFactoryInterface $resolvedTypeFactory The factory for resolved form types
      *
diff --git a/FormRenderer.php b/FormRenderer.php
@@ -53,8 +53,6 @@ class FormRenderer implements FormRendererInterface
     private $variableStack = array();
 
     /**
-     * Constructor.
-     *
      * @param FormRendererEngineInterface    $engine
      * @param CsrfTokenManagerInterface|null $csrfTokenManager
      *
diff --git a/FormTypeGuesserChain.php b/FormTypeGuesserChain.php
@@ -19,8 +19,6 @@ class FormTypeGuesserChain implements FormTypeGuesserInterface
     private $guessers = array();
 
     /**
-     * Constructor.
-     *
      * @param FormTypeGuesserInterface[] $guessers Guessers as instances of FormTypeGuesserInterface
      *
      * @throws UnexpectedTypeException if any guesser does not implement FormTypeGuesserInterface
diff --git a/Guess/Guess.php b/Guess/Guess.php
@@ -88,8 +88,6 @@ public static function getBestGuess(array $guesses)
     }
 
     /**
-     * Constructor.
-     *
      * @param int $confidence The confidence
      *
      * @throws InvalidArgumentException if the given value of confidence is unknown
diff --git a/Guess/TypeGuess.php b/Guess/TypeGuess.php
@@ -34,8 +34,6 @@ class TypeGuess extends Guess
     private $options;
 
     /**
-     * Constructor.
-     *
      * @param string $type       The guessed field type
      * @param array  $options    The options for creating instances of the
      *                           guessed class
diff --git a/Guess/ValueGuess.php b/Guess/ValueGuess.php
@@ -21,8 +21,6 @@ class ValueGuess extends Guess
     private $value;
 
     /**
-     * Constructor.
-     *
      * @param string|int|bool|null $value      The guessed value
      * @param int                  $confidence The confidence that the guessed class name
      *                                         is correct
diff --git a/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
@@ -72,4 +72,12 @@ public function testReverseTransformEmpty()
 
         $this->assertNull($transformer->reverseTransform(''));
     }
+
+    public function testFloatToIntConversionMismatchOnReversTransform()
+    {
+        $transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
+        IntlTestHelper::requireFullIntl($this, false);
+        \Locale::setDefault('de_AT');
+        $this->assertSame(3655, (int) $transformer->reverseTransform('36,55'));
+    }
 }
diff --git a/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
diff --git a/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/Tests/Extension/Validator/Constraints/FormValidatorTest.php
diff --git a/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php b/Tests/Extension/Validator/Type/FormTypeValidatorExtensionTest.php

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ class CallbackTransformer implements DataTransformerInterface`
`31`	`31`	`private $reverseTransform;`
`32`	`32`
`33`	`33`	`/**`
`34`		`- * Constructor.`
`35`		`- *`
`36`	`34`	`* @param callable $transform The forward transform callback`
`37`	`35`	`* @param callable $reverseTransform The reverse transform callback`
`38`	`36`	`*`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ abstract class BaseDateTimeTransformer implements DataTransformerInterface`
`30`	`30`	`protected $outputTimezone;`
`31`	`31`
`32`	`32`	`/**`
`33`		`- * Constructor.`
`34`		`- *`
`35`	`33`	`* @param string $inputTimezone The name of the input timezone`
`36`	`34`	`* @param string $outputTimezone The name of the output timezone`
`37`	`35`	`*`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer`
`28`	`28`	`private $calendar;`
`29`	`29`
`30`	`30`	`/**`
`31`		`- * Constructor.`
`32`		`- *`
`33`	`31`	`* @see BaseDateTimeTransformer::formats for available format options`
`34`	`32`	`*`
`35`	`33`	`* @param string $inputTimezone The name of the input timezone`
Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,11 @@ public function __construct($scale = 2, $grouping = true, $roundingMode = self::`
`54`	`54`	`*/`
`55`	`55`	`public function transform($value)`
`56`	`56`	`{`
`57`		`- if (null !== $value) {`
	`57`	`+ if (null !== $value && 1 !== $this->divisor) {`
`58`	`58`	`if (!is_numeric($value)) {`
`59`	`59`	`throw new TransformationFailedException('Expected a numeric.');`
`60`	`60`	`}`
`61`		`-`
`62`		`- $value /= $this->divisor;`
	`61`	`+ $value = (string) ($value / $this->divisor);`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`return parent::transform($value);`
`@@ -78,9 +77,8 @@ public function transform($value)`
`78`	`77`	`public function reverseTransform($value)`
`79`	`78`	`{`
`80`	`79`	`$value = parent::reverseTransform($value);`
`81`		`-`
`82`		`- if (null !== $value) {`
`83`		`- $value *= $this->divisor;`
	`80`	`+ if (null !== $value && 1 !== $this->divisor) {`
	`81`	`+ $value = (float) (string) ($value * $this->divisor);`
`84`	`82`	`}`
`85`	`83`
`86`	`84`	`return $value;`