Fix AddReturnArrayDocblockBasedOnArrayMapRector (#6800)

carlos-granados · web-flow · commit 45e746b189e6 · 2025-03-20T21:58:50.000+01:00
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddReturnArrayDocblockBasedOnArrayMapRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddReturnArrayDocblockBasedOnArrayMapRector.php
@@ -127,10 +127,10 @@ public function refactor(Node $node): null|Function_|ClassMethod
 
         $hasChanged = $this->phpDocTypeChanger->changeReturnType($node, $functionLikePhpDocInfo, $arrayType);
         if ($hasChanged) {
-            return null;
+            return $node;
         }
 
-        return $node;
+        return null;
     }
 
     private function hasNonArrayReturnType(ClassMethod|Function_ $functionLike): bool

Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,10 @@ public function refactor(Node $node): null\|Function_\|ClassMethod`
`127`	`127`
`128`	`128`	`$hasChanged = $this->phpDocTypeChanger->changeReturnType($node, $functionLikePhpDocInfo, $arrayType);`
`129`	`129`	`if ($hasChanged) {`
`130`		`- return null;`
	`130`	`+ return $node;`
`131`	`131`	`}`
`132`	`132`
`133`		`- return $node;`
	`133`	`+ return null;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`private function hasNonArrayReturnType(ClassMethod\|Function_ $functionLike): bool`