[type-declarations] Open isset check in StrictArrayParamDimFetchRectorTest, move to last position in type-declaration level

Author: TomasVotruba

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

@@ -0,0 +1,43 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;
+
+final class CoverIssetWithDimFetch
+{
+    public function run($param, $item): bool
+    {
+        if (! isset($param[$item])) {
+            return false;
+        }
+
+        if ($param[$item] === 100) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;
+
+final class CoverIssetWithDimFetch
+{
+    public function run(array $param, $item): bool
+    {
+        if (! isset($param[$item])) {
+            return false;
+        }
+
+        if ($param[$item] === 100) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+?>

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

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;
+
+final class IncludeIssetIndex
+{
+    public function run($param): void
+    {
+        echo isset($param['index']) ? $param['index'] : 'test';
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\StrictArrayParamDimFetchRector\Fixture;
+
+final class IncludeIssetIndex
+{
+    public function run(array $param): void
+    {
+     	echo isset($param['index']) ? $param['index'] : 'test';
+    }
+}
+
+?>

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

@@ -15,7 +15,6 @@
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Empty_;
 use PhpParser\Node\Expr\FuncCall;
-use PhpParser\Node\Expr\Isset_;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\FunctionLike;
@@ -28,6 +27,7 @@
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
+use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
 use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
@@ -182,10 +182,7 @@ private function isParamAccessedArrayDimFetch(Param $param, ClassMethod|Function
                 return NodeVisitor::STOP_TRAVERSAL;
             }
 
-            if ($variableType instanceof ObjectType && $this->typeComparator->isSubtype(
-                $variableType,
-                new ObjectType('ArrayAccess')
-            )) {
+            if ($this->isArrayAccess($variableType)) {
                 $isParamAccessedArrayDimFetch = false;
                 return NodeVisitor::STOP_TRAVERSAL;
             }
@@ -217,14 +214,6 @@ private function shouldStop(Node $node, Param $param, string $paramName): bool
         $nodeToCheck = null;
 
         if (! $param->default instanceof Expr) {
-            if ($node instanceof Isset_) {
-                foreach ($node->vars as $var) {
-                    if ($var instanceof ArrayDimFetch && $var->var instanceof Variable && $var->var->name === $paramName) {
-                        return true;
-                    }
-                }
-            }
-
             if ($node instanceof Empty_ && $node->expr instanceof ArrayDimFetch && $node->expr->var instanceof Variable && $node->expr->var->name === $paramName) {
                 return true;
             }
@@ -320,4 +309,13 @@ private function isMethodCallOrArrayDimFetch(string $paramName, ?Node $node): bo
 
         return false;
     }
+
+    private function isArrayAccess(Type $type): bool
+    {
+        if (! $type instanceof ObjectType) {
+            return false;
+        }
+
+        return $this->typeComparator->isSubtype($type, new ObjectType('ArrayAccess'));
+    }
 }

rules/TypeDeclaration/Rector/ClassMethod/StrictArrayParamDimFetchRector.php

@@ -33,7 +33,7 @@ public function __construct(
 
     public function getRuleDefinition(): RuleDefinition
     {
-        return new RuleDefinition('Add function/closure param array type, if dim fetch is inside', [
+        return new RuleDefinition('Add closure and arrow function param array type, if dim fetch is used inside', [
             new CodeSample(
                 <<<'CODE_SAMPLE'
 $array = [['name' => 'John']];

rules/TypeDeclaration/Rector/FuncCall/AddArrowFunctionParamArrayWhereDimFetchRector.php

@@ -15,6 +15,7 @@
 use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromCreateMockAssignRector;
 use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromDocblockSetUpDefinedRector;
 use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromJMSSerializerAttributeTypeRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\AddClassMethodParamArrayWhereDimFetchRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeBasedOnPHPUnitDataProviderRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeFromPropertyTypeRector;
@@ -137,10 +138,12 @@ final class TypeDeclarationLevel
         AddReturnTypeDeclarationBasedOnParentClassMethodRector::class,
         ReturnTypeFromStrictFluentReturnRector::class,
         ReturnNeverTypeRector::class,
-        StrictArrayParamDimFetchRector::class,
         StrictStringParamConcatRector::class,
         TypedPropertyFromJMSSerializerAttributeTypeRector::class,
 
+        // array parameter from dim fetch assign inside
+        StrictArrayParamDimFetchRector::class,
+
         // possibly based on docblocks, but also helpful, intentionally last
         AddArrayFunctionClosureParamTypeRector::class,
         TypedPropertyFromDocblockSetUpDefinedRector::class,