diff --git a/framework/web/Request.php b/framework/web/Request.php
index 292bc95205..083b7329a9 100644
--- a/framework/web/Request.php
+++ b/framework/web/Request.php
@@ -87,7 +87,6 @@ use yii\validators\IpValidator;
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
- * @SuppressWarnings(PHPMD.SuperGlobals)
  */
 class Request extends \yii\base\Request
 {
diff --git a/phpstan-7x.dist.neon b/phpstan-7x.dist.neon
index 5463d9b84c..50aaba102f 100644
--- a/phpstan-7x.dist.neon
+++ b/phpstan-7x.dist.neon
@@ -1,22 +1,3 @@
 includes:
+    - phpstan.dist.neon
     - phpstan-baseline-7x.neon
-
-parameters:
-    level: 1
-
-    paths:
-        - build
-        - framework
-
-    bootstrapFiles:
-        - framework/BaseYii.php
-
-    dynamicConstantNames:
-        - YII_DEBUG
-        - YII_ENV
-        - YII_ENV_DEV
-        - YII_ENV_PROD
-        - YII_ENV_TEST
-
-    ignoreErrors:
-        - '#Unsafe usage of new static\(\).#'
diff --git a/phpstan-baseline-7x.neon b/phpstan-baseline-7x.neon
index a79f76635d..b52d088172 100644
--- a/phpstan-baseline-7x.neon
+++ b/phpstan-baseline-7x.neon
@@ -5,16 +5,6 @@ parameters:
 			count: 1
 			path: framework/behaviors/AttributeTypecastBehavior.php
 
-		-
-			message: "#^Variable \\$viaClass might not be defined\\.$#"
-			count: 5
-			path: framework/db/BaseActiveRecord.php
-
-		-
-			message: "#^Variable \\$viaTable might not be defined\\.$#"
-			count: 5
-			path: framework/db/BaseActiveRecord.php
-
 		-
 			message: "#^Class BackedEnum not found\\.$#"
 			count: 2
@@ -31,36 +21,26 @@ parameters:
 			path: framework/db/Command.php
 
 		-
-			message: "#^Variable \\$command might not be defined\\.$#"
+			message: "#^Call to an undefined static method BackedEnum\\:\\:from\\(\\)\\.$#"
 			count: 1
-			path: framework/db/Query.php
+			path: framework/behaviors/AttributeTypecastBehavior.php
 
 		-
-			message: "#^Variable \\$rawValues in isset\\(\\) always exists and is not nullable\\.$#"
-			count: 1
-			path: framework/db/conditions/InConditionBuilder.php
-
-		-
-			message: "#^Access to undefined constant PDO\\:\\:CUBRID_SCH_CONSTRAINT\\.$#"
-			count: 1
-			path: framework/db/cubrid/Schema.php
-
-		-
-			message: "#^Access to undefined constant PDO\\:\\:CUBRID_SCH_IMPORTED_KEYS\\.$#"
+			message: "#^Access to property \\$value on an unknown class BackedEnum\\.$#"
 			count: 2
-			path: framework/db/cubrid/Schema.php
+			path: framework/db/ColumnSchema.php
 
 		-
-			message: "#^Access to undefined constant PDO\\:\\:CUBRID_SCH_PRIMARY_KEY\\.$#"
-			count: 2
-			path: framework/db/cubrid/Schema.php
-
-		-
-			message: "#^Access to undefined constant PDO\\:\\:CUBRID_SCH_TABLE\\.$#"
-			count: 2
-			path: framework/db/cubrid/Schema.php
-
-		-
-			message: "#^Variable \\$error in isset\\(\\) always exists and is always null\\.$#"
+			message: "#^Access to property \\$value on an unknown class BackedEnum\\.$#"
 			count: 1
-			path: framework/helpers/BaseConsole.php
+			path: framework/db/Command.php
+
+		-
+			message: "#^Access to property \\$name on an unknown class UnitEnum\\.$#"
+			count: 1
+			path: framework/db/Command.php
+
+		-
+			message: "#^Call to an undefined method ReflectionType\\:\\:getName\\(\\)\\.$#"
+			count: 2
+			path: framework/web/Controller.php
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index fc0a1fdd74..abc7ed6f5a 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -44,3 +44,353 @@ parameters:
 			message: "#^Variable \\$error in isset\\(\\) always exists and is always null\\.$#"
 			count: 1
 			path: framework/helpers/BaseConsole.php
+
+		-
+			message: "#^Unsafe call to private method yii\\\\helpers\\\\BaseConsole::getProgressbarWidth\\(\\) through static\\:\\:\\.$#"
+			count: 1
+			path: framework/helpers/BaseConsole.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$modelClass\\.$#"
+			count: 1
+			path: framework/grid/DataColumn.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getViewNames\\(\\)\\.$#"
+			count: 1
+			path: framework/db/pgsql/QueryBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getValue\\(\\)\\.$#"
+			count: 1
+			path: framework/db/pgsql/JsonExpressionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getValue\\(\\)\\.$#"
+			count: 2
+			path: framework/db/pgsql/ArrayExpressionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getDimension\\(\\)\\.$#"
+			count: 1
+			path: framework/db/pgsql/ArrayExpressionBuilder.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$condition with type yii\\\\db\\\\ExpressionInterface is not subtype of native type yii\\\\db\\\\conditions\\\\InCondition\\.$#"
+			count: 1
+			path: framework/db/oci/conditions/InConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getValue\\(\\)\\.$#"
+			count: 1
+			path: framework/db/mysql/JsonExpressionBuilder.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ColumnSchema\\:\\:\\$isComputed\\.$#"
+			count: 1
+			path: framework/db/mssql/Schema.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ColumnSchema\\:\\:defaultPhpTypecast\\(\\)\\.$#"
+			count: 1
+			path: framework/db/mssql/Schema.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\Schema\\:\\:getViewNames\\(\\)\\.$#"
+			count: 1
+			path: framework/db/mssql/QueryBuilder.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ColumnSchema\\:\\:\\$isComputed\\.$#"
+			count: 1
+			path: framework/db/mssql/QueryBuilder.php
+
+		-
+			message: "#^Call to an undefined method PDO\\:\\:cubrid_schema\\(\\)\\.$#"
+			count: 7
+			path: framework/db/cubrid/Schema.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getOperator\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/SimpleConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getColumn\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/SimpleConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getValue\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/SimpleConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getCondition\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/NotConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getOperator\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/LikeConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getColumn\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/LikeConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getValue\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/LikeConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getEscapingReplacements\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/LikeConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getOperator\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/InConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getColumn\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/InConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getValues\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/InConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method Traversable\\:\\:rewind\\(\\)\\.$#"
+			count: 2
+			path: framework/db/conditions/InConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method Traversable\\:\\:current\\(\\)\\.$#"
+			count: 2
+			path: framework/db/conditions/InConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\conditions\\\\ConditionInterface\\:\\:getColumn\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/InConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getHash\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/HashConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getOperator\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/ExistsConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getQuery\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/ExistsConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getOperator\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/ConjunctionConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getExpressions\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/ConjunctionConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getOperator\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/BetweenConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getColumn\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/BetweenConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getIntervalStart\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/BetweenConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getIntervalEnd\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/BetweenConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getOperator\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/BetweenColumnsConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getIntervalStartColumn\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/BetweenColumnsConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getIntervalEndColumn\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/BetweenColumnsConditionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:getValue\\(\\)\\.$#"
+			count: 1
+			path: framework/db/conditions/BetweenColumnsConditionBuilder.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ExpressionInterface\\:\\:\\$params\\.$#"
+			count: 1
+			path: framework/db/ExpressionBuilder.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ExpressionInterface\\:\\:__toString\\(\\)\\.$#"
+			count: 1
+			path: framework/db/ExpressionBuilder.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$via\\.$#"
+			count: 4
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$link\\.$#"
+			count: 16
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$multiple\\.$#"
+			count: 2
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$indexBy\\.$#"
+			count: 1
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$modelClass\\.$#"
+			count: 3
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:attributeLabels\\(\\)\\.$#"
+			count: 1
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:isRelationPopulated\\(\\)\\.$#"
+			count: 2
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ActiveRecordInterface\\:\\:attributeHints\\(\\)\\.$#"
+			count: 1
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ActiveQueryInterface\\:\\:findWith\\(\\)\\.$#"
+			count: 1
+			path: framework/db/BaseActiveRecord.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$multiple\\.$#"
+			count: 3
+			path: framework/db/ActiveRelationTrait.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$link\\.$#"
+			count: 4
+			path: framework/db/ActiveRelationTrait.php
+
+		-
+			message: "#^PHPDoc tag \\@var for variable \\$viaQuery has invalid type yii\\\\db\\\\ActiveQueryTrait\\.$#"
+			count: 1
+			path: framework/db/ActiveRelationTrait.php
+
+		-
+			message: "#^Access to property \\$asArray on an unknown class yii\\\\db\\\\ActiveQueryTrait\\.$#"
+			count: 1
+			path: framework/db/ActiveRelationTrait.php
+
+		-
+			message: "#^Access to property \\$primaryModel on an unknown class yii\\\\db\\\\ActiveQueryTrait\\.$#"
+			count: 2
+			path: framework/db/ActiveRelationTrait.php
+
+		-
+			message: "#^Call to method asArray\\(\\) on an unknown class yii\\\\db\\\\ActiveQueryTrait\\.$#"
+			count: 1
+			path: framework/db/ActiveRelationTrait.php
+
+		-
+			message: "#^Call to method populateRelation\\(\\) on an unknown class yii\\\\db\\\\ActiveQueryTrait\\.$#"
+			count: 1
+			path: framework/db/ActiveRelationTrait.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$primaryModel\\.$#"
+			count: 1
+			path: framework/db/ActiveQueryTrait.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$with\\.$#"
+			count: 1
+			path: framework/db/ActiveQueryTrait.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$modelClass\\.$#"
+			count: 1
+			path: framework/db/ActiveQuery.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\db\\\\ActiveQueryInterface\\:\\:buildJoinWith\\(\\)\\.$#"
+			count: 1
+			path: framework/db/ActiveQuery.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\db\\\\ActiveQueryInterface\\:\\:\\$modelClass\\.$#"
+			count: 2
+			path: framework/data/ActiveDataProvider.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\base\\\\BaseObject\\&yii\\\\db\\\\MigrationInterface\\:\\:\\$compact\\.$#"
+			count: 1
+			path: framework/console/controllers/BaseMigrateController.php
+
+		-
+			message: "#^PHPDoc tag \\@param references unknown parameter\\: \\$args$#"
+			count: 2
+			path: framework/console/Controller.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\base\\\\Component\\:\\:isAttributeChanged\\(\\)\\.$#"
+			count: 1
+			path: framework/behaviors/SluggableBehavior.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\base\\\\Component\\:\\:formName\\(\\)\\.$#"
+			count: 1
+			path: framework/behaviors/OptimisticLockBehavior.php
+
+		-
+			message: "#^Access to an undefined property yii\\\\base\\\\Component\\:\\:\\$view\\.$#"
+			count: 2
+			path: framework/behaviors/CacheableWidgetBehavior.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\base\\\\Model\\:\\:canSetOldAttribute\\(\\)\\.$#"
+			count: 1
+			path: framework/behaviors/AttributeTypecastBehavior.php
+
+		-
+			message: "#^Call to an undefined method yii\\\\base\\\\Model\\:\\:setOldAttribute\\(\\)\\.$#"
+			count: 1
+			path: framework/behaviors/AttributeTypecastBehavior.php
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 3f06ff7fe6..cddd5efa53 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 1
+    level: 2
 
     paths:
         - build