diff --git a/.phive/phars.xml b/.phive/phars.xml
index a95d33f..848f478 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.1.31" installed="2.1.31" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="2.1.55" installed="2.1.55" location="./tools/phpstan" copy="false"/>
 </phive>
diff --git a/src/TestSuite/Constraint/Queue/JobQueuedTimes.php b/src/TestSuite/Constraint/Queue/JobQueuedTimes.php
index 9937308..69bdda8 100644
--- a/src/TestSuite/Constraint/Queue/JobQueuedTimes.php
+++ b/src/TestSuite/Constraint/Queue/JobQueuedTimes.php
@@ -16,8 +16,6 @@ class JobQueuedTimes extends QueueConstraintBase
 {
     /**
      * Expected number of times
-     *
-     * @var int
      */
     protected int $times;
 
diff --git a/src/TestSuite/Constraint/Queue/QueueConstraintBase.php b/src/TestSuite/Constraint/Queue/QueueConstraintBase.php
index 7ff4099..bffcd72 100644
--- a/src/TestSuite/Constraint/Queue/QueueConstraintBase.php
+++ b/src/TestSuite/Constraint/Queue/QueueConstraintBase.php
@@ -15,8 +15,6 @@ abstract class QueueConstraintBase extends Constraint
 {
     /**
      * Job index to check
-     *
-     * @var int|null
      */
     protected ?int $at = null;
 
diff --git a/src/TestSuite/QueueTrait.php b/src/TestSuite/QueueTrait.php
index 8d8686c..240771b 100644
--- a/src/TestSuite/QueueTrait.php
+++ b/src/TestSuite/QueueTrait.php
@@ -96,7 +96,7 @@ public function assertJobNotQueued(string $jobClass, string $message = ''): void
         $jobs = TestQueueClient::getQueuedJobsByClass($jobClass);
         $this->assertEmpty(
             $jobs,
-            $message ?: "Job {$jobClass} was queued unexpectedly",
+            $message ?: sprintf('Job %s was queued unexpectedly', $jobClass),
         );
     }
 
@@ -137,7 +137,7 @@ public function assertJobQueuedWith(
         string $message = '',
     ): void {
         $jobs = TestQueueClient::getQueuedJobsByClass($jobClass);
-        $this->assertNotEmpty($jobs, "Job {$jobClass} was not queued");
+        $this->assertNotEmpty($jobs, sprintf('Job %s was not queued', $jobClass));
 
         $found = false;
         foreach ($jobs as $job) {
@@ -149,7 +149,7 @@ public function assertJobQueuedWith(
 
         $this->assertTrue(
             $found,
-            $message ?: "Job {$jobClass} was not queued with expected data",
+            $message ?: sprintf('Job %s was not queued with expected data', $jobClass),
         );
     }
 
@@ -177,7 +177,7 @@ public function assertJobQueuedToQueue(
 
         $this->assertTrue(
             $found,
-            $message ?: "Job {$jobClass} was not queued to queue {$queue}",
+            $message ?: sprintf('Job %s was not queued to queue %s', $jobClass, $queue),
         );
     }
 
@@ -195,7 +195,7 @@ public function assertJobQueuedWithDelay(
         string $message = '',
     ): void {
         $jobs = TestQueueClient::getQueuedJobsByClass($jobClass);
-        $this->assertNotEmpty($jobs, "Job {$jobClass} was not queued");
+        $this->assertNotEmpty($jobs, sprintf('Job %s was not queued', $jobClass));
 
         $found = false;
         foreach ($jobs as $job) {
@@ -207,7 +207,7 @@ public function assertJobQueuedWithDelay(
 
         $this->assertTrue(
             $found,
-            $message ?: "Job {$jobClass} was not queued with delay {$delay}",
+            $message ?: sprintf('Job %s was not queued with delay %d', $jobClass, $delay),
         );
     }
 
@@ -225,7 +225,7 @@ public function assertJobQueuedWithPriority(
         string $message = '',
     ): void {
         $jobs = TestQueueClient::getQueuedJobsByClass($jobClass);
-        $this->assertNotEmpty($jobs, "Job {$jobClass} was not queued");
+        $this->assertNotEmpty($jobs, sprintf('Job %s was not queued', $jobClass));
 
         $found = false;
         foreach ($jobs as $job) {
@@ -237,7 +237,7 @@ public function assertJobQueuedWithPriority(
 
         $this->assertTrue(
             $found,
-            $message ?: "Job {$jobClass} was not queued with priority {$priority}",
+            $message ?: sprintf('Job %s was not queued with priority %s', $jobClass, $priority),
         );
     }
 
diff --git a/src/TestSuite/TestQueueClient.php b/src/TestSuite/TestQueueClient.php
index aa3e554..584a9dc 100644
--- a/src/TestSuite/TestQueueClient.php
+++ b/src/TestSuite/TestQueueClient.php
@@ -42,8 +42,6 @@ class TestQueueClient
 
     /**
      * Transport registration flag
-     *
-     * @var bool
      */
     protected static bool $registered = false;
 
@@ -120,6 +118,7 @@ public static function captureMessage(
         } elseif ($destination instanceof Topic) {
             $queueName = $destination->getTopicName();
         }
+
         $queueName = $requeueOptions['queue'] ?? $queueName;
 
         $properties = $message->getProperties();
diff --git a/src/TestSuite/Transport/TestConsumer.php b/src/TestSuite/Transport/TestConsumer.php
index 783ed88..ca2bf70 100644
--- a/src/TestSuite/Transport/TestConsumer.php
+++ b/src/TestSuite/Transport/TestConsumer.php
@@ -16,8 +16,6 @@ class TestConsumer implements Consumer
 {
     /**
      * Queue
-     *
-     * @var \Interop\Queue\Queue
      */
     protected Queue $queue;
 
diff --git a/src/TestSuite/Transport/TestContext.php b/src/TestSuite/Transport/TestContext.php
index d0b1781..e29b9d9 100644
--- a/src/TestSuite/Transport/TestContext.php
+++ b/src/TestSuite/Transport/TestContext.php
@@ -21,8 +21,6 @@ class TestContext implements Context
 {
     /**
      * Cached producer instance
-     *
-     * @var \Interop\Queue\Producer|null
      */
     protected ?Producer $producer = null;
 
@@ -68,7 +66,7 @@ public function createTopic(string $name): Topic
      */
     public function createProducer(): Producer
     {
-        if ($this->producer === null) {
+        if (!$this->producer instanceof Producer) {
             $this->producer = new TestProducer();
         }
 
diff --git a/src/TestSuite/Transport/TestDestination.php b/src/TestSuite/Transport/TestDestination.php
index 47618de..0389618 100644
--- a/src/TestSuite/Transport/TestDestination.php
+++ b/src/TestSuite/Transport/TestDestination.php
@@ -15,8 +15,6 @@ class TestDestination implements Queue, Topic
 {
     /**
      * Destination name
-     *
-     * @var string
      */
     protected string $name;
 
diff --git a/src/TestSuite/Transport/TestDriver.php b/src/TestSuite/Transport/TestDriver.php
index b70bb2c..f6ced19 100644
--- a/src/TestSuite/Transport/TestDriver.php
+++ b/src/TestSuite/Transport/TestDriver.php
@@ -3,11 +3,8 @@
 
 namespace Cake\Queue\TestSuite\Transport;
 
-use Enqueue\Client\Config;
 use Enqueue\Client\Driver\GenericDriver;
 use Enqueue\Client\DriverInterface;
-use Enqueue\Client\RouteCollection;
-use Interop\Queue\Context;
 
 /**
  * Test Driver
@@ -16,15 +13,4 @@
  */
 class TestDriver extends GenericDriver implements DriverInterface
 {
-    /**
-     * Constructor
-     *
-     * @param \Interop\Queue\Context $context Context
-     * @param \Enqueue\Client\Config $config Client config
-     * @param \Enqueue\Client\RouteCollection $routes Route collection
-     */
-    public function __construct(Context $context, Config $config, RouteCollection $routes)
-    {
-        parent::__construct($context, $config, $routes);
-    }
 }
diff --git a/src/TestSuite/Transport/TestMessage.php b/src/TestSuite/Transport/TestMessage.php
index 0fce319..2eaa341 100644
--- a/src/TestSuite/Transport/TestMessage.php
+++ b/src/TestSuite/Transport/TestMessage.php
@@ -14,8 +14,6 @@ class TestMessage implements Message
 {
     /**
      * Message body
-     *
-     * @var string
      */
     protected string $body;
 
diff --git a/src/TestSuite/Transport/TestProducer.php b/src/TestSuite/Transport/TestProducer.php
index f019089..75b433f 100644
--- a/src/TestSuite/Transport/TestProducer.php
+++ b/src/TestSuite/Transport/TestProducer.php
@@ -17,22 +17,16 @@ class TestProducer implements Producer
 {
     /**
      * Delivery delay
-     *
-     * @var int|null
      */
     protected ?int $deliveryDelay = null;
 
     /**
      * Time to live
-     *
-     * @var int|null
      */
     protected ?int $timeToLive = null;
 
     /**
      * Priority
-     *
-     * @var int|null
      */
     protected ?int $priority = null;