diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b270598..ac6e91f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
container: php:${{ matrix.php_version }}
strategy:
matrix:
- php_version: [8.1, 8.2,8.3,8.4]
+ php_version: [7.4, 8.0, 8.1, 8.2]
services:
redis:
image: redis:7.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 276f6e3..7ac48fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,28 +1,3 @@
-# 2.5.3 (2025-06-08)
-- Update typing of Log() to support all psr\log versions
-
-- # 2.5.2 (2025-06-08)
-- Update typing of Log() to support all psr\log versions
-
-# 2.5.1 (2025-06-08)
-- Update psr/log version requirements
-
-# 2.5.0 (2025-06-08)
-- Update packages
-
-# 2.4.0 (2024-12-11)
-- Update packages (psr/log ^3.0.2)
-
-# 2.3.0 (2024-09-04)
-- Update packages
-
-# 2.2.0 (2023-03-20)
-- Update pacakges
-- Bump requirements to PHP >= 8.1
-
-# 2.1.3 (2023-11-15)
-- Resolved issue with SET EX TTL's using unix-timestamps
-
# 2.1.2 (2023-03-22)
- Update composer packages
- Update git information (GitHub)
diff --git a/README.md b/README.md
index c2d7234..4c6ceb9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-php-resque: PHP Background (Resque) Worker
+php-resque: PHP Resque Worker (and Enqueue)
===========================================
Resque is a Redis-backed library for creating background jobs, placing
@@ -42,7 +42,7 @@ On top of the original fork (chrisboulton/php-resque) I have added:
## Requirements ##
-* PHP 8.1+
+* PHP 7.0+
* phpredis
* Redis 2.2+
@@ -53,9 +53,19 @@ Composer package inside your project.
If you're not familiar with Composer, please see .
-1. Run `composer require idanoo/php-resque`.
+1. Add php-resque to your application's composer.json.
-2. If you haven't already, add the Composer autoload to your project's
+```json
+{
+ "require": {
+ "idanoo/php-resque": "^2.0"
+ }
+}
+```
+
+2. Run `composer install`.
+
+3. If you haven't already, add the Composer autoload to your project's
initialization file. (example)
```sh
@@ -74,7 +84,7 @@ Resque::setBackend('redis:6379');
$args = ['name' => 'TestName'];
-Resque::enqueue('default', '\App\MyJobClass', $args);
+Resque::enqueue('default', 'My_Job', $args);
```
### Defining Jobs ###
@@ -82,9 +92,7 @@ Resque::enqueue('default', '\App\MyJobClass', $args);
Each job should be in its own class, and include a `perform` method.
```php
-namespace \App;
-
-class MyJobClass
+class My_Job
{
public function perform()
{
@@ -107,9 +115,7 @@ The `tearDown` method, if defined, will be called after the job finishes.
```php
-namespace App;
-
-class MyJobClass
+class My_Job
{
public function setUp()
{
@@ -133,17 +139,17 @@ class MyJobClass
This method can be used to conveniently remove a job from a queue.
```php
-// Removes job class '\App\MyJobClass' of queue 'default'
-Resque::dequeue('default', ['\App\MyJobClass']);
+// Removes job class 'My_Job' of queue 'default'
+Resque::dequeue('default', ['My_Job']);
-// Removes job class '\App\MyJobClass' with Job ID '087df5819a790ac666c9608e2234b21e' of queue 'default'
-Resque::dequeue('default', ['\App\MyJobClass' => '087df5819a790ac666c9608e2234b21e']);
+// Removes job class 'My_Job' with Job ID '087df5819a790ac666c9608e2234b21e' of queue 'default'
+Resque::dequeue('default', ['My_Job' => '087df5819a790ac666c9608e2234b21e']);
-// Removes job class '\App\MyJobClass' with arguments of queue 'default'
-Resque::dequeue('default', ['\App\MyJobClass' => ['foo' => 1, 'bar' => 2]]);
+// Removes job class 'My_Job' with arguments of queue 'default'
+Resque::dequeue('default', ['My_Job' => ['foo' => 1, 'bar' => 2]]);
// Removes multiple jobs
-Resque::dequeue('default', ['\App\MyJobClass', '\App\MyJobClass2']);
+Resque::dequeue('default', ['My_Job', 'My_Job2']);
```
If no jobs are given, this method will dequeue all jobs matching the provided queue.
@@ -164,7 +170,7 @@ To track the status of a job, pass `true` as the fourth argument to
returned:
```php
-$token = Resque::enqueue('default', '\App\MyJobClass', $args, true);
+$token = Resque::enqueue('default', 'My_Job', $args, true);
echo $token;
```
diff --git a/composer.json b/composer.json
index 15199f0..9f1d38f 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
}
],
"require": {
- "php": ">=8.1",
- "psr/log": "^1.1 || ^2.0 || ^3.0",
+ "php": ">7.4",
+ "psr/log": "^1.1.0",
"colinmollenhour/credis": "^1.14.0"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index bb2aed1..6e21cde 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,24 +4,24 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "d8e5313006d5c73b54ee6a410b1ad016",
+ "content-hash": "71f4b3628e3e3b1682cddae59c246514",
"packages": [
{
"name": "colinmollenhour/credis",
- "version": "v1.17.0",
+ "version": "v1.14.0",
"source": {
"type": "git",
"url": "https://github.com/colinmollenhour/credis.git",
- "reference": "f4930b426f6b1238b687a1ffe6ee5af7f835b40a"
+ "reference": "dccc8a46586475075fbb012d8bd523b8a938c2dc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/f4930b426f6b1238b687a1ffe6ee5af7f835b40a",
- "reference": "f4930b426f6b1238b687a1ffe6ee5af7f835b40a",
+ "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/dccc8a46586475075fbb012d8bd523b8a938c2dc",
+ "reference": "dccc8a46586475075fbb012d8bd523b8a938c2dc",
"shasum": ""
},
"require": {
- "php": ">=7.4.0"
+ "php": ">=5.6.0"
},
"suggest": {
"ext-redis": "Improved performance for communicating with redis"
@@ -49,36 +49,36 @@
"homepage": "https://github.com/colinmollenhour/credis",
"support": {
"issues": "https://github.com/colinmollenhour/credis/issues",
- "source": "https://github.com/colinmollenhour/credis/tree/v1.17.0"
+ "source": "https://github.com/colinmollenhour/credis/tree/v1.14.0"
},
- "time": "2025-02-10T18:58:46+00:00"
+ "time": "2022-11-09T01:18:39+00:00"
},
{
"name": "psr/log",
- "version": "3.0.2",
+ "version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
- "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+ "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
"shasum": ""
},
"require": {
- "php": ">=8.0.0"
+ "php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.x-dev"
+ "dev-master": "1.1.x-dev"
}
},
"autoload": {
"psr-4": {
- "Psr\\Log\\": "src"
+ "Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -99,9 +99,9 @@
"psr-3"
],
"support": {
- "source": "https://github.com/php-fig/log/tree/3.0.2"
+ "source": "https://github.com/php-fig/log/tree/1.1.4"
},
- "time": "2024-09-11T13:17:53+00:00"
+ "time": "2021-05-03T11:20:27+00:00"
}
],
"packages-dev": [
@@ -185,30 +185,30 @@
},
{
"name": "doctrine/instantiator",
- "version": "2.0.0",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
+ "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
- "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+ "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
"shasum": ""
},
"require": {
- "php": "^8.1"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^11",
+ "doctrine/coding-standard": "^9 || ^11",
"ext-pdo": "*",
"ext-phar": "*",
- "phpbench/phpbench": "^1.2",
- "phpstan/phpstan": "^1.9.4",
- "phpstan/phpstan-phpunit": "^1.3",
- "phpunit/phpunit": "^9.5.27",
- "vimeo/psalm": "^5.4"
+ "phpbench/phpbench": "^0.16 || ^1",
+ "phpstan/phpstan": "^1.4",
+ "phpstan/phpstan-phpunit": "^1",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "vimeo/psalm": "^4.30 || ^5.4"
},
"type": "library",
"autoload": {
@@ -235,7 +235,7 @@
],
"support": {
"issues": "https://github.com/doctrine/instantiator/issues",
- "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
+ "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
},
"funding": [
{
@@ -251,20 +251,20 @@
"type": "tidelift"
}
],
- "time": "2022-12-30T00:23:10+00:00"
+ "time": "2022-12-30T00:15:36+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.13.1",
+ "version": "1.11.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c"
+ "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c",
- "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+ "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
"shasum": ""
},
"require": {
@@ -272,12 +272,11 @@
},
"conflict": {
"doctrine/collections": "<1.6.8",
- "doctrine/common": "<2.13.3 || >=3 <3.2.2"
+ "doctrine/common": "<2.13.3 || >=3,<3.2.2"
},
"require-dev": {
"doctrine/collections": "^1.6.8",
"doctrine/common": "^2.13.3 || ^3.2.2",
- "phpspec/prophecy": "^1.10",
"phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
},
"type": "library",
@@ -303,7 +302,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
},
"funding": [
{
@@ -311,31 +310,29 @@
"type": "tidelift"
}
],
- "time": "2025-04-29T12:36:36+00:00"
+ "time": "2023-03-08T13:26:56+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v5.5.0",
+ "version": "v4.15.4",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
+ "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
- "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
+ "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
"shasum": ""
},
"require": {
- "ext-ctype": "*",
- "ext-json": "*",
"ext-tokenizer": "*",
- "php": ">=7.4"
+ "php": ">=7.0"
},
"require-dev": {
"ircmaxell/php-yacc": "^0.0.7",
- "phpunit/phpunit": "^9.0"
+ "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
},
"bin": [
"bin/php-parse"
@@ -343,7 +340,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "4.9-dev"
}
},
"autoload": {
@@ -367,27 +364,26 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
},
- "time": "2025-05-31T08:24:38+00:00"
+ "time": "2023-03-05T19:49:14+00:00"
},
{
"name": "phar-io/manifest",
- "version": "2.0.4",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "54750ef60c58e43759730615a392c31c80e23176"
+ "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
- "reference": "54750ef60c58e43759730615a392c31c80e23176",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+ "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
"shasum": ""
},
"require": {
"ext-dom": "*",
- "ext-libxml": "*",
"ext-phar": "*",
"ext-xmlwriter": "*",
"phar-io/version": "^3.0.1",
@@ -428,15 +424,9 @@
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
"support": {
"issues": "https://github.com/phar-io/manifest/issues",
- "source": "https://github.com/phar-io/manifest/tree/2.0.4"
+ "source": "https://github.com/phar-io/manifest/tree/2.0.3"
},
- "funding": [
- {
- "url": "https://github.com/theseer",
- "type": "github"
- }
- ],
- "time": "2024-03-03T12:33:53+00:00"
+ "time": "2021-07-20T11:28:43+00:00"
},
{
"name": "phar-io/version",
@@ -553,35 +543,35 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.32",
+ "version": "9.2.26",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
+ "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
- "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
+ "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.19.1 || ^5.1.0",
+ "nikic/php-parser": "^4.15",
"php": ">=7.3",
- "phpunit/php-file-iterator": "^3.0.6",
- "phpunit/php-text-template": "^2.0.4",
- "sebastian/code-unit-reverse-lookup": "^2.0.3",
- "sebastian/complexity": "^2.0.3",
- "sebastian/environment": "^5.1.5",
- "sebastian/lines-of-code": "^1.0.4",
- "sebastian/version": "^3.0.2",
- "theseer/tokenizer": "^1.2.3"
+ "phpunit/php-file-iterator": "^3.0.3",
+ "phpunit/php-text-template": "^2.0.2",
+ "sebastian/code-unit-reverse-lookup": "^2.0.2",
+ "sebastian/complexity": "^2.0",
+ "sebastian/environment": "^5.1.2",
+ "sebastian/lines-of-code": "^1.0.3",
+ "sebastian/version": "^3.0.1",
+ "theseer/tokenizer": "^1.2.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.6"
+ "phpunit/phpunit": "^9.3"
},
"suggest": {
"ext-pcov": "PHP extension that provides line coverage",
@@ -590,7 +580,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "9.2.x-dev"
+ "dev-master": "9.2-dev"
}
},
"autoload": {
@@ -618,8 +608,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
},
"funding": [
{
@@ -627,7 +616,7 @@
"type": "github"
}
],
- "time": "2024-08-22T04:23:01+00:00"
+ "time": "2023-03-06T12:58:08+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -872,45 +861,45 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.23",
+ "version": "9.6.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95"
+ "reference": "86e761949019ae83f49240b2f2123fb5ab3b2fc5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43d2cb18d0675c38bd44982a5d1d88f6d53d8d95",
- "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86e761949019ae83f49240b2f2123fb5ab3b2fc5",
+ "reference": "86e761949019ae83f49240b2f2123fb5ab3b2fc5",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.5.0 || ^2",
+ "doctrine/instantiator": "^1.3.1 || ^2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.13.1",
- "phar-io/manifest": "^2.0.4",
- "phar-io/version": "^3.2.1",
+ "myclabs/deep-copy": "^1.10.1",
+ "phar-io/manifest": "^2.0.3",
+ "phar-io/version": "^3.0.2",
"php": ">=7.3",
- "phpunit/php-code-coverage": "^9.2.32",
- "phpunit/php-file-iterator": "^3.0.6",
+ "phpunit/php-code-coverage": "^9.2.13",
+ "phpunit/php-file-iterator": "^3.0.5",
"phpunit/php-invoker": "^3.1.1",
- "phpunit/php-text-template": "^2.0.4",
- "phpunit/php-timer": "^5.0.3",
- "sebastian/cli-parser": "^1.0.2",
- "sebastian/code-unit": "^1.0.8",
+ "phpunit/php-text-template": "^2.0.3",
+ "phpunit/php-timer": "^5.0.2",
+ "sebastian/cli-parser": "^1.0.1",
+ "sebastian/code-unit": "^1.0.6",
"sebastian/comparator": "^4.0.8",
- "sebastian/diff": "^4.0.6",
- "sebastian/environment": "^5.1.5",
- "sebastian/exporter": "^4.0.6",
- "sebastian/global-state": "^5.0.7",
- "sebastian/object-enumerator": "^4.0.4",
- "sebastian/resource-operations": "^3.0.4",
- "sebastian/type": "^3.2.1",
+ "sebastian/diff": "^4.0.3",
+ "sebastian/environment": "^5.1.3",
+ "sebastian/exporter": "^4.0.5",
+ "sebastian/global-state": "^5.0.1",
+ "sebastian/object-enumerator": "^4.0.3",
+ "sebastian/resource-operations": "^3.0.3",
+ "sebastian/type": "^3.2",
"sebastian/version": "^3.0.2"
},
"suggest": {
@@ -954,8 +943,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.23"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.5"
},
"funding": [
{
@@ -966,33 +954,25 @@
"url": "https://github.com/sebastianbergmann",
"type": "github"
},
- {
- "url": "https://liberapay.com/sebastianbergmann",
- "type": "liberapay"
- },
- {
- "url": "https://thanks.dev/u/gh/sebastianbergmann",
- "type": "thanks_dev"
- },
{
"url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
"type": "tidelift"
}
],
- "time": "2025-05-02T06:40:34+00:00"
+ "time": "2023-03-09T06:34:10+00:00"
},
{
"name": "sebastian/cli-parser",
- "version": "1.0.2",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/cli-parser.git",
- "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
+ "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
- "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+ "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+ "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
"shasum": ""
},
"require": {
@@ -1027,7 +1007,7 @@
"homepage": "https://github.com/sebastianbergmann/cli-parser",
"support": {
"issues": "https://github.com/sebastianbergmann/cli-parser/issues",
- "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
+ "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
},
"funding": [
{
@@ -1035,7 +1015,7 @@
"type": "github"
}
],
- "time": "2024-03-02T06:27:43+00:00"
+ "time": "2020-09-28T06:08:49+00:00"
},
{
"name": "sebastian/code-unit",
@@ -1224,20 +1204,20 @@
},
{
"name": "sebastian/complexity",
- "version": "2.0.3",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/complexity.git",
- "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
+ "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
- "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
+ "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+ "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^4.18 || ^5.0",
+ "nikic/php-parser": "^4.7",
"php": ">=7.3"
},
"require-dev": {
@@ -1269,7 +1249,7 @@
"homepage": "https://github.com/sebastianbergmann/complexity",
"support": {
"issues": "https://github.com/sebastianbergmann/complexity/issues",
- "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
+ "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
},
"funding": [
{
@@ -1277,20 +1257,20 @@
"type": "github"
}
],
- "time": "2023-12-22T06:19:30+00:00"
+ "time": "2020-10-26T15:52:27+00:00"
},
{
"name": "sebastian/diff",
- "version": "4.0.6",
+ "version": "4.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
+ "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
- "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+ "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
"shasum": ""
},
"require": {
@@ -1335,7 +1315,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
- "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
+ "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
},
"funding": [
{
@@ -1343,7 +1323,7 @@
"type": "github"
}
],
- "time": "2024-03-02T06:30:58+00:00"
+ "time": "2020-10-26T13:10:38+00:00"
},
{
"name": "sebastian/environment",
@@ -1410,16 +1390,16 @@
},
{
"name": "sebastian/exporter",
- "version": "4.0.6",
+ "version": "4.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
+ "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
- "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+ "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
"shasum": ""
},
"require": {
@@ -1475,7 +1455,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
- "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
+ "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
},
"funding": [
{
@@ -1483,20 +1463,20 @@
"type": "github"
}
],
- "time": "2024-03-02T06:33:00+00:00"
+ "time": "2022-09-14T06:03:37+00:00"
},
{
"name": "sebastian/global-state",
- "version": "5.0.7",
+ "version": "5.0.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
+ "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
- "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+ "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
"shasum": ""
},
"require": {
@@ -1539,7 +1519,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/global-state/issues",
- "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
+ "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
},
"funding": [
{
@@ -1547,24 +1527,24 @@
"type": "github"
}
],
- "time": "2024-03-02T06:35:11+00:00"
+ "time": "2022-02-14T08:28:10+00:00"
},
{
"name": "sebastian/lines-of-code",
- "version": "1.0.4",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/lines-of-code.git",
- "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
+ "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
- "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+ "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+ "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^4.18 || ^5.0",
+ "nikic/php-parser": "^4.6",
"php": ">=7.3"
},
"require-dev": {
@@ -1596,7 +1576,7 @@
"homepage": "https://github.com/sebastianbergmann/lines-of-code",
"support": {
"issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
- "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
+ "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
},
"funding": [
{
@@ -1604,7 +1584,7 @@
"type": "github"
}
],
- "time": "2023-12-22T06:20:34+00:00"
+ "time": "2020-11-28T06:42:11+00:00"
},
{
"name": "sebastian/object-enumerator",
@@ -1783,16 +1763,16 @@
},
{
"name": "sebastian/resource-operations",
- "version": "3.0.4",
+ "version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
+ "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
- "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+ "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
"shasum": ""
},
"require": {
@@ -1804,7 +1784,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.0-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -1825,7 +1805,8 @@
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"support": {
- "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
+ "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+ "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
},
"funding": [
{
@@ -1833,7 +1814,7 @@
"type": "github"
}
],
- "time": "2024-03-14T16:00:52+00:00"
+ "time": "2020-09-28T06:45:17+00:00"
},
{
"name": "sebastian/type",
@@ -1946,16 +1927,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.13.0",
+ "version": "3.7.2",
"source": {
"type": "git",
- "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
- "reference": "65ff2489553b83b4597e89c3b8b721487011d186"
+ "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+ "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/65ff2489553b83b4597e89c3b8b721487011d186",
- "reference": "65ff2489553b83b4597e89c3b8b721487011d186",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
+ "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
"shasum": ""
},
"require": {
@@ -1965,11 +1946,11 @@
"php": ">=5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"bin": [
- "bin/phpcbf",
- "bin/phpcs"
+ "bin/phpcs",
+ "bin/phpcbf"
],
"type": "library",
"extra": {
@@ -1984,62 +1965,35 @@
"authors": [
{
"name": "Greg Sherwood",
- "role": "Former lead"
- },
- {
- "name": "Juliette Reinders Folmer",
- "role": "Current lead"
- },
- {
- "name": "Contributors",
- "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
+ "role": "lead"
}
],
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
- "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+ "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
"keywords": [
"phpcs",
"standards",
"static analysis"
],
"support": {
- "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
- "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
- "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
- "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
+ "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+ "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+ "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
},
- "funding": [
- {
- "url": "https://github.com/PHPCSStandards",
- "type": "github"
- },
- {
- "url": "https://github.com/jrfnl",
- "type": "github"
- },
- {
- "url": "https://opencollective.com/php_codesniffer",
- "type": "open_collective"
- },
- {
- "url": "https://thanks.dev/u/gh/phpcsstandards",
- "type": "thanks_dev"
- }
- ],
- "time": "2025-05-11T03:36:00+00:00"
+ "time": "2023-02-22T23:07:41+00:00"
},
{
"name": "theseer/tokenizer",
- "version": "1.2.3",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+ "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
- "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+ "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
"shasum": ""
},
"require": {
@@ -2068,7 +2022,7 @@
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"support": {
"issues": "https://github.com/theseer/tokenizer/issues",
- "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
+ "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
},
"funding": [
{
@@ -2076,17 +2030,17 @@
"type": "github"
}
],
- "time": "2024-03-03T12:36:25+00:00"
+ "time": "2021-07-28T10:34:58+00:00"
}
],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": {},
+ "stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=8.1"
+ "php": ">7.4"
},
- "platform-dev": {},
- "plugin-api-version": "2.6.0"
+ "platform-dev": [],
+ "plugin-api-version": "2.3.0"
}
diff --git a/src/Resque/Event.php b/src/Resque/Event.php
index f445375..7886640 100644
--- a/src/Resque/Event.php
+++ b/src/Resque/Event.php
@@ -22,7 +22,6 @@ class Event
*
* @param string $event Name of event to be raised.
* @param mixed $data Optional, any data that should be passed to each callback.
- *
* @return true
*/
public static function trigger($event, $data = null)
@@ -50,8 +49,7 @@ class Event
* Listen in on a given event to have a specified callback fired.
*
* @param string $event Name of event to listen on.
- * @param mixed $callback Any callback callable by call_user_func_array
- *
+ * @param mixed $callback Any callback callable by call_user_func_array.
* @return true
*/
public static function listen($event, $callback)
@@ -69,7 +67,6 @@ class Event
*
* @param string $event Name of event.
* @param mixed $callback The callback as defined when listen() was called.
- *
* @return true
*/
public static function stopListening($event, $callback)
@@ -88,10 +85,8 @@ class Event
/**
* Call all registered listeners.
- *
- * @return void
*/
- public static function clearListeners(): void
+ public static function clearListeners()
{
self::$events = [];
}
diff --git a/src/Resque/Job/Factory.php b/src/Resque/Job/Factory.php
index 9ee0b74..be04d8e 100644
--- a/src/Resque/Job/Factory.php
+++ b/src/Resque/Job/Factory.php
@@ -9,7 +9,6 @@ namespace Resque\Job;
* @author Daniel Mason
* @license http://www.opensource.org/licenses/mit-license.php
*/
-
class Factory implements FactoryInterface
{
public ?Job $job;
@@ -17,8 +16,6 @@ class Factory implements FactoryInterface
public array $args;
/**
- * Create job factory
- *
* @param $className
* @param array $args
* @param $queue
diff --git a/src/Resque/Job/Status.php b/src/Resque/Job/Status.php
index 6387c2a..0486394 100644
--- a/src/Resque/Job/Status.php
+++ b/src/Resque/Job/Status.php
@@ -62,7 +62,7 @@ class Status
\Resque\Resque::redis()->set(
'job:' . $id . ':status',
json_encode($statusPacket),
- ['ex' => \Resque\Redis::DEFAULT_REDIS_TTL],
+ ['ex' => time() + 86400],
);
}
@@ -106,7 +106,7 @@ class Status
\Resque\Resque::redis()->set(
(string)$this,
json_encode($statusPacket),
- ['ex' => \Resque\Redis::DEFAULT_REDIS_TTL],
+ ['ex' => time() + 86400],
);
}
diff --git a/src/Resque/Log.php b/src/Resque/Log.php
index 2608d87..e446a72 100644
--- a/src/Resque/Log.php
+++ b/src/Resque/Log.php
@@ -25,10 +25,9 @@ class Log extends \Psr\Log\AbstractLogger
* @param mixed $level PSR-3 log level constant, or equivalent string
* @param string $message Message to log, may contain a { placeholder }
* @param array $context Variables to replace { placeholder }
- *
* @return null
*/
- public function log($level, $message, array $context = []): void
+ public function log($level, $message, array $context = [])
{
$logLevels = [
'emergency',
diff --git a/src/Resque/Redis.php b/src/Resque/Redis.php
index 5537b55..f726feb 100644
--- a/src/Resque/Redis.php
+++ b/src/Resque/Redis.php
@@ -14,14 +14,12 @@ class Redis
{
/**
* Redis Client
- *
* @var \Credis_Client
*/
private $driver;
/**
* Redis namespace
- *
* @var string
*/
private static $defaultNamespace = 'resque:';
@@ -41,11 +39,6 @@ class Redis
*/
public const DEFAULT_DATABASE = 0;
- /**
- * Default Redis TTL (2 days)
- */
- public const DEFAULT_REDIS_TTL = 172800;
-
/**
* @var array List of all commands in Redis that supply a key as their
* first argument. Used to prefix keys with the Resque namespace.
@@ -97,6 +90,17 @@ class Redis
'rename',
'rpoplpush'
];
+ // sinterstore
+ // sunion
+ // sunionstore
+ // sdiff
+ // sdiffstore
+ // sinter
+ // smove
+ // mget
+ // msetnx
+ // mset
+ // renamenx
/**
* Set Redis namespace (prefix) default: resque
@@ -110,7 +114,6 @@ class Redis
if (substr($namespace, -1) !== ':' && $namespace != '') {
$namespace .= ':';
}
-
self::$defaultNamespace = $namespace;
}
diff --git a/src/Resque/Resque.php b/src/Resque/Resque.php
index f193e18..e4872f9 100644
--- a/src/Resque/Resque.php
+++ b/src/Resque/Resque.php
@@ -12,7 +12,7 @@ namespace Resque;
class Resque
{
- public const VERSION = '2.5.3';
+ public const VERSION = '2.1.0';
public const DEFAULT_INTERVAL = 5;
diff --git a/src/Resque/Stat.php b/src/Resque/Stat.php
index 6cfa6c1..45bfe45 100644
--- a/src/Resque/Stat.php
+++ b/src/Resque/Stat.php
@@ -38,7 +38,7 @@ class Stat
$set = Resque::redis()->set(
'stat:' . $stat,
$by,
- ['ex' => Redis::DEFAULT_REDIS_TTL, 'nx'],
+ ['ex' => time() + 86400, 'nx'],
);
// If it already exists, return the incrby value
diff --git a/src/Resque/Worker.php b/src/Resque/Worker.php
index fc08303..6c19f13 100644
--- a/src/Resque/Worker.php
+++ b/src/Resque/Worker.php
@@ -83,7 +83,6 @@ class Worker
/**
* Return all workers known to Resque as instantiated instances.
- *
* @return array
*/
public static function all(): array
@@ -97,17 +96,14 @@ class Worker
foreach ($workers as $workerId) {
$instances[] = self::find($workerId);
}
-
return $instances;
}
/**
* Given a worker ID, check if it is registered/valid.
*
- * @param string $workerId ID of the worker
- *
- * @return boolean True if the worker exists, false if not
- *
+ * @param string $workerId ID of the worker.
+ * @return boolean True if the worker exists, false if not.
* @throws Resque_RedisException
*/
public static function exists($workerId): bool
@@ -118,10 +114,8 @@ class Worker
/**
* Given a worker ID, find it and return an instantiated worker class for it.
*
- * @param string $workerId The ID of the worker
- *
- * @return Resque_Worker|bool
- *
+ * @param string $workerId The ID of the worker.
+ * @return bool|Resque_Worker
* @throws Resque_RedisException
*/
public static function find($workerId)
@@ -129,13 +123,11 @@ class Worker
if (false === strpos($workerId, ":") || !self::exists($workerId)) {
return false;
}
-
/** @noinspection PhpUnusedLocalVariableInspection */
list($hostname, $pid, $queues) = explode(':', $workerId, 3);
$queues = explode(',', $queues);
$worker = new self($queues);
$worker->setId($workerId);
-
return $worker;
}
@@ -143,10 +135,8 @@ class Worker
* Set the ID of this worker to a given ID string.
*
* @param string $workerId ID for the worker.
- *
- * @return void
*/
- public function setId($workerId): void
+ public function setId($workerId)
{
$this->id = $workerId;
}
@@ -160,11 +150,9 @@ class Worker
* @param int $interval How often to check for new jobs across the queues.
* @param bool $blocking
*
- * @return void
- *
* @throws Resque_RedisException
*/
- public function work($interval = Resque::DEFAULT_INTERVAL, $blocking = false): void
+ public function work($interval = Resque::DEFAULT_INTERVAL, $blocking = false)
{
$this->updateProcLine('Starting');
$this->startup();
@@ -263,13 +251,11 @@ class Worker
}
/**
- * Process a single job
+ * Process a single job.
*
- * @param \Resque\Job\Job $job The job to be processed
- *
- * @return void
+ * @param \Resque\Job\Job $job The job to be processed.
*/
- public function perform(\Resque\Job\Job $job): void
+ public function perform(\Resque\Job\Job $job)
{
try {
Event::trigger('afterFork', $job);
@@ -287,8 +273,7 @@ class Worker
/**
* @param bool $blocking
* @param int $timeout
- *
- * @return object|boolean - Instance of \Resque\Job\Job if a job is found, false if not
+ * @return object|boolean Instance of \Resque\Job\Job if a job is found, false if not.
*/
public function reserve($blocking = false, $timeout = null)
{
@@ -319,17 +304,16 @@ class Worker
/**
* Return an array containing all of the queues that this worker should use
- * when searching for jobs
+ * when searching for jobs.
*
* If * is found in the list of queues, every queue will be searched in
* alphabetic order. (@param boolean $fetch If true, and the queue is set to *, will fetch
- * all queue names from redis
+ * all queue names from redis.
+ * @return array Array of associated queues.
+ * @see $fetch)
*
- * @param boolean $fetch
- *
- * @return array Array of associated queues
*/
- public function queues(bool $fetch = true): array
+ public function queues($fetch = true)
{
if (!in_array('*', $this->queues) || $fetch == false) {
return $this->queues;
@@ -337,16 +321,13 @@ class Worker
$queues = Resque::queues();
sort($queues);
-
return $queues;
}
/**
- * Perform necessary actions to start a worker
- *
- * @return void
+ * Perform necessary actions to start a worker.
*/
- private function startup(): void
+ private function startup()
{
$this->registerSigHandlers();
$this->pruneDeadWorkers();
@@ -359,11 +340,9 @@ class Worker
* the name of the currently running process to indicate the current state
* of a worker.
*
- * @param string $status The updated process title
- *
- * @return void
+ * @param string $status The updated process title.
*/
- private function updateProcLine($status): void
+ private function updateProcLine($status)
{
$processTitle = 'resque-' . Resque::VERSION . ': ' . $status;
if (function_exists('cli_set_process_title') && PHP_OS !== 'Darwin') {
@@ -380,10 +359,8 @@ class Worker
* INT: Shutdown immediately and stop processing jobs.
* QUIT: Shutdown after the current job finishes processing.
* USR1: Kill the forked child immediately and continue processing jobs.
- *
- * @return void
*/
- private function registerSigHandlers(): void
+ private function registerSigHandlers()
{
if (!function_exists('pcntl_signal')) {
return;
@@ -399,11 +376,9 @@ class Worker
}
/**
- * Signal handler callback for USR2, pauses processing of new jobs
- *
- * @return void
+ * Signal handler callback for USR2, pauses processing of new jobs.
*/
- public function pauseProcessing(): void
+ public function pauseProcessing()
{
$this->logger->log(\Psr\Log\LogLevel::NOTICE, 'USR2 received; pausing job processing');
$this->paused = true;
@@ -412,10 +387,8 @@ class Worker
/**
* Signal handler callback for CONT, resumes worker allowing it to pick
* up new jobs.
- *
- * @return void
*/
- public function unPauseProcessing(): void
+ public function unPauseProcessing()
{
$this->logger->log(\Psr\Log\LogLevel::NOTICE, 'CONT received; resuming job processing');
$this->paused = false;
@@ -424,10 +397,8 @@ class Worker
/**
* Schedule a worker for shutdown. Will finish processing the current job
* and when the timeout interval is reached, the worker will shut down.
- *
- * @return void
*/
- public function shutdown(): void
+ public function shutdown()
{
$this->shutdown = true;
$this->logger->log(\Psr\Log\LogLevel::NOTICE, 'Shutting down');
@@ -436,10 +407,8 @@ class Worker
/**
* Force an immediate shutdown of the worker, killing any child jobs
* currently running.
- *
- * @return void
*/
- public function shutdownNow(): void
+ public function shutdownNow()
{
$this->shutdown();
$this->killChild();
@@ -448,10 +417,8 @@ class Worker
/**
* Kill a forked child job immediately. The job it is processing will not
* be completed.
- *
- * @return void
*/
- public function killChild(): void
+ public function killChild()
{
if (!$this->child) {
$this->logger->log(\Psr\Log\LogLevel::DEBUG, 'No child to kill.');
@@ -480,10 +447,8 @@ class Worker
* This is a form of garbage collection to handle cases where the
* server may have been killed and the Resque workers did not die gracefully
* and therefore leave state information in Redis.
- *
- * @return void
*/
- public function pruneDeadWorkers(): void
+ public function pruneDeadWorkers()
{
$workerPids = $this->workerPids();
$workers = self::all();
@@ -509,7 +474,7 @@ class Worker
*
* @return array Array of Resque worker process IDs.
*/
- public function workerPids(): array
+ public function workerPids()
{
$pids = [];
exec('ps -A -o pid,command | grep [r]esque', $cmdOutput);
@@ -521,26 +486,22 @@ class Worker
/**
* Register this worker in Redis.
- * 48 hour TTL so we don't pollute the redis db on server termination.
- *
- * @return void
+ * 48 hour TTL so we don't pollute the db on server termination.
*/
- public function registerWorker(): void
+ public function registerWorker()
{
Resque::redis()->sadd('workers', (string)$this);
Resque::redis()->set(
'worker:' . (string)$this . ':started',
date('D M d H:i:s T Y'),
- ['ex' => Redis::DEFAULT_REDIS_TTL],
+ ['ex' => time() + 86400],
);
}
/**
* Unregister this worker in Redis. (shutdown etc)
- *
- * @return void
*/
- public function unregisterWorker(): void
+ public function unregisterWorker()
{
if (is_object($this->currentJob)) {
$this->currentJob->fail(new \Resque\Job\DirtyExitException());
@@ -555,15 +516,12 @@ class Worker
}
/**
- * Tell Redis which job we're currently working on
- *
- * @param \Resque\Job\Job $job \Resque\Job\Job instance containing the job we're working on
- *
- * @return void
+ * Tell Redis which job we're currently working on.
*
+ * @param \Resque\Job\Job $job \Resque\Job\Job instance containing the job we're working on.
* @throws Resque_RedisException
*/
- public function workingOn(\Resque\Job\Job $job): void
+ public function workingOn(\Resque\Job\Job $job)
{
$job->worker = $this;
$this->currentJob = $job;
@@ -577,17 +535,15 @@ class Worker
Resque::redis()->set(
'worker:' . $job->worker,
$data,
- ['ex' => Redis::DEFAULT_REDIS_TTL],
+ ['ex' => time() + 86400],
);
}
/**
* Notify Redis that we've finished working on a job, clearing the working
- * state and incrementing the job stats
- *
- * @return void
+ * state and incrementing the job stats.
*/
- public function doneWorking(): void
+ public function doneWorking()
{
$this->currentJob = null;
Stat::incr('processed');
@@ -596,29 +552,28 @@ class Worker
}
/**
- * Generate a string representation of this worker
+ * Generate a string representation of this worker.
*
- * @return string String identifier for this worker instance
+ * @return string String identifier for this worker instance.
*/
- public function __toString(): string
+ public function __toString()
{
- return (string) $this->id;
+ return $this->id;
}
/**
- * Return an object describing the job this worker is currently working on
+ * Return an object describing the job this worker is currently working on.
*
- * @return array Array with details of current job
+ * @return array Array with details of current job.
*/
public function job(): array
{
$job = Resque::redis()->get('worker:' . $this);
-
return $job ? json_decode($job, true) : [];
}
/**
- * Get a statistic belonging to this worker
+ * Get a statistic belonging to this worker.
*
* @param string $stat Statistic to fetch.
*
@@ -633,10 +588,8 @@ class Worker
* Inject the logging object into the worker
*
* @param \Psr\Log\LoggerInterface $logger
- *
- * @return void
*/
- public function setLogger(\Psr\Log\LoggerInterface $logger): void
+ public function setLogger(\Psr\Log\LoggerInterface $logger)
{
$this->logger = $logger;
}
diff --git a/tests/Resque/Tests/RedisTest.php b/tests/Resque/Tests/RedisTest.php
index b834f93..200f208 100644
--- a/tests/Resque/Tests/RedisTest.php
+++ b/tests/Resque/Tests/RedisTest.php
@@ -17,7 +17,7 @@ class RedisTest extends TestCase
$this->redis->set(
'testKey',
24,
- ['ex' => \Resque\Redis::DEFAULT_REDIS_TTL],
+ ['ex' => time() + 3600],
);
$val = $this->redis->get("testKey");