Skip to content

Commit 398377f

Browse files
committed
refactor new usages to methods
1 parent 487eb4f commit 398377f

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

src/Analyser/MutatingScope.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5530,7 +5530,7 @@ private function getInstanceOfType(Expr\Instanceof_ $node): Type
55305530
) {
55315531
return new BooleanType();
55325532
}
5533-
if ($expressionType instanceof NeverType) {
5533+
if ($expressionType->isNever()->yes()) {
55345534
return new ConstantBooleanType(false);
55355535
}
55365536

src/Reflection/InitializerExprTypeResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ private function getFiniteOrConstantScalarTypes(Type $leftType, Type $rightType,
11381138

11391139
public function getBitwiseXorTypeFromTypes(Type $leftType, Type $rightType): Type
11401140
{
1141-
if ($leftType instanceof NeverType || $rightType instanceof NeverType) {
1141+
if ($leftType->isNever()->or($rightType->isNever())->yes()) {
11421142
return $this->getNeverType($leftType, $rightType);
11431143
}
11441144

src/Rules/Comparison/WhileLoopAlwaysTrueConditionRule.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use PHPStan\Rules\Rule;
1414
use PHPStan\Rules\RuleErrorBuilder;
1515
use PHPStan\Type\Constant\ConstantBooleanType;
16-
use PHPStan\Type\NeverType;
1716

1817
/**
1918
* @implements Rule<BreaklessWhileLoopNode>
@@ -70,7 +69,7 @@ public function processNode(
7069
if ($exprType->isTrue()->yes()) {
7170
$ref = $scope->getFunction() ?? $scope->getAnonymousFunctionReflection();
7271

73-
if ($ref !== null && $ref->getReturnType() instanceof NeverType) {
72+
if ($ref !== null && $ref->getReturnType()->isNever()->yes()) {
7473
return [];
7574
}
7675

src/Type/Php/ArrayCountValuesDynamicReturnTypeExtension.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use PHPStan\Type\IntegerRangeType;
1414
use PHPStan\Type\IntegerType;
1515
use PHPStan\Type\IntersectionType;
16-
use PHPStan\Type\NeverType;
1716
use PHPStan\Type\StringType;
1817
use PHPStan\Type\Type;
1918
use PHPStan\Type\TypeCombinator;
@@ -50,7 +49,7 @@ public function getTypeFromFunctionCall(
5049

5150
foreach ($arrayTypes as $arrayType) {
5251
$itemType = TypeCombinator::intersect($arrayType->getItemType(), $allowedValues);
53-
if ($itemType instanceof NeverType) {
52+
if ($itemType->isNever()->yes()) {
5453
continue;
5554
}
5655

src/Type/TypeCombinator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public static function union(Type ...$types): Type
165165
) {
166166
return $types[$i];
167167
}
168-
if ($types[$i] instanceof NeverType && !$types[$i]->isExplicit()) {
168+
if ($types[$i]->isNever()->yes() && $types[$i]->isExplicitNever()->no()) {
169169
array_splice($types, $i--, 1);
170170
$typesCount--;
171171
continue;
@@ -1135,7 +1135,7 @@ public static function intersect(Type ...$types): Type
11351135
}
11361136

11371137
foreach ($types as $type) {
1138-
if ($type instanceof NeverType && !$type->isExplicit()) {
1138+
if ($type->isNever()->yes() && $type->isExplicitNever()->no()) {
11391139
return $type;
11401140
}
11411141
}

0 commit comments

Comments
 (0)