diff --git a/src/CommandBus/Handler/DefaultParameterResolver.php b/src/CommandBus/Handler/DefaultParameterResolver.php
index d9e8bd8bc..167650e98 100644
--- a/src/CommandBus/Handler/DefaultParameterResolver.php
+++ b/src/CommandBus/Handler/DefaultParameterResolver.php
@@ -19,7 +19,6 @@ public function __construct(
     ) {
     }
 
-    /** @return iterable<int, mixed> */
     public function resolve(ReflectionMethod $method, object $command): iterable
     {
         foreach ($method->getParameters() as $index => $parameter) {
@@ -34,7 +33,7 @@ public function resolve(ReflectionMethod $method, object $command): iterable
             }
 
             try {
-                yield $this->container->get(self::serviceName($method, $parameter));
+                yield $this->container->get($this->serviceName($method, $parameter));
             } catch (ContainerExceptionInterface $exception) {
                 throw ServiceNotResolvable::missingService(
                     $method->getDeclaringClass()->getName(),
diff --git a/src/CommandBus/Handler/ParameterResolver.php b/src/CommandBus/Handler/ParameterResolver.php
index 53145a801..c5fb0424f 100644
--- a/src/CommandBus/Handler/ParameterResolver.php
+++ b/src/CommandBus/Handler/ParameterResolver.php
@@ -8,6 +8,6 @@
 
 interface ParameterResolver
 {
-    /** @return iterable<mixed> */
+    /** @return iterable<int, mixed> */
     public function resolve(ReflectionMethod $method, object $command): iterable;
 }
diff --git a/src/QueryBus/HandlerFinder.php b/src/QueryBus/HandlerFinder.php
index 6b936d947..700460b74 100644
--- a/src/QueryBus/HandlerFinder.php
+++ b/src/QueryBus/HandlerFinder.php
@@ -67,7 +67,6 @@ public static function findInClass(string $classString): iterable
                 );
             }
 
-            /** @var class-string $commandClass */
             $commandClass = $type->getClassName();
 
             yield new HandlerReference(
diff --git a/tests/Unit/Subscription/ErrorContextTest.php b/tests/Unit/Subscription/ErrorContextTest.php
index 132fb4bbf..086155a8d 100644
--- a/tests/Unit/Subscription/ErrorContextTest.php
+++ b/tests/Unit/Subscription/ErrorContextTest.php
@@ -43,6 +43,7 @@ public function testErrorContext(): void
 
         $firstTrace = $error['trace'][0];
 
+        self::assertIsArray($firstTrace);
         self::assertArrayHasKey('file', $firstTrace);
         self::assertSame(__FILE__, $firstTrace['file'] ?? null);
         self::assertArrayHasKey('line', $firstTrace);