1.4.5 patch - formatting + composer replace

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.5 (2019-08-28)
+- Added 'replaced' composer tag.
+- Formatting changes.
+
 ## 1.4.4 (2019-06-02)
 - Updated tests to run on GitLab CI.
 - Can now run tests locally using `gitlab-runner exec docker test:7.0`

README.md

@@ -1,4 +1,4 @@
-php-resque: PHP Resque Worker (and Enqueue)  [![Build Status](https://travis-ci.org/iDanoo/php-resque.svg?branch=master)](https://travis-ci.org/iDanoo/php-resque)
+php-resque: PHP Resque Worker (and Enqueue)
 ===========================================
 
 Resque is a Redis-backed library for creating background jobs, placing

composer.json

@@ -1,7 +1,11 @@
 {
 	"name": "idanoo/php-resque",
-	"version": "1.4.4",
+	"version": "1.4.5",
 	"type": "library",
+	"replace": {
+		"chrisboulton/php-resque":  "*",
+		"danhunsaker/php-resque": "*"
+	},
 	"description": "Redis backed library for creating background jobs and processing them later. Based on resque for Ruby. Originally forked from chrisboulton/php-resque.",
 	"keywords": ["job", "background", "redis", "resque"],
 	"homepage": "http://www.github.com/idanoo/php-resque/",

lib/Resque.php

@@ -10,7 +10,7 @@
 
 class Resque
 {
-    const VERSION = '1.4.3';
+    const VERSION = '1.4.5';
 
     const DEFAULT_INTERVAL = 5;
 

lib/Resque/Failure.php

@@ -19,8 +19,8 @@ class Resque_Failure
      * Create a new failed job on the backend.
      *
      * @param array $payload The contents of the job that has just failed.
-     * @param \Exception $exception The exception generated when the job failed to run.
-     * @param \Resque_Worker $worker Instance of Resque_Worker that was running this job when it failed.
+     * @param Exception $exception The exception generated when the job failed to run.
+     * @param Resque_Worker $worker Instance of Resque_Worker that was running this job when it failed.
      * @param string $queue The name of the queue that this job was fetched from.
      */
     public static function create($payload, Exception $exception, Resque_Worker $worker, $queue)

lib/Resque/Job.php

@@ -57,7 +57,7 @@ class Resque_Job
      * @param string $id Unique identifier for tracking the job. Generated if not supplied.
      *
      * @return string
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function create($queue, $class, $args = null, $monitor = false, $id = null)
     {

lib/Resque/Job/Factory.php

@@ -8,7 +8,7 @@ class Resque_Job_Factory implements Resque_Job_FactoryInterface
      * @param array $args
      * @param $queue
      * @return Resque_JobInterface
-     * @throws \Resque_Exception
+     * @throws Resque_Exception
      */
     public function create($className, $args, $queue)
     {

lib/Resque/Log.php

@@ -45,11 +45,11 @@ class Resque_Log extends Psr\Log\AbstractLogger
         if (array_search($level, $logLevels) <= array_search($this->logLevel, $logLevels)) {
             fwrite(
                 STDOUT,
-                '[' . $level . '][' . strftime('%Y-%m-%d %T') . '] ' . $this->interpolate($message, $context) . PHP_EOL
+                '[' . $level . '][' . strftime('%Y-%m-%d %T') . '] ' .
+                    $this->interpolate($message, $context) . PHP_EOL
             );
         }
         return;
-
     }
 
     /**

lib/Resque/Redis.php

@@ -185,7 +185,7 @@ class Resque_Redis
         // Check the URI scheme
         $validSchemes = ['redis', 'tcp'];
         if (isset($parts['scheme']) && !in_array($parts['scheme'], $validSchemes)) {
-            throw new \InvalidArgumentException("Invalid DSN. Supported schemes are " . implode(', ', $validSchemes));
+            throw new InvalidArgumentException("Invalid DSN. Supported schemes are " . implode(', ', $validSchemes));
         }
 
         // Allow simple 'hostname' format, which `parse_url` treats as a path, not host.

lib/Resque/Worker.php

@@ -254,8 +254,8 @@ class Resque_Worker
     }
 
     /**
-     * @param  bool $blocking
-     * @param  int $timeout
+     * @param bool $blocking
+     * @param int $timeout
      * @return object|boolean               Instance of Resque_Job if a job is found, false if not.
      */
     public function reserve($blocking = false, $timeout = null)
@@ -290,11 +290,11 @@ class Resque_Worker
      * when searching for jobs.
      *
      * If * is found in the list of queues, every queue will be searched in
-     * alphabetic order. (@see $fetch)
-     *
-     * @param boolean $fetch If true, and the queue is set to *, will fetch
+     * alphabetic order. (@param boolean $fetch If true, and the queue is set to *, will fetch
      * all queue names from redis.
      * @return array Array of associated queues.
+     * @see $fetch)
+     *
      */
     public function queues($fetch = true)
     {

test/Resque/Tests/JobStatusTest.php

@@ -11,7 +11,7 @@
 class Resque_Tests_JobStatusTest extends Resque_Tests_TestCase
 {
     /**
-     * @var \Resque_Worker
+     * @var Resque_Worker
      */
     protected $worker;