Merge pull request #2695 from sabbelasichon/tv-type-methods-update

sabbelasichon · Oct 7, 2021 · d03a5a8 · d03a5a8
2 parents f1d5f33 + 2cd9582
commit d03a5a8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/src/Helper/Typo3NodeResolver.php b/src/Helper/Typo3NodeResolver.php
@@ -247,8 +247,7 @@ private function isPropertyFetchOnParentVariableOfType(Node $node, string $type)
             return false;
         }
 
-        $objectType = $this->nodeTypeResolver->resolve($parentNode->expr->var);
-
+        $objectType = $this->nodeTypeResolver->getType($parentNode->expr->var);
         if (! $objectType instanceof ObjectType) {
             return false;
         }

diff --git a/src/Rector/v10/v0/SwiftMailerBasedMailMessageToMailerBasedMessageRector.php b/src/Rector/v10/v0/SwiftMailerBasedMailMessageToMailerBasedMessageRector.php
@@ -104,7 +104,7 @@ public function getRuleDefinition(): RuleDefinition
 
     private function refactorMethodSetBody(MethodCall $node): ?MethodCall
     {
-        $bodyType = $this->nodeTypeResolver->resolve($node->args[0]->value);
+        $bodyType = $this->nodeTypeResolver->getType($node->args[0]->value);
         $contentType = isset($node->args[1]) ? $this->valueResolver->getValue($node->args[1]->value) : null;
 
         if (! $bodyType instanceof StringType) {

diff --git a/src/Rector/v11/v0/ExtbaseControllerActionsMustReturnResponseInterfaceRector.php b/src/Rector/v11/v0/ExtbaseControllerActionsMustReturnResponseInterfaceRector.php
@@ -207,7 +207,7 @@ private function alreadyResponseReturnType(ClassMethod $node): bool
                 continue;
             }
 
-            $returnType = $this->nodeTypeResolver->getStaticType($return->expr);
+            $returnType = $this->getType($return->expr);
             if ($returnType->isSuperTypeOf($responseObjectType)->yes()) {
                 return true;
             }

diff --git a/src/Rector/v8/v0/RefactorRemovedMethodsFromContentObjectRendererRector.php b/src/Rector/v8/v0/RefactorRemovedMethodsFromContentObjectRendererRector.php
@@ -106,7 +106,7 @@ public function getRuleDefinition(): RuleDefinition
 
     private function shouldSkip(MethodCall $node): bool
     {
-        $staticType = $this->getStaticType($node->var);
+        $staticType = $this->getType($node->var);
         if ($staticType instanceof TypeWithClassName && 'TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer' === $staticType->getClassName()) {
             return false;
         }

diff --git a/src/Rector/v9/v3/RemoveColPosParameterRector.php b/src/Rector/v9/v3/RemoveColPosParameterRector.php
@@ -55,7 +55,7 @@ public function refactor(Node $node): ?Node
         }
 
         // must be number type
-        $secondArgType = $this->getStaticType($node->args[1]->value);
+        $secondArgType = $this->getType($node->args[1]->value);
         if (! $secondArgType instanceof IntegerType) {
             return null;
         }