Skip to content

Remove dead code #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
viktorprogger wants to merge 2 commits into
base: adapt-to-queue
Choose a base branch
from
Open

Remove dead code #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8fd270
Remove dead code
viktorprogger May 11, 2026
d25ede5
Merge branch 'adapt-to-queue' into remove-dead-code
viktorprogger May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

$dlxExchangeSettings = $exchangeSettings
->withName("{$exchangeSettings->getName()}.dlx")
->withAutoDelete(true)

Check warning on line 82 in src/Adapter.php

View workflow job for this annotation

GitHub Actions / PHP 8.4-ubuntu-latest 

Escaped Mutant for Mutator "TrueValue":

@@ @@
         if ($exchangeSettings === null) {
             throw new InvalidArgumentException('Message cannot be delayed to a queue without an exchange. Exchange is mandatory.');
         }
-        $dlxExchangeSettings = $exchangeSettings->withName("{$exchangeSettings->getName()}.dlx")->withAutoDelete(true)->withType(AMQPExchangeType::TOPIC);
+        $dlxExchangeSettings = $exchangeSettings->withName("{$exchangeSettings->getName()}.dlx")->withAutoDelete(false)->withType(AMQPExchangeType::TOPIC);
         $deliveryTime = time() + (int) $delaySeconds;
         $queueSettings = $this->queueProvider->getQueueSettings();
         $dlxQueueSettings = $queueSettings->withName("{$queueSettings->getName()}.dlx.{$deliveryTime}")->withAutoDeletable(true)->withArguments(['x-dead-letter-exchange' => ['S', $exchangeSettings->getName()], 'x-expires' => ['I', (int) ($delaySeconds * 1000) + 30000], 'x-message-ttl' => ['I', (int) ($delaySeconds * 1000)]]);
->withType(AMQPExchangeType::TOPIC);

$deliveryTime = time() + (int) $delaySeconds;
Expand Down Expand Up @@ -130,10 +130,10 @@
$this->queueProvider
->getQueueSettings()
->getName(),
false,

Check warning on line 133 in src/Adapter.php

View workflow job for this annotation

GitHub Actions / PHP 8.4-ubuntu-latest 

Escaped Mutant for Mutator "FalseValue":

