8000 Merge branch '7.0' into 7.1 · symfony/symfony@6932b4b · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6932b4b

Browse files
xabbuhxabbuh
committed
Merge branch '7.0' into 7.1
* 7.0: Fix and add test add missing webhook services for Brevo and Mailjet [Validator] updated Macedonian translation [Validator] updated Portuguese translation
2 parents 7f3d8c6 + 4052194 commit 6932b4b

File tree

5 files changed

+37
-6
lines changed

5 files changed

+37
-6
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_webhook.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,34 @@
1111

1212
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
1313

14+
use Symfony\Component\Mailer\Bridge\Brevo\RemoteEvent\BrevoPayloadConverter;
15+
use Symfony\Component\Mailer\Bridge\Brevo\Webhook\BrevoRequestParser;
1416
use Symfony\Component\Mailer\Bridge\Mailgun\RemoteEvent\MailgunPayloadConverter;
1517
use Symfony\Component\Mailer\Bridge\Mailgun\Webhook\MailgunRequestParser;
18+
use Symfony\Component\Mailer\Bridge\Mailjet\RemoteEvent\MailjetPayloadConverter;
19+
use Symfony\Component\Mailer\Bridge\Mailjet\Webhook\MailjetRequestParser;
1620
use Symfony\Component\Mailer\Bridge\Postmark\RemoteEvent\PostmarkPayloadConverter;
1721
use Symfony\Component\Mailer\Bridge\Postmark\Webhook\PostmarkRequestParser;
1822
use Symfony\Component\Mailer\Bridge\Sendgrid\RemoteEvent\SendgridPayloadConverter;
1923
use Symfony\Component\Mailer\Bridge\Sendgrid\Webhook\SendgridRequestParser;
2024

2125
return static function (ContainerConfigurator $container) {
2226
$container->services()
27+
->set('mailer.payload_converter.brevo', BrevoPayloadConverter::class)
28+
->set('mailer.webhook.request_parser.brevo', BrevoRequestParser::class)
29+
->args([service('mailer.payload_converter.brevo')])
30+
->alias(BrevoRequestParser::class, 'mailer.webhook.request_parser.brevo')
31+
2332
->set('mailer.payload_converter.mailgun', MailgunPayloadConverter::class)
2433
->set('mailer.webhook.request_parser.mailgun', MailgunRequestParser::class)
2534
->args([service('mailer.payload_converter.mailgun')])
2635
->alias(MailgunRequestParser::class, 'mailer.webhook.request_parser.mailgun')
2736

37+
->set('mailer.payload_converter.mailjet', MailjetPayloadConverter::class)
38+
->set('mailer.webhook.request_parser.mailjet', MailjetRequestParser::class)
39+
->args([service('mailer.payload_converter.mailjet')])
40+
->alias(MailjetRequestParser::class, 'mailer.webhook.request_parser.mailjet')
41+
2842
->set('mailer.payload_converter.postmark', PostmarkPayloadConverter::class)
2943
->set('mailer.webhook.request_parser.postmark', PostmarkRequestParser::class)
3044
->args([service('mailer.payload_converter.postmark')])

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,10 @@
426426
<source>Using hidden overlay characters is not allowed.</source>
427427
<target>Не е дозволено користење на скриени знаци за преклопување.</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>Зголемувања на датотеката е неважечка ({{ extension }}). Дозволени зголемувања се ({{ extensions }}).</target>
432+
</trans-unit>
429433
</body>
430434
</file>
431435
</xliff>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,10 @@
426426
<source>Using hidden overlay characters is not allowed.</source>
427427
<target>Não é permitido usar caracteres de sobreposição ocultos.</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>A extensão do ficheiro é inválida ({{ extension }}). As extensões permitidas são {{ extensions }}.</target>
432+
</trans-unit>
429433
</body>
430434
</file>
431435
</xliff>

‎src/Symfony/Component/Validator/Tests/Constraints/CssColorValidatorTest.php

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,11 +418,22 @@ public function getInvalidHSLA(): array
418418
return [['hsla(1000, 1000%, 20000%, 999)'], ['hsla(-100, -10%, -2%, 999)'], ['hsla(a, b, c, d)'], ['hsla(a, b%, c%, d)'], ['hsla( 9 99% , 99 9% , 9 %']];
419419
}
420420

421-
public function testUnknownFormatsOnValidateTriggerException()
421+
/**
422+
* @dataProvider getInvalidFormats
423+
*/
424+
public function testUnknownFormatAsStringThrowsException($formats)
422425
{
423426
$this->expectException(\InvalidArgumentException::class);
424427
$this->expectExceptionMessage('The "formats" parameter value is not valid. It must contain one or more of the following values: "hex_long, hex_long_with_alpha, hex_short, hex_short_with_alpha, basic_named_colors, extended_named_colors, system_colors, keywords, rgb, rgba, hsl, hsla".');
425-
$constraint = new CssColor('Unknown Format');
426-
$this->validator->validate('#F4B907', $constraint);
428+
429+
new CssColor($formats);
430+
}
431+
432+
public static function getInvalidFormats(): array
433+
{
434+
return [
435+
'as string' => ['Unknown Format'],
436+
'as array' => [['Unknown Format']],
437+
];
427438
}
428439
}

‎src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTestCase.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,9 @@ public function testMaxSizeNotExceeded($bytesWritten, $limit)
233233
public function testInvalidMaxSize()
234234
{
235235
$this->expectException(ConstraintDefinitionException::class);
236-
$constraint = new File([
236+
new File([
237237
'maxSize' => '1abc',
238238
]);
239-
240-
$this->validator->validate($this->path, $constraint);
241239
}
242240

243241
public static function provideBinaryFormatTests()

0 commit comments

Comments
 (0)
0