[DowngradePhp80] Handle not match @return with native return type on DowngradeUnionTypeDeclarationRector (#295)

* [DowngradePhp80] Handle not match @return with native return type on DowngradeUnionTypeDeclarationRector

* Fix

* Fix

* [ci-review] Rector Rectify

* keep doc

* keep doc

---------

Co-authored-by: GitHub Action <[email protected]>

Author: samsonasik

rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector/Fixture/match_return_doc_with_native.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FunctionLike\DowngradeUnionTypeDeclarationRector\Fixture;
+
+final class MatchReturnDocWithNative
+{
+    /**
+     * @return \stdClass[]|null|int
+     */
+    public function run($value): int|null|array
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FunctionLike\DowngradeUnionTypeDeclarationRector\Fixture;
+
+final class MatchReturnDocWithNative
+{
+    /**
+     * @return \stdClass[]|null|int
+     */
+    public function run($value)
+    {
+    }
+}
+
+?>

rules-tests/DowngradePhp80/Rector/FunctionLike/DowngradeUnionTypeDeclarationRector/Fixture/not_match_return_doc_with_native.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FunctionLike\DowngradeUnionTypeDeclarationRector\Fixture;
+
+final class NotMatchReturnDocWithNative
+{
+    /**
+     * @return \stdClass[]|null
+     */
+    public function run($value): int|null|array
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FunctionLike\DowngradeUnionTypeDeclarationRector\Fixture;
+
+final class NotMatchReturnDocWithNative
+{
+    /**
+     * @return \stdClass[]|null
+     */
+    public function run($value)
+    {
+    }
+}
+
+?>

src/PhpDocDecorator/PhpDocFromTypeDeclarationDecorator.php

@@ -56,7 +56,7 @@ public function __construct(
         private readonly ReflectionResolver $reflectionResolver,
         private readonly PhpAttributeAnalyzer $phpAttributeAnalyzer,
         private readonly PhpVersionProvider $phpVersionProvider,
-        private readonly AstResolver $astResolver,
+        private readonly AstResolver $astResolver
     ) {
         $this->classMethodWillChangeReturnTypes = [
             // @todo how to make list complete? is the method list needed or can we use just class names?
@@ -74,7 +74,9 @@ public function decorateReturn(ClassMethod|Function_|Closure|ArrowFunction $func
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($functionLike);
 
         $returnTagValueNode = $phpDocInfo->getReturnTagValue();
-        $returnType = $returnTagValueNode instanceof ReturnTagValueNode
+
+        $returnType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($functionLike->returnType);
+        $returnDocType = $returnTagValueNode instanceof ReturnTagValueNode
             ? $this->staticTypeMapper->mapPHPStanPhpDocTypeToPHPStanType($returnTagValueNode, $functionLike->returnType)
             : $this->staticTypeMapper->mapPhpParserNodePHPStanType($functionLike->returnType);
 
@@ -88,7 +90,7 @@ public function decorateReturn(ClassMethod|Function_|Closure|ArrowFunction $func
             return;
         }
 
-        $this->phpDocTypeChanger->changeReturnType($functionLike, $phpDocInfo, $returnType);
+        $this->phpDocTypeChanger->changeReturnType($functionLike, $phpDocInfo, $returnDocType);
 
         $functionLike->returnType = null;
         if (! $functionLike instanceof ClassMethod) {