Fix multi property default assign (#2986)

rules-tests/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector/Fixture/multi_properties.php.inc

@@ -0,0 +1,32 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector\Fixture;
+
+final class MultiProperties
+{
+    private $thing1, $thing2, $thing3;
+
+    public function __construct()
+    {
+        $this->thing1 = 1;
+        $this->thing2 = 2;
+        $this->thing3 = 3;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector\Fixture;
+
+final class MultiProperties
+{
+    private $thing1 = 1, $thing2 = 2, $thing3 = 3;
+
+    public function __construct()
+    {
+    }
+}
+
+?>

rules/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector.php

@@ -8,6 +8,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
+use PhpParser\Node\Stmt\PropertyProperty;
 use Rector\CodeQuality\NodeAnalyzer\ConstructorPropertyDefaultExprResolver;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\MethodName;
@@ -71,28 +72,26 @@ public function refactor(Node $node): ?Node
 
         // resolve property defaults
         $defaultPropertyExprAssigns = $this->constructorPropertyDefaultExprResolver->resolve($constructClassMethod);
-
         if ($defaultPropertyExprAssigns === []) {
             return null;
         }
 
         $hasChanged = false;
-        foreach ($defaultPropertyExprAssigns as $defaultPropertyExprAssign) {
-            $property = $node->getProperty($defaultPropertyExprAssign->getPropertyName());
-            if (! $property instanceof Property) {
-                continue;
-            }
 
-            if ($property->isReadonly()) {
-                continue;
-            }
+        $propertyProperties = $this->getNonReadonlyPropertyProperty($node);
+
+        foreach ($defaultPropertyExprAssigns as $defaultPropertyExprAssign) {
+            foreach ($propertyProperties as $propertyProperty) {
+                if (! $this->isName($propertyProperty, $defaultPropertyExprAssign->getPropertyName())) {
+                    continue;
+                }
 
-            $propertyProperty = $property->props[0];
-            $propertyProperty->default = $defaultPropertyExprAssign->getDefaultExpr();
+                $propertyProperty->default = $defaultPropertyExprAssign->getDefaultExpr();
 
-            $hasChanged = true;
+                $hasChanged = true;
 
-            $this->removeNode($defaultPropertyExprAssign->getAssignExpression());
+                $this->removeNode($defaultPropertyExprAssign->getAssignExpression());
+            }
         }
 
         if (! $hasChanged) {
@@ -101,4 +100,22 @@ public function refactor(Node $node): ?Node
 
         return $node;
     }
+
+    /**
+     * @return PropertyProperty[]
+     */
+    private function getNonReadonlyPropertyProperty(Class_ $class): array
+    {
+        $propertyProperties = [];
+
+        foreach ($class->getProperties() as $property) {
+            if ($property->isReadonly()) {
+                continue;
+            }
+
+            $propertyProperties = array_merge($propertyProperties, $property->props);
+        }
+
+        return $propertyProperties;
+    }
 }