Merge branch '3.4' into 4.4

xabbuh · xabbuh · commit 0ed20be40786 · 2020-09-09T10:00:22.000+02:00
* 3.4:
  [Intl] promote warnings to value errors on PHP 8
  Fix CS
  DateTime validator support for trailing data
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -357,6 +357,10 @@ public function format($value, $type = self::TYPE_DEFAULT)
 
         // The original NumberFormatter does not support this format type
         if (self::TYPE_CURRENCY === $type) {
+            if (\PHP_VERSION_ID >= 80000) {
+                throw new \ValueError(sprintf('The format type must be a NumberFormatter::TYPE_* constant (%s given).', $type));
+            }
+
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
@@ -513,6 +517,10 @@ public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
         $type = (int) $type;
 
         if (self::TYPE_DEFAULT === $type || self::TYPE_CURRENCY === $type) {
+            if (\PHP_VERSION_ID >= 80000) {
+                throw new \ValueError(sprintf('The format type must be a NumberFormatter::TYPE_* constant (%d given).', $type));
+            }
+
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
@@ -324,7 +324,9 @@ public function formatTypeDoubleWithCurrencyStyleProvider()
      */
     public function testFormatTypeCurrency($formatter, $value)
     {
-        if (method_exists($this, 'expectWarning')) {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        } elseif (method_exists($this, 'expectWarning')) {
             $this->expectWarning();
         } else {
             $this->expectException(Warning::class);
@@ -338,6 +340,10 @@ public function testFormatTypeCurrency($formatter, $value)
      */
     public function testFormatTypeCurrencyReturn($formatter, $value)
     {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        }
+
         $this->assertFalse(@$formatter->format($value, NumberFormatter::TYPE_CURRENCY));
     }
 
@@ -709,7 +715,9 @@ public function parseProvider()
 
     public function testParseTypeDefault()
     {
-        if (method_exists($this, 'expectWarning')) {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        } elseif (method_exists($this, 'expectWarning')) {
             $this->expectWarning();
         } else {
             $this->expectException(Warning::class);
@@ -833,7 +841,9 @@ public function parseTypeDoubleProvider()
 
     public function testParseTypeCurrency()
     {
-        if (method_exists($this, 'expectWarning')) {
+        if (\PHP_VERSION_ID >= 80000) {
+            $this->expectException(\ValueError::class);
+        } elseif (method_exists($this, 'expectWarning')) {
             $this->expectWarning();
         } else {
             $this->expectException(Warning::class);
diff --git a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
@@ -59,6 +59,12 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
+        if ('+' === substr($constraint->format, -1)) {
+            $errors['warnings'] = array_filter($errors['warnings'], function ($warning) {
+                return 'Trailing data' !== $warning;
+            });
+        }
+
         foreach ($errors['warnings'] as $warning) {
             if ('The parsed date was invalid' === $warning) {
                 $this->context->buildViolation($constraint->message)
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
@@ -136,4 +136,12 @@ public function getInvalidDateTimes()
             ['Y-m-d H:i:s', '2010-01-01 00:00:60', DateTime::INVALID_TIME_ERROR],
         ];
     }
+
+    public function testDateTimeWithTrailingData()
+    {
+        $this->validator->validate('1995-05-10 00:00:00', new DateTime([
+            'format' => 'Y-m-d+',
+        ]));
+        $this->assertNoViolation();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -136,4 +136,12 @@ public function getInvalidDateTimes()`
`136`	`136`	`['Y-m-d H:i:s', '2010-01-01 00:00:60', DateTime::INVALID_TIME_ERROR],`
`137`	`137`	`];`
`138`	`138`	`}`
	`139`	`+`
	`140`	`+ public function testDateTimeWithTrailingData()`
	`141`	`+ {`
	`142`	`+ $this->validator->validate('1995-05-10 00:00:00', new DateTime([`
	`143`	`+ 'format' => 'Y-m-d+',`
	`144`	`+ ]));`
	`145`	`+ $this->assertNoViolation();`
	`146`	`+ }`
`139`	`147`	`}`