Remove prioritized option, use x-max-priority

Valentin Nazarov · Valentin Nazarov · commit a47be792a1ef · 2021-06-22T11:14:26.000+03:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
@@ -209,60 +209,6 @@ public function testSetsParametersOnTheQueueAndExchange()
         $connection->publish('body');
     }
 
-    public function testSetsMaxPriorityArgumentForQueueWithEnabledPriority()
-    {
-        $factory = new TestAmqpFactory(
-            $amqpConnection = $this->createMock(\AMQPConnection::class),
-            $amqpChannel = $this->createMock(\AMQPChannel::class),
-            $amqpQueue = $this->createMock(\AMQPQueue::class),
-            $amqpExchange = $this->createMock(\AMQPExchange::class)
-        );
-
-        $amqpQueue->expects($this->once())->method('setArguments')->with([
-            'x-max-priority' => 255,
-        ]);
-
-        $dsn = 'amqp://localhost/%2f/messages?'.
-            'queues[messages][prioritized]=true';
-        $connection = Connection::fromDsn($dsn, [
-            'queues' => [
-                'messages' => [
-                    'prioritized' => 'true',
-                ],
-            ],
-        ], $factory);
-        $connection->publish('body');
-    }
-
-    public function testDoesNotOverrideMaxPriorityArgumentForQueueWithEnabledPriority()
-    {
-        $factory = new TestAmqpFactory(
-            $amqpConnection = $this->createMock(\AMQPConnection::class),
-            $amqpChannel = $this->createMock(\AMQPChannel::class),
-            $amqpQueue = $this->createMock(\AMQPQueue::class),
-            $amqpExchange = $this->createMock(\AMQPExchange::class)
-        );
-
-        $amqpQueue->expects($this->once())->method('setArguments')->with([
-            'x-max-priority' => 127,
-        ]);
-
-        $dsn = 'amqp://localhost/%2f/messages?'.
-            'queues[messages][prioritized]=true&'.
-            'queues[messages][arguments][x-max-priority]=127';
-        $connection = Connection::fromDsn($dsn, [
-            'queues' => [
-                'messages' => [
-                    'prioritized' => 'true',
-                    'arguments' => [
-                        'x-max-priority' => '127',
-                    ],
-                ],
-            ],
-        ], $factory);
-        $connection->publish('body');
-    }
-
     public function invalidQueueArgumentsDataProvider(): iterable
     {
         $baseDsn = 'amqp://localhost/%2f/messages';
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -65,11 +65,8 @@ class Connection
         'binding_arguments',
         'flags',
         'arguments',
-        'prioritized',
     ];
 
-    private const DEFAULT_QUEUE_MAX_PRIORITY = 255;
-
     private const AVAILABLE_EXCHANGE_OPTIONS = [
         'name',
         'type',
@@ -142,7 +139,6 @@ public function __construct(array $connectionOptions, array $exchangeOptions, ar
      *     * binding_arguments: Arguments to be used while binding the queue.
      *     * flags: Queue flags (Default: AMQP_DURABLE)
      *     * arguments: Extra arguments
-     *     * prioritized: Enables priority queue. Does not override x-max-priority argument, if it was set (Default: false)
      *   * exchange:
      *     * name: Name of the exchange
      *     * type: Type of exchange (Default: fanout)
@@ -224,10 +220,6 @@ public static function fromDsn(string $dsn, array $options = [], AmqpFactory $am
             if (\is_array($queueOptions['arguments'] ?? false)) {
                 $queueOptions['arguments'] = self::normalizeQueueArguments($queueOptions['arguments']);
             }
-            $prioritized = filter_var($queueOptions['prioritized'] ?? false, \FILTER_VALIDATE_BOOLEAN);
-            if ($prioritized && !isset($queueOptions['arguments']['x-max-priority'])) {
-                $queueOptions['arguments']['x-max-priority'] = self::DEFAULT_QUEUE_MAX_PRIORITY;
-            }
 
             return $queueOptions;
         }, $queuesOptions);
