Fix SA

Author: DanielBadura

Diff for: baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.7.1@a2f190972555ea01b0cfcc1913924d6c5fc1a64e">
+<files psalm-version="6.8.4@7ee919229d510c5834af3112072f4b12cd7bb51a">
   <file src="src/Aggregate/AggregateRootBehaviour.php">
     <UnsafeInstantiation>
       <code><![CDATA[new static()]]></code>
@@ -83,6 +83,15 @@
       <code><![CDATA[require_once $file]]></code>
     </UnresolvableInclude>
   </file>
+  <file src="src/QueryBus/ServiceHandlerProvider.php">
+    <MixedArgument>
+      <code><![CDATA[$service::{$handler->method}(...)]]></code>
+    </MixedArgument>
+    <MixedMethodCall>
+      <code><![CDATA[$handler->method]]></code>
+      <code><![CDATA[$service::{$handler->method}(...)]]></code>
+    </MixedMethodCall>
+  </file>
   <file src="src/Repository/DefaultRepository.php">
     <PossiblyNullArgument>
       <code><![CDATA[$streamName]]></code>

Diff for: src/Attribute/Answer.php

@@ -9,9 +9,9 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final class Answer
 {
-    /** @param class-string $queryClass */
+    /** @param class-string|null $queryClass */
     public function __construct(
-        public readonly string $queryClass,
+        public readonly string|null $queryClass = null,
     ) {
     }
 }

Diff for: src/QueryBus/ChainHandlerProvider.php

@@ -4,7 +4,6 @@
 
 namespace Patchlevel\EventSourcing\QueryBus;
 
-
 final class ChainHandlerProvider implements HandlerProvider
 {
     /** @param iterable<HandlerProvider> $providers */
@@ -25,7 +24,7 @@ public function handlerForQuery(string $queryClass): iterable
         foreach ($this->providers as $provider) {
             $handlers = [
                 ...$handlers,
-                ...$provider->handlerForCommand($queryClass),
+                ...$provider->handlerForQuery($queryClass),
             ];
         }
 

Diff for: src/QueryBus/HandlerFinder.php

@@ -22,17 +22,17 @@ public static function findInClass(string $classString): iterable
         $reflectionClass = new ReflectionClass($classString);
 
         foreach ($reflectionClass->getMethods() as $reflectionMethod) {
-            $handleAttributes = $reflectionMethod->getAttributes(Answer::class);
+            $answerAttributes = $reflectionMethod->getAttributes(Answer::class);
 
-            if ($handleAttributes === []) {
+            if ($answerAttributes === []) {
                 continue;
             }
 
-            $handle = $handleAttributes[0]->newInstance();
+            $answer = $answerAttributes[0]->newInstance();
 
-            if ($handle->queryClass !== null) {
+            if ($answer->queryClass !== null) {
                 yield new HandlerReference(
-                    $handle->queryClass,
+                    $answer->queryClass,
                     $reflectionMethod->getName(),
                     $reflectionMethod->isStatic(),
                 );

Diff for: src/QueryBus/HandlerProvider.php

@@ -4,8 +4,6 @@
 
 namespace Patchlevel\EventSourcing\QueryBus;
 
-use Patchlevel\EventSourcing\CommandBus\HandlerDescriptor;
-
 interface HandlerProvider
 {
     /**

Diff for: src/QueryBus/HandlerReference.php

@@ -6,7 +6,7 @@
 
 final class HandlerReference
 {
-    /** @param class-string $commandClass */
+    /** @param class-string $queryClass */
     public function __construct(
         public readonly string $queryClass,
         public readonly string $method,

Diff for: src/QueryBus/SyncQueryBus.php

@@ -26,7 +26,7 @@ public function __construct(
         }
     }
 
-    /** @throws HandlerNotFound */
+    /** @throws InvalidQueryHandler */
     public function dispatch(object $query): mixed
     {
         $this->logger?->debug('QueryBus: dispatch query', ['query' => $query::class]);