Merge pull request #4 from pdffiller/release/1.2

Release/1.2

Author: osadchyi-s

AUTHORS

@@ -0,0 +1 @@
+Serhii Osadchyi <[email protected]>

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 PDFfiller
+Copyright (c) 2018-2019 PDFfiller
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -31,7 +31,7 @@ Also you can set Qless queue as default in  `config/queue.php`
     'default' => env('QUEUE_DRIVER', 'qless'),
 ```
 
-And redis connection in `config/database.php`
+Redis connection in `config/database.php`
 
 ```php
     'redis' => [
@@ -49,6 +49,23 @@ And redis connection in `config/database.php`
     ],
 ```
 
+And add Laravel Qless service provider to app.php
+
+```php
+<?php
+
+return [
+    //...
+    'providers' => [
+        //...
+        /**
+         * Qless
+         */
+         LaravelQless\LaravelQlessServiceProvider::class,
+    ]
+];
+```
+
 ## Usage
 
 Once you completed the configuration you can use Laravel Queue API. If you used other queue drivers you do not need to change anything else. If you do not know how to use Queue API, please refer to the official Laravel documentation: http://laravel.com/docs/queues
@@ -80,7 +97,7 @@ Than you can put job to all subscribers.
 /**
  * Put job to few queues
  */
-\Queue::pushToSubscriber('this.is.test', TestQless::class, ['test' => 'test']);
+\Queue::pushToTopic('this.is.test', TestQless::class, ['test' => 'test']);
 // Push job to queue1 and queue2, but not to queue3
 
 ```

composer.json

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

config/queue.php

