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/Debugger.php

@@ -11,17 +11,22 @@
 use Yiisoft\Yii\Debug\Storage\StorageInterface;
 use Yiisoft\Yii\Http\Event\BeforeRequest;
 
+/**
+ * @psalm-type BacktraceType = list<array{file?:string,line?:int,function?:string,class?:class-string,object?:object,type?:string,args?:array}>
+ */
 final class Debugger
 {
     private bool $skipCollect = false;
     private bool $active = false;
 
+    /**
+     * @param CollectorInterface[] $collectors
+     * @param string[] $ignoredRequests
+     * @param string[] $ignoredCommands
+     */
     public function __construct(
         private readonly DebuggerIdGenerator $idGenerator,
         private readonly StorageInterface $target,
-        /**
-         * @var CollectorInterface[]
-         */
         private readonly array $collectors,
         private array $ignoredRequests = [],
         private array $ignoredCommands = [],
@@ -117,7 +122,7 @@ private function isCommandIgnored(?string $command): bool
     }
 
     /**
-     * @param array $ignoredRequests Patterns for ignored request URLs.
+     * @param string[] $ignoredRequests Patterns for ignored request URLs.
      *
      * @see WildcardPattern
      */
@@ -129,7 +134,7 @@ public function withIgnoredRequests(array $ignoredRequests): self
     }
 
     /**
-     * @param array $ignoredCommands Patterns for ignored commands names.
+     * @param string[] $ignoredCommands Patterns for ignored commands names.
      *
      * @see WildcardPattern
      */

src/FlattenException.php

@@ -15,6 +15,8 @@
  * Implements the Throwable interface
  * Basically, this class removes all objects from the trace.
  * Ported from Symfony components @link https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Debug/Exception/FlattenException.php
+ *
+ * @psalm-import-type BacktraceType from Debugger
  */
 final class FlattenException implements Stringable
 {
@@ -163,6 +165,8 @@ public function getTrace(): array
 
     /**
      * @param array $trace the Exception stack trace as an array.
+     *
+     * @psalm-param BacktraceType $trace
      */
     private function setTrace(array $trace): void
     {
@@ -293,12 +297,13 @@ private function flattenArgs(array $args, int $level = 0, int &$count = 0): arra
     }
 
     /**
-     * @return string the real class name of an incomplete class
+     * @return string The real class name of an incomplete class
      */
     private function getClassNameFromIncomplete(__PHP_Incomplete_Class $value): string
     {
         $array = new ArrayObject($value);
 
+        /** @var string */
         return $array['__PHP_Incomplete_Class_Name'];
     }
 }

src/Helper/BacktraceIgnoreMatcher.php

@@ -5,31 +5,44 @@
 namespace Yiisoft\Yii\Debug\Helper;
 
 use Yiisoft\Strings\CombinedRegexp;
+use Yiisoft\Yii\Debug\Debugger;
 
 /**
  * All backtrace parameters should contain at least 4 elements in the following order:
  * 0 – Called method
  * 1 – Proxy
  * 2 – Real using place / Composer\ClassLoader include function
  * 3 – Whatever / Composer\ClassLoader
+ *
+ * @psalm-import-type BacktraceType from Debugger
  */
 final class BacktraceIgnoreMatcher
 {
+    /**
+     * @param string[] $patterns
+     * @psalm-param BacktraceType $backtrace
+     */
     public static function isIgnoredByFile(array $backtrace, array $patterns): bool
     {
-        if (!isset($backtrace[2])) {
+        if (!isset($backtrace[2]['file'])) {
             return false;
         }
         $path = $backtrace[2]['file'];
 
         return self::doesStringMatchPattern($path, $patterns);
     }
 
+    /**
+     * @psalm-param BacktraceType $backtrace
+     */
     public static function isIgnoredByClass(array $backtrace, array $classes): bool
     {
         return isset($backtrace[3]['class']) && in_array($backtrace[3]['class'], $classes, true);
     }
 
+    /**
+     * @param string[] $patterns
+     */
     public static function doesStringMatchPattern(string $string, array $patterns): bool
     {
         if (empty($patterns)) {

src/Helper/StreamWrapper/StreamWrapper.php

@@ -215,6 +215,7 @@ public function url_stat(string $path, int $flags): array|false
 
     public function stream_metadata(string $path, int $option, mixed $value): bool
     {
+        /** @psalm-suppress MixedArgument */
         return match ($option) {
             STREAM_META_TOUCH => touch($path, ...$value),
             STREAM_META_OWNER_NAME, STREAM_META_OWNER => chown($path, $value),

src/Storage/FileStorage.php

@@ -18,7 +18,6 @@
 use function glob;
 use function strlen;
 use function substr;
-use function uasort;
 
 final class FileStorage implements StorageInterface
 {
@@ -49,16 +48,17 @@ public function setHistorySize(int $historySize): void
     public function read(string $type, ?string $id = null): array
     {
         clearstatcache();
-        $data = [];
-        $pattern = sprintf(
-            '%s/**/%s/%s.json',
-            $this->path,
-            $id ?? '**',
-            $type,
+
+        $dataFiles = $this->findFilesOrderByModifiedTime(
+            sprintf(
+                '%s/**/%s/%s.json',
+                $this->path,
+                $id ?? '**',
+                $type,
+            )
         );
-        $dataFiles = glob($pattern, GLOB_NOSORT);
-        uasort($dataFiles, static fn ($a, $b) => filemtime($a) <=> filemtime($b));
 
+        $data = [];
         foreach ($dataFiles as $file) {
             $dir = dirname($file);
             $id = substr($dir, strlen(dirname($file, 2)) + 1);
@@ -121,12 +121,11 @@ private function collectSummaryData(): array
      */
     private function gc(): void
     {
-        $summaryFiles = glob($this->path . '/**/**/summary.json', GLOB_NOSORT);
+        $summaryFiles = $this->findFilesOrderByModifiedTime($this->path . '/**/**/summary.json');
         if (empty($summaryFiles) || count($summaryFiles) <= $this->historySize) {
             return;
         }
 
-        uasort($summaryFiles, static fn ($a, $b) => filemtime($b) <=> filemtime($a));
         $excessFiles = array_slice($summaryFiles, $this->historySize);
         foreach ($excessFiles as $file) {
             $path1 = dirname($file);
@@ -143,4 +142,21 @@ private function gc(): void
             }
         }
     }
+
+    /**
+     * @return string[]
+     */
+    private function findFilesOrderByModifiedTime(string $pattern): array
+    {
+        $files = glob($pattern, GLOB_NOSORT);
+        if ($files === false) {
+            return [];
+        }
+
+        usort(
+            $files,
+            static fn (string $a, string $b) => filemtime($b) <=> filemtime($a)
+        );
+        return $files;
+    }
 }

src/Storage/StorageInterface.php

@@ -36,7 +36,7 @@ public function addCollector(CollectorInterface $collector): void;
     /**
      * Returns collected data from collectors added
      *
-     * @return array collected data
+     * @return array[] The collected data
      */
     public function getData(): array;