[SN-31237] Fix compatibility with Laravel 11+ (#32)

- Fix QlessJob::attempts() to return actual attempts made instead of max retries
- Replace deprecated getMockBuilder()->disableOriginalConstructor() with createMock()
- Update testAttempts to verify correct attempts-so-far calculation
- Add php ^8.3 constraint to composer.json require
- Remove leading whitespace from infection/infection constraint

Co-authored-by: Andrii Yarosh <yarosh.andrey2001@gmail.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 3 people

composer.json

@@ -15,15 +15,17 @@
         }
     ],
     "require": {
+        "php": "^8.3",
         "ext-json": "*",
         "pdffiller/qless-php": "^3.23"
     },
     "require-dev": {
-        "illuminate/events": "5.6.*|5.7.*|^6.20",
-        "infection/infection": "^0.12.0",
-        "orchestra/testbench": "~3.0",
-        "phpstan/phpstan": "^0.11.1",
-        "phpunit/phpunit": ">=5.3 <8.0 | ^8.2",
+        "illuminate/contracts": "^11.0 | ^12.0",
+        "illuminate/events": "^11.0 | ^12.0",
+        "infection/infection": "^0.33.0",
+        "orchestra/testbench": "^9.0 | ^10.0",
+        "phpstan/phpstan": "^2.2",
+        "phpunit/phpunit": "^12.5",
         "squizlabs/php_codesniffer": "^3.4"
     },
     "autoload": {
@@ -42,7 +44,8 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
-            "ocramius/package-versions": true
+            "ocramius/package-versions": true,
+            "infection/extension-installer": true
         }
     }
 }

phpunit.xml

@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-         bootstrap="tests/bootstrap.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Laravel Qless test suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+<phpunit bootstrap="tests/bootstrap.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Laravel Qless test suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
+</phpunit>

src/Job/QlessJob.php

@@ -133,7 +133,7 @@ public function delete()
      */
     public function attempts()
     {
-        return $this->job->getRetries();
+        return max(($this->job->getRetries() - $this->job->getRemaining()) + 1, 1);
     }
 
     /**

src/Queue/QlessQueue.php

@@ -2,6 +2,7 @@
 
 namespace LaravelQless\Queue;
 
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Queue\InvalidPayloadException;
 use Illuminate\Queue\Queue;
@@ -62,23 +63,24 @@ public function size($queue = null): int
      * Push a raw payload onto the queue.
      *
      * @param string $payload
-     * @param string $queueName
+     * @param string $queue
      * @param array $options
+     *
      * @return mixed
      */
