Use isInteger() (#3571)

rectorphp · Apr 8, 2023 · 59cdfc8 · 59cdfc8
1 parent 437cc5a
commit 59cdfc8
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/packages/NodeTypeResolver/NodeTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver.php
@@ -240,7 +240,7 @@ public function getNativeType(Expr $expr): Type
     public function isNumberType(Expr $expr): bool
     {
         $nodeType = $this->getType($expr);
-        if ($nodeType instanceof IntegerType) {
+        if ($nodeType->isInteger()->yes()) {
             return true;
         }
 

diff --git a/packages/NodeTypeResolver/PHPStan/Type/StaticTypeAnalyzer.php b/packages/NodeTypeResolver/PHPStan/Type/StaticTypeAnalyzer.php
@@ -73,7 +73,7 @@ private function isScalarType(Type $type): bool
             return true;
         }
 
-        if ($type instanceof IntegerType) {
+        if ($type->isInteger()->yes()) {
             return true;
         }
 

diff --git a/packages/NodeTypeResolver/TypeComparator/ScalarTypeComparator.php b/packages/NodeTypeResolver/TypeComparator/ScalarTypeComparator.php
@@ -26,7 +26,7 @@ public function areEqualScalar(Type $firstType, Type $secondType): bool
             return $firstTypeClass === $secondTypeClass;
         }
 
-        if ($firstType instanceof IntegerType && $secondType instanceof IntegerType) {
+        if ($firstType->isInteger()->yes() && $secondType->isInteger()->yes()) {
             return true;
         }
 
@@ -80,7 +80,7 @@ private function isScalarType(Type $type): bool
             return true;
         }
 
-        if ($type instanceof IntegerType) {
+        if ($type->isInteger()->yes()) {
             return true;
         }
 

diff --git a/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeAnalyzer.php b/packages/PHPStanStaticTypeMapper/TypeAnalyzer/UnionTypeAnalyzer.php
@@ -118,7 +118,7 @@ public function isScalar(UnionType $unionType): bool
                 continue;
             }
 
-            if ($type instanceof IntegerType) {
+            if ($type->isInteger()->yes()) {
                 continue;
             }
 

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php
@@ -248,7 +248,7 @@ private function isPairClassTooDetailed(Type $itemType): bool
 
     private function isIntegerKeyAndNonNestedArray(ArrayType $arrayType): bool
     {
-        if (! $arrayType->getKeyType() instanceof IntegerType) {
+        if (! $arrayType->getKeyType()->isInteger()->yes()) {
             return false;
         }
 

diff --git a/packages/PhpAttribute/NodeAnalyzer/ExprParameterReflectionTypeCorrector.php b/packages/PhpAttribute/NodeAnalyzer/ExprParameterReflectionTypeCorrector.php
@@ -92,7 +92,7 @@ private function correctItemByParameterReflection(
         $clearParameterType = TypeCombinator::removeNull($parameterType);
 
         // correct type
-        if ($clearParameterType instanceof IntegerType && $item instanceof String_) {
+        if ($clearParameterType->isInteger()->yes() && $item instanceof String_) {
             return new LNumber((int) $item->value);
         }
 

diff --git a/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php b/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php
@@ -160,7 +160,7 @@ private function resolveNewConditionNode(Expr $expr, bool $isNegated): ?BinaryOp
         }
 
         $exprType = $this->getType($expr);
-        if ($exprType instanceof IntegerType) {
+        if ($exprType->isInteger()->yes()) {
             return $this->resolveInteger($isNegated, $expr);
         }
 

diff --git a/rules/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php b/rules/Php74/Rector/FuncCall/MbStrrposEncodingArgumentPositionRector.php
@@ -65,7 +65,7 @@ public function refactor(Node $node): ?Node
         }
 
         $secondArgType = $this->getType($node->args[2]->value);
-        if ($secondArgType instanceof IntegerType) {
+        if ($secondArgType->isInteger()->yes()) {
             return null;
         }
 

diff --git a/rules/Php80/NodeAnalyzer/SwitchAnalyzer.php b/rules/Php80/NodeAnalyzer/SwitchAnalyzer.php
@@ -42,7 +42,7 @@ public function hasDifferentTypeCases(array $cases, Expr $expr): bool
         $uniqueTypes = $this->typeFactory->uniquateTypes($types);
         $countUniqueTypes = count($uniqueTypes);
 
-        if ($countUniqueTypes === 1 && $uniqueTypes[0] instanceof IntegerType) {
+        if ($countUniqueTypes === 1 && $uniqueTypes[0]->isInteger()->yes()) {
             $switchCondType = $this->nodeTypeResolver->getType($expr);
             if (! $switchCondType instanceof MixedType && $switchCondType->isString()->maybe()) {
                 return true;

diff --git a/rules/Strict/NodeFactory/ExactCompareFactory.php b/rules/Strict/NodeFactory/ExactCompareFactory.php
@@ -40,7 +40,7 @@ public function createIdenticalFalsyCompare(
             return new Identical($expr, new String_(''));
         }
 
-        if ($exprType instanceof IntegerType) {
+        if ($exprType->isInteger()->yes()) {
             return new Identical($expr, new LNumber(0));
         }
 
@@ -72,7 +72,7 @@ public function createNotIdenticalFalsyCompare(
             return new NotIdentical($expr, new String_(''));
         }
 
-        if ($exprType instanceof IntegerType) {
+        if ($exprType->isInteger()->yes()) {
             return new NotIdentical($expr, new LNumber(0));
         }
 

diff --git a/rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php
@@ -127,7 +127,7 @@ private function isScalarType(Type $type): bool
             return true;
         }
 
-        if ($type instanceof IntegerType) {
+        if ($type->isInteger()->yes()) {
             return true;
         }
 

diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php
@@ -146,7 +146,7 @@ static function (Node $subNode): bool {
 
         if ($resolvedType instanceof UnionType) {
             $benevolentUnionTypeIntegerType = $this->resolveBenevolentUnionTypeInteger($functionLike, $resolvedType);
-            if ($benevolentUnionTypeIntegerType instanceof IntegerType) {
+            if ($benevolentUnionTypeIntegerType->isInteger()->yes()) {
                 return $benevolentUnionTypeIntegerType;
             }
         }
@@ -157,15 +157,15 @@ static function (Node $subNode): bool {
     private function resolveBenevolentUnionTypeInteger(
         ClassMethod|Function_|Closure|ArrowFunction $functionLike,
         UnionType $unionType
-    ): UnionType|IntegerType {
+    ): Type {
         $types = $unionType->getTypes();
         $countTypes = count($types);
 
         if ($countTypes !== 2) {
             return $unionType;
         }
 
-        if (! ($types[0] instanceof IntegerType && $types[1]->isString()->yes())) {
+        if (! ($types[0]->isInteger()->yes() && $types[1]->isString()->yes())) {
             return $unionType;
         }