From 926f8a887cc256d9433c8cee8c4d41f7ec3f2dcc Mon Sep 17 00:00:00 2001
From: idanoo <daniel@m2.nz>
Date: Fri, 19 Feb 2021 13:44:10 +1300
Subject: [PATCH] 2.0.0: Add namespacing (#1)

2.0.0: Namespace for idanoo/php-resque
Co-Authored-By: idanoo <daniel@m2.nz>
Co-Committed-By: idanoo <daniel@m2.nz>
---
 composer.json                 | 28 ++++++++++++++++++----------
 config/resque.php             | 17 -----------------
 src/Console/WorkCommand.php   | 11 +++++------
 src/Job.php                   |  5 +++--
 src/Queue.php                 |  9 +++++----
 src/Resque.php                | 27 ++++++++++++++-------------
 src/ResqueServiceProvider.php |  7 ++++---
 src/Worker.php                |  8 ++++----
 8 files changed, 53 insertions(+), 59 deletions(-)

diff --git a/composer.json b/composer.json
index 570bf22..dde9a65 100644
--- a/composer.json
+++ b/composer.json
@@ -1,22 +1,30 @@
 {
-    "name": "hlgrrnhrdt/laravel-resque",
-    "authors": [
-        {
-            "name": "Holger Reinhardt",
-            "email": "hlgrrnhrdt@gmail.com"
-        }
-    ],
+	"name": "idanoo/laravel-resque",
+	"type": "library",
+	"replace": {
+		"hlgrrnhrdt/laravel-resque": "*"
+    },
+	"description": "Wrapper for idanoo/php-resque (Laravel/Lumen ^5.2.0)",
+	"keywords": ["job", "background", "redis", "resque", "php"],
+	"homepage": "https://www.gitlab.com/idanoo/laravel-resque/",
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Daniel Mason",
+			"email": "daniel@m2.nz"
+		}
+	],
     "require": {
         "illuminate/console": "^5.2",
         "illuminate/config": "^5.2",
-        "danhunsaker/php-resque": "^1.3"
+        "idanoo/php-resque": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.4"
+        "phpunit/phpunit": "^9"
     },
     "autoload": {
         "psr-4": {
-            "Hlgrrnhrdt\\Resque\\": "src/"
+            "Idanoo\\Resque\\": "src/"
         }
     }
 }
diff --git a/config/resque.php b/config/resque.php
index b53cb98..3a0c9bd 100644
--- a/config/resque.php
+++ b/config/resque.php
@@ -1,23 +1,6 @@
 <?php
 
 return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Redis Config
-    |--------------------------------------------------------------------------
-    |
-    */
-
     'default' => env('RESQUE_REDIS', 'resque'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Prefix
-    |--------------------------------------------------------------------------
-    |
-    */
-
     'prefix' => env('RESQUE_PREFIX'),
-
 ];
diff --git a/src/Console/WorkCommand.php b/src/Console/WorkCommand.php
index 9b01c38..492c2dd 100644
--- a/src/Console/WorkCommand.php
+++ b/src/Console/WorkCommand.php
@@ -1,9 +1,8 @@
 <?php
-namespace Hlgrrnhrdt\Resque\Console;
+namespace Idanoo\Resque\Console;
 
-use Hlgrrnhrdt\Resque\Resque;
+use Idanoo\Resque\Resque;
 use Illuminate\Console\Command as IlluminateCommand;
