Small refactor

Author: osadchyi-s

AUTHORS

@@ -1,2 +1 @@
-Serghei Iakovlev <[email protected]>
-Stuart Carnie <[email protected]>
+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

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.*",

src/Queue/QlessQueue.php

@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Queue\InvalidPayloadException;
 use Illuminate\Queue\Queue;
+use LaravelQless\Contracts\JobHandler;
 use LaravelQless\Job\QlessJob;
 use Qless\Client;
 use Qless\Topics\Topic;
@@ -22,20 +23,15 @@ class QlessQueue extends Queue implements QueueContract
      */
     private $connect;
 
-    /**
-     * @var array
-     */
-    private $config;
-
     /**
      * @var string
      */
-    protected $connectionName;
+    private $defaultQueue;
 
     /**
-     * @var string
+     * @var array
      */
-    protected $defaultQueue;
+    private $config;
 
     /**
      * QlessQueue constructor.
@@ -45,7 +41,7 @@ class QlessQueue extends Queue implements QueueContract
     public function __construct(Client $connect, array $config)
     {
         $this->connect = $connect;
-        $this->defaultQueue = $config['queue'] ?? '';
+        $this->defaultQueue = $config['queue'] ?? null;
         $this->connectionName = $config['connection'] ?? '';
         $this->config = $config;
     }
@@ -56,7 +52,7 @@ public function __construct(Client $connect, array $config)
      * @param  string  $queue
      * @return int
      */
-    public function size($queue = null)
+    public function size($queue = null): int
     {
         return $this->getConnection()->length($queue);
     }
@@ -126,7 +122,7 @@ public function later($delay, $job, $data = '', $queueName = null)
      * @param string $queueName
      * @return string
      */
-    public function recur(int $interval, string $job, array $data, ?string $queueName = null)
+    public function recur(int $interval, string $job, array $data, ?string $queueName = null): string
     {
         /** @var \Qless\Queues\Queue $queue */
         $queue = $this->getConnection()->queues[$queueName];
@@ -142,8 +138,6 @@ public function recur(int $interval, string $job, array $data, ?string $queueNam
      */
     public function pop($queueName = null)
     {
-        $queueName = $queueName ?? $this->defaultQueue;
-
         /** @var \Qless\Queues\Queue $queue */
         $queue = $this->getConnection()->queues[$queueName];
 
@@ -156,9 +150,11 @@ public function pop($queueName = null)
         $payload = $this->makePayload($job->getKlass(), $job->getData());
 
         return new QlessJob(
+            $this->container,
+            $this,
+            app()->make(JobHandler::class),
             $job,
-            $payload,
-            $this->getConnectionName()
+            $payload
         );
     }
 
@@ -193,15 +189,15 @@ public function unSubscribe(string $topic, string $queueName = null): bool
     }
 
     /**
-     * @param string $topic
+     * @param string $topicName
      * @param string $job
      * @param array $data
      * @param array $options
-     * @return array
+     * @return array|string
      */
-    public function pushToTopic(string $topic, string $job, array $data = [], array $options = []): array
+    public function pushToTopic(string $topicName, string $job, array $data = [], array $options = []): array
     {
-        $topic = new Topic($topic, $this->getConnection());
+        $topic = new Topic($topicName, $this->getConnection());
 
         return $topic->put(
             $job,
@@ -218,7 +214,7 @@ public function pushToTopic(string $topic, string $job, array $data = [], array
      * @param array $options
      * @return string
      */
-    protected function makePayload(string $job, $data, $options = [])
+    protected function makePayload(string $job, $data, $options = []): string
     {
         $payload = json_encode([
             'displayName' => explode('@', $job)[0],
@@ -237,29 +233,6 @@ protected function makePayload(string $job, $data, $options = [])
         return $payload;
     }
 
-    /**
-     * Get the connection name for the queue.
-     *
-     * @return string
-     */
-    public function getConnectionName(): string
-    {
-        return $this->connectionName;
-    }
-
-    /**
-     * Set the connection name for the queue.
-     *
-     * @param  string  $name
-     * @return $this
-     */
-    public function setConnectionName($name): self
-    {
-        $this->connectionName = $name;
-
-        return $this;
-    }
-
     /**
      * @return Client
      */