Merge branch '5.0'

* 5.0: (21 commits)
  fix merge
  CS
  [FrameworkBundle][ContainerLintCommand] Improve messages when the kernel or the container is not supported
  [Serializer] Skip uninitialized (PHP 7.4) properties in PropertyNormalizer and ObjectNormalizer
  stop using deprecated Doctrine persistence classes
  [Cache] Fix wrong classname in deprecation message
  Fix regex lookahead syntax in ApplicationTest
  Fixed syntax in comment
  [SecurityBundle][FirewallMap] Remove unused property
  [Messenger][AMQP] Use delivery_mode=2 by default
  [FrameworkBundle][DependencyInjection] Skip removed ids in the lint container command and its associated pass
  [SECURITY] Revert "AbstractAuthenticationListener.php error instead info. Rebase of #28462"
  [FrameworkBundle][Secrets] Hook configured local dotenv file
  [DI] Improve performance of processDefinition
  fix redis multi host dsn not recognized
  fix constructor argument type declaration
  Fix invalid Windows path normalization
  [Validator][ConstraintValidator] Safe fail on invalid timezones
  [DoctrineBridge] Fixed submitting invalid ids when using queries with limit
  [FrameworkBundle] Add info & example to auto_mapping config
  ...

Author: nicolas-grekas

ConstraintValidator.php