-use Resque_Worker;
 use Symfony\Component\Console\Input\InputOption;
 
 /**
@@ -28,12 +27,12 @@ class WorkCommand extends IlluminateCommand
     protected $description = 'Run a resque worker';
 
     /**
-     * @var \Hlgrrnhrdt\Resque\Resque
+     * @var \Idanoo\Resque\Resque
      */
     private $resque;
 
     /**
-     * @param \Hlgrrnhrdt\Resque\Resque $resque
+     * @param \Idanoo\Resque\Resque $resque
      */
     public function __construct(Resque $resque)
     {
@@ -64,7 +63,7 @@ class WorkCommand extends IlluminateCommand
      */
     private function startWorker(array $queues, $interval = 5)
     {
-        $worker = new Resque_Worker($queues);
+        $worker = new \Resque\Worker($queues);
         $this->info(\sprintf('Starting worker %s', $worker));
         $worker->work($interval);
     }
diff --git a/src/Job.php b/src/Job.php
index 6a63bbc..cb0a269 100644
--- a/src/Job.php
+++ b/src/Job.php
@@ -1,5 +1,6 @@
 <?php
-namespace Hlgrrnhrdt\Resque;
+
+namespace Idanoo\Resque;
 
 /**
  * Job
@@ -44,7 +45,7 @@ abstract class Job
      */
     public function name()
     {
-        return \get_class($this);
+        return get_class($this);
     }
 
     /**
diff --git a/src/Queue.php b/src/Queue.php
index b386d32..c60329c 100644
--- a/src/Queue.php
+++ b/src/Queue.php
@@ -1,5 +1,6 @@
 <?php
-namespace Hlgrrnhrdt\Resque;
+
+namespace Idanoo\Resque;
 
 /**
  * Queue
@@ -34,7 +35,7 @@ class Queue
      */
     public function size()
     {
-        return \Resque::size($this->name);
+        return \Resque\Resque::size($this->name);
     }
 
     /**
@@ -42,10 +43,10 @@ class Queue
      */
     public function jobs()
     {
-        $result = \Resque::redis()->lrange('queue:' . $this->name, 0, -1);
+        $result = \Resque\Resque::redis()->lrange('queue:' . $this->name, 0, -1);
         $jobs = [];
         foreach ($result as $job) {
-            $jobs[] = (new \Resque_Job($this->name, \json_decode($job, true)))->getInstance();
+            $jobs[] = (new \Resque\Job\Job($this->name, \json_decode($job, true)))->getInstance();
         }
 
         return $jobs;
diff --git a/src/Resque.php b/src/Resque.php
index 1da773a..87e2435 100644
--- a/src/Resque.php
+++ b/src/Resque.php
@@ -1,5 +1,6 @@
 <?php
-namespace Hlgrrnhrdt\Resque;
+
+namespace Idanoo\Resque;
 
 use RuntimeException;
 
@@ -27,7 +28,7 @@ class Resque
      */
     public function setPrefix($prefix)
     {
-        \Resque_Redis::prefix($prefix);
+        \Resque\Redis::prefix($prefix);
         return $this;
     }
 
@@ -35,7 +36,7 @@ class Resque
      * @param Job  $job
      * @param bool $trackStatus
      *
-     * @return null|\Resque_Job_Status
+     * @return null|\Resque\Job\Status
      */
     public function enqueueOnce(Job $job, $trackStatus = false)
     {
@@ -43,13 +44,13 @@ class Resque
 
         foreach ($queue->jobs() as $queuedJob) {
             if (true === $job->equals($queuedJob)) {
-                return ($trackStatus) ? new \Resque_Job_Status($queuedJob->job->payload['id']) : null;
+                return ($trackStatus) ? new \Resque\Job\Status($queuedJob->job->payload['id']) : null;
             }
         }
 
         foreach ($this->working() as $workingJob) {
             if (true === $job->equals($workingJob)) {
-                return ($trackStatus) ? new \Resque_Job_Status($workingJob->job->payload['id']) : null;
+                return ($trackStatus) ? new \Resque\Job\Status($workingJob->job->payload['id']) : null;
             }
         }
 
@@ -62,11 +63,11 @@ class Resque
     private function working()
     {
         $jobs = [];
-        foreach (\Resque::redis()->smembers('workers') as $worker) {
-            $job = \Resque::redis()->get('worker:' . $worker);
+        foreach (\Resque\Resque::redis()->smembers('workers') as $worker) {
+            $job = \Resque\Resque::redis()->get('worker:' . $worker);
             $job = \json_decode($job, true);
             if (!\json_last_error()) {
-                $jobs[] = (new \Resque_Job($job['queue'], $job['payload']))
+                $jobs[] = (new \Resque\Job\Job($job['queue'], $job['payload']))
                     ->getInstance();
             }
         }
@@ -82,21 +83,21 @@ class Resque
      */
     public function enqueue(Job $job, $trackStatus = false)
     {
-        $id = \Resque::enqueue($job->queue(), $job->name(), $job->arguments(), $trackStatus);
+        $id = \Resque\Resque::enqueue($job->queue(), $job->name(), $job->arguments(), $trackStatus);
 
         if (true === $trackStatus) {
-            return new \Resque_Job_Status($id);
+            return new \Resque\Job\Status($id);
         }
 
         return null;
     }
 
     /**
-     * @return \Resque_Redis
+     * @return \Resque\Redis
      */
     public function redis()
     {
-        return \Resque::redis();
+        return \Resque\Resque::redis();
     }
 
     /**
@@ -106,6 +107,6 @@ class Resque
      */
     public function fork()
     {
-        return \Resque::fork();
+        return \Resque\Resque::fork();
     }
 }
diff --git a/src/ResqueServiceProvider.php b/src/ResqueServiceProvider.php
index 87d0510..279e4e4 100644
--- a/src/ResqueServiceProvider.php
+++ b/src/ResqueServiceProvider.php
@@ -1,7 +1,8 @@
 <?php
-namespace Hlgrrnhrdt\Resque;
 
-use Hlgrrnhrdt\Resque\Console\WorkCommand;
+namespace Idanoo\Resque;
+
+use Idanoo\Resque\Console\WorkCommand;
 use Illuminate\Support\ServiceProvider;
 
 /**
@@ -66,6 +67,6 @@ class ResqueServiceProvider extends ServiceProvider
 
         $dsn = sprintf('redis://%s/%s', $server, $database);
 
-        \Resque::setBackend($dsn);
+        \Resque\Resque::setBackend($dsn);
     }
 }
diff --git a/src/Worker.php b/src/Worker.php
index 2c281d5..e2074df 100644
--- a/src/Worker.php
+++ b/src/Worker.php
@@ -1,5 +1,5 @@
 <?php
-namespace Hlgrrnhrdt\Resque;
+namespace Idanoo\Resque;
 
 /**
  * Worker
@@ -9,14 +9,14 @@ namespace Hlgrrnhrdt\Resque;
 class Worker
 {
     /**
-     * @var \Resque_Worker
+     * @var \Resque\Worker
      */
     private $worker;
 
     /**
-     * @param \Resque_Worker $worker
+     * @param \Resque\Worker $worker
      */
-    public function __construct(\Resque_Worker $worker)
+    public function __construct(\Resque\Worker $worker)
     {
         $this->worker = $worker;
     }