-    public function pushRaw($payload, $queueName = null, array $options = [])
+    public function pushRaw($payload, $queue = null, array $options = [])
     {
         $payloadData = array_merge(json_decode($payload, true), $options);
 
-        $queueName = $queueName ?? $this->defaultQueue;
+        $queue = $queue ?? $this->defaultQueue;
 
-        $queue = $this->getRandomConnection()->queues[$queueName];
+        $queueObj = $this->getRandomConnection()->queues[$queue];
 
         $qlessOptions = $payloadData['data'][self::JOB_OPTIONS_KEY] ?? [];
 
         $options = array_merge($qlessOptions, $options);
 
-        return $queue->put(
+        return $queueObj->put(
             $payloadData['job'],
             $payloadData['data'],
             $options['jid'] ?? null,
@@ -95,12 +97,13 @@ public function pushRaw($payload, $queueName = null, array $options = [])
      *
      * @param string|object $job
      * @param mixed $data
-     * @param string $queueName
+     * @param string $queue
+     *
      * @return mixed
      */
-    public function push($job, $data = '', $queueName = null)
+    public function push($job, $data = '', $queue = null)
     {
-        return $this->pushRaw($this->makePayload($job, (array)$data), $queueName);
+        return $this->pushRaw($this->makePayload($job, (array)$data), $queue);
     }
 
     /**
@@ -109,17 +112,18 @@ public function push($job, $data = '', $queueName = null)
      * @param \DateTimeInterface|\DateInterval|int $delay
      * @param string|object $job
      * @param mixed $data
-     * @param string $queueName
+     * @param string $queue
+     *
      * @return mixed
      */
-    public function later($delay, $job, $data = '', $queueName = null)
+    public function later($delay, $job, $data = '', $queue = null)
     {
         $options = $data[self::JOB_OPTIONS_KEY] ?? [];
         $options = array_merge($options, ['timeout' => $delay]);
 
         return $this->pushRaw(
             $this->makePayload($job, $data, $options),
-            $queueName,
+            $queue,
             $options
         );
     }
@@ -130,18 +134,17 @@ public function later($delay, $job, $data = '', $queueName = null)
      * @param int $interval
      * @param string $job
      * @param array $data
-     * @param string $queueName
+     * @param string|null $queue
      * @return string
      */
-    public function recur(int $interval, string $job, array $data, ?string $queueName = null): string
+    public function recur(int $interval, string $job, array $data, ?string $queue = null): string
     {
-        /** @var \Qless\Queues\Queue $queue */
-        $queue = $this->getNextConnection()->queues[$queueName];
+        $queueObj = $this->getNextConnection()->queues[$queue];
 
         $options = $data[self::JOB_OPTIONS_KEY] ?? [];
         $options = array_merge($options, ['interval' => $interval]);
 
-        return $queue->recur(
+        return $queueObj->recur(
             $job,
             $data,
             $options['interval'],
@@ -157,21 +160,23 @@ public function recur(int $interval, string $job, array $data, ?string $queueNam
     /**
      * Pop the next job off of the queue.
      *
-     * @param string $queueName
+     * @param string $queue
+     *
      * @return QlessJob|null
+     * @throws BindingResolutionException
      */
-    public function pop($queueName = null)
+    public function pop($queue = null)
     {
         $connectionCount = $this->getClientCount();
 
         for ($i = 0; $i < $connectionCount; $i++) {
             $connection = $this->getNextConnection();
 
-            /** @var \Qless\Queues\Queue $queue */
-            $queue = $connection->queues[$queueName];
+            /** @var \Qless\Queues\Queue $queueObj */
+            $queueObj = $connection->queues[$queue];
 
             /** @var \Qless\Jobs\BaseJob $job */
-            $job = $queue->pop(self::WORKER_PREFIX . $connection->getWorkerName());
+            $job = $queueObj->pop(self::WORKER_PREFIX . $connection->getWorkerName());
 
             if ($job) {
                 break;

tests/Job/QlessJobTest.php

@@ -155,13 +155,16 @@ public function testDelete(): void
     public function testAttempts(): void
     {
         $job = $this->getJob();
+        $job->expects(self::once())
+            ->method('getRetries')
+            ->willReturn(5);
         $job->expects(self::once())
             ->method('getRemaining')
             ->willReturn(3);
 
         $job = (new QlessJob($this->getContainer(), $this->getQueue(), $this->getJobHandler(), $job, ''));
 
-        self::assertEquals($job->attempts(), 3);
+        self::assertEquals(3, $job->attempts());
     }
 
     public function testMaxTries(): void
@@ -234,39 +237,31 @@ public function testGetRawBody(): void
      */
     private function getContainer()
     {
-        return $this->getMockBuilder(Container::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        return $this->createMock(Container::class);
     }
 
     /**
      * @return QlessQueue|\PHPUnit\Framework\MockObject\MockObject
      */
     private function getQueue()
     {
-        return $this->getMockBuilder(QlessQueue::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        return $this->createMock(QlessQueue::class);
     }
 
     /**
      * @return JobHandler|\PHPUnit\Framework\MockObject\MockObject
      */
     private function getJobHandler()
     {
-        return $this->getMockBuilder(JobHandler::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        return $this->createMock(JobHandler::class);
     }
 
     /**
      * @return BaseJob|\PHPUnit\Framework\MockObject\MockObject
      */
     private function getJob()
     {
-        return $this->getMockBuilder(BaseJob::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        return $this->createMock(BaseJob::class);
     }
 
 }

tests/ServiceProviderTest.php

@@ -2,9 +2,7 @@
 
 namespace LaravelQless\Tests;
 
-use Illuminate\Container\Container;
 use Illuminate\Queue\QueueManager;
-use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
 use LaravelQless\LaravelQlessServiceProvider;
 use LaravelQless\Queue\QlessConnector;
@@ -34,8 +32,6 @@ public function testBoot()
         $app = $this->app;
         $app['queue'] = $queueMock;
 
-        $app['events'] = $this->createMock(Event::class);
-
         $providerMock = new LaravelQlessServiceProvider($app);
         $providerMock->boot();
     }