Fix L versions and run pint

Author: lukewaite-intouch

.github/workflows/tests.yml

@@ -15,13 +15,13 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.3, 8.4]
-        laravel: ['^11.0', '^12.0']
+        laravel: ['^11.44.7', '^12.24.0']
         dependency-version: [prefer-stable]
         include:
-          - laravel: "^12.0"
-            testbench: 10.*
-          - laravel: "^11.0"
-            testbench: 9.*
+          - laravel: "^12.24.0"
+            testbench: "10.6.*"
+          - laravel: "^11.44.7"
+            testbench: "9.15.*"
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

composer.json

@@ -31,7 +31,7 @@
     "phpstan/phpstan": "^2.1",
     "larastan/larastan": "^3.0",
     "orchestra/testbench": "^9.15|^10.6",
-    "laravel/pint": "^1.16"
+    "laravel/pint": "^1.25.1"
   },
   "scripts": {
     "test": "phpunit",

src/Console/QueueWorkBatchCommand.php

@@ -118,7 +118,6 @@ protected function gatherWorkerOptions()
     /**
      * Store a failed job event.
      *
-     * @param  \Illuminate\Queue\Events\JobFailed  $event
      * @return void
      */
     protected function logFailedJob(JobFailed $event)

src/Contracts/JobContainerOverrides.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Laravel Queue for AWS Batch.
  *
@@ -32,7 +33,6 @@
  * ]
  *
  * Interface JobContainerOverrides
- * @package LukeWaite\LaravelQueueAwsBatch\Contracts
  */
 interface JobContainerOverrides
 {

src/Exceptions/JobNotFoundException.php

@@ -12,6 +12,4 @@
 
 namespace LukeWaite\LaravelQueueAwsBatch\Exceptions;
 
-class JobNotFoundException extends LaravelAwsBatchQueueException
-{
-}
+class JobNotFoundException extends LaravelAwsBatchQueueException {}

src/Exceptions/LaravelAwsBatchQueueException.php

@@ -12,6 +12,4 @@
 
 namespace LukeWaite\LaravelQueueAwsBatch\Exceptions;
 
-class LaravelAwsBatchQueueException extends \Exception
-{
-}
+class LaravelAwsBatchQueueException extends \Exception {}

src/Exceptions/UnsupportedException.php

@@ -12,6 +12,4 @@
 
 namespace LukeWaite\LaravelQueueAwsBatch\Exceptions;
 
-class UnsupportedException extends LaravelAwsBatchQueueException
-{
-}
+class UnsupportedException extends LaravelAwsBatchQueueException {}

src/Queues/BatchQueue.php

@@ -78,8 +78,8 @@ protected function getBatchDisplayName($job)
      *
      * @param  string|null  $queue
      * @param  array  $payload
-    * @param  string  $jobName
-    * @param  mixed  $job
+     * @param  string  $jobName
+     * @param  mixed  $job
      * @return int
      */
     protected function pushToBatch($queue, $payload, $jobName, $job = null)
@@ -92,10 +92,10 @@ protected function pushToBatch($queue, $payload, $jobName, $job = null)
             'jobQueue' => $this->getQueue($queue),
             'parameters' => [
                 'jobId' => $jobId,
-            ]
+            ],
         ];
 
-    if (isset($job) && is_object($job) && $this->implementsJobContainerOverrides($job)) {
+        if (isset($job) && is_object($job) && $this->implementsJobContainerOverrides($job)) {
             /** @var JobContainerOverrides $job */
             $overrides = $job->getBatchContainerOverrides();
 

tests/BatchJobTest.php

@@ -20,7 +20,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->job = new \stdClass();
+        $this->job = new \stdClass;
         $this->job->payload = '{"job":"foo","data":["data"]}';
         $this->job->id = 4;
         $this->job->queue = 'default';
@@ -29,23 +29,23 @@ protected function setUp(): void
         $this->batchQueue = m::mock('LukeWaite\LaravelQueueAwsBatch\Queues\BatchQueue');
 
         $this->batchJob = new BatchJob(
-            new \Illuminate\Container\Container(),
+            new \Illuminate\Container\Container,
             $this->batchQueue,
             $this->job,
             'testConnection',
             'defaultQueue',
         );
     }
 
-    public function testReleaseDoesntDeleteButDoesUpdate()
+    public function test_release_doesnt_delete_but_does_update()
     {
         $this->batchQueue->shouldReceive('release')->once();
         $this->batchQueue->shouldNotReceive('deleteReserved');
 
         $this->batchJob->release(0);
     }
 
-    public function testThrowsExceptionOnReleaseWIthDelay()
+    public function test_throws_exception_on_release_w_ith_delay()
     {
         $this->expectException(UnsupportedException::class);
         $this->expectExceptionMessage('The BatchJob does not support releasing back onto the queue with a delay');

tests/BatchQueueTest.php

@@ -34,10 +34,10 @@ protected function setUp(): void
             $this->batch,
         );
 
-        $this->queue->setContainer(new \Illuminate\Container\Container());
+        $this->queue->setContainer(new \Illuminate\Container\Container);
     }
 
