[ci-review] Rector Rectify

rectorphp · Jan 29, 2021 · 83de443 · 83de443
1 parent 1c882b5
commit 83de443
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/rules/generics/src/TagValueNodeFactory/MethodTagValueNodeFactory.php b/rules/generics/src/TagValueNodeFactory/MethodTagValueNodeFactory.php
@@ -77,13 +77,16 @@ private function resolveStringParameters(array $parameterReflections): array
         return $stringParameters;
     }
 
-    private function resolveReturnTagTypeNode(ReturnTagValueNode $returnTagValueNode, TemplateTypeMap $templateTypeMap): TypeNode
-    {
+    private function resolveReturnTagTypeNode(
+        ReturnTagValueNode $returnTagValueNode,
+        TemplateTypeMap $templateTypeMap
+    ): TypeNode {
         $returnTagTypeNode = $returnTagValueNode->type;
-
         if ($returnTagValueNode->type instanceof UnionTypeNode) {
             return $this->resolveUnionTypeNode($returnTagValueNode->type, $templateTypeMap);
-        } elseif ($returnTagValueNode->type instanceof IdentifierTypeNode) {
+        }
+
+        if ($returnTagValueNode->type instanceof IdentifierTypeNode) {
             return $this->resolveIdentifierTypeNode(
                 $returnTagValueNode->type,
                 $templateTypeMap,
@@ -94,22 +97,6 @@ private function resolveReturnTagTypeNode(ReturnTagValueNode $returnTagValueNode
         return $returnTagTypeNode;
     }
 
-    private function resolveIdentifierTypeNode(
-        IdentifierTypeNode $identifierTypeNode,
-        TemplateTypeMap $templateTypeMap,
-        TypeNode $fallbackTypeNode
-    ): TypeNode {
-        $typeName = $identifierTypeNode->name;
-        $genericType = $templateTypeMap->getType($typeName);
-
-        if ($genericType instanceof Type) {
-            $returnTagType = $genericType;
-            return $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($returnTagType);
-        }
-
-        return $fallbackTypeNode;
-    }
-
     private function resolveUnionTypeNode(UnionTypeNode $unionTypeNode, TemplateTypeMap $templateTypeMap): UnionTypeNode
     {
         $resolvedTypes = [];
@@ -133,4 +120,20 @@ private function resolveUnionTypeNode(UnionTypeNode $unionTypeNode, TemplateType
 
         return new UnionTypeNode($resolvedTypes);
     }
+
+    private function resolveIdentifierTypeNode(
+        IdentifierTypeNode $identifierTypeNode,
+        TemplateTypeMap $templateTypeMap,
+        TypeNode $fallbackTypeNode
+    ): TypeNode {
+        $typeName = $identifierTypeNode->name;
+        $genericType = $templateTypeMap->getType($typeName);
+
+        if ($genericType instanceof Type) {
+            $returnTagType = $genericType;
+            return $this->staticTypeMapper->mapPHPStanTypeToPHPStanPhpDocTypeNode($returnTagType);
+        }
+
+        return $fallbackTypeNode;
+    }
 }