Skip to content

Commit e5904cf

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: (22 commits) 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 Bump Symfony version to 7.0.3 Update VERSION for 7.0.2 Update CHANGELOG for 7.0.2 Bump Symfony version to 6.4.3 Update VERSION for 6.4.2 Update CHANGELOG for 6.4.2 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 ...
2 parents 2e9671e + 19f349d commit e5904cf

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
@@ -708,6 +708,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
708708
$form = $this->factory->create(static::TESTED_TYPE, null, [
709709
'widget' => $widget,
710710
'empty_data' => $emptyData,
711+
'years' => range(2018, (int) date('Y')),
711712
]);
712713
$form->submit(null);
713714

Tests/Extension/Core/Type/DateTypeTest.php

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

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

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

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

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

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

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

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

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

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

207207
\Locale::setDefault('de_DE');
@@ -1093,6 +1093,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
10931093
$form = $this->factory->create(static::TESTED_TYPE, null, [
10941094
'widget' => $widget,
10951095
'empty_data' => $emptyData,
1096+
'years' => range(2018, (int) date('Y')),
10961097
]);
10971098
$form->submit(null);
10981099

0 commit comments

Comments
 (0)