Skip to content

Commit 2aeb717

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: relax assertions for ICU 72.1 [Validator] Fix regression with class metadatada on parent classes [Intl] Fixed directory traversal in emoji compression tool [VarExporter] Fix exporting classes with __serialize() but not __unserialize() [HttpFoundation][HttpKernel] Fix deprecations when `Content-Type` is `null`
2 parents ae00de2 + a9432b6 commit 2aeb717

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function testTransformToDifferentLocale()
124124

125125
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
126126

127-
$this->assertEquals('Feb 3, 2010, 4:05 AM', $transformer->transform($this->dateTime));
127+
$this->assertMatchesRegularExpression('/^Feb 3, 2010, 4:05\s+AM$/u', $transformer->transform($this->dateTime));
128128
}
129129

130130
public function testTransformEmpty()

Tests/Extension/Core/Type/DateTimeTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ public function testSingleTextWidgetWithCustomNonHtml5Format()
539539
]);
540540
$view = $form->createView();
541541

542-
$this->assertSame('2/13/19, 7:12:13 PM', $view->vars['value']);
542+
$this->assertMatchesRegularExpression('#^2/13/19, 7:12:13\s+PM$#u', $view->vars['value']);
543543
}
544544

545545
public function testDateTypeChoiceErrorsBubbleUp()

0 commit comments

Comments
 (0)