[DeadCode] Skip property fetch on cond as may be overridden on Remove…

…AlwaysTrueIfConditionRector (#5796)

* [DeadCode] Skip property fetch overriden by next method call on RemoveAlwaysTrueIfConditionRector

* [ci-review] Rector Rectify

* clean up

* skip property fetch

* skip

* skip also ArrayDimFetch

* also ArrayDimfetch

---------

Co-authored-by: GitHub Action <actions@github.com>

rules-tests/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector/Fixture/skip_array_dim_fetch.php.inc

@@ -0,0 +1,51 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector\Fixture;
+
+$changes = [];
+foreach (toAdd() as $add) {
+    $changes[$add['id']]['add'][] = 1;
+}
+foreach (toRem() as $del) {
+    $changes[$del['id']]['del'][] = 2;
+}
+foreach ($changes as $changeSet) {
+    if (isset($changeSet['del'])) {
+        echo 1;
+    }
+    if (isset($changeSet['add'])) {
+        echo 2;
+    }
+}
+
+/**
+ * @return array{array{id: int}}|array{}
+ */
+function toAdd(): array
+{
+	if (rand(0,1)) {
+		return [];
+	}
+
+	return [
+		0 => [
+			'id' => 1,
+		],
+	];
+}
+
+/**
+ * @return array{array{id: int}}|array{}
+ */
+function toRem(): array
+{
+	if (rand(0,1)) {
+		return [];
+	}
+
+	return [
+		0 => [
+			'id' => 1,
+		]
+	];
+}

rules-tests/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector/Fixture/skip_override_by_next_method_call.php.inc

@@ -0,0 +1,26 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector\Fixture;
+
+class SkipPropertyFetchOverriddenByNextMethodCall
+{
+    private bool $executed;
+
+    public function run(): void
+    {
+        $this->executed = false;
+
+        $this->execute();
+
+        if (!$this->executed) {
+            echo 'not run';
+        }
+    }
+
+    protected function execute()
+    {
+        if (rand(0, 1)) {
+            $this->executed = true;
+        }
+    }
+}

rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PhpParser\Node\Expr\PropertyFetch;
@@ -15,13 +16,11 @@
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\NodeTraverser;
-use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use Rector\DeadCode\NodeAnalyzer\SafeLeftTypeBooleanAndOrAnalyzer;
 use Rector\NodeAnalyzer\ExprAnalyzer;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Rector\AbstractRector;
-use Rector\Reflection\ReflectionResolver;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -31,7 +30,6 @@
 final class RemoveAlwaysTrueIfConditionRector extends AbstractRector
 {
     public function __construct(
-        private readonly ReflectionResolver $reflectionResolver,
         private readonly ExprAnalyzer $exprAnalyzer,
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly SafeLeftTypeBooleanAndOrAnalyzer $safeLeftTypeBooleanAndOrAnalyzer
@@ -107,7 +105,7 @@ public function refactor(Node $node): int|null|array|If_
             return null;
         }
 
-        if ($this->shouldSkipPropertyFetch($node->cond)) {
+        if ($this->shouldSkipExpr($node->cond)) {
             return null;
         }
 
@@ -141,35 +139,12 @@ private function shouldSkipFromParam(Expr $expr): bool
         return false;
     }
 
-    private function shouldSkipPropertyFetch(Expr $expr): bool
+    private function shouldSkipExpr(Expr $expr): bool
     {
-        /** @var PropertyFetch[]|StaticPropertyFetch[] $propertyFetches */
-        $propertyFetches = $this->betterNodeFinder->findInstancesOf(
+        return (bool) $this->betterNodeFinder->findInstancesOf(
             $expr,
-            [PropertyFetch::class, StaticPropertyFetch::class]
+            [PropertyFetch::class, StaticPropertyFetch::class, ArrayDimFetch::class]
         );
-
-        foreach ($propertyFetches as $propertyFetch) {
-            $classReflection = $this->reflectionResolver->resolveClassReflectionSourceObject($propertyFetch);
-
-            if (! $classReflection instanceof ClassReflection) {
-                // cannot get parent Trait_ from Property Fetch
-                return true;
-            }
-
-            $propertyName = (string) $this->nodeNameResolver->getName($propertyFetch);
-
-            if (! $classReflection->hasNativeProperty($propertyName)) {
-                continue;
-            }
-
-            $nativeProperty = $classReflection->getNativeProperty($propertyName);
-            if (! $nativeProperty->hasNativeType()) {
-                return true;
-            }
-        }
-
-        return false;
     }
 
     private function refactorIfWithBooleanAnd(If_ $if): ?If_