From 3fd129ff50ca57f219130fe9665bd4951fac42bd Mon Sep 17 00:00:00 2001
From: Markus Staab <markus.staab@redaxo.de>
Date: Sat, 12 Nov 2022 10:52:27 +0100
Subject: [PATCH] remove NodeTypeAnalyzer (#3055)

---
 .../NodeTypeAnalyzer/NodeTypeAnalyzer.php     | 37 -------------------
 .../FuncCall/StringifyStrNeedlesRector.php    |  8 +---
 .../NullToStrictStringFuncCallArgRector.php   |  6 +--
 3 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php

diff --git a/rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php b/rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php
deleted file mode 100644
index 3171fcc476c..00000000000
--- a/rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\Php73\NodeTypeAnalyzer;
-
-use PHPStan\Type\Accessory\AccessoryNumericStringType;
-use PHPStan\Type\IntersectionType;
-use PHPStan\Type\StringType;
-use PHPStan\Type\Type;
-use PHPStan\Type\UnionType;
-
-final class NodeTypeAnalyzer
-{
-    public function isStringyType(Type $type): bool
-    {
-        if ($type instanceof StringType) {
-            return true;
-        }
-
-        if ($type instanceof AccessoryNumericStringType) {
-            return true;
-        }
-
-        if ($type instanceof IntersectionType || $type instanceof UnionType) {
-            foreach ($type->getTypes() as $innerType) {
-                if (! $this->isStringyType($innerType)) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php b/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php
index e214775f8f4..118a3c28316 100644
--- a/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php
+++ b/rules/Php73/Rector/FuncCall/StringifyStrNeedlesRector.php
@@ -12,7 +12,6 @@
 use PHPStan\Type\StringType;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersionFeature;
-use Rector\Php73\NodeTypeAnalyzer\NodeTypeAnalyzer;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -39,11 +38,6 @@ final class StringifyStrNeedlesRector extends AbstractRector implements MinPhpVe
         'stristr',
     ];
 
-    public function __construct(
-        private readonly NodeTypeAnalyzer $nodeTypeAnalyzer
-    ) {
-    }
-
     public function provideMinPhpVersion(): int
     {
         return PhpVersionFeature::DEPRECATE_INT_IN_STR_NEEDLES;
@@ -99,7 +93,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if ($this->nodeTypeAnalyzer->isStringyType($needleType)) {
+        if ($needleType->isString()->yes()) {
             return null;
         }
 
diff --git a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php
index 63024b5b420..bd81cb72d41 100644
--- a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php
+++ b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php
@@ -26,7 +26,6 @@
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
-use Rector\Php73\NodeTypeAnalyzer\NodeTypeAnalyzer;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -331,8 +330,7 @@ final class NullToStrictStringFuncCallArgRector extends AbstractRector implement
 
     public function __construct(
         private readonly ReflectionResolver $reflectionResolver,
-        private readonly ArgsAnalyzer $argsAnalyzer,
-        private readonly NodeTypeAnalyzer $nodeTypeAnalyzer
+        private readonly ArgsAnalyzer $argsAnalyzer
     ) {
     }
 
@@ -460,7 +458,7 @@ private function processNullToStrictStringOnNodePosition(
         }
 
         $type = $this->nodeTypeResolver->getType($argValue);
-        if ($this->nodeTypeAnalyzer->isStringyType($type)) {
+        if ($type->isString()->yes()) {
             return null;
         }