Merge branch '7.2' into 7.3

* 7.2: (47 commits)
  Remove comment about AppVeyor in `phpunit`
  [Webhook][RemoteEvent] fix SendgridPayloadConverter category support
  Update old Appveyor skip conditions
  sync the Dutch translation file with changes from the 7.2 branch
  [Yaml] fix inline notation with inline comment
  clean up code for doctrine/persistence 2.x
  Generate missing translations using Gemini
  fix(property-info): make sure that SerializerExtractor returns null for invalid class metadata
  add translations for the Slug constraint
  [RemoteEvent][Webhook] fix SendgridRequestParser & SendgridPayloadConverter in case of missing sg_message_id
  [Messenger] Fix `TransportMessageIdStamp` not always added
  [DoctrineBridge] Fix compatibility to Doctrine persistence 2.5 in Doctrine Bridge 6.4 to avoid Projects stuck on 6.3
  [PropertyInfo] Fix add missing composer conflict
  [ErrorHandler] Don't trigger "internal" deprecations for anonymous LazyClosure instances
  [VarDumper] Fix displaying closure's "this" from anonymous classes
  [Doctrine][Messenger] Prevents multiple TransportMessageIdStamp being stored in envelope
  [HttpKernel] Don't override existing LoggerInterface autowiring alias in LoggerPass
  reject inline notations followed by invalid content
  Fix predis command error checking
  [Security] Fix triggering session tracking from ContextListener
  ...

Author: xabbuh

Tests/Transport/BeanstalkdReceiverTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\Connection;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
+use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Serializer as SerializerComponent;
@@ -40,14 +41,21 @@ public function testItReturnsTheDecodedMessageToTheHandler()
         $receiver = new BeanstalkdReceiver($connection, $serializer);
         $actualEnvelopes = $receiver->get();
         $this->assertCount(1, $actualEnvelopes);
-        $this->assertEquals(new DummyMessage('Hi'), $actualEnvelopes[0]->getMessage());
+        /** @var Envelope $actualEnvelope */
+        $actualEnvelope = $actualEnvelopes[0];
+        $this->assertEquals(new DummyMessage('Hi'), $actualEnvelope->getMessage());
 
         /** @var BeanstalkdReceivedStamp $receivedStamp */
-        $receivedStamp = $actualEnvelopes[0]->last(BeanstalkdReceivedStamp::class);
+        $receivedStamp = $actualEnvelope->last(BeanstalkdReceivedStamp::class);
 
         $this->assertInstanceOf(BeanstalkdReceivedStamp::class, $receivedStamp);
         $this->assertSame('1', $receivedStamp->getId());
         $this->assertSame($tube, $receivedStamp->getTube());
+
+        /** @var TransportMessageIdStamp $transportMessageIdStamp */
+        $transportMessageIdStamp = $actualEnvelope->last(TransportMessageIdStamp::class);
+        $this->assertNotNull($transportMessageIdStamp);
+        $this->assertSame('1', $transportMessageIdStamp->getId());
     }
 
     public function testItReturnsEmptyArrayIfThereAreNoMessages()

Tests/Transport/BeanstalkdSenderTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\Connection;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Stamp\DelayStamp;
+use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 final class BeanstalkdSenderTest extends TestCase
@@ -28,13 +29,21 @@ public function testSend()
         $encoded = ['body' => '...', 'headers' => ['type' => DummyMessage::class]];
 
         $connection = $this->createMock(Connection::class);
-        $connection->expects($this->once())->method('send')->with($encoded['body'], $encoded['headers'], 0, null);
+        $connection->expects($this->once())->method('send')
+            ->with($encoded['body'], $encoded['headers'], 0, null)
+            ->willReturn('1')
+        ;
 
         $serializer = $this->createMock(SerializerInterface::class);
         $serializer->method('encode')->with($envelope)->willReturn($encoded);
 
         $sender = new BeanstalkdSender($connection, $serializer);
-        $sender->send($envelope);
+        $actualEnvelope = $sender->send($envelope);
+
+        /** @var TransportMessageIdStamp $transportMessageIdStamp */
+        $transportMessageIdStamp = $actualEnvelope->last(TransportMessageIdStamp::class);
+        $this->assertNotNull($transportMessageIdStamp);
+        $this->assertSame('1', $transportMessageIdStamp->getId());
     }
 
     public function testSendWithDelay()

Transport/BeanstalkdReceiver.php

@@ -18,6 +18,7 @@
 use Symfony\Component\Messenger\Transport\Receiver\MessageCountAwareInterface;
 use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
+use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 
 /**
  * @author Antonio Pauletich <[email protected]>
@@ -52,7 +53,12 @@ public function get(): iterable
             throw $exception;
         }
 
-        return [$envelope->with(new BeanstalkdReceivedStamp($beanstalkdEnvelope['id'], $this->connection->getTube()))];
+        return [$envelope
+            ->withoutAll(TransportMessageIdStamp::class)
+            ->with(
+                new BeanstalkdReceivedStamp($beanstalkdEnvelope['id'], $this->connection->getTube()),
+                new TransportMessageIdStamp($beanstalkdEnvelope['id']),
+            )];
     }
 
     public function ack(Envelope $envelope): void

Transport/BeanstalkdSender.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Stamp\DelayStamp;
+use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 use Symfony\Component\Messenger\Transport\Sender\SenderInterface;
 use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
@@ -35,13 +36,13 @@ public function send(Envelope $envelope): Envelope
     {
         $encodedMessage = $this->serializer->encode($envelope);
 
-        $this->connection->send(
+        $id = $this->connection->send(
             $encodedMessage['body'],
             $encodedMessage['headers'] ?? [],
             $envelope->last(DelayStamp::class)?->getDelay() ?? 0,
             $envelope->last(BeanstalkdPriorityStamp::class)?->priority,
         );
 
-        return $envelope;
+        return $envelope->with(new TransportMessageIdStamp($id));
     }
 }