[DowngradePhp80] Do not change correct union array docblock on Downgr…

…adeUnionTypeDeclarationRector (#191) * [DowngradePhp80] Do not change correct union array docblock on DowngradeUnionTypeDeclarationRector * [ci-review] Rector Rectify * Fixed * Fix --------- Co-authored-by: GitHub Action <[email protected]>
rectorphp · Sep 11, 2023 · 74058c2 · 74058c2
1 parent fa41cc7
commit 74058c2
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/...ypeDeclarationRector/Fixture/do_not_change_correct_union_array_docblock_on_param2.php.inc b/...ypeDeclarationRector/Fixture/do_not_change_correct_union_array_docblock_on_param2.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FunctionLike\DowngradeUnionTypeDeclarationRector\Fixture;
+
+use PhpParser\Node;
+
+final class DoNotChangeCorrectUnionArrayDocblockOnParam2
+{
+    /**
+     * @param Node|Node[] $node
+     */
+    function execute(Node | array $node): void
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\FunctionLike\DowngradeUnionTypeDeclarationRector\Fixture;
+
+use PhpParser\Node;
+
+final class DoNotChangeCorrectUnionArrayDocblockOnParam2
+{
+    /**
+     * @param Node|Node[] $node
+     */
+    function execute($node): void
+    {
+    }
+}
+
+?>
diff --git a/rules/DowngradePhp73/Tokenizer/FollowedByNewlineOnlyMaybeWithSemicolonAnalyzer.php b/rules/DowngradePhp73/Tokenizer/FollowedByNewlineOnlyMaybeWithSemicolonAnalyzer.php
@@ -21,6 +21,6 @@ public function isFollowed(File $file, Node $node): bool
 
         return ! isset($oldTokens[$nextTokenPosition]) ||
             isset($oldTokens[$nextTokenPosition][1]) &&
-            \str_starts_with((string) $oldTokens[$nextTokenPosition][1], "\n");
+            \str_starts_with($oldTokens[$nextTokenPosition][1], "\n");
     }
 }
diff --git a/src/PhpDocDecorator/PhpDocFromTypeDeclarationDecorator.php b/src/PhpDocDecorator/PhpDocFromTypeDeclarationDecorator.php
@@ -14,6 +14,7 @@
 use PhpParser\Node\Stmt\Function_;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use PHPStan\Reflection\ClassReflection;
+use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
@@ -223,11 +224,17 @@ private function moveParamTypeToParamDoc(
         Param $param,
         Type $type
     ): void {
+        $param->type = null;
+
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($functionLike);
         $paramName = $this->nodeNameResolver->getName($param);
-        $this->phpDocTypeChanger->changeParamType($functionLike, $phpDocInfo, $type, $param, $paramName);
 
-        $param->type = null;
+        $phpDocParamType = $phpDocInfo->getParamType($paramName);
+        if (! $type instanceof MixedType && $type::class === $phpDocParamType::class) {
+            return;
+        }
+
+        $this->phpDocTypeChanger->changeParamType($functionLike, $phpDocInfo, $type, $param, $paramName);
     }
 
     /**