diff --git a/.github/workflows/bc.yml b/.github/workflows/bc.yml
index 00041a9..5b32e6f 100644
--- a/.github/workflows/bc.yml
+++ b/.github/workflows/bc.yml
@@ -8,7 +8,7 @@ on:
       - '.gitattributes'
       - 'infection.json.dist'
       - 'phpunit.xml.dist'
-      - 'psalm.xml'
+      - 'phpstan.neon'
   push:
     branches: ['master']
     paths-ignore:
@@ -19,7 +19,7 @@ on:
       - '.gitattributes'
       - 'infection.json.dist'
       - 'phpunit.xml.dist'
-      - 'psalm.xml'
+      - 'phpstan.neon'
 
 name: backwards compatibility
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 05e7b40..d12a95a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
       - '.gitignore'
       - '.gitattributes'
       - 'infection.json.dist'
-      - 'psalm.xml'
+      - 'phpstan.neon'
 
   push:
     branches: ['master']
@@ -18,7 +18,7 @@ on:
       - '.gitignore'
       - '.gitattributes'
       - 'infection.json.dist'
-      - 'psalm.xml'
+      - 'phpstan.neon'
 
 name: build
 
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
index a857bce..4bdba4c 100644
--- a/.github/workflows/composer-require-checker.yml
+++ b/.github/workflows/composer-require-checker.yml
@@ -8,7 +8,7 @@ on:
       - '.gitattributes'
       - 'infection.json.dist'
       - 'phpunit.xml.dist'
-      - 'psalm.xml'
+      - 'phpstan.neon'
 
   push:
     branches: ['master']
@@ -20,7 +20,7 @@ on:
       - '.gitattributes'
       - 'infection.json.dist'
       - 'phpunit.xml.dist'
-      - 'psalm.xml'
+      - 'phpstan.neon'
 
 name: Composer require checker
 
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
index 2282c14..f2e1528 100644
--- a/.github/workflows/mutation.yml
+++ b/.github/workflows/mutation.yml
@@ -6,7 +6,7 @@ on:
       - 'CHANGELOG.md'
       - '.gitignore'
       - '.gitattributes'
-      - 'psalm.xml'
+      - 'phpstan.neon'
 
   push:
     branches: ['master']
@@ -16,7 +16,7 @@ on:
       - 'CHANGELOG.md'
       - '.gitignore'
       - '.gitattributes'
-      - 'psalm.xml'
+      - 'phpstan.neon'
 
 name: mutation test
 
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
index 457772a..bb9bc78 100644
--- a/.github/workflows/rector.yml
+++ b/.github/workflows/rector.yml
@@ -7,7 +7,7 @@ on:
       - '.gitignore'
       - '.gitattributes'
       - 'infection.json.dist'
-      - 'psalm.xml'
+      - 'phpstan.neon'
 
 name: rector
 
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index e33eca8..7be817a 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -23,8 +23,8 @@ on:
 name: static analysis
 
 jobs:
-  psalm:
-    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+  phpstan:
+    uses: yiisoft/actions/.github/workflows/phpstan.yml@master
     with:
       os: >-
         ['ubuntu-latest']
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2d656a..999ab65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## 5.0.1 under development
 
-- no changes in this release.
+- Chg #155: Improve static analyze annotations (@vjik)
+- Enh #155: Remove unnecessary `array_filter` call in `AssetUtil::extractFilePathsForExport()` method (@vjik)
 
 ## 5.0.0 December 11, 2024
 
