From eb3395645ff078b5256296fe288c3819b740cd15 Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@m2.nz>
Date: Sun, 8 Jun 2025 13:59:27 +1200
Subject: [PATCH 1/3] v2.5.1 - Update psr/log reqs

---
 CHANGELOG.md          | 5 ++++-
 composer.json         | 2 +-
 src/Resque/Resque.php | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db43114..44c37b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
-# 2.5.0 (205-06-08)
+# 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)
diff --git a/composer.json b/composer.json
index 183efaa..15199f0 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
 	],
 	"require": {
 		"php": ">=8.1",
-		"psr/log": "^3.0.2",
+		"psr/log": "^1.1 || ^2.0 || ^3.0",
 		"colinmollenhour/credis": "^1.14.0"
 	},
 	"require-dev": {
diff --git a/src/Resque/Resque.php b/src/Resque/Resque.php
index 4e933a8..aca7065 100644
--- a/src/Resque/Resque.php
+++ b/src/Resque/Resque.php
@@ -12,7 +12,7 @@ namespace Resque;
 
 class Resque
 {
-    public const VERSION = '2.5.0';
+    public const VERSION = '2.5.1';
 
     public const DEFAULT_INTERVAL = 5;
 

From b9042358e16748996e1844abd3194fb7375f9940 Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@m2.nz>
Date: Sun, 8 Jun 2025 14:21:33 +1200
Subject: [PATCH 2/3] v2.5.2 add support for psr/log ^1

---
 CHANGELOG.md          | 3 +++
 composer.lock         | 2 +-
 src/Resque/Log.php    | 3 ++-
 src/Resque/Resque.php | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44c37b4..f65b2b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 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
 
diff --git a/composer.lock b/composer.lock
index d5f144c..bb2aed1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "41f50fbbaf38787881da45b3077408fb",
+    "content-hash": "d8e5313006d5c73b54ee6a410b1ad016",
     "packages": [
         {
             "name": "colinmollenhour/credis",
diff --git a/src/Resque/Log.php b/src/Resque/Log.php
index d759a0e..3756f52 100644
--- a/src/Resque/Log.php
+++ b/src/Resque/Log.php
@@ -25,9 +25,10 @@ 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, \Stringable|string $message, array $context = []): void
+    public function log($level, string|\Stringable $message, array $context = []): void
     {
         $logLevels = [
             'emergency',
diff --git a/src/Resque/Resque.php b/src/Resque/Resque.php
index aca7065..97d579d 100644
--- a/src/Resque/Resque.php
+++ b/src/Resque/Resque.php
@@ -12,7 +12,7 @@ namespace Resque;
 
 class Resque
 {
-    public const VERSION = '2.5.1';
+    public const VERSION = '2.5.2';
 
     public const DEFAULT_INTERVAL = 5;
 

From aad9334fbab946946aad5d8a4bb424c33bed4809 Mon Sep 17 00:00:00 2001
From: Daniel Mason <daniel@m2.nz>
Date: Sun, 8 Jun 2025 15:20:22 +1200
Subject: [PATCH 3/3] 2.5.3 - Update LOG()

---
 CHANGELOG.md          | 5 ++++-
 src/Resque/Log.php    | 2 +-
 src/Resque/Resque.php | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f65b2b7..276f6e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
-# 2.5.2 (2025-06-08)
+# 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)
diff --git a/src/Resque/Log.php b/src/Resque/Log.php
index 3756f52..2608d87 100644
--- a/src/Resque/Log.php
+++ b/src/Resque/Log.php
@@ -28,7 +28,7 @@ class Log extends \Psr\Log\AbstractLogger
      *
      * @return null
      */
-    public function log($level, string|\Stringable $message, array $context = []): void
+    public function log($level, $message, array $context = []): void
     {
         $logLevels = [
             'emergency',
diff --git a/src/Resque/Resque.php b/src/Resque/Resque.php
index 97d579d..f193e18 100644
--- a/src/Resque/Resque.php
+++ b/src/Resque/Resque.php
@@ -12,7 +12,7 @@ namespace Resque;
 
 class Resque
 {
-    public const VERSION = '2.5.2';
+    public const VERSION = '2.5.3';
 
     public const DEFAULT_INTERVAL = 5;