From 162e3a64756ceb5c8f07a5809d50d7695b4cad91 Mon Sep 17 00:00:00 2001 From: Nicolai Cornelis Date: Mon, 28 Oct 2024 21:32:07 +0100 Subject: [PATCH] Remove unused consume_all parameter --- src/Queue/AMQPCreateInfo.php | 3 --- src/Queue/BeanstalkCreateInfo.php | 3 --- tests/Unit/Queue/AMQPCreateInfoTest.php | 5 ----- tests/Unit/Queue/BeanstalkCreateInfoTest.php | 11 ++--------- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/Queue/AMQPCreateInfo.php b/src/Queue/AMQPCreateInfo.php index 883da0b..d27daf6 100644 --- a/src/Queue/AMQPCreateInfo.php +++ b/src/Queue/AMQPCreateInfo.php @@ -18,7 +18,6 @@ final class AMQPCreateInfo extends CreateInfo public const MULTIPLE_ACK_DEFAULT_VALUE = false; public const REQUEUE_ON_FAIL_DEFAULT_VALUE = false; public const DURABLE_DEFAULT_VALUE = false; - public const CONSUME_ALL_DEFAULT_VALUE = false; public const QUEUE_HEADERS_DEFAULT_VALUE = []; public const DELETE_QUEUE_ON_STOP_DEFAULT_VALUE = false; public const REDIAL_TIMEOUT_DEFAULT_VALUE = 60; @@ -49,7 +48,6 @@ public function __construct( public readonly bool $requeueOnFail = self::REQUEUE_ON_FAIL_DEFAULT_VALUE, public readonly bool $durable = self::DURABLE_DEFAULT_VALUE, public readonly bool $exchangeDurable = self::EXCHANGE_DURABLE_DEFAULT_VALUE, - public readonly bool $consumeAll = self::CONSUME_ALL_DEFAULT_VALUE, public readonly array $queueHeaders = self::QUEUE_HEADERS_DEFAULT_VALUE, public readonly bool $deleteQueueOnStop = self::DELETE_QUEUE_ON_STOP_DEFAULT_VALUE, public readonly int $redialTimeout = self::REDIAL_TIMEOUT_DEFAULT_VALUE, @@ -83,7 +81,6 @@ public function toArray(): array 'multiple_ack' => $this->multipleAck, 'requeue_on_fail' => $this->requeueOnFail, 'durable' => $this->durable, - 'consume_all' => $this->consumeAll, 'delete_queue_on_stop' => $this->deleteQueueOnStop, 'redial_timeout' => $this->redialTimeout, ]); diff --git a/src/Queue/BeanstalkCreateInfo.php b/src/Queue/BeanstalkCreateInfo.php index bb31282..e28c04b 100644 --- a/src/Queue/BeanstalkCreateInfo.php +++ b/src/Queue/BeanstalkCreateInfo.php @@ -13,7 +13,6 @@ final class BeanstalkCreateInfo extends CreateInfo public const TUBE_PRIORITY_MAX_VALUE = 2 ** 32; public const TUBE_DEFAULT_VALUE = 'default'; public const RESERVE_TIMEOUT_DEFAULT_VALUE = 5; - public const CONSUME_ALL_DEFAULT_VALUE = false; /** * @param non-empty-string $name @@ -28,7 +27,6 @@ public function __construct( public readonly int $tubePriority = self::TUBE_PRIORITY_DEFAULT_VALUE, public readonly string $tube = self::TUBE_DEFAULT_VALUE, public readonly int $reserveTimeout = self::RESERVE_TIMEOUT_DEFAULT_VALUE, - public readonly bool $consumeAll = self::CONSUME_ALL_DEFAULT_VALUE, ) { parent::__construct(Driver::Beanstalk, $name, $priority); @@ -43,7 +41,6 @@ public function toArray(): array 'tube_priority' => $this->tubePriority, 'tube' => $this->tube, 'reserve_timeout' => $this->reserveTimeout, - 'consume_all' => $this->consumeAll, ]); } } diff --git a/tests/Unit/Queue/AMQPCreateInfoTest.php b/tests/Unit/Queue/AMQPCreateInfoTest.php index 3e44f35..aefbe58 100644 --- a/tests/Unit/Queue/AMQPCreateInfoTest.php +++ b/tests/Unit/Queue/AMQPCreateInfoTest.php @@ -26,7 +26,6 @@ public function testDefaultValues(): void $this->assertFalse($amqpCreateInfo->requeueOnFail); $this->assertFalse($amqpCreateInfo->durable); $this->assertSame(AMQPCreateInfo::EXCHANGE_DURABLE_DEFAULT_VALUE, $amqpCreateInfo->exchangeDurable); - $this->assertSame(AMQPCreateInfo::CONSUME_ALL_DEFAULT_VALUE, $amqpCreateInfo->consumeAll); $this->assertSame(AMQPCreateInfo::QUEUE_HEADERS_DEFAULT_VALUE, $amqpCreateInfo->queueHeaders); $this->assertSame(AMQPCreateInfo::DELETE_QUEUE_ON_STOP_DEFAULT_VALUE, $amqpCreateInfo->deleteQueueOnStop); $this->assertSame(AMQPCreateInfo::REDIAL_TIMEOUT_DEFAULT_VALUE, $amqpCreateInfo->redialTimeout); @@ -50,7 +49,6 @@ public function testCustomValues(): void requeueOnFail: true, durable: true, exchangeDurable: true, - consumeAll: true, queueHeaders: [ 'x-queue-type' => 'quorum', ], @@ -71,7 +69,6 @@ public function testCustomValues(): void $this->assertTrue($amqpCreateInfo->requeueOnFail); $this->assertTrue($amqpCreateInfo->durable); $this->assertTrue($amqpCreateInfo->exchangeDurable); - $this->assertTrue($amqpCreateInfo->consumeAll); $this->assertSame(['x-queue-type' => 'quorum'], $amqpCreateInfo->queueHeaders); $this->assertTrue($amqpCreateInfo->deleteQueueOnStop); $this->assertSame(10, $amqpCreateInfo->redialTimeout); @@ -95,7 +92,6 @@ public function testToArray(): void requeueOnFail: true, durable: true, exchangeDurable: true, - consumeAll: true, queueHeaders: [ 'x-queue-type' => 'quorum', ], @@ -120,7 +116,6 @@ public function testToArray(): void 'requeue_on_fail' => true, 'durable' => true, 'exchange_durable' => true, - 'consume_all' => true, 'queue_headers' => [ 'x-queue-type' => 'quorum', ], diff --git a/tests/Unit/Queue/BeanstalkCreateInfoTest.php b/tests/Unit/Queue/BeanstalkCreateInfoTest.php index 7d6b609..d84fb9f 100644 --- a/tests/Unit/Queue/BeanstalkCreateInfoTest.php +++ b/tests/Unit/Queue/BeanstalkCreateInfoTest.php @@ -21,7 +21,6 @@ public function testConstructor(): void $this->assertEquals(BeanstalkCreateInfo::TUBE_PRIORITY_DEFAULT_VALUE, $beanstalkCreateInfo->tubePriority); $this->assertEquals(BeanstalkCreateInfo::TUBE_DEFAULT_VALUE, $beanstalkCreateInfo->tube); $this->assertEquals(BeanstalkCreateInfo::RESERVE_TIMEOUT_DEFAULT_VALUE, $beanstalkCreateInfo->reserveTimeout); - $this->assertEquals(BeanstalkCreateInfo::CONSUME_ALL_DEFAULT_VALUE, $beanstalkCreateInfo->consumeAll); } public function testBeanstalkCreateInfoCustomValues(): void @@ -31,15 +30,13 @@ public function testBeanstalkCreateInfoCustomValues(): void $tubePriority = 100; $tube = 'my-tube'; $reserveTimeout = 30; - $consumeAll = true; $beanstalkCreateInfo = new BeanstalkCreateInfo( name: $name, priority: $priority, tubePriority: $tubePriority, tube: $tube, - reserveTimeout: $reserveTimeout, - consumeAll: $consumeAll + reserveTimeout: $reserveTimeout ); $this->assertEquals(Driver::Beanstalk, $beanstalkCreateInfo->driver); @@ -48,7 +45,6 @@ public function testBeanstalkCreateInfoCustomValues(): void $this->assertEquals($tubePriority, $beanstalkCreateInfo->tubePriority); $this->assertEquals($tube, $beanstalkCreateInfo->tube); $this->assertEquals($reserveTimeout, $beanstalkCreateInfo->reserveTimeout); - $this->assertEquals($consumeAll, $beanstalkCreateInfo->consumeAll); } public function testToArray(): void @@ -58,15 +54,13 @@ public function testToArray(): void $tubePriority = 100; $tube = 'my-tube'; $reserveTimeout = 30; - $consumeAll = true; $beanstalkCreateInfo = new BeanstalkCreateInfo( name: $name, priority: $priority, tubePriority: $tubePriority, tube: $tube, - reserveTimeout: $reserveTimeout, - consumeAll: $consumeAll + reserveTimeout: $reserveTimeout ); $expectedArray = [ @@ -76,7 +70,6 @@ public function testToArray(): void 'tube_priority' => $tubePriority, 'tube' => $tube, 'reserve_timeout' => $reserveTimeout, - 'consume_all' => $consumeAll, ]; $this->assertEquals($expectedArray, $beanstalkCreateInfo->toArray());