remove NodeTypeAnalyzer (#3055)

rectorphp · Nov 12, 2022 · 3fd129f · 3fd129f
1 parent 64f4a55
commit 3fd129f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 48 deletions.
diff --git a/rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php b/rules/Php73/NodeTypeAnalyzer/NodeTypeAnalyzer.php
diff --git 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
@@ -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;
         }