Merge branch refs/heads/1.11.x into 1.12.x

phpstan · Aug 19, 2024 · 9488c63 · 9488c63
2 parents df7dfdb + 85351dd
commit 9488c63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/build/phpstan.neon b/build/phpstan.neon
@@ -85,6 +85,10 @@ parameters:
 			message: "#^Parameter \\#1 (?:\\$argument|\\$objectOrClass) of class ReflectionClass constructor expects class\\-string\\<PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig\\>\\|PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig, string given\\.$#"
 			count: 1
 			path: ../src/Command/CommandHelper.php
+		-
+			message: "#^Parameter \\#1 (?:\\$argument|\\$objectOrClass) of class ReflectionClass constructor expects class\\-string\\<PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig\\>\\|PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig, string given\\.$#"
+			count: 1
+			path: ../src/Diagnose/PHPStanDiagnoseExtension.php
 		- '#^Parameter \#1 \$offsetType of class PHPStan\\Type\\Accessory\\HasOffsetType constructor expects PHPStan\\Type\\Constant\\ConstantIntegerType\|PHPStan\\Type\\Constant\\ConstantStringType#'
 		- '#^Short ternary operator is not allowed#'
 	reportStaticMethodSignatures: true

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -164,11 +164,6 @@ parameters:
 			count: 1
 			path: src/Diagnose/PHPStanDiagnoseExtension.php
 
-		-
-			message: "#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\<PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig\\>\\|PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig, string given\\.$#"
-			count: 1
-			path: src/Diagnose/PHPStanDiagnoseExtension.php
-
 		-
 			message: "#^Parameter \\#1 \\$path of function dirname expects string, string\\|false given\\.$#"
 			count: 1