Updated deprecation message and fixed tests

Nyholm · Nyholm · commit cbbd57c2f880 · 2020-01-22T15:16:17.000+01:00
diff --git a/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Fixtures/DummyMessage.php b/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Fixtures/DummyMessage.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Fixtures;
+
+class DummyMessage
+{
+    private $message;
+
+    public function __construct(string $message)
+    {
+        $this->message = $message;
+    }
+
+    public function getMessage(): string
+    {
+        return $this->message;
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Fixtures/long_receiver.php b/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Fixtures/long_receiver.php
@@ -3,7 +3,7 @@
 $componentRoot = $_SERVER['COMPONENT_ROOT'];
 
 if (!is_file($autoload = $componentRoot.'/vendor/autoload.php')) {
-    $autoload = $componentRoot.'/../../../../vendor/autoload.php';
+    $autoload = $componentRoot.'/../../../../../../vendor/autoload.php';
 }
 
 if (!file_exists($autoload)) {
diff --git a/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/AmqpExtIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/AmqpExtIntegrationTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpReceivedStamp;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpReceiver;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpSender;
@@ -20,7 +21,6 @@
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Stamp\DelayStamp;
 use Symfony\Component\Messenger\Stamp\RedeliveryStamp;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
@@ -171,7 +171,7 @@ public function testItReceivesSignals()
         $this->assertFalse($process->isRunning());
         $this->assertLessThan($amqpReadTimeout, microtime(true) - $signalTime);
         $this->assertSame($expectedOutput.<<<'TXT'
-Get envelope with message: Symfony\Component\Messenger\Tests\Fixtures\DummyMessage
+Get envelope with message: Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Fixtures\DummyMessage
 with stamps: [
     "Symfony\\Component\\Messenger\\Bridge\\AmqpExt\\Transport\\AmqpReceivedStamp",
     "Symfony\\Component\\Messenger\\Stamp\\ReceivedStamp",
diff --git a/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/AmqpReceiverTest.php b/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/AmqpReceiverTest.php
@@ -12,11 +12,11 @@
 namespace Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpReceivedStamp;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpReceiver;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\Connection;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Serializer as SerializerComponent;
diff --git a/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/AmqpSenderTest.php b/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/AmqpSenderTest.php
@@ -12,11 +12,11 @@
 namespace Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpSender;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpStamp;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\Connection;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 /**
diff --git a/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/AmqpTransportTest.php b/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/AmqpTransportTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpTransport;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\Connection;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
 
diff --git a/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/AmqpExt/Tests/Transport/ConnectionTest.php
@@ -12,11 +12,11 @@
 namespace Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\AmqpExt\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpFactory;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpStamp;
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\Connection;
 use Symfony\Component\Messenger\Exception\InvalidArgumentException;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 
 /**
  * @requires extension amqp
diff --git a/src/Symfony/Component/Messenger/Bridge/AmqpExt/composer.json b/src/Symfony/Component/Messenger/Bridge/AmqpExt/composer.json
@@ -18,12 +18,13 @@
     "require": {
         "php": "^7.2.5",
         "ext-amqp": "*",
-        "symfony/messenger": "^4.4|^5.0"
+        "symfony/messenger": "^5.1"
     },
     "require-dev": {
         "symfony/property-access": "^4.4|^5.0",
         "symfony/serializer": "^4.4|^5.0",
-        "symfony/event-dispatcher": "^4.4|^5.0"
+        "symfony/event-dispatcher": "^4.4|^5.0",
+        "symfony/process": "^4.4|^5.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Messenger\\Bridge\\AmqpExt\\": "" },
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Fixtures/DummyMessage.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Fixtures/DummyMessage.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures;
+
+class DummyMessage
+{
+    private $message;
+
+    public function __construct(string $message)
+    {
+        $this->message = $message;
+    }
+
+    public function getMessage(): string
+    {
+        return $this->message;
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -19,8 +19,9 @@
 use Doctrine\DBAL\Schema\SchemaConfig;
 use Doctrine\DBAL\Schema\Synchronizer\SchemaSynchronizer;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
+
 
 class ConnectionTest extends TestCase
 {
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php
@@ -13,7 +13,7 @@
 
 use Doctrine\DBAL\DriverManager;
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
+use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;
 
 /**
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineReceiverTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineReceiverTest.php
@@ -14,11 +14,11 @@
 use Doctrine\DBAL\Driver\PDOException;
 use Doctrine\DBAL\Exception\DeadlockException;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
 use Symfony\Component\Messenger\Exception\TransportException;
 use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineReceivedStamp;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineReceiver;
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineSenderTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineSenderTest.php
@@ -12,10 +12,10 @@
 namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Stamp\DelayStamp;
 use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineSender;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php
@@ -12,8 +12,8 @@
 namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json b/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json
@@ -19,7 +19,7 @@
         "php": "^7.2.5",
         "doctrine/dbal": "^2.6",
         "doctrine/persistence": "^1.3",
-        "symfony/messenger": "^4.4|^5.0"
+        "symfony/messenger": "^5.1"
     },
     "require-dev": {
         "symfony/serializer": "^4.4|^5.0",
diff --git a/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Fixtures/DummyMessage.php b/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Fixtures/DummyMessage.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Messenger\Bridge\RedisExt\Tests\Fixtures;
+
+class DummyMessage
+{
+    private $message;
+
+    public function __construct(string $message)
+    {
+        $this->message = $message;
+    }
+
+    public function getMessage(): string
+    {
+        return $this->message;
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Transport/RedisExtIntegrationTest.php b/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Transport/RedisExtIntegrationTest.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Messenger\Bridge\RedisExt\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
+use Symfony\Component\Messenger\Bridge\RedisExt\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\RedisExt\Transport\Connection;
 
 /**
diff --git a/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Transport/RedisReceiverTest.php b/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Transport/RedisReceiverTest.php
@@ -13,7 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
+use Symfony\Component\Messenger\Bridge\RedisExt\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\RedisExt\Transport\Connection;
 use Symfony\Component\Messenger\Bridge\RedisExt\Transport\RedisReceiver;
 use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
diff --git a/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Transport/RedisSenderTest.php b/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Transport/RedisSenderTest.php
@@ -13,7 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
+use Symfony\Component\Messenger\Bridge\RedisExt\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\RedisExt\Transport\Connection;
 use Symfony\Component\Messenger\Bridge\RedisExt\Transport\RedisSender;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
diff --git a/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Transport/RedisTransportTest.php b/src/Symfony/Component/Messenger/Bridge/RedisExt/Tests/Transport/RedisTransportTest.php
@@ -13,7 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
+use Symfony\Component\Messenger\Bridge\RedisExt\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Bridge\RedisExt\Transport\Connection;
 use Symfony\Component\Messenger\Bridge\RedisExt\Transport\RedisTransport;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
diff --git a/src/Symfony/Component/Messenger/Bridge/RedisExt/composer.json b/src/Symfony/Component/Messenger/Bridge/RedisExt/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.2.5",
         "ext-redis": "*",
-        "symfony/messenger": "^4.4|^5.0"
+        "symfony/messenger": "^5.1"
     },
     "require-dev": {
         "symfony/property-access": "^4.4|^5.0",
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpFactory.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpFactory.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpFactory as BridgeAmqpFactory;
 
 if (! class_exists(BridgeAmqpFactory::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be required by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpFactory::class, BridgeAmqpFactory::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be included by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpFactory::class, BridgeAmqpFactory::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeAmqpFactory::class, AmqpFactory::class);
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceivedStamp.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceivedStamp.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpReceivedStamp as BridgeAmqpReceivedStamp;
 
 if (! class_exists(BridgeAmqpReceivedStamp::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be required by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpReceivedStamp::class, BridgeAmqpReceivedStamp::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be included by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpReceivedStamp::class, BridgeAmqpReceivedStamp::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeAmqpReceivedStamp::class, AmqpReceivedStamp::class);
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpReceiver as BridgeAmqpReceiver;
 
 if (! class_exists(BridgeAmqpReceiver::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be required by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpReceiver::class, BridgeAmqpReceiver::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be included by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpReceiver::class, BridgeAmqpReceiver::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeAmqpReceiver::class, AmqpReceiver::class);
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpSender as BridgeAmqpSender;
 
 if (! class_exists(BridgeAmqpSender::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be required by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpSender::class, BridgeAmqpSender::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be included by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpSender::class, BridgeAmqpSender::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeAmqpSender::class, AmqpSender::class);
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpStamp.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpStamp.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpStamp as BridgeAmqpStamp;
 
 if (! class_exists(BridgeAmqpStamp::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be required by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpStamp::class, BridgeAmqpStamp::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be included by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpStamp::class, BridgeAmqpStamp::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeAmqpStamp::class, AmqpStamp::class);
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransport.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransport.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpTransport as BridgeAmqpTransport;
 
 if (! class_exists(BridgeAmqpTransport::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be required by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpTransport::class, BridgeAmqpTransport::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be included by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpTransport::class, BridgeAmqpTransport::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeAmqpTransport::class, AmqpTransport::class);
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\AmqpTransportFactory as BridgeAmqpTransportFactory;
 
 if (! class_exists(BridgeAmqpTransportFactory::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be required by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpTransportFactory::class, BridgeAmqpTransportFactory::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be included by default in 6.0. Run "composer require symfony/messenger-amqp".', AmqpTransportFactory::class, BridgeAmqpTransportFactory::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeAmqpTransportFactory::class, AmqpTransportFactory::class);
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\AmqpExt\Transport\Connection as BridgeConnection;
 
 if (! class_exists(BridgeConnection::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be required by default in 6.0. Run "composer require symfony/messenger-amqp".', Connection::class, BridgeConnection::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The AmqpExt transport has been moved to package "symfony/messenger-amqp" and will not be included by default in 6.0. Run "composer require symfony/messenger-amqp".', Connection::class, BridgeConnection::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeConnection::class, Connection::class);
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection as BridgeConnection;
 
 if (! class_exists(BridgeConnection::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The Doctrine transport has been moved to package "symfony/messenger-doctrine" and will not be required by default in 6.0. Run "composer require symfony/messenger-doctrine".', Connection::class, BridgeConnection::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The Doctrine transport has been moved to package "symfony/messenger-doctrine" and will not be included by default in 6.0. Run "composer require symfony/messenger-doctrine".', Connection::class, BridgeConnection::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeConnection::class, Connection::class);
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceivedStamp.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceivedStamp.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineReceivedStamp as BridgeDoctrineReceivedStamp;
 
 if (! class_exists(BridgeDoctrineReceivedStamp::class, false)) {
-    @trigger_error(sprintf('The "%s" class is @deprecated since Symfony 5.1, use "%s" instead. The Doctrine transport has been moved to package "symfony/messenger-doctrine" and will not be required by default in 6.0. Run "composer require symfony/messenger-doctrine".', DoctrineReceivedStamp::class, BridgeDoctrineReceivedStamp::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('The "%s" class is deprecated since Symfony 5.1, use "%s" instead. The Doctrine transport has been moved to package "symfony/messenger-doctrine" and will not be included by default in 6.0. Run "composer require symfony/messenger-doctrine".', DoctrineReceivedStamp::class, BridgeDoctrineReceivedStamp::class), E_USER_DEPRECATED);
 }
 
 class_alias(BridgeDoctrineReceivedStamp::class, DoctrineReceivedStamp::class);
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceiver.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineReceiver.php
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineSender.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineSender.php
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransport.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransport.php
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/RedisReceivedStamp.php b/src/Symfony/Component/Messenger/Transport/RedisExt/RedisReceivedStamp.php
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/RedisReceiver.php b/src/Symfony/Component/Messenger/Transport/RedisExt/RedisReceiver.php
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/RedisSender.php b/src/Symfony/Component/Messenger/Transport/RedisExt/RedisSender.php
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/RedisTransport.php b/src/Symfony/Component/Messenger/Transport/RedisExt/RedisTransport.php
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/RedisTransportFactory.php b/src/Symfony/Component/Messenger/Transport/RedisExt/RedisTransportFactory.php

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`$componentRoot = $_SERVER['COMPONENT_ROOT'];`
`4`	`4`
`5`	`5`	`if (!is_file($autoload = $componentRoot.'/vendor/autoload.php')) {`
`6`		`- $autoload = $componentRoot.'/../../../../vendor/autoload.php';`
	`6`	`+ $autoload = $componentRoot.'/../../../../../../vendor/autoload.php';`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`if (!file_exists($autoload)) {`