Fix some psalm errors

Author: SerafimArts

src/Directive/Directive.php

@@ -18,20 +18,20 @@ abstract class Directive implements FunctionLikeDirectiveInterface
     /**
      * @var string
      */
-    protected const ERROR_TOO_MANY_ARGUMENTS = 'Too many arguments when macro directive is called, %s required';
+    private const ERROR_TOO_MANY_ARGUMENTS = 'Too many arguments when macro directive is called, %s required';
 
     /**
      * @var string
      */
-    protected const ERROR_TOO_FEW_ARGUMENTS = 'Too few arguments when macro directive is called, %s required';
+    private const ERROR_TOO_FEW_ARGUMENTS = 'Too few arguments when macro directive is called, %s required';
 
     /**
-     * @var int
+     * @var positive-int|0
      */
     protected int $minArgumentsCount = 0;
 
     /**
-     * @var int
+     * @var positive-int|0
      */
     protected int $maxArgumentsCount = 0;
 
@@ -53,11 +53,11 @@ protected function assertArgumentsCount(array $arguments): void
         $haystack = \count($arguments);
 
         if ($haystack > $this->getMaxArgumentsCount()) {
-            throw new \ArgumentCountError(\sprintf(static::ERROR_TOO_MANY_ARGUMENTS, $this->getMaxArgumentsCount()));
+            throw new \ArgumentCountError(\sprintf(self::ERROR_TOO_MANY_ARGUMENTS, $this->getMaxArgumentsCount()));
         }
 
         if ($haystack < $this->getMinArgumentsCount()) {
-            throw new \ArgumentCountError(\sprintf(static::ERROR_TOO_FEW_ARGUMENTS, $this->getMinArgumentsCount()));
+            throw new \ArgumentCountError(\sprintf(self::ERROR_TOO_FEW_ARGUMENTS, $this->getMinArgumentsCount()));
         }
     }
 

src/Internal/Expression/Parser.php

@@ -79,7 +79,7 @@ public static function fromFile(string $pathname): self
      * @return ExpressionInterface
      * @throws \Throwable
      */
-    public function parse($source, array $options = []): iterable
+    public function parse($source, array $options = []): ExpressionInterface
     {
         return $this->runtime->parse($source, $options);
     }

src/Internal/Runtime/DirectiveExecutor.php

@@ -12,6 +12,7 @@
 namespace FFI\Preprocessor\Internal\Runtime;
 
 use FFI\Contracts\Preprocessor\Directive\DirectiveInterface;
+use FFI\Contracts\Preprocessor\Directive\FunctionLikeDirectiveInterface;
 use FFI\Contracts\Preprocessor\Directive\RepositoryInterface;
 use FFI\Preprocessor\Exception\DirectiveEvaluationException;
 use FFI\Preprocessor\Exception\PreprocessException;
@@ -84,9 +85,7 @@ public function replace(string $body, int $ctx = self::CTX_SOURCE): string
             $body = $this->replaceDefinedExpression($body);
         }
 
-        $body = $this->replaceDefinedDirectives($body);
-
-        return $body;
+        return $this->replaceDefinedDirectives($body);
     }
 
     /**
@@ -110,7 +109,10 @@ public function replace(string $body, int $ctx = self::CTX_SOURCE): string
      */
     private function replaceDefinedExpression(string $body): string
     {
-        $lookup = fn(array $matches) => $this->directives->defined($matches[1]) ? 'true' : 'false';
+        $lookup = fn (array $matches): string =>
+            /** @psalm-suppress MixedArgument */
+            $this->directives->defined($matches[1]) ? 'true' : 'false'
+        ;
 
         return \preg_replace_callback(self::PCRE_DEFINED, $lookup, $body);
     }
@@ -120,21 +122,22 @@ private function replaceDefinedExpression(string $body): string
      *
      * @param string $body
      * @return string
+     * @psalm-suppress MixedInferredReturnType
      */
     private function replaceDefinedDirectives(string $body): string
     {
         $stream = $this->findAndReplace($body);
 
         while ($stream->valid()) {
-            [$name, $arguments] = [$stream->key(), $stream->current()];
-
             try {
-                $stream->send($this->execute($name, $arguments));
+                /** @psalm-suppress MixedArgument */
+                $stream->send($this->execute($stream->key(), $stream->current()));
             } catch (\Throwable $e) {
                 $stream->throw($e);
             }
         }
 
+        /** @psalm-suppress MixedReturnStatement */
         return $stream->getReturn();
     }
 
@@ -201,7 +204,8 @@ private function findDirectiveAndReplace(string $name, DirectiveInterface $direc
         // and means that do not need to do a lookahead to read
         // additional directive arguments.
         //
-        $isSimpleDirective = $directive->getMaxArgumentsCount() === 0;
+        $isSimpleDirective = !$directive instanceof FunctionLikeDirectiveInterface
+            || $directive->getMaxArgumentsCount() === 0;
 
         $coroutine = $this->findDirectiveAndUpdateBody($name, $body);
 
@@ -263,11 +267,11 @@ private function findDirectiveAndReplace(string $name, DirectiveInterface $direc
      *  }
      * </code>
      *
-     * @psalm-return \Generator<int, int, string, string>
-     *
      * @param string $name
      * @param string $body
      * @return \Generator
+     * @psalm-return \Generator<int, int, string, string>
+     * @psalm-suppress MixedReturnTypeCoercion
      */
     private function findDirectiveAndUpdateBody(string $name, string $body): \Generator
     {
@@ -285,6 +289,7 @@ private function findDirectiveAndUpdateBody(string $name, string $body): \Genera
                 continue;
             }
 
+            /** @psalm-suppress RedundantConditionGivenDocblockType */
             if (\is_string($replacement = yield $offset => $offset + $length)) {
                 $body = $replacement;
             }
@@ -444,7 +449,7 @@ private function createTokenForSource(string $name, string $body, int $from, int
      * Accepts the name of a directive and its arguments, and returns the
      * result of executing that directive.
      *
-     * @param string $name
+     * @param non-empty-string $name
      * @param array $arguments
      * @return string
      * @throws DirectiveEvaluationException