Utilize Type->isString() (#3063)

rectorphp · Nov 15, 2022 · 1b236c8 · 1b236c8
1 parent 04257d3
commit 1b236c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/packages/NodeTypeResolver/PHPStan/Type/StaticTypeAnalyzer.php b/packages/NodeTypeResolver/PHPStan/Type/StaticTypeAnalyzer.php
@@ -65,7 +65,7 @@ private function isScalarType(Type $type): bool
             return true;
         }
 
-        return $type instanceof BooleanType || $type instanceof StringType || $type instanceof IntegerType || $type instanceof FloatType;
+        return $type instanceof BooleanType || $type->isString()->yes() || $type instanceof IntegerType || $type instanceof FloatType;
     }
 
     private function isAlwaysTruableUnionType(Type $type): bool

diff --git a/packages/NodeTypeResolver/TypeAnalyzer/StringTypeAnalyzer.php b/packages/NodeTypeResolver/TypeAnalyzer/StringTypeAnalyzer.php
@@ -19,20 +19,6 @@ public function __construct(
     public function isStringOrUnionStringOnlyType(Expr $expr): bool
     {
         $nodeType = $this->nodeTypeResolver->getType($expr);
-        if ($nodeType instanceof StringType) {
-            return true;
-        }
-
-        if ($nodeType instanceof UnionType) {
-            foreach ($nodeType->getTypes() as $singleType) {
-                if ($singleType->isSuperTypeOf(new StringType())->no()) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return false;
+        return $nodeType->isString()->yes();
     }
 }