Fix #93: Rename AMQP namespace to Amqp (#128)

samdark · web-flow · commit d1e9207a4466 · 2026-06-05T01:03:12.000+03:00
diff --git a/.github/workflows/bechmark.yml b/.github/workflows/bechmark.yml
@@ -87,7 +87,7 @@ jobs:
         working-directory: ./tests
         run: |
           if [ "${{ env.WITH_BENCH_BASELINE }}" == '1' ]; then
-            docker compose run --rm -e XDEBUG_MODE=off php${{ matrix.php }} php vendor/bin/phpbench run --report='aggregate' --ref=default --assert="mode(variant.time.avg) <= mode(baseline.time.avg) +/- 5%" > phpbench.log
+            docker compose run --rm -e XDEBUG_MODE=off php${{ matrix.php }} php vendor/bin/phpbench run --report='aggregate' --ref=default --assert="mode(variant.time.avg) <= mode(baseline.time.avg) +/- 10%" > phpbench.log
           else
             docker compose run --rm -e XDEBUG_MODE=off php${{ matrix.php }} php vendor/bin/phpbench run --report='aggregate' > phpbench.log
           fi
diff --git a/composer.json b/composer.json
@@ -45,12 +45,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Yiisoft\\Queue\\AMQP\\": "src"
+            "Yiisoft\\Queue\\Amqp\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Yiisoft\\Queue\\AMQP\\Tests\\": "tests"
+            "Yiisoft\\Queue\\Amqp\\Tests\\": "tests"
         }
     },
     "extra": {
diff --git a/config/di.php b/config/di.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-use Yiisoft\Queue\AMQP\QueueProvider;
-use Yiisoft\Queue\AMQP\QueueProviderInterface;
-use Yiisoft\Queue\AMQP\Settings\Queue;
-use Yiisoft\Queue\AMQP\Settings\QueueSettingsInterface;
+use Yiisoft\Queue\Amqp\QueueProvider;
+use Yiisoft\Queue\Amqp\QueueProviderInterface;
+use Yiisoft\Queue\Amqp\Settings\Queue;
+use Yiisoft\Queue\Amqp\Settings\QueueSettingsInterface;
 
 return [
     QueueProviderInterface::class => QueueProvider::class,
diff --git a/src/Adapter.php b/src/Adapter.php
@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP;
+namespace Yiisoft\Queue\Amqp;
 
 use BackedEnum;
 use InvalidArgumentException;
 use PhpAmqpLib\Exchange\AMQPExchangeType;
 use PhpAmqpLib\Message\AMQPMessage;
 use Throwable;
 use Yiisoft\Queue\Adapter\AdapterInterface;
-use Yiisoft\Queue\AMQP\Exception\NotImplementedException;
-use Yiisoft\Queue\AMQP\Settings\ExchangeSettingsInterface;
-use Yiisoft\Queue\AMQP\Settings\QueueSettingsInterface;
+use Yiisoft\Queue\Amqp\Exception\NotImplementedException;
+use Yiisoft\Queue\Amqp\Settings\ExchangeSettingsInterface;
+use Yiisoft\Queue\Amqp\Settings\QueueSettingsInterface;
 use Yiisoft\Queue\Cli\LoopInterface;
 use Yiisoft\Queue\Message\DelayEnvelope;
 use Yiisoft\Queue\Message\MessageInterface;
diff --git a/src/Exception/ExchangeDeclaredException.php b/src/Exception/ExchangeDeclaredException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Exception;
+namespace Yiisoft\Queue\Amqp\Exception;
 
 use InvalidArgumentException;
 use Yiisoft\FriendlyException\FriendlyExceptionInterface;
diff --git a/src/Exception/NotImplementedException.php b/src/Exception/NotImplementedException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Exception;
+namespace Yiisoft\Queue\Amqp\Exception;
 
 use RuntimeException;
 
diff --git a/src/ExistingMessagesConsumer.php b/src/ExistingMessagesConsumer.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP;
+namespace Yiisoft\Queue\Amqp;
 
 use PhpAmqpLib\Message\AMQPMessage;
 use Throwable;
diff --git a/src/Middleware/DelayMiddleware.php b/src/Middleware/DelayMiddleware.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Middleware;
+namespace Yiisoft\Queue\Amqp\Middleware;
 
 use Yiisoft\Queue\Message\DelayEnvelope;
 use Yiisoft\Queue\Message\MessageInterface;
diff --git a/src/QueueProvider.php b/src/QueueProvider.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP;
+namespace Yiisoft\Queue\Amqp;
 
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AbstractConnection;
-use Yiisoft\Queue\AMQP\Exception\ExchangeDeclaredException;
-use Yiisoft\Queue\AMQP\Settings\ExchangeSettingsInterface;
-use Yiisoft\Queue\AMQP\Settings\QueueSettingsInterface;
+use Yiisoft\Queue\Amqp\Exception\ExchangeDeclaredException;
+use Yiisoft\Queue\Amqp\Settings\ExchangeSettingsInterface;
+use Yiisoft\Queue\Amqp\Settings\QueueSettingsInterface;
 
 /**
  * @internal
diff --git a/src/QueueProviderInterface.php b/src/QueueProviderInterface.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP;
+namespace Yiisoft\Queue\Amqp;
 
 use PhpAmqpLib\Channel\AMQPChannel;
-use Yiisoft\Queue\AMQP\Settings\ExchangeSettingsInterface;
-use Yiisoft\Queue\AMQP\Settings\QueueSettingsInterface;
+use Yiisoft\Queue\Amqp\Settings\ExchangeSettingsInterface;
+use Yiisoft\Queue\Amqp\Settings\QueueSettingsInterface;
 
 /**
  * @internal
diff --git a/src/Settings/Exchange.php b/src/Settings/Exchange.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Settings;
+namespace Yiisoft\Queue\Amqp\Settings;
 
 use PhpAmqpLib\Exchange\AMQPExchangeType;
 use PhpAmqpLib\Wire\AMQPTable;
diff --git a/src/Settings/ExchangeSettingsInterface.php b/src/Settings/ExchangeSettingsInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Settings;
+namespace Yiisoft\Queue\Amqp\Settings;
 
 use PhpAmqpLib\Wire\AMQPTable;
 
@@ -29,7 +29,7 @@ public function isPassive(): bool;
     /**
      * Positional arguments to be used with {@see \PhpAmqpLib\Channel\AMQPChannel::exchange_declare()}
      *
-     * @see \Yiisoft\Queue\AMQP\QueueProvider::getChannel()
+     * @see \Yiisoft\Queue\Amqp\QueueProvider::getChannel()
      *
      * @return (AMQPTable|array|bool|int|string|null)[]
      *
diff --git a/src/Settings/QosSettings.php b/src/Settings/QosSettings.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Settings;
+namespace Yiisoft\Queue\Amqp\Settings;
 
 use InvalidArgumentException;
 
diff --git a/src/Settings/Queue.php b/src/Settings/Queue.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Settings;
+namespace Yiisoft\Queue\Amqp\Settings;
 
 use PhpAmqpLib\Wire\AMQPTable;
 use Yiisoft\Queue\Provider\QueueProviderInterface;
diff --git a/src/Settings/QueueSettingsInterface.php b/src/Settings/QueueSettingsInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Settings;
+namespace Yiisoft\Queue\Amqp\Settings;
 
 use PhpAmqpLib\Wire\AMQPTable;
 
@@ -29,7 +29,7 @@ public function isPassive(): bool;
     /**
      * Returns positional arguments to be used with {@see \PhpAmqpLib\Channel\AMQPChannel::queue_declare()}
      *
-     * @see \Yiisoft\Queue\AMQP\QueueProvider::getChannel()
+     * @see \Yiisoft\Queue\Amqp\QueueProvider::getChannel()
      *
      * @return (AMQPTable|array|bool|int|string|null)[]
      *
diff --git a/tests/Benchmark/QueueConsumeBench.php b/tests/Benchmark/QueueConsumeBench.php
@@ -9,12 +9,12 @@
 use PhpBench\Attributes\BeforeMethods;
 use PhpBench\Attributes\Iterations;
 use PhpBench\Attributes\Revs;
-use Yiisoft\Queue\AMQP\Adapter;
-use Yiisoft\Queue\AMQP\QueueProvider;
-use Yiisoft\Queue\AMQP\Settings\Queue as QueueSettings;
+use Yiisoft\Queue\Amqp\Adapter;
+use Yiisoft\Queue\Amqp\QueueProvider;
+use Yiisoft\Queue\Amqp\Settings\Queue as QueueSettings;
 use Yiisoft\Queue\Cli\SimpleLoop;
 use Yiisoft\Queue\Message\JsonMessageSerializer;
-use Yiisoft\Queue\AMQP\Tests\Support\TestMessage as Message;
+use Yiisoft\Queue\Amqp\Tests\Support\TestMessage as Message;
 
 #[BeforeClassMethods('cleanupQueue')]
 final class QueueConsumeBench
diff --git a/tests/Benchmark/QueuePushBench.php b/tests/Benchmark/QueuePushBench.php
@@ -11,12 +11,12 @@
 use PhpBench\Attributes\OutputMode;
 use PhpBench\Attributes\OutputTimeUnit;
 use PhpBench\Attributes\Revs;
-use Yiisoft\Queue\AMQP\Adapter;
-use Yiisoft\Queue\AMQP\QueueProvider;
-use Yiisoft\Queue\AMQP\Settings\Queue as QueueSettings;
+use Yiisoft\Queue\Amqp\Adapter;
+use Yiisoft\Queue\Amqp\QueueProvider;
+use Yiisoft\Queue\Amqp\Settings\Queue as QueueSettings;
 use Yiisoft\Queue\Cli\SimpleLoop;
 use Yiisoft\Queue\Message\JsonMessageSerializer;
-use Yiisoft\Queue\AMQP\Tests\Support\TestMessage as Message;
+use Yiisoft\Queue\Amqp\Tests\Support\TestMessage as Message;
 
 final class QueuePushBench
 {
diff --git a/tests/Integration/ConsumeExistingMessagesTest.php b/tests/Integration/ConsumeExistingMessagesTest.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Integration;
+namespace Yiisoft\Queue\Amqp\Tests\Integration;
 
-use Yiisoft\Queue\AMQP\Adapter;
-use Yiisoft\Queue\AMQP\QueueProvider;
-use Yiisoft\Queue\AMQP\Settings\Queue as QueueSettings;
+use Yiisoft\Queue\Amqp\Adapter;
+use Yiisoft\Queue\Amqp\QueueProvider;
+use Yiisoft\Queue\Amqp\Settings\Queue as QueueSettings;
 use Yiisoft\Queue\Cli\SimpleLoop;
 use Yiisoft\Queue\Message\JsonMessageSerializer;
-use Yiisoft\Queue\AMQP\Tests\Support\TestMessage as Message;
+use Yiisoft\Queue\Amqp\Tests\Support\TestMessage as Message;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 
 class ConsumeExistingMessagesTest extends TestCase
diff --git a/tests/Integration/DelayMiddlewareTest.php b/tests/Integration/DelayMiddlewareTest.php
@@ -2,22 +2,22 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Integration;
+namespace Yiisoft\Queue\Amqp\Tests\Integration;
 
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Yiisoft\Queue\Adapter\AdapterInterface;
-use Yiisoft\Queue\AMQP\Adapter;
-use Yiisoft\Queue\AMQP\Middleware\DelayMiddleware;
-use Yiisoft\Queue\AMQP\QueueProvider;
-use Yiisoft\Queue\AMQP\Settings\Queue as QueueSettings;
-use Yiisoft\Queue\AMQP\Settings\Exchange as ExchangeSettings;
-use Yiisoft\Queue\AMQP\Tests\Support\FakeAdapter;
-use Yiisoft\Queue\AMQP\Tests\Support\FileHelper;
+use Yiisoft\Queue\Amqp\Adapter;
+use Yiisoft\Queue\Amqp\Middleware\DelayMiddleware;
+use Yiisoft\Queue\Amqp\QueueProvider;
+use Yiisoft\Queue\Amqp\Settings\Queue as QueueSettings;
+use Yiisoft\Queue\Amqp\Settings\Exchange as ExchangeSettings;
+use Yiisoft\Queue\Amqp\Tests\Support\FakeAdapter;
+use Yiisoft\Queue\Amqp\Tests\Support\FileHelper;
 use Yiisoft\Queue\Cli\LoopInterface;
 use Yiisoft\Queue\Cli\SignalLoop;
 use Yiisoft\Queue\Message\JsonMessageSerializer;
-use Yiisoft\Queue\AMQP\Tests\Support\TestMessage as Message;
+use Yiisoft\Queue\Amqp\Tests\Support\TestMessage as Message;
 use Yiisoft\Queue\Middleware\CallableFactory;
 use Yiisoft\Queue\Middleware\Push\PushMiddlewareConfig;
 use Yiisoft\Queue\Middleware\Push\PushMiddlewareFactory;
diff --git a/tests/Integration/TestCase.php b/tests/Integration/TestCase.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Integration;
+namespace Yiisoft\Queue\Amqp\Tests\Integration;
 
 use Symfony\Component\Process\Process;
-use Yiisoft\Queue\AMQP\Tests\Support\FileHelper;
-use Yiisoft\Queue\AMQP\Tests\Support\MainTestCase;
+use Yiisoft\Queue\Amqp\Tests\Support\FileHelper;
+use Yiisoft\Queue\Amqp\Tests\Support\MainTestCase;
 
 abstract class TestCase extends MainTestCase
 {
diff --git a/tests/Support/ExtendedSimpleMessageHandler.php b/tests/Support/ExtendedSimpleMessageHandler.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Support;
+namespace Yiisoft\Queue\Amqp\Tests\Support;
 
 use Yiisoft\Queue\Message\MessageInterface;
 
diff --git a/tests/Support/FakeAdapter.php b/tests/Support/FakeAdapter.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Support;
+namespace Yiisoft\Queue\Amqp\Tests\Support;
 
 use BackedEnum;
 use LogicException;
 use Yiisoft\Queue\Adapter\AdapterInterface;
-use Yiisoft\Queue\AMQP\QueueProviderInterface;
+use Yiisoft\Queue\Amqp\QueueProviderInterface;
 use Yiisoft\Queue\Cli\LoopInterface;
 use Yiisoft\Queue\Message\MessageInterface;
 use Yiisoft\Queue\Message\MessageSerializerInterface;
diff --git a/tests/Support/FileHelper.php b/tests/Support/FileHelper.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Support;
+namespace Yiisoft\Queue\Amqp\Tests\Support;
 
 use RuntimeException;
 
diff --git a/tests/Support/MainTestCase.php b/tests/Support/MainTestCase.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Support;
+namespace Yiisoft\Queue\Amqp\Tests\Support;
 
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Support/SimpleMessageHandler.php b/tests/Support/SimpleMessageHandler.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Support;
+namespace Yiisoft\Queue\Amqp\Tests\Support;
 
 use Yiisoft\Queue\Message\MessageInterface;
 
diff --git a/tests/Support/TestMessage.php b/tests/Support/TestMessage.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Support;
+namespace Yiisoft\Queue\Amqp\Tests\Support;
 
 use Yiisoft\Queue\Message\MessageInterface;
 
diff --git a/tests/Unit/DelayMiddlewareTest.php b/tests/Unit/DelayMiddlewareTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Unit;
+namespace Yiisoft\Queue\Amqp\Tests\Unit;
 
-use Yiisoft\Queue\AMQP\Middleware\DelayMiddleware;
+use Yiisoft\Queue\Amqp\Middleware\DelayMiddleware;
 use Yiisoft\Queue\Message\DelayEnvelope;
-use Yiisoft\Queue\AMQP\Tests\Support\TestMessage as Message;
+use Yiisoft\Queue\Amqp\Tests\Support\TestMessage as Message;
 use Yiisoft\Queue\Message\MessageInterface;
 use Yiisoft\Queue\Middleware\Push\PushHandlerInterface;
 
diff --git a/tests/Unit/ExchangeSettingsTest.php b/tests/Unit/ExchangeSettingsTest.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Unit;
+namespace Yiisoft\Queue\Amqp\Tests\Unit;
 
 use PhpAmqpLib\Exchange\AMQPExchangeType;
 use PhpAmqpLib\Wire\AMQPTable;
-use Yiisoft\Queue\AMQP\Settings\Exchange as ExchangeSettings;
+use Yiisoft\Queue\Amqp\Settings\Exchange as ExchangeSettings;
 
 final class ExchangeSettingsTest extends UnitTestCase
 {
diff --git a/tests/Unit/FriendlyExceptionTest.php b/tests/Unit/FriendlyExceptionTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Queue\AMQP\Tests\Unit;
+namespace Yiisoft\Queue\Amqp\Tests\Unit;
 
-use Yiisoft\Queue\AMQP\Exception\ExchangeDeclaredException;
+use Yiisoft\Queue\Amqp\Exception\ExchangeDeclaredException;
 
 final class FriendlyExceptionTest extends UnitTestCase
 {
diff --git a/tests/Unit/QosSettingsTest.php b/tests/Unit/QosSettingsTest.php
diff --git a/tests/Unit/QueueProviderTest.php b/tests/Unit/QueueProviderTest.php
diff --git a/tests/Unit/QueueSettingsTest.php b/tests/Unit/QueueSettingsTest.php
diff --git a/tests/Unit/QueueTest.php b/tests/Unit/QueueTest.php
diff --git a/tests/Unit/UnitTestCase.php b/tests/Unit/UnitTestCase.php
diff --git a/tests/yii b/tests/yii