@@ @@
     public function subscribe(callable $handlerCallback): void
     {
         $channel = $this->queueProvider->getChannel();
-        $channel->basic_consume($this->queueProvider->getQueueSettings()->getName(), $this->queueProvider->getQueueSettings()->getName(), false, false, false, true, function (AMQPMessage $amqpMessage) use ($handlerCallback, $channel): void {
+        $channel->basic_consume($this->queueProvider->getQueueSettings()->getName(), $this->queueProvider->getQueueSettings()->getName(), true, false, false, true, function (AMQPMessage $amqpMessage) use ($handlerCallback, $channel): void {
             try {
                 $handlerCallback($this->serializer->unserialize($amqpMessage->getBody()));
                 $channel->basic_ack($amqpMessage->getDeliveryTag());
false,
false,

Check warning on line 135 in src/Adapter.php

View workflow job for this annotation

GitHub Actions / PHP 8.4-ubuntu-latest 

Escaped Mutant for Mutator "FalseValue":

@@ @@
     public function subscribe(callable $handlerCallback): void
     {
         $channel = $this->queueProvider->getChannel();
-        $channel->basic_consume($this->queueProvider->getQueueSettings()->getName(), $this->queueProvider->getQueueSettings()->getName(), false, false, false, true, function (AMQPMessage $amqpMessage) use ($handlerCallback, $channel): void {
+        $channel->basic_consume($this->queueProvider->getQueueSettings()->getName(), $this->queueProvider->getQueueSettings()->getName(), false, false, true, true, function (AMQPMessage $amqpMessage) use ($handlerCallback, $channel): void {
             try {
                 $handlerCallback($this->serializer->unserialize($amqpMessage->getBody()));
                 $channel->basic_ack($amqpMessage->getDeliveryTag());
true,

Check warning on line 136 in src/Adapter.php

View workflow job for this annotation

GitHub Actions / PHP 8.4-ubuntu-latest 

Escaped Mutant for Mutator "TrueValue":

@@ @@
     public function subscribe(callable $handlerCallback): void
     {
         $channel = $this->queueProvider->getChannel();
-        $channel->basic_consume($this->queueProvider->getQueueSettings()->getName(), $this->queueProvider->getQueueSettings()->getName(), false, false, false, true, function (AMQPMessage $amqpMessage) use ($handlerCallback, $channel): void {
+        $channel->basic_consume($this->queueProvider->getQueueSettings()->getName(), $this->queueProvider->getQueueSettings()->getName(), false, false, false, false, function (AMQPMessage $amqpMessage) use ($handlerCallback, $channel): void {
             try {
                 $handlerCallback($this->serializer->unserialize($amqpMessage->getBody()));
                 $channel->basic_ack($amqpMessage->getDeliveryTag());
function (AMQPMessage $amqpMessage) use ($handlerCallback, $channel): void {
try {
$handlerCallback($this->serializer->unserialize($amqpMessage->getBody()));
Expand All @@ -153,22 +153,4 @@
$channel->wait();
}
}

public function getQueueProvider(): QueueProviderInterface
{
return $this->queueProvider;
}

public function withQueueProvider(QueueProviderInterface $queueProvider): self
{
$new = clone $this;
$new->queueProvider = $queueProvider;

return $new;
}

public function getChannel(): string
{
return $this->queueProvider->getQueueSettings()->getName();
}
}
11 changes: 0 additions & 11 deletions src/Exception/NotImplementedException.php
View file
Open in desktop

This file was deleted.

14 changes: 1 addition & 13 deletions src/QueueProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function getChannel(): AMQPChannel
}

$this->channelId = $this->connection->get_free_channel_id();
$channel = $this->connection->channel($this->getChannelId());
$channel = $this->connection->channel($this->channelId);
$channel->queue_declare(...$this->queueSettings->getPositionalSettings());

if ($this->exchangeSettings !== null) {
Expand Down Expand Up @@ -88,9 +88,6 @@ public function withQueueName(string $queue): self

$instance = clone $this;
$instance->queueSettings = $instance->queueSettings->withName($queue);
if ($this->channelId !== null) {
$instance->channelId = null;
}

return $instance;
}
Expand Down Expand Up @@ -135,13 +132,4 @@ public function channelClose(): void
$this->channelId = null;
}
}

private function getChannelId(): int
{
if ($this->channelId === null) {
$this->channelId = $this->connection->get_free_channel_id();
}

return $this->channelId;
}
}
54 changes: 0 additions & 54 deletions tests/Support/FakeAdapter.php
View file
Open in desktop

This file was deleted.

39 changes: 10 additions & 29 deletions tests/Unit/ExchangeSettingsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,23 @@

use PhpAmqpLib\Exchange\AMQPExchangeType;
use PhpAmqpLib\Wire\AMQPTable;
use Yiisoft\Queue\AMQP\Adapter;
use Yiisoft\Queue\AMQP\QueueProvider;
use Yiisoft\Queue\AMQP\Settings\Exchange as ExchangeSettings;
use Yiisoft\Queue\AMQP\Settings\Queue as QueueSettings;
use Yiisoft\Queue\Message\JsonMessageSerializer;

final class ExchangeSettingsTest extends UnitTestCase
{
public function testCommonSettings(): void
{
$queueProvider = new QueueProvider(
$this->createConnection(),
$this->getQueueSettings(),
$exchangeSettings = new ExchangeSettings(
exchangeName: 'yii-queue-test-common-settings',
passive: true,
durable: true,
autoDelete: false,
internal: true,
nowait: true,
arguments: new AMQPTable([
'alternate-exchange' => 'yii-queue-test-common-settings-alt',
])
);
$adapter = new Adapter(
$queueProvider
->withQueueSettings(
new QueueSettings('yii-queue-test-common-settings')
)
->withExchangeSettings(
new ExchangeSettings(
exchangeName: 'yii-queue-test-common-settings',
passive: true,
durable: true,
autoDelete: false,
internal: true,
nowait: true,
arguments: new AMQPTable([
'alternate-exchange' => 'yii-queue-test-common-settings-alt',
])
)
),
new JsonMessageSerializer(),
$this->getLoop(),
);
$exchangeSettings = $adapter->getQueueProvider()->getExchangeSettings();

self::assertTrue($exchangeSettings->isDurable());
self::assertTrue($exchangeSettings->isInternal());
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/QueueProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function testWithQueueAndExchangeSettings(): void
self::assertEquals($messageBody['data']['payload']['time'], $result);
}

public function testWithChannelNameExchangeDeclaredException(): void
public function testWithQueueNameExchangeDeclaredException(): void
{
$queueProvider = new QueueProvider(
$this->createConnection(),
Expand All @@ -80,7 +80,7 @@ public function testWithChannelNameExchangeDeclaredException(): void
->withExchangeSettings(
new ExchangeSettings('yii-queue-test-with-channel-name')
Comment on lines 67 to 81
)
->withQueueName('yii-queue-test-channel-name'),
->withQueueName('yii-queue-test-queue-name'),
new JsonMessageSerializer(),
$this->getLoop(),
);
Expand Down
38 changes: 11 additions & 27 deletions tests/Unit/QueueSettingsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,34 +40,18 @@ protected function setUp(): void

public function testCommonSettings(): void
{
$queueProvider = new QueueProvider(
$this->createConnection(),
$this->getQueueSettings(),
$queueSettings = new QueueSettings(
queueName: 'yii-queue-test-queue-common-settings',
passive: true,
durable: true,
exclusive: true,
nowait: true,
arguments: new AMQPTable([
'x-dead-letter-exchange' => 'yii-queue-test-queue-common-settings-dead-letter-exc',
'x-message-ttl' => 15000,
'x-expires' => 16000,
])
);
$adapter = new Adapter(
$queueProvider
->withQueueSettings(
new QueueSettings(
queueName: 'yii-queue-test-queue-common-settings',
passive: true,
durable: true,
exclusive: true,
nowait: true,
arguments: new AMQPTable([
'x-dead-letter-exchange' => 'yii-queue-test-queue-common-settings-dead-letter-exc',
'x-message-ttl' => 15000,
'x-expires' => 16000,
])
)
)
->withExchangeSettings(
new ExchangeSettings('yii-queue-test-queue-common-settings')
),
new JsonMessageSerializer(),
$this->getLoop(),
);

$queueSettings = $adapter->getQueueProvider()->getQueueSettings();

self::assertTrue($queueSettings->isDurable());
self::assertTrue($queueSettings->isPassive());
Expand Down
14 changes: 0 additions & 14 deletions tests/Unit/QueueTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Yiisoft\Queue\Adapter\AdapterInterface;
use Yiisoft\Queue\AMQP\Adapter;
use Yiisoft\Queue\AMQP\QueueProvider;
use Yiisoft\Queue\AMQP\QueueProviderInterface;
use Yiisoft\Queue\AMQP\Settings\Exchange as ExchangeSettings;
use Yiisoft\Queue\AMQP\Settings\Queue as QueueSettings;
use Yiisoft\Queue\AMQP\Tests\Support\FileHelper;
Expand All @@ -18,7 +17,6 @@
use Yiisoft\Queue\Message\IdEnvelope;
use Yiisoft\Queue\Message\JsonMessageSerializer;
use Yiisoft\Queue\Message\Message;
use Yiisoft\Queue\Message\MessageSerializerInterface;
use Yiisoft\Queue\Queue;

final class QueueTest extends UnitTestCase
Expand Down Expand Up @@ -123,16 +121,4 @@ private function getDefaultQueue(AdapterInterface $adapter): Queue
{
return $this->makeQueue($adapter);
}

public function testImmutable(): void
{
$queueProvider = $this->createMock(QueueProviderInterface::class);
$adapter = new Adapter(
$queueProvider,
$this->createMock(MessageSerializerInterface::class),
$this->createMock(LoopInterface::class)
);

self::assertNotSame($adapter, $adapter->withQueueProvider($queueProvider));
}
}
Loading