Merge pull request #7 from pdffiller/no-queue-realization

Add sync mode

Author: osadchyi-s

composer.json

@@ -16,7 +16,7 @@
     ],
     "require": {
         "ext-json": "*",
-        "pdffiller/qless-php": "3.4.0"
+        "pdffiller/qless-php": "3.6.1"
     },
     "require-dev": {
         "illuminate/events": "5.6.*|5.7.*",

src/Job/AbstractJob.php

@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Foundation\Bus\Dispatchable;
+use LaravelQless\Queue\QlessQueue;
 use Qless\Jobs\BaseJob;
 use LaravelQless\Contracts\QlessJob;
 
@@ -21,6 +22,8 @@ abstract class AbstractJob implements QlessJob, ShouldQueue, Arrayable
      */
     protected $data = [];
 
+    protected $isSync = false;
+
     public function __construct(array $data = [])
     {
         $this->data = $data;
@@ -32,11 +35,55 @@ public function __construct(array $data = [])
      */
     abstract public function perform(BaseJob $job);
 
+    /**
+     * {@inheritdoc}
+     * @return AbstractJob
+     */
+    public static function dispatchNow()
+    {
+        return (new static(...func_get_args()))->completeSync();
+    }
+
     /**
      * @return array
      */
     public function toArray(): array
     {
         return (array) $this->data;
     }
+
+    /**
+     * @return $this
+     */
+    protected function completeSync(): self
+    {
+        $this->isSync = true;
+        return $this;
+    }
+
+    private function completeImmediately(): void
+    {
+        /**@var QlessQueue $queue  */
+        $queue = app(QlessQueue::class, [
+            'config' => [
+                'queue' => $this->queue,
+                'connection' => $this->connection
+            ]
+        ]);
+
+        $jid = $queue->push($this, $this->data, $this->queue);
+        $connection = $queue->getConnection()->queues[$this->queue];
+
+        /**@var BaseJob $job */
+        $job = $connection->popByJid($jid);
+
+        $job->perform();
+    }
+
+    public function __destruct()
+    {
+        if ($this->isSync) {
+            $this->completeImmediately();
+        }
+    }
 }

tests/Queue/Job.php

@@ -17,6 +17,8 @@ public function perform(BaseJob $job)
             $job->getData()['tags'] = $job->getTags();
         }
 
+        $_SERVER['payload'] = $job->getData();
+
         $job->complete();
     }
 }

tests/Queue/QueueTest.php

@@ -199,6 +199,27 @@ public function testDispatchJob()
         $this->assertEquals('work', $data['dispatch']);
     }
 
+    public function testDispatchNowJob()
+    {
+        $this->setEnv();
+
+        $queueName = str_random();
+
+        $dispatch = Job::dispatchNow(['dispatchNow' => 'work_as_sync'])
+            ->onQueue($queueName)
+            ->onConnection('qless');
+
+        unset($dispatch);
+
+        $queue = $this->getQueue();
+
+        $job = $queue->pop($queueName);
+
+        $this->assertEquals($_SERVER['payload']['dispatchNow'], 'work_as_sync');
+
+        $this->assertNull($job);
+    }
+
     protected function getQueue()
     {
         $queue = new QlessQueue(