[TypeDeclaration] Skip with empty() check on StrictArrayParamDimFetch…

…Rector (#5432)

* [TypeDeclaration] Skip with empty() check on StrictArrayParamDimFetchRector

* fix

* remove composer phpstan-config command

.github/workflows/code_analysis.yaml

@@ -33,10 +33,6 @@ jobs:
                         name: 'PHPStan'
                         run: vendor/bin/phpstan analyse --ansi --error-format symplify
 
-                    -
-                        name: 'PHPStan for config'
-                        run: composer phpstan-config
-
                     -
                         name: 'Commented Code'
                         run: vendor/bin/easy-ci check-commented-code src rules tests rules-tests --line-limit 5 --ansi

rules-tests/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector/Fixture/skip_empty_check.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;
+
+final class SkipEmptyCheck
+{
+    public function run($productOptions)
+    {
+        if (empty($productOptions)) {
+            return [];
+        }
+
+        echo $productOptions['list'][0];
+    }
+}

rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php

@@ -11,6 +11,7 @@
 use PhpParser\Node\Expr\BinaryOp\Coalesce;
 use PhpParser\Node\Expr\Cast\Array_;
 use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Expr\Empty_;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
@@ -156,7 +157,9 @@ private function isParamAccessedArrayDimFetch(Param $param, ClassMethod|Function
             // skip integer in possibly string type as string can be accessed via int
             $dimType = $this->getType($node->dim);
             if ($dimType->isInteger()->yes() && $variableType->isString()->maybe()) {
-                return null;
+                // force set to false to avoid too early replaced
+                $isParamAccessedArrayDimFetch = false;
+                return NodeTraverser::STOP_TRAVERSAL;
             }
 
             $isParamAccessedArrayDimFetch = true;
@@ -212,11 +215,15 @@ private function shouldStop(Node $node, string $paramName): bool
             return true;
         }
 
-        return $this->isEchoedOrCasted($node, $paramName);
+        return $this->isEmptyOrEchoedOrCasted($node, $paramName);
     }
 
-    private function isEchoedOrCasted(Node $node, string $paramName): bool
+    private function isEmptyOrEchoedOrCasted(Node $node, string $paramName): bool
     {
+        if ($node instanceof Empty_ && $node->expr instanceof Variable && $this->isName($node->expr, $paramName)) {
+            return true;
+        }
+
         if ($this->isEchoed($node, $paramName)) {
             return true;
         }