- Add PHP 8.1 / 8.2 unit tests

- Updated code to be PHP 8.2 compliant

Author: idanoo

.gitlab-ci.yml

@@ -8,8 +8,8 @@
 
   # Install pcntl and redis extentions
   pecl install -o -f redis \
-  &&  rm -rf /tmp/pear \
-  &&  docker-php-ext-enable redis
+  && rm -rf /tmp/pear \
+  && docker-php-ext-enable redis
   docker-php-ext-install pcntl
 
   # Install Composer

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.0 (2023-02-07)
+- Add PHP 8.1 / 8.2 unit tests
+- Updated code to be PHP 8.2 compliant
+
 ## 2.0.3 (2022-09-12)
 - Update composer packages
 - Added WoodpeckerCI tests

README.md

@@ -1,8 +1,6 @@
 php-resque: PHP Resque Worker (and Enqueue)
 ===========================================
 
-[![Build Status](https://ci.tinker.nz/api/badges/idanoo/php-resque/status.svg)](https://ci.tinker.nz/idanoo/php-resque) 
-
 Resque is a Redis-backed library for creating background jobs, placing
 those jobs on one or more queues, and processing them later.
 

composer.json

@@ -7,7 +7,7 @@
 	},
 	"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", "php"],
-	"homepage": "https://tinker.nz/idanoo/php-resque/",
+	"homepage": "https://gitlab.com/idanoo/php-resque/",
 	"license": "MIT",
 	"authors": [
 		{
@@ -22,7 +22,9 @@
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^9",
-		"squizlabs/php_codesniffer": "3.*"
+		"squizlabs/php_codesniffer": "3.*",
+		"phpcompatibility/php-compatibility": "^9.3",
+		"dealerdirect/phpcodesniffer-composer-installer": "^1.0"
 	},
 	"bin": [
 		"bin/resque"
@@ -38,7 +40,12 @@
 		}
 	},
 	"support": {
-		"issues": "https://tinker.nz/idanoo/php-resque/issues",
-		"source": "https://tinker.nz/idanoo/php-resque"
+		"issues": "https://gitlab.com/idanoo/php-resque/issues",
+		"source": "https://gitlab.com/idanoo/php-resque"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }

composer.lock

@@ -1,19 +1,29 @@
 <?xml version="1.0"?>
-<ruleset name="phpresque" namespace="ezyVet\PHPCS">
-    <description>PSR12</description>
+<ruleset name="PHP82" namespace="ezyVet\PHPCS">
+    <description>PHP8.2 Ruleset</description>
 
     <file>.</file>
-
-    <exclude-pattern>vendor/</exclude-pattern>
+    <exclude-pattern>vendor</exclude-pattern>
     <exclude-pattern>tests/</exclude-pattern>
 
     <arg name="extensions" value="php" />
     <arg name="colors"/>
     <arg value="sp"/>
     <arg name="parallel" value="16"/>
     <arg name="report-width" value="140" />
+    <arg name="error-severity" value="1" />
+    <!-- Setting warning-severity here overrides both the '-n' CLI option and 'config-set show_warnings 0', so we
+         can't use it. -->
+
     <ini name="memory_limit" value="256M"/>
 
+    <!-- Check for version support for PHP 8.2 and higher. -->
+    <config name="testVersion" value="8.2-"/>
+
+
     <rule ref="PSR12">
     </rule>
+
+    <rule ref="PHPCompatibility">
+    </rule>
 </ruleset>

ruleset.xml

@@ -11,6 +11,10 @@
  */
 class Factory implements FactoryInterface
 {
+    public ?Job $job;
+    public string $queue;
+    public array $args;
+
     /**
      * @param $className
      * @param array $args

src/Resque/Job/Factory.php

@@ -174,7 +174,7 @@ public function getArguments()
      */
     public function getInstance()
     {
-        if (!is_null($this->instance)) {
+        if (isset($this->instance) && !is_null($this->instance)) {
             return $this->instance;
         }
 

src/Resque/Job/Job.php

@@ -12,7 +12,7 @@
 
 class Resque
 {
-    public const VERSION = '2.0.3';
+    public const VERSION = '2.1.0';
 
     public const DEFAULT_INTERVAL = 5;
 

src/Resque/Resque.php

@@ -397,6 +397,11 @@ public function testUseFactoryToGetJobInstance()
 
 class SomeJobClass implements \Resque\Job\JobInterface
 {
+    public static $called = false;
+    public $args = false;
+    public $queue;
+    public $job;
+
     /**
      * @return bool
      */
@@ -408,6 +413,11 @@ public function perform()
 
 class Some_Stub_Factory implements \Resque\Job\FactoryInterface
 {
+    public static $called = false;
+    public $args = false;
+    public $queue;
+    public $job;
+
     /**
      * @param $className
      * @param array $args

tests/Resque/Tests/JobTest.php

@@ -35,6 +35,9 @@
 class TestJob
 {
     public static $called = false;
+    public $args = false;
+    public $queue;
+    public $job;
 
     public function perform()
     {
@@ -48,6 +51,11 @@ class FailingJobException extends \Exception
 
 class FailingJob
 {
+    public static $called = false;
+    public $args = false;
+    public $queue;
+    public $job;
+
     public function perform()
     {
         throw new FailingJobException('Message!');
@@ -62,6 +70,8 @@ class TestJobWithSetUp
 {
     public static $called = false;
     public $args = false;
+    public $queue;
+    public $job;
 
     public function setUp()
     {
@@ -78,6 +88,8 @@ class TestJobWithTearDown
 {
     public static $called = false;
     public $args = false;
+    public $queue;
+    public $job;
 
     public function perform()
     {