Skip to content

Commit eff1365

Browse files
canvuralcanvural
committed
replace instanceof ErrorType usages
1 parent 2c9b692 commit eff1365

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
@@ -1800,15 +1800,15 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
18001800

18011801
$returnType = $functionReflection->getReturnType();
18021802
$generatorSendType = $returnType->getTemplateType(Generator::class, 'TSend');
1803-
if ($generatorSendType instanceof ErrorType) {
1803+
if ($generatorSendType->isError()->yes()) {
18041804
return new MixedType();
18051805
}
18061806

18071807
return $generatorSendType;
18081808
} elseif ($node instanceof Expr\YieldFrom) {
18091809
$yieldFromType = $this->getType($node->expr);
18101810
$generatorReturnType = $yieldFromType->getTemplateType(Generator::class, 'TReturn');
1811-
if ($generatorReturnType instanceof ErrorType) {
1811+
if ($generatorReturnType->isError()->yes()) {
18121812
return new MixedType();
18131813
}
18141814

@@ -6040,7 +6040,7 @@ classReflection: $classReflection->withTypes($types)->asFinal(),
60406040
return TypeTraverser::map($newGenericType, static function (Type $type, callable $traverse) use ($resolvedTemplateTypeMap): Type {
60416041
if ($type instanceof TemplateType && !$type->isArgument()) {
60426042
$newType = $resolvedTemplateTypeMap->getType($type->getName());
6043-
if ($newType === null || $newType instanceof ErrorType) {
6043+
if ($newType === null || $newType->isError()->yes()) {
60446044
return $type->getDefault() ?? $type->getBound();
60456045
}
60466046

‎src/Reflection/ClassReflection.php‎

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

‎src/Reflection/InitializerExprTypeResolver.php‎

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

@@ -974,7 +974,7 @@ public function getBitwiseAndType(Expr $left, Expr $right, callable $getTypeCall
974974
$leftNumberType = $leftTypeInner->toNumber();
975975
$rightNumberType = $rightTypeInner->toNumber();
976976

977-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
977+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
978978
return new ErrorType();
979979
}
980980

@@ -1001,7 +1001,7 @@ public function getBitwiseAndType(Expr $left, Expr $right, callable $getTypeCall
10011001
$leftNumberType = $leftType->toNumber();
10021002
$rightNumberType = $rightType->toNumber();
10031003

1004-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1004+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
10051005
return new ErrorType();
10061006
}
10071007

@@ -1043,7 +1043,7 @@ public function getBitwiseOrType(Expr $left, Expr $right, callable $getTypeCallb
10431043
$leftNumberType = $leftTypeInner->toNumber();
10441044
$rightNumberType = $rightTypeInner->toNumber();
10451045

1046-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1046+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
10471047
return new ErrorType();
10481048
}
10491049

@@ -1067,7 +1067,7 @@ public function getBitwiseOrType(Expr $left, Expr $right, callable $getTypeCallb
10671067
return new StringType();
10681068
}
10691069

1070-
if (TypeCombinator::union($leftType->toNumber(), $rightType->toNumber()) instanceof ErrorType) {
1070+
if (TypeCombinator::union($leftType->toNumber(), $rightType->toNumber())->isError()->yes()) {
10711071
return new ErrorType();
10721072
}
10731073

@@ -1102,7 +1102,7 @@ public function getBitwiseXorType(Expr $left, Expr $right, callable $getTypeCall
11021102
$leftNumberType = $leftTypeInner->toNumber();
11031103
$rightNumberType = $rightTypeInner->toNumber();
11041104

1105-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1105+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
11061106
return new ErrorType();
11071107
}
11081108

@@ -1126,7 +1126,7 @@ public function getBitwiseXorType(Expr $left, Expr $right, callable $getTypeCall
11261126
return new StringType();
11271127
}
11281128

1129-
if (TypeCombinator::union($leftType->toNumber(), $rightType->toNumber()) instanceof ErrorType) {
1129+
if (TypeCombinator::union($leftType->toNumber(), $rightType->toNumber())->isError()->yes()) {
11301130
return new ErrorType();
11311131
}
11321132

@@ -1187,7 +1187,7 @@ public function getDivType(Expr $left, Expr $right, callable $getTypeCallback):
11871187
$leftNumberType = $leftTypeInner->toNumber();
11881188
$rightNumberType = $rightTypeInner->toNumber();
11891189

1190-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1190+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
11911191
return new ErrorType();
11921192
}
11931193

@@ -1238,7 +1238,7 @@ public function getModType(Expr $left, Expr $right, callable $getTypeCallback):
12381238
return $extensionSpecified;
12391239
}
12401240

1241-
if ($leftType->toNumber() instanceof ErrorType || $rightType->toNumber() instanceof ErrorType) {
1241+
if ($leftType->toNumber()->isError()->yes() || $rightType->toNumber()->isError()->yes()) {
12421242
return new ErrorType();
12431243
}
12441244

@@ -1255,7 +1255,7 @@ public function getModType(Expr $left, Expr $right, callable $getTypeCallback):
12551255
$leftNumberType = $leftTypeInner->toNumber();
12561256
$rightNumberType = $rightTypeInner->toNumber();
12571257

1258-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1258+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
12591259
return new ErrorType();
12601260
}
12611261

@@ -1354,7 +1354,7 @@ public function getPlusType(Expr $left, Expr $right, callable $getTypeCallback):
13541354
$leftNumberType = $leftTypeInner->toNumber();
13551355
$rightNumberType = $rightTypeInner->toNumber();
13561356

1357-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1357+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
13581358
return new ErrorType();
13591359
}
13601360

@@ -1533,7 +1533,7 @@ public function getMinusType(Expr $left, Expr $right, callable $getTypeCallback)
15331533
$leftNumberType = $leftTypeInner->toNumber();
15341534
$rightNumberType = $rightTypeInner->toNumber();
15351535

1536-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1536+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
15371537
return new ErrorType();
15381538
}
15391539

@@ -1577,7 +1577,7 @@ public function getMulType(Expr $left, Expr $right, callable $getTypeCallback):
15771577
$leftNumberType = $leftTypeInner->toNumber();
15781578
$rightNumberType = $rightTypeInner->toNumber();
15791579

1580-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1580+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
15811581
return new ErrorType();
15821582
}
15831583

@@ -1630,7 +1630,7 @@ public function getPowType(Expr $left, Expr $right, callable $getTypeCallback):
16301630
}
16311631

16321632
$exponentiatedTyped = $leftType->exponentiate($rightType);
1633-
if (!$exponentiatedTyped instanceof ErrorType) {
1633+
if (!$exponentiatedTyped->isError()->yes()) {
16341634
return $exponentiatedTyped;
16351635
}
16361636

@@ -1662,7 +1662,7 @@ public function getShiftLeftType(Expr $left, Expr $right, callable $getTypeCallb
16621662
$leftNumberType = $leftTypeInner->toNumber();
16631663
$rightNumberType = $rightTypeInner->toNumber();
16641664

1665-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1665+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
16661666
return new ErrorType();
16671667
}
16681668

@@ -1689,7 +1689,7 @@ public function getShiftLeftType(Expr $left, Expr $right, callable $getTypeCallb
16891689
$leftNumberType = $leftType->toNumber();
16901690
$rightNumberType = $rightType->toNumber();
16911691

1692-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1692+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
16931693
return new ErrorType();
16941694
}
16951695

@@ -1721,7 +1721,7 @@ public function getShiftRightType(Expr $left, Expr $right, callable $getTypeCall
17211721
$leftNumberType = $leftTypeInner->toNumber();
17221722
$rightNumberType = $rightTypeInner->toNumber();
17231723

1724-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1724+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
17251725
return new ErrorType();
17261726
}
17271727

@@ -1748,7 +1748,7 @@ public function getShiftRightType(Expr $left, Expr $right, callable $getTypeCall
17481748
$leftNumberType = $leftType->toNumber();
17491749
$rightNumberType = $rightType->toNumber();
17501750

1751-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1751+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
17521752
return new ErrorType();
17531753
}
17541754

@@ -1966,7 +1966,7 @@ private function resolveCommonMath(Expr\BinaryOp $expr, Type $leftType, Type $ri
19661966
return new ErrorType();
19671967
}
19681968

1969-
if ($leftNumberType instanceof ErrorType || $rightNumberType instanceof ErrorType) {
1969+
if ($leftNumberType->isError()->yes() || $rightNumberType->isError()->yes()) {
19701970
return new ErrorType();
19711971
}
19721972
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)