Skip to content

Commit b087145

Browse files
canvuralcanvural
committed
replace instanceof ErrorType usages
1 parent 078bd8a commit b087145

File tree

76 files changed

+138
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+138
-196
lines changed

‎src/Analyser/MutatingScope.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,15 +1785,15 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
17851785

17861786
$returnType = $functionReflection->getReturnType();
17871787
$generatorSendType = $returnType->getTemplateType(Generator::class, 'TSend');
1788-
if ($generatorSendType instanceof ErrorType) {
1788+
if ($generatorSendType->isError()->yes()) {
17891789
return new MixedType();
17901790
}
17911791

17921792
return $generatorSendType;
17931793
} elseif ($node instanceof Expr\YieldFrom) {
17941794
$yieldFromType = $this->getType($node->expr);
17951795
$generatorReturnType = $yieldFromType->getTemplateType(Generator::class, 'TReturn');
1796-
if ($generatorReturnType instanceof ErrorType) {
1796+
if ($generatorReturnType->isError()->yes()) {
17971797
return new MixedType();
17981798
}
17991799

@@ -6051,7 +6051,7 @@ classReflection: $classReflection->withTypes($types)->asFinal(),
60516051
return TypeTraverser::map($newGenericType, static function (Type $type, callable $traverse) use ($resolvedTemplateTypeMap): Type {
60526052
if ($type instanceof TemplateType && !$type->isArgument()) {
60536053
$newType = $resolvedTemplateTypeMap->getType($type->getName());
6054-
if ($newType === null || $newType instanceof ErrorType) {
6054+
if ($newType === null || $newType->isError()->yes()) {
60556055
return $type->getDefault() ?? $type->getBound();
60566056
}
60576057

‎src/Reflection/ClassReflection.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,7 @@ public function getActiveTemplateTypeMap(): TemplateTypeMap
16461646
if ($resolved !== null) {
16471647
$templateTypeMap = $this->getTemplateTypeMap();
16481648
return $this->activeTemplateTypeMap = $resolved->map(static function (string $name, Type $type) use ($templateTypeMap): Type {
1649-
if ($type instanceof ErrorType) {
1649+
if ($type->isError()->yes()) {
16501650
$templateType = $templateTypeMap->getType($name);
16511651
if ($templateType !== null) {
16521652
return TemplateTypeHelper::resolveToDefaults($templateType);

‎src/Reflection/InitializerExprTypeResolver.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ public function resolveConcatType(Type $left, Type $right): Type
519519
if (TypeCombinator::union(
520520
$leftStringType,
521521
$rightStringType,
522-
) instanceof ErrorType) {
522+
)->isError()->yes()) {
523523
return new ErrorType();
524524
}
525525

@@ -988,7 +988,7 @@ public function getBitwiseAndTypeFromTypes(Type $leftType, Type $rightType): Typ
988988
$leftNumberType = $leftTypeInner->toNumber();
989989
$rightNumberType = $rightTypeInner->toNumber();
990990

991-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
991+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
992992
return new ErrorType();
993993
}
994994

@@ -1027,7 +1027,7 @@ public function getBitwiseAndTypeFromTypes(Type $leftType, Type $rightType): Typ
10271027
$leftNumberType = $leftType->toNumber();
10281028
$rightNumberType = $rightType->toNumber();
10291029

1030-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1030+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
10311031
return new ErrorType();
10321032
}
10331033

@@ -1074,7 +1074,7 @@ public function getBitwiseOrTypeFromTypes(Type $leftType, Type $rightType): Type
10741074
$leftNumberType = $leftTypeInner->toNumber();
10751075
$rightNumberType = $rightTypeInner->toNumber();
10761076

1077-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1077+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
10781078
return new ErrorType();
10791079
}
10801080

@@ -1110,7 +1110,7 @@ public function getBitwiseOrTypeFromTypes(Type $leftType, Type $rightType): Type
11101110
return new ErrorType();
11111111
}
11121112

1113-
if (TypeCombinator::union($leftType->toNumber(), $rightType->toNumber()) instanceof ErrorType) {
1113+
if (TypeCombinator::union($leftType->toNumber(), $rightType->toNumber())->isError()->yes()) {
11141114
return new ErrorType();
11151115
}
11161116

@@ -1150,7 +1150,7 @@ public function getBitwiseXorTypeFromTypes(Type $leftType, Type $rightType): Typ
11501150
$leftNumberType = $leftTypeInner->toNumber();
11511151
$rightNumberType = $rightTypeInner->toNumber();
11521152

1153-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1153+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
11541154
return new ErrorType();
11551155
}
11561156

@@ -1186,7 +1186,7 @@ public function getBitwiseXorTypeFromTypes(Type $leftType, Type $rightType): Typ
11861186
return new ErrorType();
11871187
}
11881188

1189-
if (TypeCombinator::union($leftType->toNumber(), $rightType->toNumber()) instanceof ErrorType) {
1189+
if (TypeCombinator::union($leftType->toNumber(), $rightType->toNumber())->isError()->yes()) {
11901190
return new ErrorType();
11911191
}
11921192

@@ -1257,7 +1257,7 @@ public function getDivTypeFromTypes(Expr $left, Expr $right, Type $leftType, Typ
12571257
$leftNumberType = $leftTypeInner->toNumber();
12581258
$rightNumberType = $rightTypeInner->toNumber();
12591259

1260-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1260+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
12611261
return new ErrorType();
12621262
}
12631263

@@ -1313,7 +1313,7 @@ public function getModTypeFromTypes(Expr $left, Expr $right, Type $leftType, Typ
13131313
return $extensionSpecified;
13141314
}
13151315

1316-
if ($leftType->toNumber() instanceof ErrorType || $rightType->toNumber() instanceof ErrorType) {
1316+
if ($leftType->toNumber()->isError()->yes() || $rightType->toNumber()->isError()->yes()) {
13171317
return new ErrorType();
13181318
}
13191319

@@ -1330,7 +1330,7 @@ public function getModTypeFromTypes(Expr $left, Expr $right, Type $leftType, Typ
13301330
$leftNumberType = $leftTypeInner->toNumber();
13311331
$rightNumberType = $rightTypeInner->toNumber();
13321332

1333-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1333+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
13341334
return new ErrorType();
13351335
}
13361336

@@ -1434,7 +1434,7 @@ public function getPlusTypeFromTypes(Expr $left, Expr $right, Type $leftType, Ty
14341434
$leftNumberType = $leftTypeInner->toNumber();
14351435
$rightNumberType = $rightTypeInner->toNumber();
14361436

1437-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1437+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
14381438
return new ErrorType();
14391439
}
14401440

@@ -1618,7 +1618,7 @@ public function getMinusTypeFromTypes(Expr $left, Expr $right, Type $leftType, T
16181618
$leftNumberType = $leftTypeInner->toNumber();
16191619
$rightNumberType = $rightTypeInner->toNumber();
16201620

1621-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1621+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
16221622
return new ErrorType();
16231623
}
16241624

@@ -1667,7 +1667,7 @@ public function getMulTypeFromTypes(Expr $left, Expr $right, Type $leftType, Typ
16671667
$leftNumberType = $leftTypeInner->toNumber();
16681668
$rightNumberType = $rightTypeInner->toNumber();
16691669

1670-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1670+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
16711671
return new ErrorType();
16721672
}
16731673

@@ -1725,7 +1725,7 @@ public function getPowTypeFromTypes(Expr $left, Expr $right, Type $leftType, Typ
17251725
}
17261726

17271727
$exponentiatedTyped = $leftType->exponentiate($rightType);
1728-
if (!$exponentiatedTyped instanceof ErrorType) {
1728+
if (!$exponentiatedTyped->isError()->yes()) {
17291729
return $exponentiatedTyped;
17301730
}
17311731

@@ -1762,7 +1762,7 @@ public function getShiftLeftTypeFromTypes(Expr $left, Expr $right, Type $leftTyp
17621762
$leftNumberType = $leftTypeInner->toNumber();
17631763
$rightNumberType = $rightTypeInner->toNumber();
17641764

1765-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1765+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
17661766
return new ErrorType();
17671767
}
17681768

@@ -1789,7 +1789,7 @@ public function getShiftLeftTypeFromTypes(Expr $left, Expr $right, Type $leftTyp
17891789
$leftNumberType = $leftType->toNumber();
17901790
$rightNumberType = $rightType->toNumber();
17911791

1792-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1792+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
17931793
return new ErrorType();
17941794
}
17951795

@@ -1826,7 +1826,7 @@ public function getShiftRightTypeFromTypes(Expr $left, Expr $right, Type $leftTy
18261826
$leftNumberType = $leftTypeInner->toNumber();
18271827
$rightNumberType = $rightTypeInner->toNumber();
18281828

1829-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1829+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
18301830
return new ErrorType();
18311831
}
18321832

@@ -1853,7 +1853,7 @@ public function getShiftRightTypeFromTypes(Expr $left, Expr $right, Type $leftTy
18531853
$leftNumberType = $leftType->toNumber();
18541854
$rightNumberType = $rightType->toNumber();
18551855

1856-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1856+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
18571857
return new ErrorType();
18581858
}
18591859

@@ -2071,7 +2071,7 @@ private function resolveCommonMath(Expr\BinaryOp $expr, Type $leftType, Type $ri
20712071
return new ErrorType();
20722072
}
20732073

2074-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
2074+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
20752075
return new ErrorType();
20762076
}
20772077
if ($leftNumberType instanceof NeverType || $rightNumberType instanceof NeverType) {

‎src/Reflection/Php/PhpClassReflectionExtension.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
4242
use PHPStan\Type\Constant\ConstantStringType;
4343
use PHPStan\Type\Enum\EnumCaseObjectType;
44-
use PHPStan\Type\ErrorType;
4544
use PHPStan\Type\FileTypeMapper;
4645
use PHPStan\Type\GeneralizePrecision;
4746
use PHPStan\Type\Generic\TemplateMixedType;
@@ -1161,7 +1160,7 @@ private function inferAndCachePropertyTypes(
11611160
}
11621161

11631162
$propertyType = $methodScope->getType($expr->expr);
1164-
if ($propertyType instanceof ErrorType || $propertyType instanceof NeverType) {
1163+
if ($propertyType->isError()->yes() || $propertyType instanceof NeverType) {
11651164
continue;
11661165
}
11671166

‎src/Reflection/ResolvedFunctionVariantWithOriginal.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use PHPStan\Reflection\Php\ExtendedDummyParameter;
66
use PHPStan\Type\ConditionalTypeForParameter;
7-
use PHPStan\Type\ErrorType;
87
use PHPStan\Type\Generic\GenericObjectType;
98
use PHPStan\Type\Generic\GenericStaticType;
109
use PHPStan\Type\Generic\TemplateType;
@@ -211,7 +210,7 @@ private function resolveResolvableTemplateTypes(Type $type, TemplateTypeVariance
211210
&& $type->getScope()->getFunctionName() !== null
212211
) {
213212
$newType = $this->resolvedTemplateTypeMap->getType($type->getName());
214-
if ($newType === null || $newType instanceof ErrorType) {
213+
if ($newType === null || $newType->isError()->yes()) {
215214
return $traverse($type);
216215
}
217216

@@ -252,7 +251,7 @@ private function resolveResolvableTemplateTypes(Type $type, TemplateTypeVariance
252251

253252
if ($type instanceof TemplateType && !$type->isArgument()) {
254253
$newType = $this->resolvedTemplateTypeMap->getType($type->getName());
255-
if ($newType === null || $newType instanceof ErrorType) {
254+
if ($newType === null || $newType->isError()->yes()) {
256255
return $traverse($type);
257256
}
258257

‎src/Rules/Arrays/ArrayDestructuringRule.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use PHPStan\Rules\RuleErrorBuilder;
1515
use PHPStan\Rules\RuleLevelHelper;
1616
use PHPStan\Type\Constant\ConstantIntegerType;
17-
use PHPStan\Type\ErrorType;
1817
use PHPStan\Type\ObjectType;
1918
use PHPStan\Type\Type;
2019
use PHPStan\Type\VerbosityLevel;
@@ -65,7 +64,7 @@ private function getErrors(Scope $scope, Node\Expr\List_ $var, Expr $expr): arra
6564
static fn (Type $varType): bool => $varType->isArray()->yes() || (new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->yes(),
6665
);
6766
$exprType = $exprTypeResult->getType();
68-
if ($exprType instanceof ErrorType) {
67+
if ($exprType->isError()->yes()) {
6968
return [];
7069
}
7170
if (!$exprType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($exprType)->yes()) {

‎src/Rules/Arrays/ArrayUnpackingRule.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use PHPStan\Rules\Rule;
1212
use PHPStan\Rules\RuleErrorBuilder;
1313
use PHPStan\Rules\RuleLevelHelper;
14-
use PHPStan\Type\ErrorType;
1514
use PHPStan\Type\Type;
1615
use PHPStan\Type\VerbosityLevel;
1716
use function sprintf;
@@ -46,7 +45,7 @@ public function processNode(Node $node, Scope $scope): array
4645
);
4746

4847
$keyType = $typeResult->getType();
49-
if ($keyType instanceof ErrorType) {
48+
if ($keyType->isError()->yes()) {
5049
return $typeResult->getUnknownClassErrors();
5150
}
5251

‎src/Rules/Arrays/InvalidKeyInArrayDimFetchRule.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use PHPStan\Rules\Rule;
1111
use PHPStan\Rules\RuleErrorBuilder;
1212
use PHPStan\Rules\RuleLevelHelper;
13-
use PHPStan\Type\ErrorType;
1413
use PHPStan\Type\Type;
1514
use PHPStan\Type\VerbosityLevel;
1615
use function sprintf;
@@ -49,7 +48,7 @@ public function processNode(Node $node, Scope $scope): array
4948
static fn (Type $varType): bool => $varType->isArray()->no(),
5049
)->getType();
5150

52-
if ($varType instanceof ErrorType) {
51+
if ($varType->isError()->yes()) {
5352
return [];
5453
}
5554

@@ -65,7 +64,7 @@ public function processNode(Node $node, Scope $scope): array
6564
'',
6665
static fn (Type $dimType): bool => $allowedArrayKeys->isSuperTypeOf($dimType)->yes(),
6766
)->getType();
68-
if ($dimensionType instanceof ErrorType) {
67+
if ($dimensionType->isError()->yes()) {
6968
return [];
7069
}
7170

‎src/Rules/Arrays/InvalidKeyInArrayItemRule.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use PHPStan\Rules\Rule;
1010
use PHPStan\Rules\RuleErrorBuilder;
1111
use PHPStan\Rules\RuleLevelHelper;
12-
use PHPStan\Type\ErrorType;
1312
use PHPStan\Type\Type;
1413
use PHPStan\Type\VerbosityLevel;
1514
use function sprintf;
@@ -46,7 +45,7 @@ public function processNode(Node $node, Scope $scope): array
4645
'',
4746
static fn (Type $dimType): bool => $allowedArrayKeys->isSuperTypeOf($dimType)->yes(),
4847
)->getType();
49-
if ($dimensionType instanceof ErrorType) {
48+
if ($dimensionType->isError()->yes()) {
5049
return [];
5150
}
5251

‎src/Rules/Arrays/IterableInForeachRule.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use PHPStan\Rules\Rule;
1010
use PHPStan\Rules\RuleErrorBuilder;
1111
use PHPStan\Rules\RuleLevelHelper;
12-
use PHPStan\Type\ErrorType;
1312
use PHPStan\Type\Type;
1413
use PHPStan\Type\VerbosityLevel;
1514
use function sprintf;
@@ -40,7 +39,7 @@ public function processNode(Node $node, Scope $scope): array
4039
static fn (Type $type): bool => $type->isIterable()->yes(),
4140
);
4241
$type = $typeResult->getType();
43-
if ($type instanceof ErrorType) {
42+
if ($type->isError()->yes()) {
4443
return $typeResult->getUnknownClassErrors();
4544
}
4645
if ($type->isIterable()->yes()) {

0 commit comments

Comments
 (0)