Merge branch '6.4' into 7.0

* 6.4:
  Fix and add test
  add missing webhook services for Brevo and Mailjet
  [Validator] updated Macedonian translation
  [Validator] updated Portuguese translation

Author: xabbuh

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

@@ -11,20 +11,34 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Symfony\Component\Mailer\Bridge\Brevo\RemoteEvent\BrevoPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Brevo\Webhook\BrevoRequestParser;
 use Symfony\Component\Mailer\Bridge\Mailgun\RemoteEvent\MailgunPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Mailgun\Webhook\MailgunRequestParser;
+use Symfony\Component\Mailer\Bridge\Mailjet\RemoteEvent\MailjetPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Mailjet\Webhook\MailjetRequestParser;
 use Symfony\Component\Mailer\Bridge\Postmark\RemoteEvent\PostmarkPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Postmark\Webhook\PostmarkRequestParser;
 use Symfony\Component\Mailer\Bridge\Sendgrid\RemoteEvent\SendgridPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Webhook\SendgridRequestParser;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
+        ->set('mailer.payload_converter.brevo', BrevoPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.brevo', BrevoRequestParser::class)
+            ->args([service('mailer.payload_converter.brevo')])
+        ->alias(BrevoRequestParser::class, 'mailer.webhook.request_parser.brevo')
+
         ->set('mailer.payload_converter.mailgun', MailgunPayloadConverter::class)
         ->set('mailer.webhook.request_parser.mailgun', MailgunRequestParser::class)
             ->args([service('mailer.payload_converter.mailgun')])
         ->alias(MailgunRequestParser::class, 'mailer.webhook.request_parser.mailgun')
 
+        ->set('mailer.payload_converter.mailjet', MailjetPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.mailjet', MailjetRequestParser::class)
+            ->args([service('mailer.payload_converter.mailjet')])
+        ->alias(MailjetRequestParser::class, 'mailer.webhook.request_parser.mailjet')
+
         ->set('mailer.payload_converter.postmark', PostmarkPayloadConverter::class)
         ->set('mailer.webhook.request_parser.postmark', PostmarkRequestParser::class)
             ->args([service('mailer.payload_converter.postmark')])

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

@@ -426,6 +426,10 @@
                 <source>Using hidden overlay characters is not allowed.</source>
                 <target>Не е дозволено користење на скриени знаци за преклопување.</target>
             </trans-unit>
+            <trans-unit id="110">
+                <source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
+                <target>Зголемувања на датотеката е неважечка ({{ extension }}). Дозволени зголемувања се ({{ extensions }}).</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

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

@@ -426,6 +426,10 @@
                 <source>Using hidden overlay characters is not allowed.</source>
                 <target>Não é permitido usar caracteres de sobreposição ocultos.</target>
             </trans-unit>
+            <trans-unit id="110">
+                <source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
+                <target>A extensão do ficheiro é inválida ({{ extension }}). As extensões permitidas são {{ extensions }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

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

@@ -418,11 +418,22 @@ public function getInvalidHSLA(): array
         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 %']];
     }
 
-    public function testUnknownFormatsOnValidateTriggerException()
+    /**
+     * @dataProvider getInvalidFormats
+     */
+    public function testUnknownFormatAsStringThrowsException($formats)
     {
         $this->expectException(\InvalidArgumentException::class);
         $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".');
-        $constraint = new CssColor('Unknown Format');
-        $this->validator->validate('#F4B907', $constraint);
+
+        new CssColor($formats);
+    }
+
+    public static function getInvalidFormats(): array
+    {
+        return [
+            'as string' => ['Unknown Format'],
+            'as array' => [['Unknown Format']],
+        ];
     }
 }

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

@@ -233,11 +233,9 @@ public function testMaxSizeNotExceeded($bytesWritten, $limit)
     public function testInvalidMaxSize()
     {
         $this->expectException(ConstraintDefinitionException::class);
-        $constraint = new File([
+        new File([
             'maxSize' => '1abc',
         ]);
-
-        $this->validator->validate($this->path, $constraint);
     }
 
     public static function provideBinaryFormatTests()