Update rules/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector.php

TomasVotruba · samsonasik · web-flow · commit 78bbcb00de03 · 2025-09-01T17:10:02.000+02:00
Co-authored-by: Abdul Malik Ikhsan &lt;samsonasik@gmail.com&gt;
diff --git a/rules/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector.php b/rules/CodeQuality/Rector/Class_/AddReturnTypeToDependedRector.php
@@ -106,11 +106,10 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            if ($this->silentVoidResolver->hasSilentVoid($classMethod)) {
-                continue;
+            $returns = $this->betterNodeFinder->findReturnsScoped($functionLike);
+            if (! $this->returnAnalyzer->hasOnlyReturnWithExpr($functionLike, $returns)) {
+                return null;
             }
-
-            $returns = $this->betterNodeFinder->findReturnsScoped($classMethod);
             if (count($returns) !== 1) {
                 continue;
             }

Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,10 @@ public function refactor(Node $node): ?Node`
`106`	`106`	`continue;`
`107`	`107`	`}`
`108`	`108`
`109`		`- if ($this->silentVoidResolver->hasSilentVoid($classMethod)) {`
`110`		`- continue;`
	`109`	`+ $returns = $this->betterNodeFinder->findReturnsScoped($functionLike);`
	`110`	`+ if (! $this->returnAnalyzer->hasOnlyReturnWithExpr($functionLike, $returns)) {`
	`111`	`+ return null;`
`111`	`112`	`}`
`112`		`-`
`113`		`- $returns = $this->betterNodeFinder->findReturnsScoped($classMethod);`
`114`	`113`	`if (count($returns) !== 1) {`
`115`	`114`	`continue;`
`116`	`115`	`}`