Fix tests for phpunit 11

Author: lukewaite-intouch

.github/workflows/tests.yml

@@ -47,6 +47,8 @@ jobs:
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
+        env:
+          XDEBUG_MODE: coverage
         run: vendor/bin/phpunit
 
       - name: PHPStan Static Analysis
@@ -97,7 +99,7 @@ jobs:
       - name: Find pint version
         id: find_pint_version
         run: |
-          PINT_VERSION='v1.13'
+          PINT_VERSION='v1.25.1'
           echo "Attempting to load pint version from composer.lock"
           if [ -f composer.lock ]; then
             PINT_VERSION=$(jq '.["packages-dev"][] | select(.name == "laravel/pint") | .version' composer.lock)

.gitignore

@@ -3,5 +3,6 @@ tests/coverage
 vendor
 composer.lock
 .phpstorm.meta.php
-tests/reports
+tests/reports/*
+!tests/reports/.gitignore
 .phpunit.result.cache

composer.json

@@ -27,7 +27,7 @@
     "mockery/mockery": "^1.5",
     "laravel/framework": "^11.0|^12.0",
     "phpunit/phpunit": "^10.0|^11.0",
-  "squizlabs/php_codesniffer": "^3.5",
+    "squizlabs/php_codesniffer": "^3.5",
     "phpstan/phpstan": "^1.9",
     "nunomaduro/larastan": "^1|^2",
     "orchestra/testbench": "^9.0|^10.0",

phpunit.xml.dist

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd">
+  <coverage>
     <report>
       <clover outputFile="tests/reports/clover.xml"/>
-      <text outputFile=""/>
     </report>
   </coverage>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
   <testsuites>
     <testsuite name=":vendor Test Suite">
       <directory>tests</directory>

tests/BatchJobTest.php

@@ -3,27 +3,38 @@
 namespace LukeWaite\LaravelQueueAwsBatch\Tests;
 
 use LukeWaite\LaravelQueueAwsBatch\Exceptions\UnsupportedException;
+use LukeWaite\LaravelQueueAwsBatch\Jobs\BatchJob;
 use Mockery\Adapter\Phpunit\MockeryTestCase as TestCase;
 use Mockery as m;
+use Mockery\MockInterface;
 
 class BatchJobTest extends TestCase
 {
-    public function setUp(): void
+    protected \stdClass $job;
+
+    protected MockInterface $batchQueue;
+
+    protected BatchJob $batchJob;
+
+    protected function setUp(): void
     {
+        parent::setUp();
+
         $this->job = new \stdClass();
         $this->job->payload = '{"job":"foo","data":["data"]}';
         $this->job->id = 4;
         $this->job->queue = 'default';
         $this->job->attempts = 1;
 
-        /** @var \LukeWaite\LaravelQueueAwsBatch\Jobs\BatchJob $batchJob */
-        $this->batchJob = $this->getMockBuilder('LukeWaite\LaravelQueueAwsBatch\Jobs\BatchJob')->setMethods(null)->setConstructorArgs([
-            m::mock('Illuminate\Container\Container'),
-            $this->batchQueue = m::mock('LukeWaite\LaravelQueueAwsBatch\Queues\BatchQueue'),
+        $this->batchQueue = m::mock('LukeWaite\LaravelQueueAwsBatch\Queues\BatchQueue');
+
+        $this->batchJob = new BatchJob(
+            new \Illuminate\Container\Container(),
+            $this->batchQueue,
             $this->job,
             'testConnection',
             'defaultQueue',
-        ])->getMock();
+        );
     }
 
     public function testReleaseDoesntDeleteButDoesUpdate()

tests/BatchQueueTest.php

@@ -4,23 +4,36 @@
 
 use Carbon\Carbon;
 use LukeWaite\LaravelQueueAwsBatch\Exceptions\UnsupportedException;
+use LukeWaite\LaravelQueueAwsBatch\Queues\BatchQueue;
 use Mockery\Adapter\Phpunit\MockeryTestCase as TestCase;
 use Mockery as m;
+use Mockery\MockInterface;
 
 class BatchQueueTest extends TestCase
 {
-    public function setUp(): void
+    protected MockInterface $database;
+
+    protected MockInterface $batch;
+
+    protected BatchQueue $queue;
+
+    protected function setUp(): void
     {
-        $this->queue = $this->getMockBuilder('LukeWaite\LaravelQueueAwsBatch\Queues\BatchQueue')->setMethods(null)->setConstructorArgs([
-            $this->database = m::mock('Illuminate\Database\Connection'),
+        parent::setUp();
+
+        $this->database = m::mock('Illuminate\Database\Connection');
+        $this->batch = m::mock('Aws\Batch\BatchClient');
+
+        $this->queue = new BatchQueue(
+            $this->database,
             'table',
             'default',
             '60',
             'jobdefinition',
-            $this->batch = m::mock('Aws\Batch\BatchClient'),
-        ])->getMock();
+            $this->batch,
+        );
 
-        $this->queue->setContainer(m::mock('Illuminate\Container\Container'));
+        $this->queue->setContainer(new \Illuminate\Container\Container());
     }
 
     public function testPushProperlyPushesJobOntoDatabase()
@@ -84,7 +97,7 @@ public function testGetJobById()
 
         $this->database->shouldReceive('commit')->once();
 
-        $this->queue->getJobById(1, 'default');
+        $this->queue->getJobById(1);
 
         Carbon::setTestNow();
     }

tests/reports/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore