Skip to content

Commit f0873fd

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: fix merge [VarDumper] Test intl formatter broken since dumper does not replace the nnbsp character by standard space [WebProfilerBundle] Fix intercept external redirects [Webhook] Added missing XML attribute in config XSD [String] Skip a test when an issue is detected in PCRE2 [ExpressionLanguage] Fix null coalescing propagation [Mailer] Stop using the (local) AWS shared configuration in the PHPUnit tests. detect colors on not windows fix xterm detection refactor: hyper check Missing translations for Slovak (sk) #51954 Remove redundant PHPdoc line properly handle SYMFONY_DOTENV_VARS being the empty string Avoid incompatibility with symfony/console 7 bug #45057 [Messenger] Avoid reconnecting active Redis connections. [HttpKernel] Catch `TypeError` if the wrong type is used in `BackedEnumValueResolver` [Serializer] fix regression where nullable int cannot be serialized do not overwrite an application's default serialization context
2 parents c40f7d1 + a52ec2b commit f0873fd

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Tests/Caster/IntlCasterTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public function testCastDateFormatter()
234234
$var = new \IntlDateFormatter('en', \IntlDateFormatter::TRADITIONAL, \IntlDateFormatter::TRADITIONAL);
235235

236236
$expectedLocale = $var->getLocale();
237-
$expectedPattern = $var->getPattern();
237+
$expectedPattern = $this->normalizeNarrowNoBreakSpaceCharacter($var->getPattern());
238238
$expectedCalendar = $var->getCalendar();
239239
$expectedTimeZoneId = $var->getTimeZoneId();
240240
$expectedTimeType = $var->getTimeType();
@@ -294,4 +294,9 @@ public function testCastDateFormatter()
294294
EOTXT;
295295
$this->assertDumpEquals($expected, $var);
296296
}
297+
298+
private function normalizeNarrowNoBreakSpaceCharacter(string $input): string
299+
{
300+
return str_replace("\u{202F}", '\\u{202F}', $input);
301+
}
297302
}

0 commit comments

Comments
 (0)