Skip to content

Commit 9488c63

Browse files
authored
Merge branch refs/heads/1.11.x into 1.12.x
2 parents df7dfdb + 85351dd commit 9488c63

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build/phpstan.neon

+4
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ parameters:
8585
message: "#^Parameter \\#1 (?:\\$argument|\\$objectOrClass) of class ReflectionClass constructor expects class\\-string\\<PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig\\>\\|PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig, string given\\.$#"
8686
count: 1
8787
path: ../src/Command/CommandHelper.php
88+
-
89+
message: "#^Parameter \\#1 (?:\\$argument|\\$objectOrClass) of class ReflectionClass constructor expects class\\-string\\<PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig\\>\\|PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig, string given\\.$#"
90+
count: 1
91+
path: ../src/Diagnose/PHPStanDiagnoseExtension.php
8892
- '#^Parameter \#1 \$offsetType of class PHPStan\\Type\\Accessory\\HasOffsetType constructor expects PHPStan\\Type\\Constant\\ConstantIntegerType\|PHPStan\\Type\\Constant\\ConstantStringType#'
8993
- '#^Short ternary operator is not allowed#'
9094
reportStaticMethodSignatures: true

phpstan-baseline.neon

-5
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,6 @@ parameters:
164164
count: 1
165165
path: src/Diagnose/PHPStanDiagnoseExtension.php
166166

167-
-
168-
message: "#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\<PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig\\>\\|PHPStan\\\\ExtensionInstaller\\\\GeneratedConfig, string given\\.$#"
169-
count: 1
170-
path: src/Diagnose/PHPStanDiagnoseExtension.php
171-
172167
-
173168
message: "#^Parameter \\#1 \\$path of function dirname expects string, string\\|false given\\.$#"
174169
count: 1

0 commit comments

Comments
 (0)