[Php80][Naming] Handle ClassPropertyAssignToConstructorPromotionRecto…

…r + RenamePropertyToMatchTypeRector (#861)

* [Php80][Naming] Handle ClassPropertyAssignToConstructorPromotionRector + RenamePropertyToMatchTypeRector

* Y-m-d format

* Fixed 🎉

* eol

* final touch: rename method

rules/Naming/PropertyRenamer/PropertyPromotionRenamer.php

@@ -17,6 +17,7 @@
 use Rector\Naming\ParamRenamer\ParamRenamer;
 use Rector\Naming\ValueObject\ParamRename;
 use Rector\Naming\ValueObjectFactory\ParamRenameFactory;
+use Rector\Naming\VariableRenamer;
 use Rector\NodeNameResolver\NodeNameResolver;
 
 final class PropertyPromotionRenamer
@@ -28,7 +29,8 @@ public function __construct(
         private PhpDocInfoFactory $phpDocInfoFactory,
         private ParamRenamer $paramRenamer,
         private PropertyFetchRenamer $propertyFetchRenamer,
-        private NodeNameResolver $nodeNameResolver
+        private NodeNameResolver $nodeNameResolver,
+        private VariableRenamer $variableRenamer
     ) {
     }
 
@@ -66,11 +68,11 @@ public function renamePropertyPromotion(ClassLike $classLike): void
                 continue;
             }
 
-            $this->renameParamVarName($classLike, $constructClassMethod, $desiredPropertyName, $param);
+            $this->renameParamVarNameAndVariableUsage($classLike, $constructClassMethod, $desiredPropertyName, $param);
         }
     }
 
-    private function renameParamVarName(
+    private function renameParamVarNameAndVariableUsage(
         ClassLike $classLike,
         ClassMethod $classMethod,
         string $desiredPropertyName,
@@ -90,6 +92,8 @@ private function renameParamVarName(
         $paramVarName = $param->var->name;
         $this->renameParamDoc($classMethodPhpDocInfo, $param, $paramVarName, $desiredPropertyName);
         $param->var->name = $desiredPropertyName;
+
+        $this->variableRenamer->renameVariableInFunctionLike($classMethod, $paramVarName, $desiredPropertyName);
     }
 
     private function renameParamDoc(

tests/Issues/IssueConstructorPromotionRename/Fixture/fixture.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueConstructorPromotionRename\Fixture;
+
+final class Fixture
+{
+    private $a;
+    public function __construct(\DateTimeInterface $a)
+    {
+        $this->a = $a;
+        dump($a);
+        dump($a->format('Y-m-d'));
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueConstructorPromotionRename\Fixture;
+
+final class Fixture
+{
+    public function __construct(private \DateTimeInterface $dateTime)
+    {
+        dump($dateTime);
+        dump($dateTime->format('Y-m-d'));
+    }
+}
+
+?>

tests/Issues/IssueConstructorPromotionRename/IssueConstructorPromotionRenameTest.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueConstructorPromotionRename;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class IssueConstructorPromotionRenameTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    /**
+     * @return Iterator<SmartFileInfo>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}

tests/Issues/IssueConstructorPromotionRename/config/configured_rule.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector;
+use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+    $services->set(RenamePropertyToMatchTypeRector::class);
+    $services->set(ClassPropertyAssignToConstructorPromotionRector::class);
+};