@@ -87,16 +87,12 @@ protected function formatValue($value, int $format = 0)
     {
         if (($format & self::PRETTY_DATE) && $value instanceof \DateTimeInterface) {
             if (class_exists('IntlDateFormatter')) {
-                $locale = \Locale::getDefault();
-                $formatter = new \IntlDateFormatter($locale, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, $value->getTimezone());
+                $formatter = new \IntlDateFormatter(\Locale::getDefault(), \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, 'UTC');
 
-                // neither the native nor the stub IntlDateFormatter support
-                // DateTimeImmutable as of yet
-                if (!$value instanceof \DateTime) {
-                    $value = new \DateTime($value->format('Y-m-d H:i:s.u e'));
-                }
-
-                return $formatter->format($value);
+                return $formatter->format(new \DateTime(
+                    $value->format('Y-m-d H:i:s.u'),
+                    new \DateTimeZone('UTC')
+                ));
             }
 
             return $value->format('Y-m-d H:i:s');

Constraints/GreaterThanOrEqualValidator.php

@@ -24,7 +24,7 @@ class GreaterThanOrEqualValidator extends AbstractComparisonValidator
      */
     protected function compareValues($value1, $value2)
     {
-        return $value1 >= $value2;
+        return null === $value2 || $value1 >= $value2;
     }
 
     /**

Constraints/GreaterThanValidator.php

@@ -24,7 +24,7 @@ class GreaterThanValidator extends AbstractComparisonValidator
      */
     protected function compareValues($value1, $value2)
     {
-        return $value1 > $value2;
+        return null === $value2 || $value1 > $value2;
     }
 
     /**

Constraints/LessThanOrEqualValidator.php

@@ -24,7 +24,7 @@ class LessThanOrEqualValidator extends AbstractComparisonValidator
      */
     protected function compareValues($value1, $value2)
     {
-        return $value1 <= $value2;
+        return null === $value2 || $value1 <= $value2;
     }
 
     /**

Constraints/LessThanValidator.php

@@ -24,7 +24,7 @@ class LessThanValidator extends AbstractComparisonValidator
      */
     protected function compareValues($value1, $value2)
     {
-        return $value1 < $value2;
+        return null === $value2 || $value1 < $value2;
     }
 
     /**

Tests/ConstraintValidatorTest.php

@@ -27,6 +27,9 @@ public function testFormatValue($expected, $value, $format = 0)
 
     public function formatValueProvider()
     {
+        $defaultTimezone = date_default_timezone_get();
+        date_default_timezone_set('Europe/Moscow'); // GMT+3
+
         $data = [
             ['true', true],
             ['false', false],
@@ -36,10 +39,15 @@ public function formatValueProvider()
             ['array', []],
             ['object', $toString = new TestToStringObject()],
             ['ccc', $toString, ConstraintValidator::OBJECT_TO_STRING],
-            ['object', $dateTime = (new \DateTimeImmutable('@0'))->setTimezone(new \DateTimeZone('UTC'))],
-            [class_exists(\IntlDateFormatter::class) ? 'Jan 1, 1970, 12:00 AM' : '1970-01-01 00:00:00', $dateTime, ConstraintValidator::PRETTY_DATE],
+            ['object', $dateTime = new \DateTimeImmutable('1971-02-02T08:00:00UTC')],
+            [class_exists(\IntlDateFormatter::class) ? 'Oct 4, 2019, 11:02 AM' : '2019-10-04 11:02:03', new \DateTimeImmutable('2019-10-04T11:02:03+09:00'), ConstraintValidator::PRETTY_DATE],
+            [class_exists(\IntlDateFormatter::class) ? 'Feb 2, 1971, 8:00 AM' : '1971-02-02 08:00:00', $dateTime, ConstraintValidator::PRETTY_DATE],
+            [class_exists(\IntlDateFormatter::class) ? 'Jan 1, 1970, 6:00 AM' : '1970-01-01 06:00:00', new \DateTimeImmutable('1970-01-01T06:00:00Z'), ConstraintValidator::PRETTY_DATE],
+            [class_exists(\IntlDateFormatter::class) ? 'Jan 1, 1970, 3:00 PM' : '1970-01-01 15:00:00', (new \DateTimeImmutable('1970-01-01T23:00:00'))->setTimezone(new \DateTimeZone('America/New_York')), ConstraintValidator::PRETTY_DATE],
         ];
 
+        date_default_timezone_set($defaultTimezone);
+
         return $data;
     }
 }

Tests/Constraints/AbstractComparisonValidatorTestCase.php

@@ -247,6 +247,32 @@ public function throwsOnInvalidStringDatesProvider(): array
         ];
     }
 
+    /**
+     * @dataProvider provideComparisonsToNullValueAtPropertyPath
+     */
+    public function testCompareWithNullValueAtPropertyAt($dirtyValue, $dirtyValueAsString, $isValid)
+    {
+        $constraint = $this->createConstraint(['propertyPath' => 'value']);
+        $constraint->message = 'Constraint Message';
+
+        $object = new ComparisonTest_Class(null);
+        $this->setObject($object);
+
+        $this->validator->validate($dirtyValue, $constraint);
+
+        if ($isValid) {
+            $this->assertNoViolation();
+        } else {
+            $this->buildViolation('Constraint Message')
+                ->setParameter('{{ value }}', $dirtyValueAsString)
+                ->setParameter('{{ compared_value }}', 'null')
+                ->setParameter('{{ compared_value_type }}', 'NULL')
+                ->setParameter('{{ compared_value_path }}', 'value')
+                ->setCode($this->getErrorCode())
+                ->assertRaised();
+        }
+    }
+
     public function provideAllInvalidComparisons(): array
     {
         // The provider runs before setUp(), so we need to manually fix
@@ -262,6 +288,8 @@ public function provideAllInvalidComparisons(): array
 
     abstract public function provideInvalidComparisons(): array;
 
+    abstract public function provideComparisonsToNullValueAtPropertyPath();
+
     /**
      * @param array|null $options Options for the constraint
      */

Tests/Constraints/DivisibleByValidatorTest.php

@@ -98,4 +98,9 @@ public function throwsOnNonNumericValuesProvider()
             [\ArrayIterator::class, new \ArrayIterator(), 12],
         ];
     }
+
+    public function provideComparisonsToNullValueAtPropertyPath()
+    {
+        $this->markTestSkipped('DivisibleByValidator rejects null values.');
+    }
 }

Tests/Constraints/EqualToValidatorTest.php

@@ -76,4 +76,11 @@ public function provideInvalidComparisons(): array
             [new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
         ];
     }
+
+    public function provideComparisonsToNullValueAtPropertyPath()
+    {
+        return [
+            [5, '5', false],
+        ];
+    }
 }

Tests/Constraints/GreaterThanOrEqualValidatorTest.php

@@ -79,4 +79,11 @@ public function provideInvalidComparisons(): array
             ['b', '"b"', 'c', '"c"', 'string'],
         ];
     }
+
+    public function provideComparisonsToNullValueAtPropertyPath()
+    {
+        return [
+            [5, '5', true],
+        ];
+    }
 }