static fixes

Author: TomasVotruba

phpstan.neon

@@ -43,15 +43,10 @@ parameters:
         # see https://github.com/rectorphp/rector-src/actions/runs/11798721617/job/32865546672?pr=6422#step:5:110
         - '#Doing instanceof PHPStan\\Type\\.+ is error\-prone and deprecated#'
 
-        - identifier: instanceof.alwaysTrue
+        #- identifier: instanceof.alwaysTrue
 
         # false positive
         -
             identifier: assign.propertyType
             message: '#Property PhpParser\\Node\\Identifier\:\:\$name \(non\-empty\-string\) does not accept string#'
             path: rules/CodeQuality/Rector/ClassMethod/ReplaceTestFunctionPrefixWithAttributeRector.php
-
-        # handle next
-        -
-            identifier: symplify.forbiddenNode
-            message: '#switch#'

rules-tests/CodeQuality/Rector/MethodCall/AssertEqualsToSameRector/Fixture/skip_if_an_object_is_in_any_level_of_an_array.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\MethodCall\AssertEqualsToSameRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\PHPUnit\Tests\Rector\MethodCall\AssertEqualsToSameRector\Fixture\DateTimeImmutable;
+
+final class Test extends TestCase
+{
+    public function test()
+    {
+        $expected = ['something' => ['date' => new DateTimeImmutable('2022-10-31 12:32:33')]];
+        $date = new DateTimeImmutable('2022-10-31 12:32:33');
+        $actual = compact('date');
+
+        self::assertEquals($expected, $actual);
+    }
+}
+
+?>

rules/AnnotationsToAttributes/Rector/Class_/RequiresAnnotationWithValueToAttributeRector.php

@@ -104,20 +104,22 @@ public function refactor(Node $node): ?Node
 
         $hasChanged = false;
 
-        if ($node instanceof Class_) {
-            $phpDocInfo = $this->phpDocInfoFactory->createFromNode($node);
-            if ($phpDocInfo instanceof PhpDocInfo) {
-                $requiresAttributeGroups = $this->handleRequires($phpDocInfo);
-                if ($requiresAttributeGroups !== []) {
-                    $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
-                    $node->attrGroups = array_merge($node->attrGroups, $requiresAttributeGroups);
-                    $this->removeMethodRequiresAnnotations($phpDocInfo);
-                    $hasChanged = true;
-                }
+        $phpDocInfo = $this->phpDocInfoFactory->createFromNode($node);
+        if ($phpDocInfo instanceof PhpDocInfo) {
+            $requiresAttributeGroups = $this->handleRequires($phpDocInfo);
+            if ($requiresAttributeGroups !== []) {
+                $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
+                $node->attrGroups = array_merge($node->attrGroups, $requiresAttributeGroups);
+                $this->removeMethodRequiresAnnotations($phpDocInfo);
+                $hasChanged = true;
             }
         }
 
-        return $hasChanged ? $node : null;
+        if ($hasChanged) {
+            return $node;
+        }
+
+        return null;
     }
 
     /**

rules/CodeQuality/Rector/ClassMethod/DataProviderArrayItemsNewLinedRector.php

@@ -5,7 +5,6 @@
 namespace Rector\PHPUnit\CodeQuality\Rector\ClassMethod;
 
 use PhpParser\Node;
-use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Return_;
@@ -136,10 +135,6 @@ public function refactor(Node $node): ?Node
     private function shouldRePrint(Array_ $array): bool
     {
         foreach ($array->items as $key => $item) {
-            if (! $item instanceof ArrayItem) {
-                continue;
-            }
-
             if (! isset($array->items[$key + 1])) {
                 continue;
             }

rules/PHPUnit100/Rector/Class_/RemoveNamedArgsInDataProviderRector.php

@@ -5,11 +5,9 @@
 namespace Rector\PHPUnit\PHPUnit100\Rector\Class_;
 
 use PhpParser\Node;
-use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\Yield_;
-use PhpParser\Node\Scalar\Int_;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Expression;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
@@ -127,18 +125,12 @@ private function handleArray(Array_ $array): bool
     {
         $hasChanged = false;
         foreach ($array->items as $item) {
-            if (! $item instanceof ArrayItem) {
-                continue;
-            }
-
             if (! $item->key instanceof Expr) {
                 continue;
             }
 
-            if (! $item->key instanceof Int_ && $item->key instanceof Expr) {
-                $item->key = null;
-                $hasChanged = true;
-            }
+            $item->key = null;
+            $hasChanged = true;
         }
 
         return $hasChanged;

src/NodeFactory/ConsecutiveIfsFactory.php

@@ -5,7 +5,6 @@
 namespace Rector\PHPUnit\NodeFactory;
 
 use PhpParser\Node\Arg;
-use PhpParser\Node\ArrayItem;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\ArrowFunction;
@@ -44,10 +43,6 @@ public function createIfs(MethodCall $withConsecutiveMethodCall, MethodCall $num
             if ($withConsecutiveArg->value instanceof Array_) {
                 $array = $withConsecutiveArg->value;
                 foreach ($array->items as $assertKey => $assertArrayItem) {
-                    if (! $assertArrayItem instanceof ArrayItem) {
-                        continue;
-                    }
-
                     if (! $assertArrayItem->value instanceof MethodCall) {
                         $parametersDimFetch = new ArrayDimFetch(new Variable('parameters'), new Int_($assertKey));
                         $args = [new Arg($assertArrayItem->value), new Arg($parametersDimFetch)];