Skip to content

Commit c1bf14f

Browse files
xabbuhxabbuh
committed
Merge branch '5.4' into 6.3
* 5.4: fix tests on AppVeyor Hungarian typo fix in validators translation [Validator] updated Latvian translation [Validator] Added missing Swedish translations [Mailer] [Notifier] symfony#52264 Update Sendinblue / Brevo API host [Validator] Added missing Estonian translations symfony#51939 fix File constraint tests on 32bit PHP [Form] Skip merging params & files if there are no files in the first place [Translation] Ignore bridges in `.gitattributes` file Add missing Hungarian validator translations Added missing Bosnian translations symfony#51929 Added missing Serbian (sr_Latn) translations Added missing Serbian (sr_Cyrl) translations Hide generated files in GitHub diffs and statistics symfony#51937 - Added missing Danish translations
2 parents 6637b78 + ebb8cd8 commit c1bf14f

File tree

15 files changed

+231
-15
lines changed

15 files changed

+231
-15
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
/src/Symfony/Component/Messenger/Bridge export-ignore
55
/src/Symfony/Component/Notifier/Bridge export-ignore
66
/src/Symfony/Component/Runtime export-ignore
7+
/src/Symfony/Component/Translation/Bridge export-ignore
8+
/src/Symfony/Component/Intl/Resources/data/*/* linguist-generated=true

‎src/Symfony/Component/Form/Tests/AbstractRequestHandlerTestCase.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\EventDispatcher\EventDispatcher;
1616
use Symfony\Component\Form\Extension\Core\DataMapper\DataMapper;
17+
use Symfony\Component\Form\Extension\Core\Type\TextType;
1718
use Symfony\Component\Form\Form;
1819
use Symfony\Component\Form\FormBuilder;
1920
use Symfony\Component\Form\FormError;
@@ -236,6 +237,24 @@ public function testMergeParamsAndFiles($method)
236237
$this->assertSame($file, $form->get('field2')->getData());
237238
}
238239

240+
public function testIntegerChildren()
241+
{
242+
$form = $this->createForm('root', 'POST', true);
243+
$form->add('0', TextType::class);
244+
$form->add('1', TextType::class);
245+
246+
$this->setRequestData('POST', [
247+
'root' => [
248+
'1' => 'bar',
249+
],
250+
]);
251+
252+
$this->requestHandler->handleRequest($form, $this->request);
253+
254+
$this->assertNull($form->get('0')->getData());
255+
$this->assertSame('bar', $form->get('1')->getData());
256+
}
257+
239258
/**
240259
* @dataProvider methodExceptGetProvider
241260
*/

‎src/Symfony/Component/Form/Util/FormUtil.php‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,21 @@ public static function isEmpty(mixed $data): bool
4646
*/
4747
public static function mergeParamsAndFiles(array $params, array $files): array
4848
{
49-
$result = [];
49+
if (array_is_list($files)) {
50+
foreach ($files as $value) {
51+
$params[] = $value;
52+
}
53+
54+
return $params;
55+
}
5056

5157
foreach ($params as $key => $value) {
5258
if (\is_array($value) && \is_array($files[$key] ?? null)) {
53-
$value = self::mergeParamsAndFiles($value, $files[$key]);
59+
$params[$key] = self::mergeParamsAndFiles($value, $files[$key]);
5460
unset($files[$key]);
5561
}
56-
if (\is_int($key)) {
57-
$result[] = $value;
58-
} else {
59-
$result[$key] = $value;
60-
}
6162
}
6263

63-
return array_merge($result, $files);
64+
return array_replace($params, $files);
6465
}
6566
}

