Merge branch '5.4' into 6.3

* 5.4:
  [Messenger] Fix using negative delay
  [Validator] Add missing italian translation
  [Validator] Fix using known option names as field names

Author: fabpot

src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php

@@ -72,10 +72,29 @@ public function testSendWithDelay()
             $stmt = $stmt->execute();
         }
 
-        $available_at = new \DateTimeImmutable($stmt instanceof Result ? $stmt->fetchOne() : $stmt->fetchColumn());
+        $availableAt = new \DateTimeImmutable($stmt instanceof Result ? $stmt->fetchOne() : $stmt->fetchColumn());
 
         $now = new \DateTimeImmutable('now + 60 seconds');
-        $this->assertGreaterThan($now, $available_at);
+        $this->assertGreaterThan($now, $availableAt);
+    }
+
+    public function testSendWithNegativeDelay()
+    {
+        $this->connection->send('{"message": "Hi, I am not actually delayed"}', ['type' => DummyMessage::class], -600000);
+
+        $qb = $this->driverConnection->createQueryBuilder()
+            ->select('m.available_at')
+            ->from('messenger_messages', 'm')
+            ->where('m.body = :body')
+            ->setParameter('body', '{"message": "Hi, I am not actually delayed"}');
+
+        // DBAL 2 compatibility
+        $result = method_exists($qb, 'executeQuery') ? $qb->executeQuery() : $qb->execute();
+
+        $availableAt = new \DateTimeImmutable($result->fetchOne());
+
+        $now = new \DateTimeImmutable('now - 60 seconds');
+        $this->assertLessThan($now, $availableAt);
     }
 
     public function testItRetrieveTheFirstAvailableMessage()

src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php

@@ -126,7 +126,7 @@ public static function buildConfiguration(#[\SensitiveParameter] string $dsn, ar
     public function send(string $body, array $headers, int $delay = 0): string
     {
         $now = new \DateTimeImmutable('UTC');
-        $availableAt = $now->modify(sprintf('+%d seconds', $delay / 1000));
+        $availableAt = $now->modify(sprintf('%+d seconds', $delay / 1000));
 
         $queryBuilder = $this->driverConnection->createQueryBuilder()
             ->insert($this->configuration['table_name'])

src/Symfony/Component/Validator/Constraints/Collection.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
+use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 
 /**
@@ -43,9 +44,10 @@ class Collection extends Composite
 
     public function __construct(mixed $fields = null, array $groups = null, mixed $payload = null, bool $allowExtraFields = null, bool $allowMissingFields = null, string $extraFieldsMessage = null, string $missingFieldsMessage = null)
     {
-        // no known options set? $fields is the fields array
         if (\is_array($fields)
-            && !array_intersect(array_keys($fields), ['groups', 'fields', 'allowExtraFields', 'allowMissingFields', 'extraFieldsMessage', 'missingFieldsMessage'])) {
+            && (($firstField = reset($fields)) instanceof Constraint
+                || ($firstField[0] ?? null) instanceof Constraint
+            )) {
             $fields = ['fields' => $fields];
         }
 

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

@@ -426,6 +426,10 @@
                 <source>Using hidden overlay characters is not allowed.</source>
                 <target>Non è consentito utilizzare caratteri sovrapposti nascosti.</target>
             </trans-unit>
+            <trans-unit id="110">
+                <source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
+                <target>L'estensione del file non è valida ({{ extension }}). Le estensioni consentite sono {{ extensions }}.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

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

@@ -18,6 +18,7 @@
 use Symfony\Component\Validator\Constraints\Required;
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
+use Symfony\Component\Validator\Exception\InvalidOptionsException;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
@@ -34,7 +35,7 @@ public function testRejectInvalidFieldsOption()
 
     public function testRejectNonConstraints()
     {
-        $this->expectException(ConstraintDefinitionException::class);
+        $this->expectException(InvalidOptionsException::class);
         new Collection([
             'foo' => 'bar',
         ]);
@@ -113,4 +114,43 @@ public function testConstraintHasDefaultGroupWithOptionalValues()
         $this->assertEquals(['Default'], $constraint->fields['foo']->groups);
         $this->assertEquals(['Default'], $constraint->fields['bar']->groups);
     }
+
+    public function testOnlySomeKeysAreKnowOptions()
+    {
+        $constraint = new Collection([
+            'fields' => [new Required()],
+            'properties' => [new Required()],
+            'catalog' => [new Optional()],
+        ]);
+
+        $this->assertArrayHasKey('fields', $constraint->fields);
+        $this->assertInstanceOf(Required::class, $constraint->fields['fields']);
+        $this->assertArrayHasKey('properties', $constraint->fields);
+        $this->assertInstanceOf(Required::class, $constraint->fields['properties']);
+        $this->assertArrayHasKey('catalog', $constraint->fields);
+        $this->assertInstanceOf(Optional::class, $constraint->fields['catalog']);
+    }
+
+    public function testAllKeysAreKnowOptions()
+    {
+        $constraint = new Collection([
+            'fields' => [
+                'fields' => [new Required()],
+                'properties' => [new Required()],
+                'catalog' => [new Optional()],
+            ],
+            'allowExtraFields' => true,
+            'extraFieldsMessage' => 'foo bar baz',
+        ]);
+
+        $this->assertArrayHasKey('fields', $constraint->fields);
+        $this->assertInstanceOf(Required::class, $constraint->fields['fields']);
+        $this->assertArrayHasKey('properties', $constraint->fields);
+        $this->assertInstanceOf(Required::class, $constraint->fields['properties']);
+        $this->assertArrayHasKey('catalog', $constraint->fields);
+        $this->assertInstanceOf(Optional::class, $constraint->fields['catalog']);
+
+        $this->assertTrue($constraint->allowExtraFields);
+        $this->assertSame('foo bar baz', $constraint->extraFieldsMessage);
+    }
 }