Merge pull request #4 from FortnoxAB/feature/bump-composer-deps

Bump composer dependencies and setup phpstan.

Author: afridlund85

Makefile

@@ -0,0 +1,5 @@
+phpunit: ./vendor
+	./vendor/bin/phpunit --configuration phpunit.xml.dist
+
+phpstan: ./vendor
+	./vendor/phpstan/phpstan/phpstan analyse -vvv --error-format=raw -c phpstan.neon.dist

composer.json

@@ -28,17 +28,18 @@
 		}
 	],
 	"require": {
-		"php": ">=5.6.0",
+		"php": "^8.2",
 		"colinmollenhour/credis": "~1.7",
-		"psr/log": "~1.0"
+		"psr/log": "^3.0"
 	},
 	"suggest": {
 		"ext-pcntl": "REQUIRED for forking processes on platforms that support it (so anything but Windows).",
 		"ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.",
 		"ext-redis": "Native PHP extension for Redis connectivity. Credis will automatically utilize when available."
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^8.5"
+		"phpunit/phpunit": "^10",
+		"phpstan/phpstan": "^1.10"
 	},
 	"bin": [
 		"bin/resque",

demo/php_error_job.php

@@ -3,6 +3,7 @@ class PHP_Error_Job
 {
 	public function perform()
 	{
+        /* @phpstan-ignore-next-line */
 		callToUndefinedFunction();
 	}
-}
+}

lib/Resque/Log.php

@@ -6,7 +6,7 @@
  * @author		Chris Boulton <[email protected]>
  * @license		http://www.opensource.org/licenses/mit-license.php
  */
