AFix psalm errors and improve types

Author: SerafimArts

psalm.xml

@@ -16,6 +16,7 @@
     <issueHandlers>
         <RedundantConditionGivenDocblockType errorLevel="suppress" />
         <MixedReturnStatement errorLevel="suppress" />
+        <UnusedPsalmSuppress errorLevel="suppress" />
     </issueHandlers>
     <projectFiles>
         <directory name="src" />

src/Exception/GRPCExceptionInterface.php

@@ -23,6 +23,7 @@ interface GRPCExceptionInterface extends \Throwable
     /**
      * Returns GRPC exception status code.
      *
+     * @psalm-suppress MissingImmutableAnnotation
      * @psalm-return StatusCodeType
      * @return int
      */

src/Invoker.php

@@ -81,7 +81,6 @@ private function assertResultType(Method $method, $result): bool
      * @param string|null $body
      * @return Message
      * @throws InvokeException
-     * @psalm-suppress InvalidStringClass
      */
     private function makeInput(Method $method, ?string $body): Message
     {
@@ -92,7 +91,7 @@ private function makeInput(Method $method, ?string $body): Message
             // assertions option ("zend.assertions") is enabled.
             assert($this->assertInputType($method, $class));
 
-            /** @var Message $in */
+            /** @psalm-suppress UnsafeInstantiation */
             $in = new $class();
 
             if ($body !== null) {

src/Method.php

@@ -124,6 +124,7 @@ public function getOutputType(): string
     private static function getReflectionClassByType(?\ReflectionType $type): ?\ReflectionClass
     {
         if ($type instanceof \ReflectionNamedType && ! $type->isBuiltin()) {
+            /** @psalm-suppress ArgumentTypeCoercion */
             return new \ReflectionClass($type->getName());
         }
 
@@ -319,6 +320,7 @@ public static function parse(\ReflectionMethod $method): Method
         /** @var \ReflectionNamedType $returnType */
         $returnType = $method->getReturnType();
 
+        /** @psalm-suppress ArgumentTypeCoercion */
         return new self($method->getName(), $inputType->getName(), $returnType->getName());
     }
 }

src/Server.php

@@ -68,8 +68,10 @@ public function __construct(InvokerInterface $invoker = null, array $options = [
      *  $server->registerService(EchoServiceInterface::class, new EchoService());
      * </code>
      *
-     * @param string $interface Generated service interface.
-     * @param ServiceInterface $service Must implement interface.
+     * @template T of ServiceInterface
+     *
+     * @param class-string<T> $interface Generated service interface.
+     * @param T $service Must implement interface.
      * @throws ServiceException
      */
     public function registerService(string $interface, ServiceInterface $service): void
@@ -105,6 +107,7 @@ private function tick(string $body, array $data): array
      * @param Worker $worker
      * @param string $body
      * @param string $headers
+     * @psalm-suppress InaccessibleMethod
      */
     private function workerSend(Worker $worker, string $body, string $headers): void
     {
@@ -131,9 +134,13 @@ private function workerError(Worker $worker, string $message): void
     /**
      * @param Worker $worker
      * @return array { 0: string, 1: string } | null
+     *
+     * @psalm-suppress UndefinedMethod
+     * @psalm-suppress PossiblyUndefinedVariable
      */
     private function workerReceive(Worker $worker): ?array
     {
+        /** @var string|\Stringable $body */
         $body = $worker->receive($ctx);
 
         if (empty($body) && empty($ctx)) {

src/ServiceWrapper.php

@@ -34,17 +34,14 @@ final class ServiceWrapper
 
     /**
      * @param InvokerInterface $invoker
-     * @param string $interface Service interface name.
+     * @param class-string $interface Service interface name.
      * @param ServiceInterface $service
-     *
      * @throws ServiceException
      */
-    public function __construct(
-        InvokerInterface $invoker,
-        string $interface,
-        ServiceInterface $service
-    ) {
+    public function __construct(InvokerInterface $invoker, string $interface, ServiceInterface $service)
+    {
         $this->invoker = $invoker;
+
         $this->configure($interface, $service);
     }
 
@@ -76,40 +73,44 @@ public function getMethods(): array
      * @param string $method
      * @param ContextInterface $context
      * @param string|null $input
-     * @param array $metadata
      * @return string
-     *
      * @throws NotFoundException
      * @throws InvokeException
      */
-    public function invoke(string $method, ContextInterface $context, ?string $input, array &$metadata = []): string
+    public function invoke(string $method, ContextInterface $context, ?string $input): string
     {
         if (! isset($this->methods[$method])) {
             throw NotFoundException::create("Method `{$method}` not found in service `{$this->name}`.");
         }
 
-        return $this->invoker->invoke($this->service, $this->methods[$method], $context, $input, $metadata);
+        return $this->invoker->invoke($this->service, $this->methods[$method], $context, $input);
     }
 
     /**
      * Configure service name and methods.
      *
-     * @param string $interface
+     * @param class-string $interface
      * @param ServiceInterface $service
-     *
      * @throws ServiceException
      */
     protected function configure(string $interface, ServiceInterface $service): void
     {
         try {
-            $r = new \ReflectionClass($interface);
+            $reflection = new \ReflectionClass($interface);
 
-            if (! $r->hasConstant('NAME')) {
+            if (! $reflection->hasConstant('NAME')) {
                 $message = "Invalid service interface `{$interface}`, constant `NAME` not found.";
                 throw ServiceException::create($message);
             }
 
-            $this->name = $r->getConstant('NAME');
+            $name = $reflection->getConstant('NAME');
+
+            if (! \is_string($name)) {
+                $message = "Constant `NAME` of service interface `{$interface}` must be a type of string";
+                throw ServiceException::create($message);
+            }
+
+            $this->name = $name;
         } catch (\ReflectionException $e) {
             $message = "Invalid service interface `{$interface}`.";
             throw ServiceException::create($message, StatusCode::INTERNAL, $e);
@@ -127,7 +128,7 @@ protected function configure(string $interface, ServiceInterface $service): void
 
     /**
      * @param ServiceInterface $service
-     * @return array
+     * @return array<string, Method>
      */
     protected function fetchMethods(ServiceInterface $service): array
     {