[TypeDeclaration] Skip echo-ed on StrictArrayParamDimFetchRector (#5260)

* [TypeDeclaration] Skip echo-ed on StrictArrayParamDimFetchRector * Fixed 🎉 * fix
rectorphp · Nov 18, 2023 · 6a2af18 · 6a2af18
1 parent 03c7ab7
commit 6a2af18
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 11 deletions.
diff --git a/...Declaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_echoed.php.inc b/...Declaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_echoed.php.inc
@@ -0,0 +1,17 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;
+
+final class SkipEchoed
+{
+    public function run($param)
+    {
+	 if (isset($param['bar'])) {
+            echo $param['bar'];
+        }
+
+        echo $param;
+    }
+}
+
+?>
diff --git a/...xture/with_default_not_array_type.php.inc → ...r/Fixture/with_default_array_type.php.inc b/...xture/with_default_not_array_type.php.inc → ...r/Fixture/with_default_array_type.php.inc
@@ -6,11 +6,9 @@ final class WithDefaultArrayType
 {
     public function run($param = [])
     {
-	 if (isset($param['bar'])) {
+	    if (isset($param['bar'])) {
             echo $param['bar'];
         }
-
-        echo $param;
     }
 }
 
@@ -24,11 +22,9 @@ final class WithDefaultArrayType
 {
     public function run(array $param = [])
     {
-	 if (isset($param['bar'])) {
+	    if (isset($param['bar'])) {
             echo $param['bar'];
         }
-
-        echo $param;
     }
 }
 

diff --git a/rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php b/rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php
@@ -18,6 +18,7 @@
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Echo_;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\NodeTraverser;
@@ -155,6 +156,21 @@ private function isParamAccessedArrayDimFetch(Param $param, ClassMethod|Function
         return $isParamAccessedArrayDimFetch;
     }
 
+    private function isEchoed(Node $node, string $paramName): bool
+    {
+        if (! $node instanceof Echo_) {
+            return false;
+        }
+
+        foreach ($node->exprs as $expr) {
+            if ($expr instanceof Variable && $this->isName($expr, $paramName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private function shouldStop(Node $node, string $paramName): bool
     {
         $nodeToCheck = null;
@@ -178,14 +194,27 @@ private function shouldStop(Node $node, string $paramName): bool
             $nodeToCheck = $node->var;
         }
 
-        if ($nodeToCheck instanceof MethodCall) {
-            return $nodeToCheck->var instanceof Variable && $this->isName($nodeToCheck->var, $paramName);
+        if ($this->isMethodCallOrArrayDimFetch($paramName, $nodeToCheck)) {
+            return true;
+        }
+
+        if ($nodeToCheck instanceof Variable && $this->isName($nodeToCheck, $paramName)) {
+            return true;
+        }
+
+        return $this->isEchoed($node, $paramName);
+    }
+
+    private function isMethodCallOrArrayDimFetch(string $paramName, ?Node $node): bool
+    {
+        if ($node instanceof MethodCall) {
+            return $node->var instanceof Variable && $this->isName($node->var, $paramName);
         }
 
-        if ($nodeToCheck instanceof ArrayDimFetch) {
-            return $nodeToCheck->var instanceof Variable && $this->isName($nodeToCheck->var, $paramName);
+        if ($node instanceof ArrayDimFetch) {
+            return $node->var instanceof Variable && $this->isName($node->var, $paramName);
         }
 
-        return $nodeToCheck instanceof Variable && $this->isName($nodeToCheck, $paramName);
+        return false;
     }
 }