Tests

composer.json

@@ -27,15 +27,16 @@
         "psr/event-dispatcher": "^1.0",
         "psr/log": "^1.1",
         "yiisoft/friendly-exception": "^1.0",
+        "yiisoft/serializer": "^3.0@dev",
         "yiisoft/yii-console": "^3.0@dev"
     },
     "require-dev": {
-        "yiisoft/composer-config-plugin": "^1.0@dev",
+        "infection/infection": "^0.15.3",
         "pda/pheanstalk": "*",
         "phpunit/phpunit": "^9.0",
+        "yiisoft/composer-config-plugin": "^1.0@dev",
         "yiisoft/di": "^3.0@dev",
-        "yiisoft/log": "^3.0@dev",
-        "yiisoft/event-dispatcher": "^3.0@dev"
+        "yiisoft/log": "^3.0@dev"
     },
     "suggest": {
         "ext-pcntl": "Need for process signals."

config/common.php

@@ -1,14 +1,20 @@
 <?php
 
+use Psr\Container\ContainerInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\EventDispatcher\ListenerProviderInterface;
+use Yiisoft\Di\Container;
 use Yiisoft\EventDispatcher\Dispatcher\Dispatcher;
 use Yiisoft\EventDispatcher\Provider\Provider;
+use Yiisoft\Yii\Queue\Cli\LoopInterface;
+use Yiisoft\Yii\Queue\Cli\SignalLoop;
 use Yiisoft\Yii\Queue\Worker\Worker as QueueWorker;
 use Yiisoft\Yii\Queue\Worker\WorkerInterface;
 
 return [
     EventDispatcherInterface::class => Dispatcher::class,
     WorkerInterface::class => QueueWorker::class,
     ListenerProviderInterface::class => Provider::class,
+    ContainerInterface::class => Container::class,
+    LoopInterface::class => SignalLoop::class
 ];

config/events-console.php

@@ -0,0 +1,10 @@
+<?php
+
+use Yiisoft\Yii\Queue\Event\JobFailure;
+use Yiisoft\Yii\Queue\Queue;
+
+return [
+    JobFailure::class => [
+        [Queue::class, 'jobRetry'],
+    ],
+];

infection.json.dist

@@ -0,0 +1,14 @@
+{
+    "source": {
+        "directories": [
+            "src"
+        ]
+    },
+    "timeout": 10,
+    "logs": {
+        "text": "tests/runtime/infection.log",
+        "summary": "tests/runtime/summary.log",
+        "perMutator": "tests/runtime/per-mutator.md"
+    },
+    "testFrameworkOptions": "-vvv"
+}

src/Cli/SignalLoop.php

@@ -38,11 +38,6 @@ class SignalLoop implements LoopInterface
      */
     protected array $resumeSignals = [];
 
-    /**
-     * @var Queue
-     */
-    protected Queue $queue;
-
     /**
      * @var bool status when exit signal was got.
      */
@@ -52,12 +47,8 @@ class SignalLoop implements LoopInterface
      */
     protected bool $pause = false;
 
-    /**
-     * @param Queue $queue
-     */
-    public function __construct($queue)
+    public function __construct()
     {
-        $this->queue = $queue;
         if (extension_loaded('pcntl')) {
             foreach ($this->exitSignals as $signal) {
                 pcntl_signal($signal, fn () => $this->exit = true);

src/Queue.php

@@ -11,9 +11,9 @@
 use Yiisoft\Yii\Queue\Event\AfterPush;
 use Yiisoft\Yii\Queue\Event\BeforePush;
 use Yiisoft\Yii\Queue\Event\JobFailure;
-use Yiisoft\Yii\Queue\Exception\InvalidJobException;
 use Yiisoft\Yii\Queue\Exception\JobNotSupportedException;
 use Yiisoft\Yii\Queue\Job\JobInterface;
+use Yiisoft\Yii\Queue\Job\RetryableJobInterface;
 use Yiisoft\Yii\Queue\Worker\WorkerInterface;
 
 /**
@@ -48,26 +48,20 @@ public function __construct(
         if ($driver instanceof QueueDependentInterface) {
             $driver->setQueue($this);
         }
-
-        $provider->attach([$this, 'jobRetry']);
-    }
-
-    public function __destruct()
-    {
-        $this->provider->detach(JobFailure::class);
     }
 
     public function jobRetry(JobFailure $event): void
     {
+        $job = $event->getMessage()->getJob();
         if (
-            !$event->getException() instanceof InvalidJobException
+            $job instanceof RetryableJobInterface
             && !$event->getException() instanceof JobNotSupportedException
             && $event->getQueue() === $this
-            && $event->getMessage()->getJob()->canRetry($event->getException())
+            && $job->canRetry($event->getException())
         ) {
-            $this->logger->debug('Retrying job "{job}".', ['job' => get_class($event->getMessage()->getJob())]);
-            $event->getMessage()->getJob()->retry();
-            $this->push($event->getMessage()->getJob());
+            $this->logger->debug('Retrying job "{job}".', ['job' => get_class($job)]);
+            $job->retry();
+            $this->push($job);
         }
     }
 

tests/TestCase.php

@@ -21,10 +21,8 @@ abstract class TestCase extends BaseTestCase
 {
     public $container;
 
-    public function __construct($name = null, array $data = [], $dataName = '')
+    protected function setUp(): void
     {
-        parent::__construct($name, $data, $dataName);
-        Builder::rebuild();
         $this->container = new Container(require Builder::path('tests-app'));
     }
 }

tests/unit/WorkerTest.php

@@ -7,6 +7,7 @@
 use Psr\EventDispatcher\ListenerProviderInterface;
 use RuntimeException;
 use Yiisoft\EventDispatcher\Provider\Provider;
+use Yiisoft\Yii\Console\Config\EventConfigurator;
 use Yiisoft\Yii\Queue\Event\BeforeExecution;
 use Yiisoft\Yii\Queue\Event\JobFailure;
 use Yiisoft\Yii\Queue\Message;
@@ -48,9 +49,9 @@ public function testJobExecuted(): void
     public function testJobNotExecuted(): void
     {
         $handler = fn (BeforeExecution $event) => $event->stopExecution();
-        /** @var Provider $provider */
-        $provider = $this->container->get(ListenerProviderInterface::class);
-        $provider->attach($handler);
+        /** @var EventConfigurator $configurator */
+        $configurator = $this->container->get(EventConfigurator::class);
+        $configurator->registerListeners([BeforeExecution::class => [$handler]]);
 
         $job = new SimpleJob();
         $message = new Message('', $job);
@@ -79,9 +80,9 @@ public function testThrowException(): void
     public function testThrowExceptionPrevented(): void
     {
         $handler = fn (JobFailure $event) => $event->preventThrowing();
-        /** @var Provider $provider */
-        $provider = $this->container->get(ListenerProviderInterface::class);
-        $provider->attach($handler);
+        /** @var EventConfigurator $configurator */
+        $configurator = $this->container->get(EventConfigurator::class);
+        $configurator->registerListeners([JobFailure::class => [$handler]]);
 
         $job = new ExceptionalSimpleJob();
         $message = new Message('', $job);