Psalm 1

psalm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="2"
+    errorLevel="1"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

src/Collector/Console/CommandCollector.php

@@ -15,6 +15,8 @@
 use Yiisoft\Yii\Debug\Collector\SummaryCollectorInterface;
 use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 
+use function array_key_exists;
+
 final class CommandCollector implements SummaryCollectorInterface
 {
     use CollectorTrait;
@@ -23,6 +25,19 @@
      * Let -1 mean that it was not set during the process.
      */
     private const UNDEFINED_EXIT_CODE = -1;
+
+    /**
+     * @psalm-var array<string, array{
+     *     name: string,
+     *     command: Command|null,
+     *     input: string|null,
+     *     output: string|null,
+     *     error?: string,
+     *     exitCode?: int,
+     *     arguments?: array,
+     *     options?: array,
+     * }>
+     */
     private array $commands = [];
 
     public function __construct(
@@ -41,7 +56,7 @@
             return;
         }
 
         $this->timelineCollector->collect($this, spl_object_id($event));
 
         $command = $event->getCommand();
 
@@ -60,7 +75,7 @@
 
         if ($event instanceof ConsoleTerminateEvent) {
             $this->commands[$event::class] = [
                 'name' => $command?->getName() ?? $event->getInput()->getFirstArgument() ?? '',
                 'command' => $command,
                 'input' => $this->castInputToString($event->getInput()),
                 'output' => $this->fetchOutput($event->getOutput()),
@@ -71,7 +86,7 @@
 
         $definition = $command?->getDefinition();
         $this->commands[$event::class] = [
             'name' => $command?->getName() ?? $event->getInput()->getFirstArgument() ?? '',
             'command' => $command,
             'input' => $this->castInputToString($event->getInput()),
             'output' => $this->fetchOutput($event->getOutput()),
@@ -103,7 +118,7 @@
         }
 
         return [
             'command' => [
                 'name' => $commandEvent['name'],
                 'class' => $commandEvent['command'] instanceof Command ? $commandEvent['command']::class : null,
                 'input' => $commandEvent['input'],
@@ -127,6 +142,9 @@
         return method_exists($input, '__toString') ? $input->__toString() : null;
     }
 
+    /**
+     * @return string[]
+     */
     private function getSupportedEvents(): array
     {
         return [

src/Collector/ContainerInterfaceProxy.php

@@ -7,6 +7,7 @@
 use Exception;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
+use Yiisoft\Proxy\ObjectProxy;
 use Yiisoft\Proxy\ProxyManager;
 use Yiisoft\Proxy\ProxyTrait;
 use Yiisoft\Yii\Debug\ProxyDecoratedCalls;
@@ -30,6 +31,9 @@ final class ContainerInterfaceProxy implements ContainerInterface
 
     private array $decoratedServices = [];
 
+    /**
+     * @psalm-var array<string, object>
+     */
     private array $serviceProxy = [];
 
     public function __construct(
@@ -40,6 +44,9 @@ public function __construct(
         $this->proxyManager = new ProxyManager($this->config->getProxyCachePath());
     }
 
+    /**
+     * @psalm-param array<string, mixed> $decoratedServices
+     */
     public function withDecoratedServices(array $decoratedServices): self
     {
         $new = clone $this;
@@ -108,10 +115,12 @@ private function getServiceProxy(string $service, object $instance): ?object
         }
 
         if ($this->config->hasDecoratedServiceCallableConfig($service)) {
+            /** @psalm-suppress MixedArgument */
             return $this->getServiceProxyFromCallable($this->config->getDecoratedServiceConfig($service), $instance);
         }
 
         if ($this->config->hasDecoratedServiceArrayConfigWithStringKeys($service)) {
+            /** @psalm-suppress MixedArgument */
             return $this->getCommonMethodProxy(
                 interface_exists($service) || class_exists($service) ? $service : $instance::class,
                 $instance,
@@ -120,6 +129,7 @@ interface_exists($service) || class_exists($service) ? $service : $instance::cla
         }
 
         if ($this->config->hasDecoratedServiceArrayConfig($service)) {
+            /** @psalm-suppress MixedArgument */
             return $this->getServiceProxyFromArray($instance, $this->config->getDecoratedServiceConfig($service));
         }
 
@@ -130,6 +140,9 @@ interface_exists($service) || class_exists($service) ? $service : $instance::cla
         return null;
     }
 
+    /**
+     * @psalm-param callable(ContainerInterface, object):(object|null) $callback
+     */
     private function getServiceProxyFromCallable(callable $callback, object $instance): ?object
     {
         return $callback($this, $instance);
@@ -138,7 +151,7 @@ private function getServiceProxyFromCallable(callable $callback, object $instanc
     /**
      * @psalm-param class-string $service
      */
-    private function getCommonMethodProxy(string $service, object $instance, array $callbacks): ?object
+    private function getCommonMethodProxy(string $service, object $instance, array $callbacks): ObjectProxy
     {
         $methods = [];
         foreach ($callbacks as $method => $callback) {
@@ -163,10 +176,11 @@ private function getServiceProxyFromArray(object $instance, array $params): ?obj
                     try {
                         $params[$index] = $this->get($param);
                     } catch (Exception) {
-                        //leave as is
+                        // leave as is
                     }
                 }
             }
+            /** @psalm-suppress MixedMethodCall */
             return new $proxyClass($instance, ...$params);
         } catch (Exception) {
             return null;

src/Collector/ContainerProxyConfig.php

@@ -7,6 +7,7 @@
 use Psr\EventDispatcher\EventDispatcherInterface;
 
 use function in_array;
+use function is_array;
 use function is_callable;
 
 final class ContainerProxyConfig
@@ -64,6 +65,9 @@ public function withCollector(ServiceCollector $collector): self
         return $config;
     }
 
+    /**
+     * @psalm-param array<string, mixed> $decoratedServices
+     */
     public function withDecoratedServices(array $decoratedServices): self
     {
         $config = clone $this;

src/Collector/LoggerInterfaceProxy.php

@@ -95,6 +95,7 @@ public function debug(string|Stringable $message, array $context = []): void
 
     public function log(mixed $level, string|Stringable $message, array $context = []): void
     {
+        $level = (string) $level;
         $callStack = $this->getCallStack();
 
         $this->collector->collect($level, $message, $context, $callStack['file'] . ':' . $callStack['line']);

src/Collector/ServiceMethodProxy.php

@@ -11,6 +11,9 @@ class ServiceMethodProxy extends ServiceProxy
     public function __construct(
         string $service,
         object $instance,
+        /**
+         * @psalm-var array<string, callable>
+         */
         private readonly array $methods,
         ContainerProxyConfig $config
     ) {

src/Collector/Stream/FilesystemStreamCollector.php

@@ -7,6 +7,8 @@
 use Yiisoft\Yii\Debug\Collector\CollectorTrait;
 use Yiisoft\Yii\Debug\Collector\SummaryCollectorInterface;
 
+use function count;
+
 final class FilesystemStreamCollector implements SummaryCollectorInterface
 {
     use CollectorTrait;
@@ -17,23 +19,25 @@ public function __construct(
          * Examples:
          * - '/' . preg_quote('yii-debug/src/Dumper', '/') . '/'
          * - '/ClosureExporter/'
+         *
+         * @var string[]
          */
         private readonly array $ignoredPathPatterns = [],
+        /**
+         * @var string[]
+         */
         private readonly array $ignoredClasses = [],
     ) {
     }
 
     /**
-     * @var array[]
+     * @psalm-var array<string, list<array{path: string, args: array}>>
      */
     private array $operations = [];
 
     public function getCollected(): array
     {
-        if (!$this->isActive()) {
-            return [];
-        }
-        return array_map('array_values', $this->operations);
+        return $this->isActive() ? $this->operations : [];
     }
 
     public function startup(): void

src/Collector/Stream/FilesystemStreamProxy.php

@@ -11,6 +11,9 @@
 
 use const SEEK_SET;
 
+/**
+ * @psalm-suppress MixedInferredReturnType, MixedReturnStatement
+ */
 final class FilesystemStreamProxy implements StreamWrapperInterface
 {
     public static bool $registered = false;
@@ -22,8 +25,20 @@ final class FilesystemStreamProxy implements StreamWrapperInterface
     public bool $ignored = false;
 
     public static ?FilesystemStreamCollector $collector = null;
+
+    /**
+     * @var string[]
+     */
     public static array $ignoredPathPatterns = [];
+
+    /**
+     * @var string[]
+     */
     public static array $ignoredClasses = [];
+
+    /**
+     * @psalm-var array<string, array{path: string, args: array}>
+     */
     public array $operations = [];
 
     public function __construct()
@@ -104,7 +119,7 @@ public function stream_read(int $count): string|false
     {
         if (!$this->ignored) {
             $this->operations['read'] = [
-                'path' => $this->decorated->filename,
+                'path' => $this->decorated->filename ?? '',
                 'args' => [],
             ];
         }
@@ -155,7 +170,7 @@ public function dir_readdir(): false|string
     {
         if (!$this->ignored) {
             $this->operations['readdir'] = [
-                'path' => $this->decorated->filename,
+                'path' => $this->decorated->filename ?? '',
                 'args' => [],
             ];
         }
@@ -236,7 +251,7 @@ public function stream_write(string $data): int
     {
         if (!$this->ignored) {
             $this->operations['write'] = [
-                'path' => $this->decorated->filename,
+                'path' => $this->decorated->filename ?? '',
                 'args' => [],
             ];
         }

src/Collector/Stream/HttpStreamCollector.php

@@ -7,17 +7,31 @@
 use Yiisoft\Yii\Debug\Collector\CollectorTrait;
 use Yiisoft\Yii\Debug\Collector\SummaryCollectorInterface;
 
+use function count;
+
 final class HttpStreamCollector implements SummaryCollectorInterface
 {
     use CollectorTrait;
 
     public function __construct(
+        /**
+         * @var string[]
+         */
         private readonly array $ignoredPathPatterns = [],
+        /**
+         * @var string[]
+         */
         private readonly array $ignoredClasses = [],
+        /**
+         * @var string[]
+         */
         private readonly array $ignoredUrls = []
     ) {
     }
 
+    /**
+     * @psalm-var array<string, list<array{uri: string, args: array}>>
+     */
     private array $requests = [];
 
     public function getCollected(): array
@@ -76,9 +90,7 @@ public function getSummary(): array
             'http_stream' => array_merge(
                 ...array_map(
                     fn (string $operation) => [
-                        $operation => is_countable($this->requests[$operation]) ? count(
-                            $this->requests[$operation]
-                        ) : 0,
+                        $operation => count($this->requests[$operation]),
                     ],
                     array_keys($this->requests)
                 )

src/Collector/Stream/HttpStreamProxy.php

@@ -9,15 +9,32 @@
 use Yiisoft\Yii\Debug\Helper\StreamWrapper\StreamWrapper;
 use Yiisoft\Yii\Debug\Helper\StreamWrapper\StreamWrapperInterface;
 
+use function func_get_args;
+use function in_array;
 use function stream_get_wrappers;
 
 use const SEEK_SET;
 
+/**
+ * @psalm-suppress MixedInferredReturnType, MixedReturnStatement
+ */
 final class HttpStreamProxy implements StreamWrapperInterface
 {
     public static bool $registered = false;
+
+    /**
+     * @var string[]
+     */
     public static array $ignoredPathPatterns = [];
+
+    /**
+     * @var string[]
+     */
     public static array $ignoredClasses = [];
+
+    /**
+     * @var string[]
+     */
     public static array $ignoredUrls = [];
     /**
      * @var resource|null
@@ -27,6 +44,10 @@ final class HttpStreamProxy implements StreamWrapperInterface
     public bool $ignored = false;
 
     public static ?HttpStreamCollector $collector = null;
+
+    /**
+     * @psalm-var array<string, array{path: string, args: array}>
+     */
     public array $operations = [];
 
     public function __construct()
@@ -120,7 +141,7 @@ public function stream_read(int $count): string|false
             $headers = (array) ($context['http']['header'] ?? $context['https']['header'] ?? []);
 
             $this->operations['read'] = [
-                'path' => $this->decorated->filename,
+                'path' => $this->decorated->filename ?? '',
                 'args' => [
                     'method' => $method,
                     'response_headers' => $metadata['wrapper_data'],
@@ -175,7 +196,7 @@ public function dir_readdir(): false|string
     {
         if (!$this->ignored) {
             $this->operations[__FUNCTION__] = [
-                'path' => $this->decorated->filename,
+                'path' => $this->decorated->filename ?? '',
                 'args' => [],
             ];
         }
@@ -256,7 +277,7 @@ public function stream_write(string $data): int
     {
         if (!$this->ignored) {
             $this->operations['write'] = [
-                'path' => $this->decorated->filename,
+                'path' => $this->decorated->filename ?? '',
                 'args' => [],
             ];
         }

src/DebugServiceProvider.php

@@ -14,10 +14,11 @@ final class DebugServiceProvider implements ServiceProviderInterface
     public function getDefinitions(): array
     {
         return [
-            ContainerInterface::class => static fn (ContainerInterface $container) => new ContainerInterfaceProxy(
-                $container,
-                $container->get(ContainerProxyConfig::class),
-            ),
+            ContainerInterface::class =>
+                static fn (ContainerInterface $container, ContainerProxyConfig $config) => new ContainerInterfaceProxy(
+                    $container,
+                    $config,
+                ),
         ];
     }