-    public function testPushProperlyPushesJobOntoDatabase()
+    public function test_push_properly_pushes_job_onto_database()
     {
         $this->database->shouldReceive('table')->with('table')->andReturn($query = m::mock('StdClass'));
 
@@ -59,11 +59,11 @@ public function testPushProperlyPushesJobOntoDatabase()
             $this->assertEquals(['jobId' => 100], $array['parameters']);
         });
 
-        $result = $this->queue->push(new TestJob());
+        $result = $this->queue->push(new TestJob);
         $this->assertEquals(100, $result);
     }
 
-    public function testPushProperlySanitizesJobName()
+    public function test_push_properly_sanitizes_job_name()
     {
         $this->database->shouldReceive('table')->with('table')->andReturn($query = m::mock('StdClass'));
 
@@ -76,10 +76,10 @@ public function testPushProperlySanitizesJobName()
             $this->assertEquals('LukeWaite_LaravelQueueAwsBatch_Tests_TestJob', $array['jobName']);
         });
 
-        $this->queue->push(new TestJob());
+        $this->queue->push(new TestJob);
     }
 
-    public function testPushIncludesContainerOverridesWhenJobSupportsOverrides()
+    public function test_push_includes_container_overrides_when_job_supports_overrides()
     {
         $overrides = ['vcpus' => 2];
 
@@ -95,7 +95,7 @@ public function testPushIncludesContainerOverridesWhenJobSupportsOverrides()
         $this->queue->push(new TestJobWithOverrides($overrides));
     }
 
-    public function testGetJobById()
+    public function test_get_job_by_id()
     {
         $testDate = Carbon::create(2016, 9, 4, 16);
         Carbon::setTestNow($testDate);
@@ -119,7 +119,7 @@ public function testGetJobById()
         Carbon::setTestNow();
     }
 
-    public function testRelease()
+    public function test_release()
     {
         $this->database->shouldReceive('table')->once()->with('table')->andReturn($table = m::mock('StdClass'));
         $table->shouldReceive('where')->once()->with('id', 4)->andReturn($query = m::mock('StdClass'));
@@ -128,7 +128,7 @@ public function testRelease()
             'reserved_at' => null,
         ])->andReturn(4);
 
-        $job = new \stdClass();
+        $job = new \stdClass;
         $job->payload = '{"job":"foo","data":["data"]}';
         $job->id = 4;
         $job->queue = 'default';
@@ -138,28 +138,28 @@ public function testRelease()
         $this->assertEquals(4, $result);
     }
 
-    public function testPopThrowsException()
+    public function test_pop_throws_exception()
     {
         $this->expectException(UnsupportedException::class);
         $this->expectExceptionMessage('The BatchQueue does not support running via a regular worker. Instead, you should use the queue:batch-work command with a job id.');
 
         $this->queue->pop('default');
     }
 
-    public function testLaterThrowsException()
+    public function test_later_throws_exception()
     {
         $this->expectException(UnsupportedException::class);
         $this->expectExceptionMessage('The BatchQueue does not support the later() operation.');
 
         $this->queue->later(10, 'default');
     }
 
-    public function testReleaseWithDelayThrowsException()
+    public function test_release_with_delay_throws_exception()
     {
         $this->expectException(UnsupportedException::class);
         $this->expectExceptionMessage('The BatchJob does not support releasing back onto the queue with a delay');
 
-        $job = new \stdClass();
+        $job = new \stdClass;
         $job->payload = '{"job":"foo","data":["data"]}';
         $job->id = 4;
         $job->queue = 'default';
@@ -176,9 +176,7 @@ class TestJob
 
 class TestJobWithOverrides implements JobContainerOverrides
 {
-    public function __construct(private readonly array $overrides)
-    {
-    }
+    public function __construct(private readonly array $overrides) {}
 
     public function getBatchContainerOverrides(): ?array
     {