Skip to content

Commit 8f55339

Browse files
committed
Fix build
1 parent af9e650 commit 8f55339

File tree

4 files changed

+12
-24
lines changed

4 files changed

+12
-24
lines changed

conf/config.neon

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,6 @@ services:
975975
arguments:
976976
checkMissingTypehints: %checkMissingTypehints%
977977
checkClassCaseSensitivity: %checkClassCaseSensitivity%
978-
absentTypeChecks: %featureToggles.absentTypeChecks%
979978

980979
-
981980
class: PHPStan\Rules\PhpDoc\UnresolvableTypeHelper

src/Rules/PhpDoc/AssertRuleHelper.php

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public function __construct(
3737
private ClassNameCheck $classCheck,
3838
private MissingTypehintCheck $missingTypehintCheck,
3939
private GenericObjectTypeCheck $genericObjectTypeCheck,
40-
private bool $absentTypeChecks,
4140
private bool $checkClassCaseSensitivity,
4241
private bool $checkMissingTypehints,
4342
)
@@ -83,11 +82,9 @@ public function check(
8382
$assertedExprType = $this->initializerExprTypeResolver->getType($assertedExpr, $context);
8483
$assertedExprString = $assert->getParameter()->describe();
8584
if ($assertedExprType instanceof ErrorType) {
86-
if ($this->absentTypeChecks) {
87-
$errors[] = RuleErrorBuilder::message(sprintf('Assert references unknown %s.', $assertedExprString))
88-
->identifier('assert.unknownExpr')
89-
->build();
90-
}
85+
$errors[] = RuleErrorBuilder::message(sprintf('Assert references unknown %s.', $assertedExprString))
86+
->identifier('assert.unknownExpr')
87+
->build();
9188
continue;
9289
}
9390

@@ -99,15 +96,13 @@ public function check(
9996
AssertTag::IF_FALSE => '@phpstan-assert-if-false',
10097
][$assert->getIf()];
10198

102-
if ($this->absentTypeChecks) {
103-
if ($this->unresolvableTypeHelper->containsUnresolvableType($assertedType)) {
104-
$errors[] = RuleErrorBuilder::message(sprintf(
105-
'PHPDoc tag %s for %s contains unresolvable type.',
106-
$tagName,
107-
$assertedExprString,
108-
))->identifier('assert.unresolvableType')->build();
109-
continue;
110-
}
99+
if ($this->unresolvableTypeHelper->containsUnresolvableType($assertedType)) {
100+
$errors[] = RuleErrorBuilder::message(sprintf(
101+
'PHPDoc tag %s for %s contains unresolvable type.',
102+
$tagName,
103+
$assertedExprString,
104+
))->identifier('assert.unresolvableType')->build();
105+
continue;
111106
}
112107

113108
$isSuperType = $assertedType->isSuperTypeOf($assertedExprType);
@@ -131,10 +126,6 @@ public function check(
131126
}
132127
}
133128

134-
if (!$this->absentTypeChecks) {
135-
continue;
136-
}
137-
138129
foreach ($assertedType->getReferencedClasses() as $class) {
139130
if (!$this->reflectionProvider->hasClass($class)) {
140131
$errors[] = RuleErrorBuilder::message(sprintf(

tests/PHPStan/Rules/PhpDoc/FunctionAssertRuleTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ protected function getRule(): Rule
2626
$reflectionProvider,
2727
new UnresolvableTypeHelper(),
2828
new ClassNameCheck(new ClassCaseSensitivityCheck($reflectionProvider, true), new ClassForbiddenNameCheck(self::getContainer())),
29-
new MissingTypehintCheck(true, true, true, true, []),
29+
new MissingTypehintCheck(true, []),
3030
new GenericObjectTypeCheck(),
3131
true,
3232
true,
33-
true,
3433
));
3534
}
3635

tests/PHPStan/Rules/PhpDoc/MethodAssertRuleTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ protected function getRule(): Rule
2626
$reflectionProvider,
2727
new UnresolvableTypeHelper(),
2828
new ClassNameCheck(new ClassCaseSensitivityCheck($reflectionProvider, true), new ClassForbiddenNameCheck(self::getContainer())),
29-
new MissingTypehintCheck(true, true, true, true, []),
29+
new MissingTypehintCheck(true, []),
3030
new GenericObjectTypeCheck(),
3131
true,
3232
true,
33-
true,
3433
));
3534
}
3635

0 commit comments

Comments
 (0)