PromotedConstructorPropertyFixer - get promoted property name from assignment, not from property (#734)

Author: kubawerlos

README.md

@@ -3,7 +3,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-3366-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3367-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=main)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

src/Fixer/PromotedConstructorPropertyFixer.php

@@ -156,9 +156,12 @@ private function promoteProperties(Tokens $tokens, int $classIndex, ConstructorA
 
             $tokensToInsert = [new Token([\T_PUBLIC, 'public'])];
             if ($propertyIndex !== null) {
-                $tokensToInsert = $this->removePropertyAndReturnTokensToInsert($tokens, $propertyIndex, $constructorParameterIndex);
+                $tokensToInsert = $this->removePropertyAndReturnTokensToInsert($tokens, $propertyIndex);
             }
 
+            $assignedPropertyIndex = $tokens->getPrevTokenOfKind($constructorPromotableAssignments[$constructorParameterName], [[\T_STRING]]);
+            $tokens[$constructorParameterIndex] = new Token([\T_VARIABLE, '$' . $tokens[$assignedPropertyIndex]->getContent()]);
+
             $this->removeAssignment($tokens, $constructorPromotableAssignments[$constructorParameterName]);
             $this->updateParameterSignature(
                 $tokens,
@@ -296,10 +299,8 @@ private function getClassProperties(Tokens $tokens, int $classIndex): array
     /**
      * @return array<Token>
      */
-    private function removePropertyAndReturnTokensToInsert(Tokens $tokens, int $propertyIndex, int $parameterIndex): array
+    private function removePropertyAndReturnTokensToInsert(Tokens $tokens, int $propertyIndex): array
     {
-        $tokens[$parameterIndex] = $tokens[$propertyIndex];
-
         $visibilityIndex = $tokens->getPrevTokenOfKind($propertyIndex, [[\T_PRIVATE], [\T_PROTECTED], [\T_PUBLIC], [\T_VAR]]);
         \assert(\is_int($visibilityIndex));
 

tests/Fixer/PromotedConstructorPropertyFixerTest.php

@@ -682,6 +682,20 @@ public function __construct(string $y) {
             ',
         ];
 
+        yield 'promote with different name when not defined' => [
+            '<?php class Foo {
+                public function __construct(public string $x) {
+                }
+            }
+            ',
+            '<?php class Foo {
+                public function __construct(string $y) {
+                    $this->x = $y;
+                }
+            }
+            ',
+        ];
+
         yield 'promote in multiple classes' => [
             '<?php
             abstract class Foo { // promote here