Fix just assigned variable in InlineArrayReturnAssignRector (#4363)

packages/NodeTypeResolver/NodeTypeResolver/PropertyTypeResolver.php

@@ -19,8 +19,9 @@
  */
 final class PropertyTypeResolver implements NodeTypeResolverInterface
 {
-    public function __construct(private readonly PropertyFetchTypeResolver $propertyFetchTypeResolver)
-    {
+    public function __construct(
+        private readonly PropertyFetchTypeResolver $propertyFetchTypeResolver
+    ) {
     }
 
     /**

packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ArgNodeVisitor.php

@@ -27,11 +27,11 @@ public function enterNode(Node $node): ?Node
 
         $funcCallName = $node->name->toString();
         foreach ($node->args as $arg) {
-            if (!$arg instanceof Arg) {
+            if (! $arg instanceof Arg) {
                 continue;
             }
 
-            if (!$arg->value instanceof Array_) {
+            if (! $arg->value instanceof Array_) {
                 continue;
             }
 

packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/NameNodeVisitor.php

@@ -46,11 +46,11 @@ public function enterNode(Node $node): ?Node
             return null;
         }
 
-        if (!$node instanceof StaticCall) {
+        if (! $node instanceof StaticCall) {
             return null;
         }
 
-        if (!$node->class instanceof Name) {
+        if (! $node->class instanceof Name) {
             return null;
         }
 

packages/NodeTypeResolver/Reflection/BetterReflection/SourceLocatorProvider/DynamicSourceLocatorProvider.php

@@ -82,7 +82,8 @@ public function addFilesByDirectory(string $directory, array $files): void
         $this->filesByDirectory[$directory] = $files;
     }
 
-    public function isPathsEmpty(): bool {
+    public function isPathsEmpty(): bool
+    {
         return $this->filePaths === [] && $this->filesByDirectory === [];
     }
 }

packages/PhpAttribute/NodeFactory/PhpNestedAttributeGroupFactory.php

@@ -235,7 +235,9 @@ private function createFromExplicitProperties(
                     $annotationPropertyToAttributeClass
                 );
 
-                if ($annotationPropertyToAttributeClass->doesNeedNewImport() && count($attributeName->getParts()) === 1) {
+                if ($annotationPropertyToAttributeClass->doesNeedNewImport() && count(
+                    $attributeName->getParts()
+                ) === 1) {
                     $attributeName->setAttribute(
                         AttributeKey::EXTRA_USE_IMPORT,
                         $annotationPropertyToAttributeClass->getAttributeClass()

rules-tests/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector/Fixture/skip_assign_in_the_middle.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector\Fixture;
+
+final class SkipAssignInTheMiddle
+{
+    public function run()
+    {
+        $items = [];
+
+        $result = 'Timmy';
+        $items[] = $result . ' Bobby';
+
+        return $items;
+    }
+}

rules/CodeQuality/Rector/ClassMethod/InlineArrayReturnAssignRector.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Array_;
+use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\Variable;
@@ -83,6 +84,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if (! $this->areAssignExclusiveToDimFetch($stmts)) {
+            return null;
+        }
+
         $lastStmt = array_pop($stmts);
         if (! $lastStmt instanceof Stmt) {
             return null;
@@ -154,4 +159,37 @@ private function createArray(array $keysAndExprs): Array_
 
         return new Array_($arrayItems);
     }
+
+    /**
+     * Only:
+     * $items['...'] = $result;
+     *
+     * @param Stmt[] $stmts
+     */
+    private function areAssignExclusiveToDimFetch(array $stmts): bool
+    {
+        $lastKey = array_key_last($stmts);
+
+        foreach ($stmts as $key => $stmt) {
+            if ($key === $lastKey) {
+                // skip last item
+                continue;
+            }
+
+            if (! $stmt instanceof Expression) {
+                return false;
+            }
+
+            if (! $stmt->expr instanceof Assign) {
+                return false;
+            }
+
+            $assign = $stmt->expr;
+            if (! $assign->var instanceof ArrayDimFetch) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

rules/Php82/Rector/Param/AddSensitiveParameterAttributeRector.php

@@ -4,17 +4,17 @@
 
 namespace Rector\Php82\Rector\Param;
 
-use PhpParser\Node\Param;
-use PhpParser\Node\AttributeGroup;
+use PhpParser\Node;
 use PhpParser\Node\Attribute;
+use PhpParser\Node\AttributeGroup;
 use PhpParser\Node\Name\FullyQualified;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
-use PhpParser\Node;
+use PhpParser\Node\Param;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 use Webmozart\Assert\Assert;
 
@@ -30,8 +30,9 @@ final class AddSensitiveParameterAttributeRector extends AbstractRector implemen
      */
     private array $sensitiveParameters = [];
 
-    public function __construct(protected PhpAttributeAnalyzer $phpAttributeAnalyzer)
-    {
+    public function __construct(
+        protected PhpAttributeAnalyzer $phpAttributeAnalyzer
+    ) {
     }
 
     /**
@@ -61,9 +62,7 @@ public function refactor(Node $node): ?Param
             return null;
         }
 
-        $node->attrGroups[] = new AttributeGroup([
-            new Attribute(new FullyQualified('SensitiveParameter')),
-        ]);
+        $node->attrGroups[] = new AttributeGroup([new Attribute(new FullyQualified('SensitiveParameter'))]);
 
         return $node;
     }

src/Console/Command/ProcessCommand.php

@@ -73,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         // 1. add files and directories to static locator
         $this->dynamicSourceLocatorDecorator->addPaths($paths);
         if ($this->dynamicSourceLocatorDecorator->isPathsEmpty()) {
-            $this->rectorOutputStyle->error("The given paths do not match any files");
+            $this->rectorOutputStyle->error('The given paths do not match any files');
             return ExitCode::FAILURE;
         }
 

src/StaticReflection/DynamicSourceLocatorDecorator.php

@@ -40,7 +40,8 @@ public function addPaths(array $paths): void
         }
     }
 
-    public function isPathsEmpty(): bool {
+    public function isPathsEmpty(): bool
+    {
         return $this->dynamicSourceLocatorProvider->isPathsEmpty();
     }
 }