Skip to content

Commit 51b4cab

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.3' into 6.4
* 6.3: [HttpKernel] Resolve EBADP error on flock with LOCK_SH with NFS add missing basque translations [Validator] Handle `null` case Replace Tickets by Issues [Validator] Add missing arabic translations [Validator] Added missing translations for Romanian language for Validator component [Messenger] Fix graceful exit with ids
2 parents d261eeb + d87cd8d commit 51b4cab

File tree

7 files changed

+83
-4
lines changed

7 files changed

+83
-4
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
| Bug fix? | yes/no
55
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
66
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
7-
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead -->
7+
| Issues | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead -->
88
| License | MIT
99

1010
<!--

‎src/Symfony/Component/HttpKernel/Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ protected function initializeContainer()
427427
try {
428428
is_dir($buildDir) ?: mkdir($buildDir, 0777, true);
429429

430-
if ($lock = fopen($cachePath.'.lock', 'w')) {
430+
if ($lock = fopen($cachePath.'.lock', 'w+')) {
431431
if (!flock($lock, \LOCK_EX | \LOCK_NB, $wouldBlock) && !flock($lock, $wouldBlock ? \LOCK_SH : \LOCK_EX)) {
432432
fclose($lock);
433433
$lock = null;

‎src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
124124
}
125125

126126
$this->retrySpecificIds($failureTransportName, $ids, $io, $shouldForce);
127-
$io->success('All done!');
127+
128+
if (!$this->shouldStop) {
129+
$io->success('All done!');
130+
}
128131

129132
return 0;
130133
}
@@ -255,6 +258,10 @@ private function retrySpecificIds(string $failureTransportName, array $ids, Symf
255258

256259
$singleReceiver = new SingleMessageReceiver($receiver, $envelope);
257260
$this->runWorker($failureTransportName, $singleReceiver, $io, $shouldForce);
261+
262+
if ($this->shouldStop) {
263+
break;
264+
}
258265
}
259266
}
260267

‎src/Symfony/Component/Validator/Constraints/Cascade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Cascade extends Constraint
2828
public function __construct(array|string $exclude = null, array $options = null)
2929
{
3030
if (\is_array($exclude) && !array_is_list($exclude)) {
31-
$options = array_merge($exclude, $options);
31+
$options = array_merge($exclude, $options ?? []);
3232
} else {
3333
$this->exclude = array_flip((array) $exclude);
3434
}

‎src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,30 @@
402402
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403403
<target>يجب أن تكون قيمة netmask بين {{ min }} و {{ max }}.</target>
404404
</trans-unit>
405+
<trans-unit id="104">
406+
<source>The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less.</source>
407+
<target>اسم الملف طويل جدا. يجب أن يحتوي على {{ filename_max_length }} حرف أو أقل.|اسم الملف طويل جدا. يجب أن يحتوي على {{ filename_max_length }} أحرف أو أقل.</target>
408+
</trans-unit>
409+
<trans-unit id="105">
410+
<source>The password strength is too low. Please use a stronger password.</source>
411+
<target>قوة كلمة المرور منخفضة للغاية. يرجى استخدام كلمة مرور أقوى.</target>
412+
</trans-unit>
413+
<trans-unit id="106">
414+
<source>This value contains characters that are not allowed by the current restriction-level.</source>
415+
<target>تحتوي هذه القيمة على أحرف غير مسموح بها بواسطة مستوى التقييد الحالي.</target>
416+
</trans-unit>
417+
<trans-unit id="107">
418+
<source>Using invisible characters is not allowed.</source>
419+
<target>لا يسمح باستخدام أحرف غير مرئية.</target>
420+
</trans-unit>
421+
<trans-unit id="108">
422+
<source>Mixing numbers from different scripts is not allowed.</source>
423+
<target>لا يسمح بخلط الأرقام من نصوص مختلفة.</target>
424+
</trans-unit>
425+
<trans-unit id="109">
426+
<source>Using hidden overlay characters is not allowed.</source>
427+
<target>لا يسمح باستخدام أحرف التراكب المخفية.</target>
428+
</trans-unit>
405429
</body>
406430
</file>
407431
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,30 @@
402402
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403403
<target>Maskararen balioa {{ min }} eta {{ max }} artekoa izan beharko litzateke.</target>
404404
</trans-unit>
405+
<trans-unit id="104">
406+
<source>The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less.</source>
407+
<target>Fitxategiaren izena luzeegia da. Karaktere {{ filename_max_length }} edo gutxiago izan beharko lituzke.|Fitxategiaren izena luzeegia da. {{ filename_max_length }} karaktere edo gutxiago izan beharko lituzke.</target>
408+
</trans-unit>
409+
<trans-unit id="105">
410+
<source>The password strength is too low. Please use a stronger password.</source>
411+
<target>Pasahitzaren sendotasuna baxuegia da. Mesedez, erabili pasahitz seguruagoa.</target>
412+
</trans-unit>
413+
<trans-unit id="106">
414+
<source>This value contains characters that are not allowed by the current restriction-level.</source>
415+
<target>Egungo murrizte-mailak ez du balio honek dituen karaktereak onartzen.</target>
416+
</trans-unit>
417+
<trans-unit id="107">
418+
<source>Using invisible characters is not allowed.</source>
419+
<target>Ez da onartzen karaktere ikusezinak erabiltzea.</target>
420+
</trans-unit>
421+
<trans-unit id="108">
422+
<source>Mixing numbers from different scripts is not allowed.</source>
423+
<target>Ez da onartzen script ezberdinetako zenbakiak nahastea</target>
424+
</trans-unit>
425+
<trans-unit id="109">
426+
<source>Using hidden overlay characters is not allowed.</source>
427+
<target>Ez da onartzen karaktere gainjarri ezkutuen erabilera.</target>
428+
</trans-unit>
405429
</body>
406430
</file>
407431
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,30 @@
398398
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
399399
<target>Valoarea netmask-ului trebuie sa fie intre {{ min }} si {{ max }}.</target>
400400
</trans-unit>
401+
<trans-unit id="104">
402+
<source>The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less.</source>
403+
<target>Denumirea fișierului este prea lungă. Ea trebuie să conțină {{ filename_max_length }} caractere sau mai puține.|Denumirea fișierului este prea lungă. Ea trebuie să conțină {{ filename_max_length }} caractere sau mai puține.</target>
404+
</trans-unit>
405+
<trans-unit id="105">
406+
<source>The password strength is too low. Please use a stronger password.</source>
407+
<target>Complexitatea parolei este prea mică. Vă rugăm să folosiți o parolă mai puternică.</target>
408+
</trans-unit>
409+
<trans-unit id="106">
410+
<source>This value contains characters that are not allowed by the current restriction-level.</source>
411+
<target>Această valoare conține caractere care nu sunt premise de nivelul de restricționare curent.</target>
412+
</trans-unit>
413+
<trans-unit id="107">
414+
<source>Using invisible characters is not allowed.</source>
415+
<target>Folosirea caracterelor invizibile nu este permisă.</target>
416+
</trans-unit>
417+
<trans-unit id="108">
418+
<source>Mixing numbers from different scripts is not allowed.</source>
419+
<target>Combinarea numerelor din diferite script-uri nu este permisă.</target>
420+
</trans-unit>
421+
<trans-unit id="109">
422+
<source>Using hidden overlay characters is not allowed.</source>
423+
<target>Folosirea caracterelor invizibile suprapuse nu este permisă.</target>
424+
</trans-unit>
401425
</body>
402426
</file>
403427
</xliff>

0 commit comments

Comments
 (0)