Merge master

README.md

@@ -80,8 +80,8 @@ $queue->push($message);
 Its handler may look like the following:
 
 ```php
-use Yiisoft\Yii\Queue\Message\MessageInterface;
-use Yiisoft\Yii\Queue\Message\MessageHandlerInterface;
+use Yiisoft\Queue\Message\MessageInterface;
+use Yiisoft\Queue\Message\MessageHandlerInterface;
 
 class FileDownloader implements MessageHandlerInterface
 {

src/Message/EnvelopeTrait.php

@@ -21,9 +21,9 @@ public function withMessage(MessageInterface $message): self
         return $instance;
     }
 
-    public function getHandlerName(): string
+    public function getHandler(): string
     {
-        return $this->message->getHandlerName();
+        return $this->message->getHandler();
     }
 
     public function getData(): mixed

src/Message/MessageHandlerInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Message;
+namespace Yiisoft\Queue\Message;
 
 interface MessageHandlerInterface
 {

src/Middleware/FailureHandling/FailureEnvelope.php

@@ -22,4 +22,5 @@ public function getMetadata(): array
     {
         return array_merge($this->message->getMetadata(), $this->meta);
     }
+
 }

src/Worker/Worker.php

@@ -11,6 +11,7 @@
 use Throwable;
 use Yiisoft\Injector\Injector;
 use Yiisoft\Queue\Exception\JobFailureException;
+use Yiisoft\Queue\Message\MessageHandlerInterface;
 use Yiisoft\Queue\Message\MessageInterface;
 use Yiisoft\Queue\Middleware\Consume\ConsumeFinalHandler;
 use Yiisoft\Queue\Middleware\Consume\ConsumeMiddlewareDispatcher;

tests/App/FakeHandler.php

@@ -6,8 +6,7 @@
 
 use Yiisoft\Queue\Message\MessageInterface;
 use RuntimeException;
-use Yiisoft\Yii\Queue\Message\MessageHandlerInterface;
-use Yiisoft\Yii\Queue\Message\MessageInterface;
+use Yiisoft\Queue\Message\MessageHandlerInterface;
 
 final class FakeHandler implements MessageHandlerInterface
 {

tests/Integration/MessageConsumingTest.php

@@ -12,8 +12,10 @@
 use Yiisoft\Queue\Middleware\Consume\MiddlewareFactoryConsumeInterface;
 use Yiisoft\Queue\Middleware\FailureHandling\FailureMiddlewareDispatcher;
 use Yiisoft\Queue\Middleware\FailureHandling\MiddlewareFactoryFailureInterface;
+use Yiisoft\Queue\Tests\Support\StackMessageHandler;
 use Yiisoft\Queue\Tests\TestCase;
 use Yiisoft\Queue\Worker\Worker;
+use Yiisoft\Test\Support\Container\SimpleContainer;
 
 final class MessageConsumingTest extends TestCase
 {

tests/Integration/MiddlewareTest.php

@@ -9,6 +9,7 @@
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Yiisoft\Injector\Injector;
+use Yiisoft\Queue\Tests\Support\NullMessageHandler;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 use Yiisoft\Test\Support\Log\SimpleLogger;
 use Yiisoft\Queue\Adapter\SynchronousAdapter;

tests/Support/ExceptionMessageHandler.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Tests\Support;
+namespace Yiisoft\Queue\Tests\Support;
 
 use RuntimeException;
-use Yiisoft\Yii\Queue\Message\MessageHandlerInterface;
-use Yiisoft\Yii\Queue\Message\MessageInterface;
+use Yiisoft\Queue\Message\MessageHandlerInterface;
+use Yiisoft\Queue\Message\MessageInterface;
 
 class ExceptionMessageHandler implements MessageHandlerInterface
 {

tests/Support/NullMessageHandler.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Tests\Support;
+namespace Yiisoft\Queue\Tests\Support;
 
-use Yiisoft\Yii\Queue\Message\MessageHandlerInterface;
-use Yiisoft\Yii\Queue\Message\MessageInterface;
+use Yiisoft\Queue\Message\MessageHandlerInterface;
+use Yiisoft\Queue\Message\MessageInterface;
 
 class NullMessageHandler implements MessageHandlerInterface
 {

tests/Support/StackMessageHandler.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Yii\Queue\Tests\Support;
+namespace Yiisoft\Queue\Tests\Support;
 
-use Yiisoft\Yii\Queue\Message\MessageHandlerInterface;
-use Yiisoft\Yii\Queue\Message\MessageInterface;
+use Yiisoft\Queue\Message\MessageHandlerInterface;
+use Yiisoft\Queue\Message\MessageInterface;
 
 class StackMessageHandler implements MessageHandlerInterface
 {

tests/TestCase.php

@@ -24,6 +24,8 @@
 use Yiisoft\Queue\Queue;
 use Yiisoft\Queue\Worker\Worker;
 use Yiisoft\Queue\Worker\WorkerInterface;
+use Yiisoft\Queue\Tests\Support\NullMessageHandler;
+use Yiisoft\Queue\Tests\Support\StackMessageHandler;
 
 /**
  * Base Test Case.

tests/Unit/QueueTest.php

@@ -10,6 +10,8 @@
 use Yiisoft\Queue\Tests\App\FakeAdapter;
 use Yiisoft\Queue\Tests\TestCase;
 use Yiisoft\Queue\Message\IdEnvelope;
+use Yiisoft\Queue\Tests\Support\NullMessageHandler;
+use Yiisoft\Queue\Tests\Support\StackMessageHandler;
 
 final class QueueTest extends TestCase
 {

tests/Unit/SynchronousAdapterTest.php

@@ -9,6 +9,7 @@
 use Yiisoft\Queue\QueueFactory;
 use Yiisoft\Queue\Tests\TestCase;
 use Yiisoft\Queue\Message\IdEnvelope;
+use Yiisoft\Queue\Tests\Support\NullMessageHandler;
 
 final class SynchronousAdapterTest extends TestCase
 {

tests/Unit/WorkerTest.php

@@ -20,6 +20,8 @@
 use Yiisoft\Queue\Tests\App\FakeHandler;
 use Yiisoft\Queue\Tests\TestCase;
 use Yiisoft\Queue\Worker\Worker;
+use Yiisoft\Queue\Tests\Support\ExceptionMessageHandler;
+use Yiisoft\Queue\Tests\Support\StackMessageHandler;
 
 final class WorkerTest extends TestCase
 {