[TypeDeclaration] Skip __construct in inner class on TypedPropertyFro…

…mStrictConstructorRector (#2010)

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/Fixture/skip_inner_class.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Fixture;
+
+class SkipInnerClass
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    public function __construct(string $name)
+    {
+        new class {
+            public function __construct(string $name)
+            {
+                $this->name = $name;
+            }
+        };
+    }
+}

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector/Fixture/skip_inner_class2.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Fixture;
+
+class SkipInnerClass2
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    public function __construct()
+    {
+        new class {
+            public function __construct()
+            {
+                $this->name = 'value';
+            }
+        };
+    }
+}

src/NodeManipulator/ClassMethodPropertyFetchManipulator.php

@@ -12,14 +12,16 @@
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeTraverser;
+use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
 
 final class ClassMethodPropertyFetchManipulator
 {
     public function __construct(
         private readonly SimpleCallableNodeTraverser $simpleCallableNodeTraverser,
-        private readonly NodeNameResolver $nodeNameResolver
+        private readonly NodeNameResolver $nodeNameResolver,
+        private readonly BetterNodeFinder $betterNodeFinder
     ) {
     }
 
@@ -38,7 +40,7 @@ public function findParamAssignToPropertyName(ClassMethod $classMethod, string $
 
         $this->simpleCallableNodeTraverser->traverseNodesWithCallable(
             (array) $classMethod->stmts,
-            function (Node $node) use ($propertyName, &$assignedParamName): ?int {
+            function (Node $node) use ($propertyName, &$assignedParamName, $classMethod): ?int {
                 if (! $node instanceof Assign) {
                     return null;
                 }
@@ -51,6 +53,11 @@ function (Node $node) use ($propertyName, &$assignedParamName): ?int {
                     return null;
                 }
 
+                $parentClassMethod = $this->betterNodeFinder->findParentType($node, ClassMethod::class);
+                if ($parentClassMethod !== $classMethod) {
+                    return null;
+                }
+
                 $assignedParamName = $this->nodeNameResolver->getName($node->expr);
 
                 return NodeTraverser::STOP_TRAVERSAL;
@@ -90,7 +97,7 @@ public function findAssignsToPropertyName(ClassMethod $classMethod, string $prop
 
         $this->simpleCallableNodeTraverser->traverseNodesWithCallable(
             (array) $classMethod->stmts,
-            function (Node $node) use ($propertyName, &$assignExprs, $paramNames): ?int {
+            function (Node $node) use ($propertyName, &$assignExprs, $paramNames, $classMethod): ?int {
                 if (! $node instanceof Assign) {
                     return null;
                 }
@@ -104,6 +111,11 @@ function (Node $node) use ($propertyName, &$assignExprs, $paramNames): ?int {
                     return null;
                 }
 
+                $parentClassMethod = $this->betterNodeFinder->findParentType($node, ClassMethod::class);
+                if ($parentClassMethod !== $classMethod) {
+                    return null;
+                }
+
                 $assignExprs[] = $node->expr;
                 return null;
             }