‎src/Symfony/Component/Mailer/Bridge/Sendinblue/Tests/Transport/SendinblueApiTransportTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static function getTransportData()
3838
{
3939
yield [
4040
new SendinblueApiTransport('ACCESS_KEY'),
41-
'sendinblue+api://api.sendinblue.com',
41+
'sendinblue+api://api.brevo.com',
4242
];
4343

4444
yield [
@@ -89,7 +89,7 @@ public function testSendThrowsForErrorResponse()
8989
{
9090
$client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
9191
$this->assertSame('POST', $method);
92-
$this->assertSame('https://api.sendinblue.com:8984/v3/smtp/email', $url);
92+
$this->assertSame('https://api.brevo.com:8984/v3/smtp/email', $url);
9393
$this->assertStringContainsString('Accept: */*', $options['headers'][2] ?? $options['request_headers'][1]);
9494

9595
return new MockResponse(json_encode(['message' => 'i\'m a teapot']), [
@@ -119,7 +119,7 @@ public function testSend()
119119
{
120120
$client = new MockHttpClient(function (string $method, string $url, array $options): ResponseInterface {
121121
$this->assertSame('POST', $method);
122-
$this->assertSame('https://api.sendinblue.com:8984/v3/smtp/email', $url);
122+
$this->assertSame('https://api.brevo.com:8984/v3/smtp/email', $url);
123123
$this->assertStringContainsString('Accept: */*', $options['headers'][2] ?? $options['request_headers'][1]);
124124

125125
return new MockResponse(json_encode(['messageId' => 'foobar']), [

‎src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueApiTransport.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,6 @@ private function stringifyAddress(Address $address): array
180180

181181
private function getEndpoint(): ?string
182182
{
183-
return ($this->host ?: 'api.sendinblue.com').($this->port ? ':'.$this->port : '');
183+
return ($this->host ?: 'api.brevo.com').($this->port ? ':'.$this->port : '');
184184
}
185185
}

‎src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransport.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727
final class SendinblueTransport extends AbstractTransport
2828
{
29-
protected const HOST = 'api.sendinblue.com';
29+
protected const HOST = 'api.brevo.com';
3030

3131
private string $apiKey;
3232
private string $sender;

‎src/Symfony/Component/Validator/Resources/translations/validators.bs.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>Vrijednost NetMask bi trebala biti između {{min}} i {{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>Ime datoteke je predugačko. Trebao bi imati {{ filename_max_length }} znak ili manje.|Naziv fajla je predugačak. Trebao bi imati {{ filename_max_length }} znakova ili manje.</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>Jačina lozinke je preniska. Molimo koristite jaču lozinku.</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>Ova vrijednost sadrži znakove koji nisu dozvoljeni trenutnim nivoom ograničenja.</target>
416+
</trans-unit>
417+
<trans-unit id="107">
418+
<source>Using invisible characters is not allowed.</source>
419+
<target>Upotreba nevidljivih znakova nije dozvoljena.</target>
420+
</trans-unit>
421+
<trans-unit id="108">
422+
<source>Mixing numbers from different scripts is not allowed.</source>
423+
<target>Nije dozvoljeno miješanje brojeva iz različitih pisama.</target>
424+
</trans-unit>
425+
<trans-unit id="109">
426+
<source>Using hidden overlay characters is not allowed.</source>
427+
<target>Upotreba skrivenih preklapajućih znakova nije dozvoljena.</target>
428+
</trans-unit>
405429
</body>
406430
</file>
407431
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.da.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>Værdien af netmasken skal være mellem {{ min }} og {{ 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>Filnavnet er for langt. Det bør indeholde {{ filename_max_length }} tegn eller mindre.|Filnavnet er for langt. Det bør indeholde {{ filename_max_length }} tegn eller mindre.</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>Kodeordets styrke er for lav. Du bedes indtaste et stærkere kodeord.</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>Denne værdi indeholder tegn, som ikke er tilladt med det nuværende restriktionsniveau.</target>
416+
</trans-unit>
417+
<trans-unit id="107">
418+
<source>Using invisible characters is not allowed.</source>
419+
<target>Brug af usynlige tegn er ikke tilladt.</target>
420+
</trans-unit>
421+
<trans-unit id="108">
422+
<source>Mixing numbers from different scripts is not allowed.</source>
423+
<target>At blande numre fra forskellige scripts er ikke tilladt.</target>
424+
</trans-unit>
425+
<trans-unit id="109">
426+
<source>Using hidden overlay characters is not allowed.</source>
427+
<target>At bruge skjulte overlejringstegn er ikke tilladt.</target>
428+
</trans-unit>
405429
</body>
406430
</file>
407431
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.et.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>Võrgumaski väärtus peaks olema vahemikus {{ min }} kuni {{ 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>Failinimi on liiga pikk. See peaks olema {{ filename_max_length }} tähemärk või vähem.|Failinimi on liiga pikk. See peaks olema {{ filename_max_length }} tähemärki või vähem.</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>Parooli tugevus on liiga madal. Palun kasuta tugevamat parooli.</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>See väärtus sisaldab tähemärke, mida praegune piirangu tase ei luba.</target>
416+
</trans-unit>
417+
<trans-unit id="107">
418+
<source>Using invisible characters is not allowed.</source>
419+
<target>Mittenähtavate tähemärkide kasutamine ei ole lubatud.</target>
420+
</trans-unit>
421+
<trans-unit id="108">
422+
<source>Mixing numbers from different scripts is not allowed.</source>
423+
<target>Eri kirjasüsteemidest pärit numbrite koos kasutamine pole lubatud.</target>
424+
</trans-unit>
425+
<trans-unit id="109">
426+
<source>Using hidden overlay characters is not allowed.</source>
427+
<target>Peidetud tähemärkide kasutamine pole lubatud.</target>
428+
</trans-unit>
405429
</body>
406430
</file>
407431
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.hu.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>Ennek a netmask értéknek {{ min }} és {{ max }} között kell lennie.</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>A fájlnév túl hosszú. {{ filename_max_length }} karakter vagy kevesebb legyen.|A fájlnév túl hosszú. {{ filename_max_length }} karakter vagy kevesebb legyen.</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>A jelszó túl egyszerű. Kérjük, használjon egy bonyolultabb jelszót.</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>Ez az érték olyan karaktereket tartalmaz, amik nem megengedettek.</target>
416+
</trans-unit>
417+
<trans-unit id="107">
418+
<source>Using invisible characters is not allowed.</source>
419+
<target>Láthatatlan karaktert használata nem megengedett.</target>
420+
</trans-unit>
421+
<trans-unit id="108">
422+
<source>Mixing numbers from different scripts is not allowed.</source>
423+
<target>Különböző szám írásmódok használata nem megengedett.</target>
424+
</trans-unit>
425+
<trans-unit id="109">
426+
<source>Using hidden overlay characters is not allowed.</source>
427+
<target>Rejtett módosító karakterek használata nem megengedett.</target>
428+
</trans-unit>
405429
</body>
406430
</file>
407431
</xliff>

0 commit comments

Comments
 (0)