Merge branch '5.4' into 6.3

* 5.4:
  fix test
  [Validator] added missing Portuguese and Albanian translations

Author: nicolas-grekas

src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php

@@ -27,7 +27,7 @@
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\RoutableMessageBus;
 use Symfony\Component\Messenger\Stamp\BusNameStamp;
-use Symfony\Component\Messenger\Tests\ResettableDummyReceiver;
+use Symfony\Component\Messenger\Tests\Fixtures\ResettableDummyReceiver;
 use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 
 class ConsumeMessagesCommandTest extends TestCase

src/Symfony/Component/Messenger/Tests/Fixtures/DummyReceiver.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\Tests\Fixtures;
+
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
+
+class DummyReceiver implements ReceiverInterface
+{
+    private $deliveriesOfEnvelopes;
+    private $acknowledgedEnvelopes;
+    private $acknowledgeCount = 0;
+    private $rejectCount = 0;
+
+    /**
+     * @param Envelope[][] $deliveriesOfEnvelopes
+     */
+    public function __construct(array $deliveriesOfEnvelopes)
+    {
+        $this->deliveriesOfEnvelopes = $deliveriesOfEnvelopes;
+    }
+
+    public function get(): iterable
+    {
+        $val = array_shift($this->deliveriesOfEnvelopes);
+
+        return $val ?? [];
+    }
+
+    public function ack(Envelope $envelope): void
+    {
+        ++$this->acknowledgeCount;
+        $this->acknowledgedEnvelopes[] = $envelope;
+    }
+
+    public function reject(Envelope $envelope): void
+    {
+        ++$this->rejectCount;
+    }
+
+    public function getAcknowledgeCount(): int
+    {
+        return $this->acknowledgeCount;
+    }
+
+    public function getRejectCount(): int
+    {
+        return $this->rejectCount;
+    }
+
+    public function getAcknowledgedEnvelopes(): array
+    {
+        return $this->acknowledgedEnvelopes;
+    }
+}

src/Symfony/Component/Messenger/Tests/Fixtures/ResettableDummyReceiver.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Messenger\Tests\Fixtures;
+
+use Symfony\Contracts\Service\ResetInterface;
+
+class ResettableDummyReceiver extends DummyReceiver implements ResetInterface
+{
+    private $hasBeenReset = false;
+
+    public function reset(): void
+    {
+        $this->hasBeenReset = true;
+    }
+
+    public function hasBeenReset(): bool
+    {
+        return $this->hasBeenReset;
+    }
+}

src/Symfony/Component/Messenger/Tests/WorkerTest.php

@@ -41,6 +41,8 @@
 use Symfony\Component\Messenger\Stamp\SentStamp;
 use Symfony\Component\Messenger\Stamp\StampInterface;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
+use Symfony\Component\Messenger\Tests\Fixtures\DummyReceiver;
+use Symfony\Component\Messenger\Tests\Fixtures\ResettableDummyReceiver;
 use Symfony\Component\Messenger\Transport\Receiver\QueueReceiverInterface;
 use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 use Symfony\Component\Messenger\Worker;
@@ -580,57 +582,6 @@ public function testFlushBatchOnStop()
     }
 }
 
-class DummyReceiver implements ReceiverInterface
-{
-    private $deliveriesOfEnvelopes;
-    private $acknowledgedEnvelopes;
-    private $rejectedEnvelopes;
-    private $acknowledgeCount = 0;
-    private $rejectCount = 0;
-
-    /**
-     * @param Envelope[][] $deliveriesOfEnvelopes
-     */
-    public function __construct(array $deliveriesOfEnvelopes)
-    {
-        $this->deliveriesOfEnvelopes = $deliveriesOfEnvelopes;
-    }
-
-    public function get(): iterable
-    {
-        $val = array_shift($this->deliveriesOfEnvelopes);
-
-        return $val ?? [];
-    }
-
-    public function ack(Envelope $envelope): void
-    {
-        ++$this->acknowledgeCount;
-        $this->acknowledgedEnvelopes[] = $envelope;
-    }
-
-    public function reject(Envelope $envelope): void
-    {
-        ++$this->rejectCount;
-        $this->rejectedEnvelopes[] = $envelope;
-    }
-
-    public function getAcknowledgeCount(): int
-    {
-        return $this->acknowledgeCount;
-    }
-
-    public function getRejectCount(): int
-    {
-        return $this->rejectCount;
-    }
-
-    public function getAcknowledgedEnvelopes(): array
-    {
-        return $this->acknowledgedEnvelopes;
-    }
-}
-
 class DummyQueueReceiver extends DummyReceiver implements QueueReceiverInterface
 {
     public function getFromQueues(array $queueNames): iterable
@@ -664,18 +615,3 @@ private function process(array $jobs): void
         }
     }
 }
-
-class ResettableDummyReceiver extends DummyReceiver implements ResetInterface
-{
-    private $hasBeenReset = false;
-
-    public function reset(): void
-    {
-        $this->hasBeenReset = true;
-    }
-
-    public function hasBeenReset(): bool
-    {
-        return $this->hasBeenReset;
-    }
-}

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

@@ -436,7 +436,7 @@
             </trans-unit>
             <trans-unit id="112">
                 <source>This value is not a valid MAC address.</source>
-                <target state="needs-review-translation">Este valor não é um endereço MAC válido.</target>
+                <target>Este valor não é um endereço MAC válido.</target>
             </trans-unit>
         </body>
     </file>

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

@@ -432,11 +432,11 @@
             </trans-unit>
             <trans-unit id="111">
                 <source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
-                <target state="needs-review-translation">Kodimi i karaktereve të zbuluar është i pavlefshëm ({{ detected }}). Kodimet e lejuara janë {{ encodings }}.</target>
+                <target>Kodimi i karakterit të identifikuar  është i pavlefshëm ({{ detected }}). Kodimet e lejuara janë {{ encodings }}.</target>
             </trans-unit>
             <trans-unit id="112">
                 <source>This value is not a valid MAC address.</source>
-                <target state="needs-review-translation">Kjo vlerë nuk është një adresë MAC e vlefshme.</target>
+                <target>Kjo nuk është një adresë e vlefshme e Kontrollit të Qasjes në Media (MAC).</target>
             </trans-unit>
         </body>
     </file>