review

Author: simPod

Diff for: phpstan/include-by-php-version.php

@@ -4,7 +4,7 @@
 
 $phpversion = phpversion();
 if (version_compare($phpversion, '8.4', '>=')) {
-    $includes[] = __DIR__ . '/php-8.4.neon';
+    $includes[] = __DIR__ . '/php-at-least-8.4.neon';
 }
 if (version_compare($phpversion, '8.2', '>=')) {
     $includes[] = __DIR__ . '/php-at-least-8.2.neon';

Diff for: phpstan/php-8.4.neon renamed to phpstan/php-at-least-8.4.neon

@@ -158,15 +158,10 @@ public function toArray(int $debug = DebugFlag::NONE): array
         $result = [];
 
         if ($this->errors !== []) {
-            /**
-             * @phpstan-var ErrorsHandler $defaultErrorsHandler
-             *
-             * @phpstan-ignore varTag.nativeType (phpstan cannot type callables yet)
-             */
-            $defaultErrorsHandler = static fn (array $errors, callable $formatter): array => \array_map($formatter, $errors);
             $errorsHandler = $this->errorsHandler
-                ?? $defaultErrorsHandler;
+                ?? static fn (array $errors, callable $formatter): array => \array_map($formatter, $errors);
 
+            /** @phpstan-var SerializableErrors */
             $handledErrors = $errorsHandler(
                 $this->errors,
                 FormattedError::prepareFormatter($this->errorFormatter, $debug)

Diff for: src/Executor/ExecutionResult.php

@@ -126,7 +126,7 @@ public function all(iterable $promisesOrValues): Promise
 
     /**
      * @template TArgument
-     * @template TResult of \Amp\Promise<mixed>
+     * @template TResult of AmpPromise<mixed>
      *
      * @param Deferred<TResult> $deferred
      * @param callable(TArgument): TResult $callback