Merge branch '5.4' into 6.4

* 5.4:
  add German translations for the Week constraint messages
  sync Week constraint messages translations
  [Validator] Add `D` regex modifier in relevant validators
  [Validator] Add French translation for the `Week` constraint
  reject malformed URLs with a meaningful exception
  [Mime] Add tests on constraints

Author: nicolas-grekas

src/Symfony/Component/HttpClient/HttpClientTrait.php

@@ -557,6 +557,8 @@ private static function jsonEncode(mixed $value, ?int $flags = null, int $maxDep
      */
     private static function resolveUrl(array $url, ?array $base, array $queryDefaults = []): array
     {
+        $givenUrl = $url;
+
         if (null !== $base && '' === ($base['scheme'] ?? '').($base['authority'] ?? '')) {
             throw new InvalidArgumentException(sprintf('Invalid "base_uri" option: host or scheme is missing in "%s".', implode('', $base)));
         }
@@ -610,6 +612,10 @@ private static function resolveUrl(array $url, ?array $base, array $queryDefault
             $url['query'] = null;
         }
 
+        if (null !== $url['scheme'] && null === $url['authority']) {
+            throw new InvalidArgumentException(\sprintf('Invalid URL: host is missing in "%s".', implode('', $givenUrl)));
+        }
+
         return $url;
     }
 

src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpClient\Tests;
 
 use Symfony\Component\HttpClient\Exception\ClientException;
+use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\Internal\ClientState;
 use Symfony\Component\HttpClient\Response\StreamWrapper;
@@ -451,6 +452,16 @@ public function testNullBody()
         $this->expectNotToPerformAssertions();
     }
 
+    public function testMisspelledScheme()
+    {
+        $httpClient = $this->getHttpClient(__FUNCTION__);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid URL: host is missing in "http:/localhost:8057/".');
+
+        $httpClient->request('GET', 'http:/localhost:8057/');
+    }
+
     /**
      * @dataProvider getRedirectWithAuthTests
      */

src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php

@@ -175,7 +175,6 @@ public function testResolveUrl(string $base, string $url, string $expected)
     public static function provideResolveUrl(): array
     {
         return [
-            [self::RFC3986_BASE, 'http:h',        'http:h'],
             [self::RFC3986_BASE, 'g',             'http://a/b/c/g'],
             [self::RFC3986_BASE, './g',           'http://a/b/c/g'],
             [self::RFC3986_BASE, 'g/',            'http://a/b/c/g/'],
@@ -229,7 +228,6 @@ public static function provideResolveUrl(): array
             ['http://u:p@a/b/c/d;p?q', '.',       'http://u:p@a/b/c/'],
             // path ending with slash or no slash at all
             ['http://a/b/c/d/',  'e',             'http://a/b/c/d/e'],
-            ['http:no-slash',     'e',            'http:e'],
             // falsey relative parts
             [self::RFC3986_BASE, '//0',           'http://0/'],
             [self::RFC3986_BASE, '0',             'http://a/b/c/0'],

src/Symfony/Component/Mime/Tests/AddressTest.php

@@ -43,6 +43,14 @@ public function testCreate()
         $this->assertEquals($a, Address::create('fabien@symfony.com'));
     }
 
+    public function testCreateWithInvalidFormat()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Could not parse "<fabien@symfony" to a "Symfony\Component\Mime\Address" instance.');
+
+        Address::create('<fabien@symfony');
+    }
+
     /**
      * @dataProvider fromStringProvider
      */

src/Symfony/Component/Mime/Tests/Encoder/IdnAddressEncoderTest.php

@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mime\Encoder;
+namespace Symfony\Component\Mime\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mime\Encoder\IdnAddressEncoder;
 
 class IdnAddressEncoderTest extends TestCase
 {

src/Symfony/Component/Mime/Tests/Encoder/QpContentEncoderTest.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mime\Tests\Encoder;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mime\Encoder\QpContentEncoder;
+
+class QpContentEncoderTest extends TestCase
+{
+    public function testReplaceLastChar()
+    {
+        $encoder = new QpContentEncoder();
+
+        $this->assertSame('message=09', $encoder->encodeString('message'.chr(0x09)));
+        $this->assertSame('message=20', $encoder->encodeString('message'.chr(0x20)));
+    }
+}

src/Symfony/Component/Mime/Tests/MessageTest.php

@@ -134,6 +134,16 @@ public function testGenerateMessageIdThrowsWhenHasFromButNoAddresses()
         $message->generateMessageId();
     }
 
+    public function testGenerateMessageIdThrowsWhenNeitherFromNorSenderIsPresent()
+    {
+        $message = new Message();
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('An email must have a "From" or a "Sender" header.');
+
+        $message->generateMessageId();
+    }
+
     public function testToString()
     {
         $message = new Message();

src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php

@@ -243,4 +243,12 @@ public function testBoundaryContentTypeHeader()
             $headers[0]
         );
     }
+
+    public function testConstructThrowsOnUnexpectedFieldType()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('A form field value can only be a string, an array, or an instance of TextPart ("stdClass" given).');
+
+        new FormDataPart(['foo' => new \stdClass()]);
+    }
 }

src/Symfony/Component/Mime/Tests/Test/Constraint/EmailAddressContainsTest.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mime\Tests\Test\Constraint;
+
+use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mime\Email;
+use Symfony\Component\Mime\Header\Headers;
+use Symfony\Component\Mime\Test\Constraint\EmailAddressContains;
+
+class EmailAddressContainsTest extends TestCase
+{
+    public function testToString()
+    {
+        $constraint = new EmailAddressContains('headerName', 'expectedValue');
+
+        $this->assertSame('contains address "headerName" with value "expectedValue"', $constraint->toString());
+    }
+
+    public function testFailureDescription()
+    {
+        $mailboxHeader = 'text@example.com';
+        $headers = new Headers();
+        $headers->addMailboxHeader($mailboxHeader, 'actualValue@example.com');
+
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Email contains address "text@example.com" with value "expectedValue@example.com" (value is actualValue@example.com).');
+
+        (new EmailAddressContains($mailboxHeader, 'expectedValue@example.com'))->evaluate(new Email($headers));
+    }
+}

src/Symfony/Component/Mime/Tests/Test/Constraint/EmailAttachmentCountTest.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mime\Tests\Test\Constraint;
+
+use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mime\Email;
+use Symfony\Component\Mime\Test\Constraint\EmailAttachmentCount;
+
+class EmailAttachmentCountTest extends TestCase
+{
+    public function testToString()
+    {
+        $constraint = new EmailAttachmentCount(1);
+
+        $this->assertSame('has sent "1" attachment(s)', $constraint->toString());
+    }
+
+    public function testFailureDescription()
+    {
+        $email = new Email();
+        $email->attach('attachment content', 'attachment.txt');
+
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that the Email has sent "2" attachment(s).');
+
+        (new EmailAttachmentCount(2))->evaluate($email);
+    }
+}