added force_delay option

Author: nonanerz

README.md

@@ -254,12 +254,13 @@ This will create a `QueueManager` service named `"mcfedr_queue_manager.delay"`.
 
 * `time` - A `\DateTime` object of when to schedule this job.
 * `delay` - Number of seconds from now to schedule this job.
+* `force_delay` - A boolean that forces the job to be delayed by the specified number of seconds regardless of the time parameter.
 * `manager` - Use a different job processor for this job.
 * `manager_options` - Options to pass to the processors `put` method.
 
 #### Note
 
-If `delay` or `time` option is less then 30 seconds the job will be scheduled for immediate execution.
+If `delay` or `time` option is less then 30 seconds the job will be scheduled for immediate execution unless the `force_delay` option is set to `true`
 
 #### Tables
 

src/Mcfedr/QueueManagerBundle/Manager/DoctrineDelayQueueManager.php

@@ -55,8 +55,10 @@ 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('+5 seconds', new \DateTimeZone('UTC'))) {
-            return $this->queueManagerRegistry->put($name, $arguments, $jobOptions, $jobManager);
+        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);
+            }
         }
 
         $job = new DoctrineDelayJob($name, $arguments, $jobOptions, $jobManager, $jobTime);

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

@@ -122,7 +122,7 @@ public function testPutWithNotSignificantDelayAndTimeInPast(\DateTime $jobTime):
     public function providePutWithNotSignificantDelayAndTimeInPastCases(): iterable
     {
         return [
-            [new \DateTime('+4 seconds')],
+            [new \DateTime('+12 seconds')],
             [new \DateTime('-12 seconds')],
         ];
     }
@@ -224,4 +224,22 @@ public function testNonPersisted(): void
 
         $this->manager->delete($toDelete);
     }
+
+    public function testForceDelay(): void
+    {
+        $putJob = $this->manager->put('test_worker', [
+            'argument_a' => 'a',
+        ], ['time' => new \DateTime('+5 seconds'), 'force_delay' => true]);
+
+        self::assertInstanceOf(DoctrineDelayJob::class, $putJob);
+    }
+
+    public function testNonForceDelay(): void
+    {
+        $putJob = $this->manager->put('test_worker', [
+            'argument_a' => 'a',
+        ], ['time' => new \DateTime('+5 seconds')]);
+
+        self::assertNotInstanceOf(DoctrineDelayJob::class, $putJob);
+    }
 }