-class Resque_Log extends Psr\Log\AbstractLogger 
+class Resque_Log extends Psr\Log\AbstractLogger
 {
 	public $verbose;
 
@@ -22,8 +22,7 @@ public function __construct($verbose = false) {
 	 * @param array   $context  Variables to replace { placeholder }
 	 * @return null
 	 */
-	public function log($level, $message, array $context = array())
-	{
+	public function log($level, $message, array $context = array()): void {
 		if ($this->verbose) {
 			fwrite(
 				STDOUT,
@@ -43,7 +42,7 @@ public function log($level, $message, array $context = array())
 	/**
 	 * Fill placeholders with the provided context
 	 * @author Jordi Boggiano [email protected]
-	 * 
+	 *
 	 * @param  string  $message  Message to be logged
 	 * @param  array   $context  Array of variables to use in message
 	 * @return string
@@ -55,7 +54,7 @@ public function interpolate($message, array $context = array())
 		foreach ($context as $key => $val) {
 			$replace['{' . $key . '}'] = $val;
 		}
-	
+
 		// interpolate replacement values into the message and return
 		return strtr($message, $replace);
 	}

lib/ResqueScheduler.php

@@ -10,7 +10,7 @@
 class ResqueScheduler
 {
 	const VERSION = "0.1";
-	
+
 	/**
 	 * Enqueue a job in a given number of seconds from now.
 	 *
@@ -45,7 +45,7 @@ public static function enqueueAt($at, $queue, $class, $args = array())
 
 		$job = self::jobToHash($queue, $class, $args);
 		self::delayedPush($at, $job);
-		
+
 		Resque_Event::trigger('afterSchedule', array(
 			'at'    => $at,
 			'queue' => $queue,
@@ -87,7 +87,7 @@ public static function getDelayedQueueScheduleSize()
 	 */
 	public static function getDelayedTimestampSize($timestamp)
 	{
-		$timestamp = self::toTimestamp($timestamp);
+		$timestamp = self::getTimestamp($timestamp);
 		return Resque::redis()->llen('delayed:' . $timestamp, $timestamp);
 	}
 
@@ -144,7 +144,7 @@ public static function removeDelayedJobFromTimestamp($timestamp, $queue, $class,
 
         return $count;
     }
-	
+
 	/**
 	 * Generate hash of all job properties to be saved in the scheduled queue.
 	 *
@@ -194,7 +194,7 @@ private static function getTimestamp($timestamp)
 		if ($timestamp instanceof DateTime) {
 			$timestamp = $timestamp->getTimestamp();
 		}
-		
+
 		if ((int)$timestamp != $timestamp) {
 			throw new ResqueScheduler_InvalidTimestampException(
 				'The supplied timestamp value could not be converted to an integer.'
@@ -224,15 +224,15 @@ public static function nextDelayedTimestamp($at = null)
 		else {
 			$at = self::getTimestamp($at);
 		}
-	
+
 		$items = Resque::redis()->zrangebyscore('delayed_queue_schedule', '-inf', $at, array('limit' => array(0, 1)));
 		if (!empty($items)) {
 			return $items[0];
 		}
-		
+
 		return false;
-	}	
-	
+	}
+
 	/**
 	 * Pop a job off the delayed queue for a given timestamp.
 	 *
@@ -243,9 +243,9 @@ public static function nextItemForTimestamp($timestamp)
 	{
 		$timestamp = self::getTimestamp($timestamp);
 		$key = 'delayed:' . $timestamp;
-		
+
 		$item = json_decode(Resque::redis()->lpop($key), true);
-		
+
 		self::cleanupTimestamp($key, $timestamp);
 		return $item;
 	}
@@ -265,7 +265,7 @@ private static function validateJob($class, $queue)
 		else if (empty($queue)) {
 			throw new Resque_Exception('Jobs must be put in a queue.');
 		}
-		
+
 		return true;
 	}
 }

phpstan.neon.dist

@@ -0,0 +1,12 @@
+parameters:
+	level: 1
+	phpVersion: 80200
+	parallel:
+		maximumNumberOfProcesses: 6
+	cache:
+		nodesByStringCountMax: 0
+	paths:
+		- bin
+		- demo
+		- extras
+		- lib

phpunit.xml.dist

@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-	bootstrap="test/bootstrap.php"
-	backupStaticAttributes="false"
-	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
-	processIsolation="false"
-	stopOnFailure="false"
-	syntaxCheck="false"
->
-	<testsuites>
-		<testsuite name="Resque Test Suite">
-			<directory>./test/Resque/</directory>
-		</testsuite>
-	</testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
+         bootstrap="test/bootstrap.php"
+         colors="true"
+         failOnNotice="true"
+         failOnWarning="true"
+         failOnDeprecation="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         cacheDirectory=".phpunit.cache">
 
-	<filter>
-		<whitelist>
-			<directory suffix=".php">./lib/Resque/</directory>
-		</whitelist>
-	</filter>
-</phpunit>
+  <coverage/>
+
+  <testsuites>
+    <testsuite name="Resque Test Suite">
+      <directory>./test/Resque/</directory>
+    </testsuite>
+  </testsuites>
+
+  <source>
+    <include>
+      <directory suffix=".php">./lib/Resque/</directory>
+    </include>
+  </source>
+
+</phpunit>

test/Resque/Tests/EventTest.php

@@ -40,7 +40,7 @@ public function getEventTestJob()
 		return $job;
 	}
 
-	public function eventCallbackProvider()
+	public static function eventCallbackProvider(): array
 	{
 		return array(
 			array('beforePerform', 'beforePerformEventCallback'),

test/Resque/Tests/RedisTest.php

@@ -29,7 +29,7 @@ public function testRedisExceptionsAreSurfaced()
 	 *
 	 * @return array
 	 */
-	public function validDsnStringProvider()
+	public static function validDsnStringProvider(): array
 	{
 		return array(
 			// Input , Expected output
@@ -166,7 +166,7 @@ public function validDsnStringProvider()
 	 * These DSN values should throw exceptions
 	 * @return array
 	 */
-	public function bogusDsnStringProvider()
+	public static function bogusDsnStringProvider(): array
 	{
 		return array(
 			array('http://foo.bar/'),