diff --git a/README.md b/README.md
index 80a97a9..48a4e74 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,7 @@
 [![Build status](https://github.com/yiisoft/assets/actions/workflows/build.yml/badge.svg)](https://github.com/yiisoft/assets/actions/workflows/build.yml)
 [![Code Coverage](https://codecov.io/gh/yiisoft/assets/graph/badge.svg?token=U09s7jclX6)](https://codecov.io/gh/yiisoft/assets)
 [![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fyiisoft%2Fassets%2Fmaster)](https://dashboard.stryker-mutator.io/reports/github.com/yiisoft/assets/master)
-[![static analysis](https://github.com/yiisoft/assets/workflows/static%20analysis/badge.svg)](https://github.com/yiisoft/assets/actions?query=workflow%3A%22static+analysis%22)
-[![type-coverage](https://shepherd.dev/github/yiisoft/assets/coverage.svg)](https://shepherd.dev/github/yiisoft/assets)
+[![static analysis](https://github.com/yiisoft/assets/actions/workflows/static.yml/badge.svg)](https://github.com/yiisoft/assets/actions/workflows/static.yml)
 
 The package implements client-side asset (such as CSS and JavaScript) management for PHP.
 It helps resolve dependencies and get lists of files ready for generating HTML `<script>` and `<link>` tags.
diff --git a/composer.json b/composer.json
index 3e6ad26..9cd4101 100644
--- a/composer.json
+++ b/composer.json
@@ -38,10 +38,10 @@
     "require-dev": {
         "infection/infection": "^0.27.11",
         "maglnet/composer-require-checker": "^4.7",
+        "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^10.5",
         "rector/rector": "^2.0",
         "spatie/phpunit-watcher": "^1.24",
-        "vimeo/psalm": "^5.26",
         "yiisoft/di": "^1.3",
         "yiisoft/test-support": "^3.0",
         "yiisoft/yii-debug": "dev-master"
@@ -76,6 +76,8 @@
     "scripts": {
         "test": "phpunit --testdox --no-interaction",
         "test-watch": "phpunit-watcher watch",
-        "infection": "vendor/bin/infection --only-covered"
+        "infection": "vendor/bin/infection --only-covered",
+        "phpstan": "vendor/bin/phpstan analyse",
+        "phpstan-clear-cache": "vendor/bin/phpstan clear-result-cache"
     }
 }
diff --git a/docs/internals.md b/docs/internals.md
index c7e4742..3ae0f2e 100644
--- a/docs/internals.md
+++ b/docs/internals.md
@@ -18,10 +18,10 @@ composer run infection
 
 ## Static analysis
 
-The code is statically analyzed with [Psalm](https://psalm.dev/). To run static analysis:
+The code is statically analyzed with [PHPStan](https://phpstan.org/). To run static analysis:
 
 ```shell
-./vendor/bin/psalm
+composer run phpstan
 ```
 
 ## Code style
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000..9126ea0
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,9 @@
+parameters:
+  level: 10
+  paths:
+    - src
+  ignoreErrors:
+    - identifier: missingType.iterableValue
+
+includes:
+  - phar://phpstan.phar/conf/bleedingEdge.neon
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index b48c894..0000000
--- a/psalm.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="1"
-    findUnusedBaselineEntry="true"
-    findUnusedCode="false"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-    <issueHandlers>
-        <MixedAssignment errorLevel="suppress" />
-        <RiskyTruthyFalsyComparison errorLevel="suppress" />
-    </issueHandlers>
-</psalm>
diff --git a/src/AssetBundle.php b/src/AssetBundle.php
index e538d45..1d5ccff 100644
--- a/src/AssetBundle.php
+++ b/src/AssetBundle.php
@@ -78,7 +78,7 @@ class AssetBundle
      * ]
      * ```
      *
-     * @psalm-var array<array-key, string|CssFile>
+     * @psalm-var array<array-key, CssFile|string>
      */
     public array $css = [];
 
@@ -107,7 +107,7 @@ class AssetBundle
      * ];
      * ```
      *
-     * @psalm-var array<array-key, string|CssString>
+     * @psalm-var array<array-key, CssString|string>
      */
     public array $cssStrings = [];
 
@@ -179,7 +179,7 @@ class AssetBundle
      *
      * Note that only a forward slash "/" should be used as directory separator.
      *
-     * @psalm-var array<array-key, string|JsFile>
+     * @psalm-var array<array-key, JsFile|string>
      */
     public array $js = [];
 
@@ -208,7 +208,7 @@ class AssetBundle
      * ];
      * ```
      *
-     * @psalm-var array<array-key, string|JsString>
+     * @psalm-var array<array-key, JsString|string>
      */
     public array $jsStrings = [];
 
@@ -283,6 +283,8 @@ class AssetBundle
      *     'js/script.js',
      * ]:
      * ```
+     *
+     * @psalm-var list<string>
      */
     public array $export = [];
 
diff --git a/src/AssetConverter.php b/src/AssetConverter.php
index 919a48d..899018e 100644
--- a/src/AssetConverter.php
+++ b/src/AssetConverter.php
@@ -48,7 +48,8 @@ final class AssetConverter implements AssetConverterInterface
     ];
 
     /**
-     * @var callable|null A PHP callback, which should be invoked to check whether asset conversion result is outdated.
+     * @var callable|null A PHP callback, which should be invoked to check whether asset conversion result is
+     * outdated.
      *
      * @psalm-var IsOutdatedCallback|null
      */
@@ -57,9 +58,9 @@ final class AssetConverter implements AssetConverterInterface
     /**
      * @param Aliases $aliases The aliases instance.
      * @param LoggerInterface $logger The logger instance.
-     * @param array $commands The commands that are used to perform the asset conversion.
-     * The keys are the asset file extension names, and the values are the corresponding
-     * target script types (either "css" or "js") and the commands used for the conversion.
+     * @param array $commands The commands that are used to perform the asset
+     * conversion. The keys are the asset file extension names, and the values are the corresponding target script types
+     * (either "css" or "js") and the commands used for the conversion.
      *
      * You may also use a {@link https://github.com/yiisoft/docs/blob/master/guide/en/concept/aliases.md}
      * to specify the location of the command:
@@ -266,6 +267,10 @@ private function runCommand(
         $pipes = [];
 
         $proc = proc_open($command, $descriptors, $pipes, $basePath);
+        /**
+         * @var resource $proc
+         * @var resource[] $pipes
+         */
 
         $stdout = stream_get_contents($pipes[1]);
 
diff --git a/src/AssetManager.php b/src/AssetManager.php
index a43f864..7be1673 100644
--- a/src/AssetManager.php
+++ b/src/AssetManager.php
@@ -35,21 +35,18 @@ final class AssetManager
 
     /**
      * @var true[] List of the asset bundles in register process. Use for detect circular dependency.
-     *
      * @psalm-var array<string, true>
      */
     private array $bundlesInRegisterProcess = [];
 
     /**
      * @var AssetBundle[]
-     *
      * @psalm-var array<string, AssetBundle>
      */
     private array $loadedBundles = [];
 
     /**
      * @var AssetBundle[]
-     *
      * @psalm-var array<string, AssetBundle>
      */
     private array $dummyBundles = [];
@@ -451,12 +448,11 @@ private function loadBundle(string $name): AssetBundle
             return $this->loadedBundles[$name] = $this->loader->loadBundle($name, $this->customizedBundles[$name]);
         }
 
-        /** @psalm-suppress RedundantConditionGivenDocblockType */
         if ($this->customizedBundles[$name] === false) {
-            /** @psalm-suppress MixedArgumentTypeCoercion */
             return $this->dummyBundles[$name] ??= $this->loader->loadBundle($name, (array) (new AssetBundle()));
         }
 
+        // @phpstan-ignore deadCode.unreachable
         throw new InvalidConfigException("Invalid configuration of the \"{$name}\" asset bundle.");
     }
 
diff --git a/src/AssetPublisher.php b/src/AssetPublisher.php
index a9e02e9..e9cce1d 100644
--- a/src/AssetPublisher.php
+++ b/src/AssetPublisher.php
@@ -9,7 +9,6 @@
 use Yiisoft\Aliases\Aliases;
 use Yiisoft\Assets\Exception\InvalidConfigException;
 use Yiisoft\Files\FileHelper;
-use Yiisoft\Files\PathMatcher\PathMatcherInterface;
 
 use function array_key_exists;
 use function crc32;
@@ -26,7 +25,7 @@
  * {@see AssetBundle::$basePath}.
  *
  * @psalm-type HashCallback = callable(string):string
- * @psalm-type PublishedBundle = array{0:non-empty-string,1:non-empty-string}
+ * @psalm-import-type PublishedBundle from AssetPublisherInterface
  */
 final class AssetPublisher implements AssetPublisherInterface
 {
diff --git a/src/AssetPublisherInterface.php b/src/AssetPublisherInterface.php
index 6923277..35a2f8c 100644
--- a/src/AssetPublisherInterface.php
+++ b/src/AssetPublisherInterface.php
@@ -8,6 +8,8 @@
 
 /**
  * The `AssetPublisherInterface` must be implemented by asset publisher classes.
+ *
+ * @psalm-type PublishedBundle = array{0:non-empty-string,1:non-empty-string}
  */
 interface AssetPublisherInterface
 {
@@ -39,6 +41,8 @@ interface AssetPublisherInterface
      * @throws InvalidConfigException If the asset or the asset file paths to be published does not exist.
      *
      * @return array The path (directory or file path) and the URL that the asset is published as.
+     *
+     * @psalm-return PublishedBundle
      */
     public function publish(AssetBundle $bundle): array;
 
diff --git a/src/AssetRegistrar.php b/src/AssetRegistrar.php
index f6f84fc..0f47ca1 100644
--- a/src/AssetRegistrar.php
+++ b/src/AssetRegistrar.php
@@ -192,17 +192,13 @@ public function register(AssetBundle $bundle): void
      */
     private function convertCss(AssetBundle $bundle): void
     {
-        /**
-         * @psalm-var AssetConverterInterface $this->converter
-         * @psalm-var string $bundle->basePath
-         * @psalm-var ConverterOptions $bundle->converterOptions
-         */
         foreach ($bundle->css as $i => $css) {
             if (is_array($css)) {
                 $file = $css[0];
                 if (AssetUtil::isRelative($file)) {
                     $baseFile = $this->aliases->get("{$bundle->basePath}/{$file}");
                     if (is_file($baseFile)) {
+                        // @phpstan-ignore method.nonObject
                         $css[0] = $this->converter->convert(
                             $file,
                             $bundle->basePath,
@@ -215,6 +211,7 @@ private function convertCss(AssetBundle $bundle): void
             } elseif (AssetUtil::isRelative($css)) {
                 $baseCss = $this->aliases->get("{$bundle->basePath}/{$css}");
                 if (is_file("$baseCss")) {
+                    // @phpstan-ignore method.nonObject
                     $bundle->css[$i] = $this->converter->convert(
                         $css,
                         $bundle->basePath,
@@ -230,17 +227,13 @@ private function convertCss(AssetBundle $bundle): void
      */
     private function convertJs(AssetBundle $bundle): void
     {
-        /**
-         * @psalm-var AssetConverterInterface $this->converter
-         * @psalm-var string $bundle->basePath
-         * @psalm-var ConverterOptions $bundle->converterOptions
-         */
         foreach ($bundle->js as $i => $js) {
             if (is_array($js)) {
                 $file = $js[0];
                 if (AssetUtil::isRelative($file)) {
                     $baseFile = $this->aliases->get("{$bundle->basePath}/{$file}");
                     if (is_file($baseFile)) {
+                        // @phpstan-ignore method.nonObject
                         $js[0] = $this->converter->convert(
                             $file,
                             $bundle->basePath,
@@ -253,6 +246,7 @@ private function convertJs(AssetBundle $bundle): void
             } elseif (AssetUtil::isRelative($js)) {
                 $baseJs = $this->aliases->get("{$bundle->basePath}/{$js}");
                 if (is_file($baseJs)) {
+                    // @phpstan-ignore method.nonObject
                     $bundle->js[$i] = $this->converter->convert($js, $bundle->basePath);
                 }
             }
@@ -303,7 +297,6 @@ private function registerCssFile(AssetBundle $bundle, ?string $key, array|string
         /** @psalm-var CssFile */
         $css = $this->mergeOptionsWithArray($bundle->cssOptions, $css);
 
-        /** @psalm-suppress MixedPropertyTypeCoercion It's Psalm bug https://github.com/vimeo/psalm/issues/9810 */
         $this->cssFiles[$key ?: $url] = $css;
     }
 
@@ -331,10 +324,8 @@ private function registerCssString(AssetBundle $bundle, ?string $key, mixed $css
         $config = $this->mergeOptionsWithArray($bundle->cssOptions, $config);
 
         if ($key === null) {
-            /** @psalm-suppress MixedPropertyTypeCoercion It's Psalm bug https://github.com/vimeo/psalm/issues/9810 */
             $this->cssStrings[] = $config;
         } else {
-            /** @psalm-suppress MixedPropertyTypeCoercion It's Psalm bug https://github.com/vimeo/psalm/issues/9810 */
             $this->cssStrings[$key] = $config;
         }
     }
@@ -383,7 +374,6 @@ private function registerJsFile(AssetBundle $bundle, ?string $key, array|string
         /** @psalm-var JsFile */
         $js = $this->mergeOptionsWithArray($bundle->jsOptions, $js);
 
-        /** @psalm-suppress MixedPropertyTypeCoercion It's Psalm bug https://github.com/vimeo/psalm/issues/9810 */
         $this->jsFiles[$key ?: $url] = $js;
     }
 
@@ -410,10 +400,8 @@ private function registerJsString(AssetBundle $bundle, ?string $key, mixed $jsSt
         $jsString = $this->mergeOptionsWithArray($bundle->jsOptions, $jsString);
 
         if ($key === null) {
-            /** @psalm-suppress MixedPropertyTypeCoercion It's Psalm bug https://github.com/vimeo/psalm/issues/9810 */
             $this->jsStrings[] = $jsString;
         } else {
-            /** @psalm-suppress MixedPropertyTypeCoercion It's Psalm bug https://github.com/vimeo/psalm/issues/9810 */
             $this->jsStrings[$key] = $jsString;
         }
     }
diff --git a/src/AssetUtil.php b/src/AssetUtil.php
index eac9453..1e57751 100644
--- a/src/AssetUtil.php
+++ b/src/AssetUtil.php
@@ -8,7 +8,6 @@
 use Yiisoft\Aliases\Aliases;
 
 use function array_merge;
-use function array_filter;
 use function array_unique;
 use function dirname;
 use function file_put_contents;
@@ -40,7 +39,6 @@ final class AssetUtil
      */
     public static function createAsset(string $name, array $config = []): AssetBundle
     {
-        /** @psalm-suppress UnsafeInstantiation */
         $bundle = is_subclass_of($name, AssetBundle::class) ? new $name() : new AssetBundle();
 
         foreach ($config as $property => $value) {
@@ -56,7 +54,7 @@ public static function createAsset(string $name, array $config = []): AssetBundl
      * @param AssetBundle $bundle The asset bundle which the asset file belongs to.
      * @param string $assetPath The asset path. This should be one of the assets listed
      * in {@see AssetBundle::$js} or {@see AssetBundle::$css}.
-     * @param array $assetMap Mapping from source asset files (keys) to target asset files (values)
+     * @param string[] $assetMap Mapping from source asset files (keys) to target asset files (values)
      * {@see AssetPublisher::$assetMap}.
      *
      * @psalm-param array<string, string> $assetMap
@@ -131,22 +129,19 @@ public static function extractFilePathsForExport(array $bundles): array
             }
 
             if (!empty($bundle->export)) {
-                /** @var string $filePath */
                 foreach ($bundle->export as $filePath) {
                     $filePaths[] = "{$bundle->sourcePath}/{$filePath}";
                 }
                 continue;
             }
 
-            /** @var array|string $item */
             foreach (array_merge($bundle->css, $bundle->js) as $item) {
-                /** @var string */
                 $filePath = is_array($item) ? $item[0] : $item;
                 $filePaths[] = "{$bundle->sourcePath}/{$filePath}";
             }
         }
 
-        return array_unique(array_filter($filePaths));
+        return array_unique($filePaths);
     }
 
     /**
diff --git a/src/Debug/AssetCollector.php b/src/Debug/AssetCollector.php
index e0c1348..6f89753 100644
--- a/src/Debug/AssetCollector.php
+++ b/src/Debug/AssetCollector.php
@@ -14,8 +14,14 @@ final class AssetCollector implements SummaryCollectorInterface
 {
     use CollectorTrait;
 
+    /**
+     * @psalm-var list<AssetBundle>
+     */
     private array $assetBundles = [];
 
+    /**
+     * @psalm-return list<AssetBundle>
+     */
     public function getCollected(): array
     {
         return $this->assetBundles;
@@ -30,6 +36,9 @@ public function collect(AssetBundle $assetBundle): void
         $this->assetBundles[] = $assetBundle;
     }
 
+    /**
+     * @psalm-return array{asset?:array{bundles: array{total: int}}}
+     */
     public function getSummary(): array
     {
         if (!$this->isActive()) {
@@ -45,6 +54,10 @@ public function getSummary(): array
         ];
     }
 
+    /**
+     * https://github.com/phpstan/phpstan/issues/12201
+     * @phpstan-ignore method.unused
+     */
     private function reset(): void
     {
         $this->assetBundles = [];