diff --git a/src/Exception/ExchangeDeclaredException.php b/src/Exception/ExchangeDeclaredException.php deleted file mode 100644 index dae3383..0000000 --- a/src/Exception/ExchangeDeclaredException.php +++ /dev/null @@ -1,33 +0,0 @@ -channel === null) { $this->channel = $this->connection->channel(); $this->channel->queue_declare(...$this->queueSettings->getPositionalSettings()); - - if ($this->exchangeSettings !== null) { - $this->channel->exchange_declare(...$this->exchangeSettings->getPositionalSettings()); - $this->channel->queue_bind($this->queueSettings->getName(), $this->exchangeSettings->getName()); - } + $this->channel->exchange_declare(...$this->exchangeSettings->getPositionalSettings()); + $this->channel->queue_bind($this->queueSettings->getName(), $this->exchangeSettings->getName()); } return $this->channel; @@ -69,10 +65,6 @@ public function withChannelName(string $channel): self return $this; } - if ($this->exchangeSettings !== null) { - throw new ExchangeDeclaredException(); - } - $instance = clone $this; $instance->channel = null; $instance->queueSettings = $instance->queueSettings->withName($channel); diff --git a/tests/Unit/FriendlyExceptionTest.php b/tests/Unit/FriendlyExceptionTest.php deleted file mode 100644 index 1257be4..0000000 --- a/tests/Unit/FriendlyExceptionTest.php +++ /dev/null @@ -1,17 +0,0 @@ -getName()); - } -} diff --git a/tests/Unit/QueueProviderTest.php b/tests/Unit/QueueProviderTest.php index ef01c82..0a147ac 100644 --- a/tests/Unit/QueueProviderTest.php +++ b/tests/Unit/QueueProviderTest.php @@ -5,7 +5,6 @@ namespace Yiisoft\Queue\AMQP\Tests\Unit; use Yiisoft\Queue\AMQP\Adapter; -use Yiisoft\Queue\AMQP\Exception\ExchangeDeclaredException; use Yiisoft\Queue\AMQP\QueueProvider; use Yiisoft\Queue\AMQP\Settings\Exchange as ExchangeSettings; use Yiisoft\Queue\AMQP\Settings\ExchangeSettingsInterface; @@ -64,28 +63,6 @@ public function testWithQueueAndExchangeSettings(): void self::assertEquals($messageBody['data']['payload']['time'], $result); } - public function testWithChannelNameExchangeDeclaredException(): void - { - $queueProvider = new QueueProvider( - $this->createConnection(), - $this->getQueueSettings(), - ); - - $this->expectException(ExchangeDeclaredException::class); - new Adapter( - $queueProvider - ->withQueueSettings( - new QueueSettings('yii-queue-test-with-channel-name') - ) - ->withExchangeSettings( - new ExchangeSettings('yii-queue-test-with-channel-name') - ) - ->withChannelName('yii-queue-test-channel-name'), - new JsonMessageSerializer(), - $this->getLoop(), - ); - } - public function testImmutable(): void { $queueSettings = $this->createMock(QueueSettingsInterface::class);