Merge pull request #48 from nonanerz/fix_delayed_job

fix delayed job with no time set

Author: mcfedr

src/Mcfedr/QueueManagerBundle/Manager/DoctrineDelayQueueManager.php

@@ -55,10 +55,11 @@ public function put(string $name, array $arguments = [], array $options = []): J
             $jobTime = new Carbon("+{$options['delay']} seconds", new \DateTimeZone('UTC'));
         }
 
-        if (!isset($jobTime) || $jobTime < new \DateTime('+30 seconds', new \DateTimeZone('UTC'))) {
-            if (isset($jobTime) && (!isset($options['force_delay']) || !$options['force_delay'])) {
-                return $this->queueManagerRegistry->put($name, $arguments, $jobOptions, $jobManager);
-            }
+        $executeImmediately = !isset($jobTime) || $jobTime < new \DateTime('+30 seconds', new \DateTimeZone('UTC'));
+        $executeImmediately = $executeImmediately && (!isset($jobTime) || !isset($options['force_delay']) || !$options['force_delay']);
+
+        if ($executeImmediately) {
+            return $this->queueManagerRegistry->put($name, $arguments, $jobOptions, $jobManager);
         }
 
         $job = new DoctrineDelayJob($name, $arguments, $jobOptions, $jobManager, $jobTime);

tests/Mcfedr/QueueManagerBundle/Tests/Manager/DoctrineDelayQueueManagerTest.php

@@ -242,4 +242,13 @@ public function testNonForceDelay(): void
 
         self::assertNotInstanceOf(DoctrineDelayJob::class, $putJob);
     }
+
+    public function testNonForceDelayWithNoTimeSet(): void
+    {
+        $putJob = $this->manager->put('test_worker', [
+            'argument_a' => 'a',
+        ]);
+
+        self::assertNotInstanceOf(DoctrineDelayJob::class, $putJob);
+    }
 }