Skip to content

Commit eab28dd

Browse files
derrabusderrabus
committed
Merge branch '5.4' into 6.3
* 5.4: [Validator] Made tests forward-compatible with ICU 72.1
2 parents 668c441 + e95605c commit eab28dd

11 files changed

+134
-80
lines changed

‎src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php

+9-7
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,19 @@
1818

1919
class ConstraintValidatorTest extends TestCase
2020
{
21+
use IcuCompatibilityTrait;
22+
2123
/**
2224
* @dataProvider formatValueProvider
2325
*/
24-
public function testFormatValue($expected, $value, $format = 0)
26+
public function testFormatValue(string $expected, $value, int $format = 0)
2527
{
2628
\Locale::setDefault('en');
2729

2830
$this->assertSame($expected, (new TestFormatValueConstraintValidator())->formatValueProxy($value, $format));
2931
}
3032

31-
public static function formatValueProvider()
33+
public static function formatValueProvider(): array
3234
{
3335
$defaultTimezone = date_default_timezone_get();
3436
date_default_timezone_set('Europe/Moscow'); // GMT+3
@@ -43,10 +45,10 @@ public static function formatValueProvider()
4345
['object', $toString = new TestToStringObject()],
4446
['ccc', $toString, ConstraintValidator::OBJECT_TO_STRING],
4547
['object', $dateTime = new \DateTimeImmutable('1971-02-02T08:00:00UTC')],
46-
[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],
47-
[class_exists(\IntlDateFormatter::class) ? 'Feb 2, 1971, 8:00 AM' : '1971-02-02 08:00:00', $dateTime, ConstraintValidator::PRETTY_DATE],
48-
[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],
49-
[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],
48+
[class_exists(\IntlDateFormatter::class) ? static::normalizeIcuSpaces("Oct 4, 2019, 11:02\u{202F}AM") : '2019-10-04 11:02:03', new \DateTimeImmutable('2019-10-04T11:02:03+09:00'), ConstraintValidator::PRETTY_DATE],
49+
[class_exists(\IntlDateFormatter::class) ? static::normalizeIcuSpaces("Feb 2, 1971, 8:00\u{202F}AM") : '1971-02-02 08:00:00', $dateTime, ConstraintValidator::PRETTY_DATE],
50+
[class_exists(\IntlDateFormatter::class) ? static::normalizeIcuSpaces("Jan 1, 1970, 6:00\u{202F}AM") : '1970-01-01 06:00:00', new \DateTimeImmutable('1970-01-01T06:00:00Z'), ConstraintValidator::PRETTY_DATE],
51+
[class_exists(\IntlDateFormatter::class) ? static::normalizeIcuSpaces("Jan 1, 1970, 3:00\u{202F}PM") : '1970-01-01 15:00:00', (new \DateTimeImmutable('1970-01-01T23:00:00'))->setTimezone(new \DateTimeZone('America/New_York')), ConstraintValidator::PRETTY_DATE],
5052
];
5153

5254
if (\PHP_VERSION_ID >= 80100) {
@@ -65,7 +67,7 @@ public function validate($value, Constraint $constraint): void
6567
{
6668
}
6769

68-
public function formatValueProxy($value, $format)
70+
public function formatValueProxy($value, int $format): string
6971
{
7072
return $this->formatValue($value, $format);
7173
}

‎src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php

+7-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\Constraints\EqualTo;
1616
use Symfony\Component\Validator\Constraints\EqualToValidator;
17+
use Symfony\Component\Validator\Tests\IcuCompatibilityTrait;
1718

1819
/**
1920
* @author Daniel Holmes <daniel@danielholmes.org>
2021
*/
2122
class EqualToValidatorTest extends AbstractComparisonValidatorTestCase
2223
{
24+
use IcuCompatibilityTrait;
25+
2326
protected function createValidator(): EqualToValidator
2427
{
2528
return new EqualToValidator();
@@ -61,14 +64,14 @@ public static function provideInvalidComparisons(): array
6164
return [
6265
[1, '1', 2, '2', 'int'],
6366
['22', '"22"', '333', '"333"', 'string'],
64-
[new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
65-
[new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
66-
[new \DateTime('2001-01-01 UTC'), 'Jan 1, 2001, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
67+
[new \DateTime('2001-01-01'), self::normalizeIcuSpaces("Jan 1, 2001, 12:00\u{202F}AM"), new \DateTime('2000-01-01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
68+
[new \DateTime('2001-01-01'), self::normalizeIcuSpaces("Jan 1, 2001, 12:00\u{202F}AM"), '2000-01-01', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
69+
[new \DateTime('2001-01-01 UTC'), self::normalizeIcuSpaces("Jan 1, 2001, 12:00\u{202F}AM"), '2000-01-01 UTC', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
6770
[new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
6871
];
6972
}
7073

71-
public static function provideComparisonsToNullValueAtPropertyPath()
74+
public static function provideComparisonsToNullValueAtPropertyPath(): array
7275
{
7376
return [
7477
[5, '5', false],

‎src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php

+7-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\Constraints\GreaterThanOrEqual;
1616
use Symfony\Component\Validator\Constraints\GreaterThanOrEqualValidator;
17+
use Symfony\Component\Validator\Tests\IcuCompatibilityTrait;
1718

1819
/**
1920
* @author Daniel Holmes <daniel@danielholmes.org>
2021
*/
2122
class GreaterThanOrEqualValidatorTest extends AbstractComparisonValidatorTestCase
2223
{
24+
use IcuCompatibilityTrait;
25+
2326
protected function createValidator(): GreaterThanOrEqualValidator
2427
{
2528
return new GreaterThanOrEqualValidator();
@@ -64,14 +67,14 @@ public static function provideInvalidComparisons(): array
6467
{
6568
return [
6669
[1, '1', 2, '2', 'int'],
67-
[new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2005/01/01'), 'Jan 1, 2005, 12:00 AM', 'DateTime'],
68-
[new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2005/01/01', 'Jan 1, 2005, 12:00 AM', 'DateTime'],
69-
[new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2005/01/01 UTC', 'Jan 1, 2005, 12:00 AM', 'DateTime'],
70+
[new \DateTime('2000/01/01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), new \DateTime('2005/01/01'), self::normalizeIcuSpaces("Jan 1, 2005, 12:00\u{202F}AM"), 'DateTime'],
71+
[new \DateTime('2000/01/01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2005/01/01', self::normalizeIcuSpaces("Jan 1, 2005, 12:00\u{202F}AM"), 'DateTime'],
72+
[new \DateTime('2000/01/01 UTC'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2005/01/01 UTC', self::normalizeIcuSpaces("Jan 1, 2005, 12:00\u{202F}AM"), 'DateTime'],
7073
['b', '"b"', 'c', '"c"', 'string'],
7174
];
7275
}
7376

74-
public static function provideComparisonsToNullValueAtPropertyPath()
77+
public static function provideComparisonsToNullValueAtPropertyPath(): array
7578
{
7679
return [
7780
[5, '5', true],

‎src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php

+10-7
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\Constraints\GreaterThan;
1616
use Symfony\Component\Validator\Constraints\GreaterThanValidator;
17+
use Symfony\Component\Validator\Tests\IcuCompatibilityTrait;
1718

1819
/**
1920
* @author Daniel Holmes <daniel@danielholmes.org>
2021
*/
2122
class GreaterThanValidatorTest extends AbstractComparisonValidatorTestCase
2223
{
24+
use IcuCompatibilityTrait;
25+
2326
protected function createValidator(): GreaterThanValidator
2427
{
2528
return new GreaterThanValidator();
@@ -60,20 +63,20 @@ public static function provideInvalidComparisons(): array
6063
return [
6164
[1, '1', 2, '2', 'int'],
6265
[2, '2', 2, '2', 'int'],
63-
[new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2005/01/01'), 'Jan 1, 2005, 12:00 AM', 'DateTime'],
64-
[new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
65-
[new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2005/01/01', 'Jan 1, 2005, 12:00 AM', 'DateTime'],
66-
[new \DateTime('2000/01/01'), 'Jan 1, 2000, 12:00 AM', '2000/01/01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
67-
[new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2005/01/01 UTC', 'Jan 1, 2005, 12:00 AM', 'DateTime'],
68-
[new \DateTime('2000/01/01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000/01/01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
66+
[new \DateTime('2000/01/01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), new \DateTime('2005/01/01'), self::normalizeIcuSpaces("Jan 1, 2005, 12:00\u{202F}AM"), 'DateTime'],
67+
[new \DateTime('2000/01/01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), new \DateTime('2000/01/01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
68+
[new \DateTime('2000/01/01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2005/01/01', self::normalizeIcuSpaces("Jan 1, 2005, 12:00\u{202F}AM"), 'DateTime'],
69+
[new \DateTime('2000/01/01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2000/01/01', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
70+
[new \DateTime('2000/01/01 UTC'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2005/01/01 UTC', self::normalizeIcuSpaces("Jan 1, 2005, 12:00\u{202F}AM"), 'DateTime'],
71+
[new \DateTime('2000/01/01 UTC'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2000/01/01 UTC', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
6972
[new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
7073
[new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
7174
['22', '"22"', '333', '"333"', 'string'],
7275
['22', '"22"', '22', '"22"', 'string'],
7376
];
7477
}
7578

76-
public static function provideComparisonsToNullValueAtPropertyPath()
79+
public static function provideComparisonsToNullValueAtPropertyPath(): array
7780
{
7881
return [
7982
[5, '5', true],

‎src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\Constraints\IdenticalTo;
1616
use Symfony\Component\Validator\Constraints\IdenticalToValidator;
17+
use Symfony\Component\Validator\Tests\IcuCompatibilityTrait;
1718

1819
/**
1920
* @author Daniel Holmes <daniel@danielholmes.org>
2021
*/
2122
class IdenticalToValidatorTest extends AbstractComparisonValidatorTestCase
2223
{
24+
use IcuCompatibilityTrait;
25+
2326
protected function createValidator(): IdenticalToValidator
2427
{
2528
return new IdenticalToValidator();
@@ -81,13 +84,13 @@ public static function provideInvalidComparisons(): array
8184
[1, '1', 2, '2', 'int'],
8285
[2, '2', '2', '"2"', 'string'],
8386
['22', '"22"', '333', '"333"', 'string'],
84-
[new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', 'DateTime'],
85-
[new \DateTime('2001-01-01'), 'Jan 1, 2001, 12:00 AM', new \DateTime('1999-01-01'), 'Jan 1, 1999, 12:00 AM', 'DateTime'],
87+
[new \DateTime('2001-01-01'), self::normalizeIcuSpaces("Jan 1, 2001, 12:00\u{202F}AM"), new \DateTime('2001-01-01'), self::normalizeIcuSpaces("Jan 1, 2001, 12:00\u{202F}AM"), 'DateTime'],
88+
[new \DateTime('2001-01-01'), self::normalizeIcuSpaces("Jan 1, 2001, 12:00\u{202F}AM"), new \DateTime('1999-01-01'), self::normalizeIcuSpaces("Jan 1, 1999, 12:00\u{202F}AM"), 'DateTime'],
8689
[new ComparisonTest_Class(4), '4', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
8790
];
8891
}
8992

90-
public static function provideComparisonsToNullValueAtPropertyPath()
93+
public static function provideComparisonsToNullValueAtPropertyPath(): array
9194
{
9295
return [
9396
[5, '5', false],

‎src/Symfony/Component/Validator/Tests/Constraints/LessThanOrEqualValidatorTest.php

+7-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\Constraints\LessThanOrEqual;
1616
use Symfony\Component\Validator\Constraints\LessThanOrEqualValidator;
17+
use Symfony\Component\Validator\Tests\IcuCompatibilityTrait;
1718

1819
/**
1920
* @author Daniel Holmes <daniel@danielholmes.org>
2021
*/
2122
class LessThanOrEqualValidatorTest extends AbstractComparisonValidatorTestCase
2223
{
24+
use IcuCompatibilityTrait;
25+
2326
protected function createValidator(): LessThanOrEqualValidator
2427
{
2528
return new LessThanOrEqualValidator();
@@ -66,15 +69,15 @@ public static function provideInvalidComparisons(): array
6669
{
6770
return [
6871
[2, '2', 1, '1', 'int'],
69-
[new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
70-
[new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
71-
[new \DateTime('2010-01-01 UTC'), 'Jan 1, 2010, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
72+
[new \DateTime('2010-01-01'), self::normalizeIcuSpaces("Jan 1, 2010, 12:00\u{202F}AM"), new \DateTime('2000-01-01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
73+
[new \DateTime('2010-01-01'), self::normalizeIcuSpaces("Jan 1, 2010, 12:00\u{202F}AM"), '2000-01-01', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
74+
[new \DateTime('2010-01-01 UTC'), self::normalizeIcuSpaces("Jan 1, 2010, 12:00\u{202F}AM"), '2000-01-01 UTC', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
7275
[new ComparisonTest_Class(5), '5', new ComparisonTest_Class(4), '4', __NAMESPACE__.'\ComparisonTest_Class'],
7376
['c', '"c"', 'b', '"b"', 'string'],
7477
];
7578
}
7679

77-
public static function provideComparisonsToNullValueAtPropertyPath()
80+
public static function provideComparisonsToNullValueAtPropertyPath(): array
7881
{
7982
return [
8083
[5, '5', true],

‎src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php

+10-7
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\Constraints\LessThan;
1616
use Symfony\Component\Validator\Constraints\LessThanValidator;
17+
use Symfony\Component\Validator\Tests\IcuCompatibilityTrait;
1718

1819
/**
1920
* @author Daniel Holmes <daniel@danielholmes.org>
2021
*/
2122
class LessThanValidatorTest extends AbstractComparisonValidatorTestCase
2223
{
24+
use IcuCompatibilityTrait;
25+
2326
protected function createValidator(): LessThanValidator
2427
{
2528
return new LessThanValidator();
@@ -60,19 +63,19 @@ public static function provideInvalidComparisons(): array
6063
return [
6164
[3, '3', 2, '2', 'int'],
6265
[2, '2', 2, '2', 'int'],
63-
[new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
64-
[new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
65-
[new \DateTime('2010-01-01'), 'Jan 1, 2010, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
66-
[new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
67-
[new \DateTime('2010-01-01 UTC'), 'Jan 1, 2010, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
68-
[new \DateTime('2000-01-01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
66+
[new \DateTime('2010-01-01'), self::normalizeIcuSpaces("Jan 1, 2010, 12:00\u{202F}AM"), new \DateTime('2000-01-01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
67+
[new \DateTime('2000-01-01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), new \DateTime('2000-01-01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
68+
[new \DateTime('2010-01-01'), self::normalizeIcuSpaces("Jan 1, 2010, 12:00\u{202F}AM"), '2000-01-01', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
69+
[new \DateTime('2000-01-01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2000-01-01', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
70+
[new \DateTime('2010-01-01 UTC'), self::normalizeIcuSpaces("Jan 1, 2010, 12:00\u{202F}AM"), '2000-01-01 UTC', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
71+
[new \DateTime('2000-01-01 UTC'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2000-01-01 UTC', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
6972
[new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
7073
[new ComparisonTest_Class(6), '6', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
7174
['333', '"333"', '22', '"22"', 'string'],
7275
];
7376
}
7477

75-
public static function provideComparisonsToNullValueAtPropertyPath()
78+
public static function provideComparisonsToNullValueAtPropertyPath(): array
7679
{
7780
return [
7881
[5, '5', true],

‎src/Symfony/Component/Validator/Tests/Constraints/NotEqualToValidatorTest.php

+7-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\Constraints\NotEqualTo;
1616
use Symfony\Component\Validator\Constraints\NotEqualToValidator;
17+
use Symfony\Component\Validator\Tests\IcuCompatibilityTrait;
1718

1819
/**
1920
* @author Daniel Holmes <daniel@danielholmes.org>
2021
*/
2122
class NotEqualToValidatorTest extends AbstractComparisonValidatorTestCase
2223
{
24+
use IcuCompatibilityTrait;
25+
2326
protected function createValidator(): NotEqualToValidator
2427
{
2528
return new NotEqualToValidator();
@@ -61,14 +64,14 @@ public static function provideInvalidComparisons(): array
6164
[3, '3', 3, '3', 'int'],
6265
['2', '"2"', 2, '2', 'int'],
6366
['a', '"a"', 'a', '"a"', 'string'],
64-
[new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', 'DateTime'],
65-
[new \DateTime('2000-01-01'), 'Jan 1, 2000, 12:00 AM', '2000-01-01', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
66-
[new \DateTime('2000-01-01 UTC'), 'Jan 1, 2000, 12:00 AM', '2000-01-01 UTC', 'Jan 1, 2000, 12:00 AM', 'DateTime'],
67+
[new \DateTime('2000-01-01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), new \DateTime('2000-01-01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
68+
[new \DateTime('2000-01-01'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2000-01-01', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
69+
[new \DateTime('2000-01-01 UTC'), self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), '2000-01-01 UTC', self::normalizeIcuSpaces("Jan 1, 2000, 12:00\u{202F}AM"), 'DateTime'],
6770
[new ComparisonTest_Class(5), '5', new ComparisonTest_Class(5), '5', __NAMESPACE__.'\ComparisonTest_Class'],
6871
];
6972
}
7073

71-
public static function provideComparisonsToNullValueAtPropertyPath()
74+
public static function provideComparisonsToNullValueAtPropertyPath(): array
7275
{
7376
return [
7477
[5, '5', true],

0 commit comments

Comments
 (0)