diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 3c04f87cac..1a4fee3469 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -71,6 +71,7 @@ Yii Framework 2 Change Log
 - Bug #20636: Fix `@param` annotations for `$message` in logging methods (mspirkov)
 - Bug #20637: Fix PHPDoc annotations in `ActiveRelationTrait`. Add PHPStan/Psalm annotations for `$modelClass` in `ActiveQuery`, `ActiveQueryTrait` and `ActiveRelationTrait` (mspirkov)
 - Bug #20639: Add missing generics in `yii\web` namespace (mspirkov)
+- Bug #20640: Fix `@param` annotation for `$block` in `yii\console\Markdown::renderParagraph()` (mspirkov)
 
 
 2.0.53 June 27, 2025
diff --git a/framework/console/Markdown.php b/framework/console/Markdown.php
index c67626affa..1d9b84e2ab 100644
--- a/framework/console/Markdown.php
+++ b/framework/console/Markdown.php
@@ -56,7 +56,7 @@ class Markdown extends \cebe\markdown\Parser
     /**
      * Render a paragraph block.
      *
-     * @param string $block
+     * @param array $block
      * @return string
      */
     protected function renderParagraph($block)
diff --git a/framework/db/ActiveRelationTrait.php b/framework/db/ActiveRelationTrait.php
index 266b2bac2b..275683f041 100644
--- a/framework/db/ActiveRelationTrait.php
+++ b/framework/db/ActiveRelationTrait.php
@@ -331,10 +331,12 @@ trait ActiveRelationTrait
     }
 
     /**
-     * @param ActiveRecordInterface[] $primaryModels primary models
+     * @param array $primaryModels primary models
      * @param ActiveRecordInterface[] $models models
      * @param string $primaryName the primary relation name
      * @param string $name the relation name
+     *
+     * @phpstan-param ActiveRecordInterface[]|array<array-key, array<string, mixed>> $primaryModels
      */
     private function populateInverseRelation(&$primaryModels, $models, $primaryName, $name)
     {
diff --git a/phpstan-baseline-7x.neon b/phpstan-baseline-7x.neon
index b52d088172..f4453f1a7f 100644
--- a/phpstan-baseline-7x.neon
+++ b/phpstan-baseline-7x.neon
@@ -44,3 +44,8 @@ parameters:
 			message: "#^Call to an undefined method ReflectionType\\:\\:getName\\(\\)\\.$#"
 			count: 2
 			path: framework/web/Controller.php
+
+		-
+			message: "#^Parameter \\&\\$constraints by\\-ref type of method yii\\\\db\\\\QueryBuilder\\:\\:getTableUniqueColumnNames\\(\\) expects array\\<yii\\\\db\\\\Constraint\\>\\, array\\<string\\, yii\\\\db\\\\Constraint\\>\\|false given\\.$#"
+			count: 1
+			path: framework/db/QueryBuilder.php
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 9c99274566..96eaae42e6 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -384,3 +384,58 @@ parameters:
 			message: "#^Call to an undefined method yii\\\\base\\\\Model\\:\\:setOldAttribute\\(\\)\\.$#"
 			count: 1
 			path: framework/behaviors/AttributeTypecastBehavior.php
+
+		-
+			message: "#^Method yii\\\\helpers\\\\BaseFileHelper\\:\\:filterPath\\(\\) should return bool but returns int\\<0\\, 16\\>\\.$#"
+			count: 1
+			path: framework/helpers/BaseFileHelper.php
+
+		-
+			message: "#^Parameter \\&\\$length by\\-ref type of method yii\\\\db\\\\sqlite\\\\SqlTokenizer\\:\\:isOperator\\(\\) expects int\\, int\\|null given\\.$#"
+			count: 1
+			path: framework/db/sqlite/SqlTokenizer.php
+
+		-
+			message: "#^Method yii\\\\db\\\\BaseActiveRecord\\:\\:findOne\\(\\) should return static\\(yii\\\\db\\\\BaseActiveRecord\\)\\|null but returns array\\|yii\\\\db\\\\ActiveRecordInterface\\|null\\.$#"
+			count: 1
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Property yii\\\\db\\\\ActiveQuery\\<array\\|yii\\\\db\\\\ActiveRecord\\>\\:\\:\\$primaryModel \\(yii\\\\db\\\\ActiveRecord\\) does not accept \\$this\\(yii\\\\db\\\\BaseActiveRecord\\)\\.$#"
+			count: 1
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Parameter \\&\\$models by\\-ref type of method yii\\\\db\\\\ActiveQuery\\:\\:findWith\\(\\) expects array\\<yii\\\\db\\\\ActiveRecord\\>\\, array given\\.$#"
+			count: 1
+			path: framework/db/ActiveQueryTrait.php
+
+		-
+			message: "#^Method yii\\\\captcha\\\\CaptchaAction\\:\\:generateValidationHash\\(\\) should return string but returns int\\.$#"
+			count: 1
+			path: framework/captcha/CaptchaAction.php
+
+		-
+			message: "#^Method yii\\\\caching\\\\WinCache\\:\\:setValues\\(\\) should return array but returns bool\\.$#"
+			count: 1
+			path: framework/caching/WinCache.php
+
+		-
+			message: "#^Method yii\\\\caching\\\\WinCache\\:\\:addValues\\(\\) should return array but returns bool\\.$#"
+			count: 1
+			path: framework/caching/WinCache.php
+
+		-
+			message: "#^Argument of an invalid type \\$this\\(yii\\\\caching\\\\Dependency\\) supplied for foreach\\, only iterables are supported\\.$#"
+			count: 1
+			path: framework/caching/Dependency.php
+
+		-
+			message: "#^Property yii\\\\console\\\\Application\\:\\:\\$controller \\(yii\\\\console\\\\Controller\\|yii\\\\web\\\\Controller\\) does not accept yii\\\\base\\\\Controller\\.$#"
+			count: 1
+			path: framework/base/Module.php
+
+		-
+			message: "#^Offset null does not exist on array\\{\\}\\.$#"
+			count: 1
+			path: build/controllers/ReleaseController.php
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index cddd5efa53..a5d7d9bed8 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 2
+    level: 3
 
     paths:
         - build