Merge branch '6.4' into 7.1

* 6.4:
  [DoctrineBridge] Fix the `LockStoreSchemaListener`
  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
  skip transient Redis integration tests on AppVeyor
  reject malformed URLs with a meaningful exception
  [Mime] Add tests on constraints

Author: nicolas-grekas

src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bridge\Doctrine\SchemaListener;
 
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
-use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\PersistingStoreInterface;
 use Symfony\Component\Lock\Store\DoctrineDbalStore;
 
@@ -30,20 +29,12 @@ public function postGenerateSchema(GenerateSchemaEventArgs $event): void
     {
         $connection = $event->getEntityManager()->getConnection();
 
-        $storesIterator = new \ArrayIterator($this->stores);
-        while ($storesIterator->valid()) {
-            try {
-                $store = $storesIterator->current();
-                if (!$store instanceof DoctrineDbalStore) {
-                    continue;
-                }
-
-                $store->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
-            } catch (InvalidArgumentException) {
-                // no-op
+        foreach ($this->stores as $store) {
+            if (!$store instanceof DoctrineDbalStore) {
+                continue;
             }
 
-            $storesIterator->next();
+            $store->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection));
         }
     }
 }

src/Symfony/Bridge/Doctrine/Tests/SchemaListener/LockStoreSchemaListenerTest.php

@@ -17,7 +17,6 @@
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\SchemaListener\LockStoreSchemaListener;
-use Symfony\Component\Lock\Exception\InvalidArgumentException;
 use Symfony\Component\Lock\Store\DoctrineDbalStore;
 
 class LockStoreSchemaListenerTest extends TestCase
@@ -37,23 +36,7 @@ public function testPostGenerateSchemaLockPdo()
             ->method('configureSchema')
             ->with($schema, fn () => true);
 
-        $subscriber = new LockStoreSchemaListener([$lockStore]);
-        $subscriber->postGenerateSchema($event);
-    }
-
-    public function testPostGenerateSchemaWithInvalidLockStore()
-    {
-        $entityManager = $this->createMock(EntityManagerInterface::class);
-        $entityManager->expects($this->once())
-            ->method('getConnection')
-            ->willReturn($this->createMock(Connection::class));
-        $event = new GenerateSchemaEventArgs($entityManager, new Schema());
-
-        $subscriber = new LockStoreSchemaListener((static function (): \Generator {
-            yield $this->createMock(DoctrineDbalStore::class);
-
-            throw new InvalidArgumentException('Unsupported Connection');
-        })());
+        $subscriber = new LockStoreSchemaListener((static fn () => yield $lockStore)());
         $subscriber->postGenerateSchema($event);
     }
 }

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;
@@ -456,6 +457,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/Messenger/Bridge/Redis/Tests/Transport/RedisExtIntegrationTest.php

@@ -353,6 +353,9 @@ public function testJsonError()
         }
     }
 
+    /**
+     * @group transient-on-windows
+     */
     public function testGetNonBlocking()
     {
         $redis = $this->createRedisClient();
@@ -388,6 +391,9 @@ public function testGetAfterReject()
         }
     }
 
+    /**
+     * @group transient-on-windows
+     */
     public function testItProperlyHandlesEmptyMessages()
     {
         $redisReceiver = new RedisReceiver($this->connection, new Serializer());

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();