@@ -1,10 +1,12 @@
 <?php
 
 return [
+    'default' => 'qless',
+
     'connections' => [
         'qless' => [
             'driver' => 'qless',
-            'connection' => 'default',
+            'connection' => 'qless',
             'queue' => 'default',
             'redis_connection' => 'qless',
         ],

examples/Job/ExampleJob.php

@@ -2,12 +2,11 @@
 
 namespace LaravelQless\Examples\Job;
 
-use LaravelQless\Contracts\QlessJob;
+use LaravelQless\Job\AbstractJob;
 use Qless\Jobs\BaseJob;
 
-class ExampleJob implements QlessJob
+class ExampleJob extends AbstractJob
 {
-
     /**
      * Execute the job.
      *

src/Job/AbstractJob.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace LaravelQless\Job;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Qless\Jobs\BaseJob;
+use LaravelQless\Contracts\QlessJob;
+
+/**
+ * Class AbstractJob
+ * @package LaravelQless\Job
+ */
+abstract class AbstractJob implements QlessJob, ShouldQueue, Arrayable
+{
+    use Dispatchable, Queueable;
+    /**
+     * @var array
+     */
+    protected $data = [];
+
+    public function __construct(array $data = [])
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @param BaseJob $job
+     * @return mixed
+     */
+    abstract public function perform(BaseJob $job);
+
+    /**
+     * @return array
+     */
+    public function toArray(): array
+    {
+        return (array) $this->data;
+    }
+}

src/Job/QlessJob.php

@@ -3,8 +3,11 @@
 namespace LaravelQless\Job;
 
 use Carbon\Carbon;
+use Illuminate\Container\Container;
 use Illuminate\Queue\Jobs\Job;
 use Illuminate\Contracts\Queue\Job as JobContract;
+use Illuminate\Queue\ManuallyFailedException;
+use LaravelQless\Queue\QlessQueue;
 use Qless\Jobs\BaseJob;
 use LaravelQless\Contracts\JobHandler;
 
@@ -20,36 +23,41 @@ class QlessJob extends Job implements JobContract
     protected $job;
 
     /**
-     * @var string
+     * @var QlessQueue
      */
-    protected $payload;
+    protected $qlessQueue;
 
     /**
      * @var string
      */
-    protected $connectionName;
-
-    /**
-     * @var bool
-     */
-    protected $deleted = false;
-
-    /**
-     * @var bool
-     */
-    protected $released = false;
+    protected $payload;
 
     /**
      * @var JobHandler
      */
     protected $handler;
 
-    public function __construct(BaseJob $job, string $payload, string $connectionName)
-    {
+    /**
+     * QlessJob constructor.
+     * @param Container $container
+     * @param QlessQueue $qlessQueue
+     * @param JobHandler $handler
+     * @param BaseJob $job
+     * @param string $payload
+     */
+    public function __construct(
+        Container $container,
+        QlessQueue $qlessQueue,
+        JobHandler $handler,
+        BaseJob $job,
+        string $payload
+    ) {
+        $this->container = $container;
+        $this->qlessQueue = $qlessQueue;
         $this->job = $job;
         $this->payload = $payload;
-        $this->connectionName = $connectionName;
-        $this->handler = app()->make(JobHandler::class);
+        $this->connectionName = $qlessQueue->getConnectionName();
+        $this->handler = $handler;
     }
 
     /**
@@ -88,6 +96,10 @@ public function payload()
     public function fire()
     {
         $this->handler->perform($this->job);
+
+        if ($this->job->failed) {
+            $this->failed(new ManuallyFailedException());
+        }
     }
 
     /**
@@ -99,8 +111,7 @@ public function fire()
     public function release($delay = 0)
     {
         $this->released = true;
-        return \Queue::connection($this->getConnectionName())
-            ->later($delay, $this->job->getKlass(), $this->job->getData(), $this->job->getQueue());
+        return $this->qlessQueue->later($delay, $this->job->getKlass(), $this->job->getData(), $this->job->getQueue());
     }
 
     /**
@@ -114,36 +125,6 @@ public function delete()
         $this->deleted = true;
     }
 
-    /**
-     * Determine if the job has been deleted.
-     *
-     * @return bool
-     */
-    public function isDeleted()
-    {
-        return $this->deleted;
-    }
-
-    /**
-     * Determine if the job has been deleted.
-     *
-     * @return bool
-     */
-    public function isReleased()
-    {
-        return $this->released;
-    }
-
-    /**
-     * Determine if the job has been deleted or released.
-     *
-     * @return bool
-     */
-    public function isDeletedOrReleased()
-    {
-        return $this->isDeleted() || $this->isReleased();
-    }
-
     /**
      * Get the number of times the job has been attempted.
      *
@@ -154,17 +135,6 @@ public function attempts()
         return $this->job->getRemaining();
     }
 
-    /**
-     * Process an exception that caused the job to fail.
-     *
-     * @param  \Throwable  $e
-     * @return void
-     */
-    public function failed($e)
-    {
-        $this->job->fail($e->getCode(), $e->getMessage());
-    }
-
     /**
      * Get the number of times to attempt a job.
      *
@@ -205,28 +175,6 @@ public function getName()
         return $this->job->getKlass();
     }
 
-    /**
-     * Get the resolved name of the queued job class.
-     *
-     * Resolves the name of "wrapped" jobs such as class-based handlers.
-     *
-     * @return string
-     */
-    public function resolveName()
-    {
-        return $this->job->getKlass(); // ??
-    }
-
-    /**
-     * Get the name of the connection the job belongs to.
-     *
-     * @return string
-     */
-    public function getConnectionName()
-    {
-        return $this->connectionName;
-    }
-
     /**
      * Get the name of the queue the job belongs to.
      *

src/Queue/QlessConnector.php

@@ -21,7 +21,7 @@ class QlessConnector implements ConnectorInterface
     */
     public function connect(array $config): QlessQueue
     {
-         $redisConnection = array_get($config, 'redis_connection', 'default');
+         $redisConnection = array_get($config, 'redis_connection', 'qless');
 
          $redisConfig = Config::get('database.redis.' . $redisConnection, []);