remove return tags in TemplateAnnotationToThisRenderRector as no longer needed

rules-tests/CodeQuality/Rector/ClassMethod/TemplateAnnotationToThisRenderRector/Fixture/remove_double_return.php.inc

@@ -0,0 +1,42 @@
+<?php
+
+namespace AppBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+
+final class RemoveDoubleReturn extends AbstractController
+{
+    /**
+     * @Template("AppBundle:Module:next.html.twig")
+     *
+     * @return Response
+     *
+     * @return array
+     */
+    public function indexAction(): array
+    {
+        return [];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace AppBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+
+final class RemoveDoubleReturn extends AbstractController
+{
+    public function indexAction(): \Symfony\Component\HttpFoundation\Response
+    {
+        return $this->render('AppBundle:Module:next.html.twig');
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/ClassMethod/TemplateAnnotationToThisRenderRector/Fixture/with_array_return_type.php.inc

@@ -39,9 +39,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 final class WithArrayReturnType extends AbstractController
 {
-    /**
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
     public function indexAction(): \Symfony\Component\HttpFoundation\Response
     {
         return $this->render('AppBundle:Module:index.html.twig');

rules-tests/CodeQuality/Rector/ClassMethod/TemplateAnnotationToThisRenderRector/Fixture/with_return_types.php.inc

@@ -45,9 +45,6 @@ use Symfony\Component\HttpFoundation\Response;
 
 final class ClassWithReturnTypes extends AbstractController
 {
-    /**
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
     public function index2Action(): \Symfony\Component\HttpFoundation\Response
     {
         if (true) {
@@ -57,9 +54,6 @@ final class ClassWithReturnTypes extends AbstractController
         return $this->render('AppBundle:Module:index2.html.twig');
     }
 
-    /**
-     * @return Response
-     */
     public function index3Action(): Response
     {
         return $this->render('AppBundle:Module:index3.html.twig');

src/TypeDeclaration/ReturnTypeDeclarationUpdater.php

@@ -8,11 +8,8 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
-use PHPStan\Type\ArrayType;
 use PHPStan\Type\ObjectType;
-use PHPStan\Type\UnionType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\BetterPhpDocParser\ValueObject\Type\FullyQualifiedIdentifierTypeNode;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Php\PhpVersionProvider;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -33,30 +30,14 @@ public function __construct(
      */
     public function updateClassMethod(ClassMethod $classMethod, string $className): void
     {
-        $this->updatePhpDoc($classMethod, $className);
+        $this->removeReturnDocBlocks($classMethod);
         $this->updatePhp($classMethod, $className);
     }
 
-    /**
-     * @param class-string $className
-     */
-    private function updatePhpDoc(ClassMethod $classMethod, string $className): void
+    private function removeReturnDocBlocks(ClassMethod $classMethod): void
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($classMethod);
-
-        $returnTagValueNode = $phpDocInfo->getReturnTagValue();
-        if (! $returnTagValueNode instanceof ReturnTagValueNode) {
-            return;
-        }
-
-        $returnStaticType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType(
-            $returnTagValueNode->type,
-            $classMethod
-        );
-
-        if ($returnStaticType instanceof ArrayType || $returnStaticType instanceof UnionType) {
-            $returnTagValueNode->type = new FullyQualifiedIdentifierTypeNode($className);
-        }
+        $phpDocInfo->removeByType(ReturnTagValueNode::class);
 
         $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($classMethod);
     }