Skip to content

Commit 4825337

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: make sure that the submitted year is an accepted choice skip some tests that do not work with ICU 71.1/72.1 [Cache] Fix Couchbase expiration test Add missing translations (uk) #53307 [Validator] Add missing Japanese translation (id=111) Added missing Estonian validator translations add missing swedish validators translations harden cache expiration test Bump Symfony version to 6.3.12 Update VERSION for 6.3.11 Update CHANGELOG for 6.3.11 Bump Symfony version to 5.4.35 Update VERSION for 5.4.34 Update CONTRIBUTORS for 5.4.34 Update CHANGELOG for 5.4.34 [Validator] added missing Latvian translation
2 parents 10649ab + 33a2494 commit 4825337

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

Tests/Extension/Core/Type/DateTimeTypeTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
710710
$form = $this->factory->create(static::TESTED_TYPE, null, [
711711
'widget' => $widget,
712712
'empty_data' => $emptyData,
713+
'years' => range(2018, (int) date('Y')),
713714
]);
714715
$form->submit(null);
715716

Tests/Extension/Core/Type/DateTypeTest.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ public function testSubmitFromSingleTextDateTime()
9595
// we test against "de_DE", so we need the full implementation
9696
IntlTestHelper::requireFullIntl($this, false);
9797

98-
if ('71.1' === Intl::getIcuVersion()) {
99-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
98+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
99+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
100100
}
101101

102102
\Locale::setDefault('de_DE');
@@ -121,8 +121,8 @@ public function testSubmitFromSingleTextDateTimeImmutable()
121121
// we test against "de_DE", so we need the full implementation
122122
IntlTestHelper::requireFullIntl($this, false);
123123

124-
if ('71.1' === Intl::getIcuVersion()) {
125-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
124+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
125+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
126126
}
127127

128128
\Locale::setDefault('de_DE');
@@ -148,8 +148,8 @@ public function testSubmitFromSingleTextString()
148148
// we test against "de_DE", so we need the full implementation
149149
IntlTestHelper::requireFullIntl($this, false);
150150

151-
if ('71.1' === Intl::getIcuVersion()) {
152-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
151+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
152+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
153153
}
154154

155155
\Locale::setDefault('de_DE');
@@ -174,8 +174,8 @@ public function testSubmitFromSingleTextTimestamp()
174174
// we test against "de_DE", so we need the full implementation
175175
IntlTestHelper::requireFullIntl($this, false);
176176

177-
if ('71.1' === Intl::getIcuVersion()) {
178-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
177+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
178+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
179179
}
180180

181181
\Locale::setDefault('de_DE');
@@ -202,8 +202,8 @@ public function testSubmitFromSingleTextRaw()
202202
// we test against "de_DE", so we need the full implementation
203203
IntlTestHelper::requireFullIntl($this, false);
204204

205-
if ('71.1' === Intl::getIcuVersion()) {
206-
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1.');
205+
if (\in_array(Intl::getIcuVersion(), ['71.1', '72.1'], true)) {
206+
$this->markTestSkipped('Skipping test due to a bug in ICU 71.1/72.1.');
207207
}
208208

209209
\Locale::setDefault('de_DE');
@@ -1095,6 +1095,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
10951095
$form = $this->factory->create(static::TESTED_TYPE, null, [
10961096
'widget' => $widget,
10971097
'empty_data' => $emptyData,
1098+
'years' => range(2018, (int) date('Y')),
10981099
]);
10991100
$form->submit(null);
11001101

0 commit comments

Comments
 (0)