PromotedConstructorPropertyFixer - do not promote when there is assignment to variable (#1063)

Author: kubawerlos

src/Analyzer/Analysis/ConstructorAnalysis.php

@@ -110,17 +110,17 @@ public function getConstructorPromotableAssignments(): array
         $closeBrace = $this->tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $openBrace);
 
         $variables = [];
+        $variablesWithAssignments = [];
         $properties = [];
         $propertyToVariableMap = [];
 
-        for ($index = $openBrace + 1; $index < $closeBrace; $index++) {
-            if (!$this->tokens[$index]->isGivenKind(\T_VARIABLE)) {
-                continue;
-            }
-
+        foreach ($this->tokens->findGivenKind(\T_VARIABLE, $openBrace, $closeBrace) as $index => $token) {
             $semicolonIndex = $this->tokens->getNextMeaningfulToken($index);
             \assert(\is_int($semicolonIndex));
             if (!$this->tokens[$semicolonIndex]->equals(';')) {
+                if ($this->tokens[$semicolonIndex]->equals('=')) {
+                    $variablesWithAssignments[] = $token->getContent();
+                }
                 continue;
             }
 
@@ -129,8 +129,12 @@ public function getConstructorPromotableAssignments(): array
                 continue;
             }
 
+            if (\in_array($token->getContent(), $variablesWithAssignments, true)) {
+                continue;
+            }
+
             $properties[$propertyIndex] = $this->tokens[$propertyIndex]->getContent();
-            $variables[$index] = $this->tokens[$index]->getContent();
+            $variables[$index] = $token->getContent();
             $propertyToVariableMap[$propertyIndex] = $index;
         }
 

tests/Analyzer/Analysis/ConstructorAnalysisTest.php

@@ -255,5 +255,19 @@ public function __construct($x) {
                 }
             }',
         ];
+
+        yield 'with assignment of parameter' => [
+            ['$x' => 30, '$z' => 68],
+            '<?php class Foo {
+                public function __construct($x, $y, $z) {
+                    $this->x = $x;
+                    if (someCondition()) {
+                        $y = -1;
+                    }
+                    $this->y = $y;
+                    $this->z = $z;
+                }
+            }',
+        ];
     }
 }

tests/Fixer/PromotedConstructorPropertyFixerTest.php

@@ -927,6 +927,26 @@ public function __construct(int $x, int $y, int $z, bool $condition)
             ',
         ];
 
+        yield 'do not promote when there is assignment to variable' => [
+            <<<'PHP'
+                <?php
+                class Foo
+                {
+                    private string $value;
+
+                    public function __construct(string $value = '')
+                    {
+                        if ($value === 'deleted') {
+                            $value = '';
+                        }
+
+                        $this->value = $value;
+                    }
+                }
+
+                PHP,
+        ];
+
         yield 'promote nullable types' => [
             '<?php class Foo {
                 private int $z;
@@ -990,7 +1010,7 @@ public function __construct(
             }',
         ];
 
-        yield 'promote single property when propery is declared last' => [
+        yield 'promote single property when property is declared last' => [
             '<?php class Foo {
                 public function namedConstructor($a, $b) { return new self($a . $b); }
                 public function __construct(private string $bar) {