Merge pull request #33551 from anzin/improvement/m2-32866-update-php-amqplib-to-latest-version

32866: Updated php-amqplib/php-amqplib to the latest version 3.0.0

Author: andrewbess

composer.json

@@ -65,7 +65,7 @@
         "magento/zendframework1": "~1.14.2",
         "monolog/monolog": "^1.17",
         "pelago/emogrifier": "^5.0.0",
-        "php-amqplib/php-amqplib": "~2.10.0",
+        "php-amqplib/php-amqplib": "~3.0.0",
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "~4.1.0",

composer.lock

@@ -5,10 +5,13 @@
  */
 namespace Magento\Framework\Amqp;
 
+use Closure;
+use Exception;
 use Magento\Framework\MessageQueue\ConnectionLostException;
 use Magento\Framework\MessageQueue\EnvelopeInterface;
 use Magento\Framework\MessageQueue\QueueInterface;
-use PhpAmqpLib\Exception\AMQPProtocolConnectionException;
+use Magento\Framework\Phrase;
+use PhpAmqpLib\Exception\AMQPTimeoutException;
 use PhpAmqpLib\Message\AMQPMessage;
 use Magento\Framework\MessageQueue\EnvelopeFactory;
 use Psr\Log\LoggerInterface;
@@ -73,11 +76,11 @@ public function dequeue()
         /** @var AMQPMessage $message */
         try {
             $message = $channel->basic_get($this->queueName);
-        } catch (AMQPProtocolConnectionException $e) {
+        } catch (Exception $exception) {
             throw new ConnectionLostException(
-                $e->getMessage(),
-                $e->getCode(),
-                $e
+                $exception->getMessage(),
+                $exception->getCode(),
+                $exception
             );
         }
 
@@ -107,11 +110,11 @@ public function acknowledge(EnvelopeInterface $envelope)
         // @codingStandardsIgnoreStart
         try {
             $channel->basic_ack($properties['delivery_tag']);
-        } catch (AMQPProtocolConnectionException $e) {
+        } catch (Exception $exception) {
             throw new ConnectionLostException(
-                $e->getMessage(),
-                $e->getCode(),
-                $e
+                $exception->getMessage(),
+                $exception->getCode(),
+                $exception
             );
         }
         // @codingStandardsIgnoreEnd
@@ -135,7 +138,7 @@ public function subscribe($callback)
             // @codingStandardsIgnoreEnd
             $envelope = $this->envelopeFactory->create(['body' => $message->body, 'properties' => $properties]);
 
-            if ($callback instanceof \Closure) {
+            if ($callback instanceof Closure) {
                 $callback($envelope);
             } else {
                 call_user_func($callback, $envelope);
@@ -165,7 +168,7 @@ public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionM
         // @codingStandardsIgnoreEnd
         if ($rejectionMessage !== null) {
             $this->logger->critical(
-                new \Magento\Framework\Phrase('Message has been rejected: %message', ['message' => $rejectionMessage])
+                new Phrase('Message has been rejected: %message', ['message' => $rejectionMessage])
             );
         }
     }