Skip to content

Commit a3c56e2

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: 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) symfony#53307 [Validator] Add missing Japanese translation (id=111) Added missing Estonian validator translations add missing swedish validators translations 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 Update CHANGELOG for 5.4.34 [Validator] added missing Latvian translation
2 parents 412ea7a + 9222754 commit a3c56e2

File tree

10 files changed

+109
-47
lines changed

10 files changed

+109
-47
lines changed

CONTRIBUTORS.md

Lines changed: 71 additions & 36 deletions
Large diffs are not rendered by default.

src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ protected function doSave(array $values, $lifetime): array|bool
183183
}
184184

185185
$upsertOptions = new UpsertOptions();
186-
$upsertOptions->expiry(\DateTimeImmutable::createFromFormat('U', time() + $lifetime));
186+
$upsertOptions->expiry($lifetime);
187187

188188
$ko = [];
189189
foreach ($values as $key => $value) {

src/Symfony/Component/Cache/Tests/Adapter/ProxyAdapterAndRedisAdapterTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ static function (CacheItem $item, $expiry) {
6666
$this->assertSame($value, $this->cache->getItem('baz')->get());
6767

6868
sleep(1);
69+
usleep(100000);
6970
$this->assertSame($value, $this->cache->getItem('foo')->get());
7071
$this->assertSame($value, $this->cache->getItem('bar')->get());
7172
$this->assertFalse($this->cache->getItem('baz')->isHit());

src/Symfony/Component/Form/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

src/Symfony/Component/Form/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

src/Symfony/Component/Validator/Resources/translations/validators.et.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,14 @@
426426
<source>Using hidden overlay characters is not allowed.</source>
427427
<target>Peidetud tähemärkide kasutamine pole lubatud.</target>
428428
</trans-unit>
429+
<trans-unit id="110">
430+
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431+
<target>Faili laiend on vigane ({{ extension }}). Lubatud laiendid on {{ extensions }}.</target>
432+
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>Tuvastatud teksti kodeering on vigane ({{ detected }}). Lubatud kodeeringud on {{ encodings }}.</target>
436+
</trans-unit>
429437
</body>
430438
</file>
431439
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@
430430
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431431
<target>ファイルの拡張子が無効です({{ extension }})。有効な拡張子は{{ extensions }}です。</target>
432432
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>検出された文字コードは無効です({{ detected }})。有効な文字コードは{{ encodings }}です。</target>
436+
</trans-unit>
433437
</body>
434438
</file>
435439
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.lv.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@
430430
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431431
<target>Faila paplašinājums nav derīgs ({{ extension }}). Atļautie paplašinājumi ir {{ extensions }}.</target>
432432
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>Noteiktais rakstzīmju kodējums nav derīgs ({{ detected }}). Atļautie kodējumi ir {{ encodings }}.</target>
436+
</trans-unit>
433437
</body>
434438
</file>
435439
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@
430430
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431431
<target>Filtillägget är ogiltigt ({{ extension }}). Tillåtna filtillägg är {{ extensions }}.</target>
432432
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>Den upptäckta teckenkodningen är ogiltig ({{ detected }}). Tillåtna kodningar är {{ encodings }}.</target>
436+
</trans-unit>
433437
</body>
434438
</file>
435439
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.uk.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@
430430
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431431
<target>Розширення файлу недопустиме ({{ extension }}). Дозволені розширення {{ extensions }}.</target>
432432
</trans-unit>
433+
<trans-unit id="111">
434+
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435+
<target>Недопустиме кодування символів ({{ detected }}). Допустимі кодування: {{ encodings }}.</target>
436+
</trans-unit>
433437
</body>
434438
</file>
435439
</xliff>

0 commit comments

Comments
 (0)