From 1a96989c399aad09d707161adf06c83402f851fd Mon Sep 17 00:00:00 2001
From: Thomas ZILLIOX <thomas.zilliox@innocraft.com>
Date: Fri, 27 Mar 2026 00:53:44 +0100
Subject: [PATCH] Fix PHPUnit deprecation warnings in integration tests

---
 tests/Integration/Queue/ProcessorTest.php | 52 ++++++++---------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/tests/Integration/Queue/ProcessorTest.php b/tests/Integration/Queue/ProcessorTest.php
index 1661fdb..7c0c84e 100644
--- a/tests/Integration/Queue/ProcessorTest.php
+++ b/tests/Integration/Queue/ProcessorTest.php
@@ -313,45 +313,29 @@ public function test_process_ShouldActuallyRetryProcessingAllRequestsWithoutTheF
                      ->setConstructorArgs(array($this->queue, $this->lock))
                      ->getMock();
 
-        $mock->expects($this->at(0))
-             ->method('processRequestSets')
-             ->with($this->anything(), $this->callback(function ($arg) {
-                 return 2 === count($arg) && 1 === $arg[0]->getNumberOfRequests() &&  5 === $arg[1]->getNumberOfRequests();
-             }))
-            ->will($this->returnCallback($forwardCallToProcessor));
-
-        $mock->expects($this->at(1))
-             ->method('processRequestSets')
-             ->with($this->anything(), $this->equalTo(array()))
-            ->will($this->returnCallback($forwardCallToProcessor));
-
-        $mock->expects($this->at(2)) // one of them fails
-             ->method('processRequestSets')
-             ->with($this->anything(), $this->callback(function ($arg) {
-                 return 2 === count($arg) && 1 === $arg[0]->getNumberOfRequests() &&  2 === $arg[1]->getNumberOfRequests();
-             }))
-             ->will($this->returnCallback($forwardCallToProcessor));
-
-        $mock->expects($this->at(3)) // retry, this time it should work
+        $expectedRequestSetCalls = [
+            [1, 5],
+            [],
+            [1, 2],
+            [1],
+            [3, 1],
+            [],
+        ];
+        $mock->expects($this->exactly(count($expectedRequestSetCalls)))
              ->method('processRequestSets')
-             ->with($this->anything(), $this->callback(function ($arg) {
-                 return 1 === count($arg) && 1 === $arg[0]->getNumberOfRequests();
-             }))
-            ->will($this->returnCallback($forwardCallToProcessor));
+             ->willReturnCallback(function ($tracker, $queuedRequestSets) use (&$expectedRequestSetCalls, $forwardCallToProcessor) {
+                 $expectedCounts = array_shift($expectedRequestSetCalls);
+                 $actualCounts = array_map(function ($requestSet) {
+                     return $requestSet->getNumberOfRequests();
+                 }, $queuedRequestSets);
 
-        $mock->expects($this->at(4)) // both of them fails
-             ->method('processRequestSets')
-             ->with($this->anything(), $this->callback(function ($arg) {
-                 return 2 === count($arg) && 3 === $arg[0]->getNumberOfRequests() &&  1 === $arg[1]->getNumberOfRequests();
-             }))
-             ->will($this->returnCallback($forwardCallToProcessor));
+                 $this->assertSame($expectedCounts, $actualCounts);
 
-        $mock->expects($this->at(5))  // as both fail none should be retried
-             ->method('processRequestSets')
-             ->with($this->anything(), $this->equalTo(array()))
-             ->will($this->returnCallback($forwardCallToProcessor));
+                 return $forwardCallToProcessor($tracker, $queuedRequestSets);
+             });
 
         $mock->process($this->createTracker());
+        $this->assertSame([], $expectedRequestSetCalls);
     }
 
     public function test_process_shouldRestoreEnvironmentAfterTrackingRequests()