[TypeDeclaration] Handle multiple methods define __construct later on…

… TypedPropertyFromStrictConstructorRector (#2009)
rectorphp · Apr 5, 2022 · e470787 · e470787
1 parent 85ff416
commit e470787
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 0 deletions.
diff --git a/...TypedPropertyFromStrictConstructorRector/Fixture/multi_methods_with_default_value.php.inc b/...TypedPropertyFromStrictConstructorRector/Fixture/multi_methods_with_default_value.php.inc
@@ -0,0 +1,44 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Fixture;
+
+final class MultiMethodsWithDefaultValue
+{
+    /**
+     * @var string
+     */
+    private $rootView = 'admin.index';
+
+    public function run()
+    {
+        $this->rootView = 'super_admin.index';
+    }
+
+    public function __construct()
+    {
+        $this->rootView = 'super_admin.index';
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector\Fixture;
+
+final class MultiMethodsWithDefaultValue
+{
+    private string $rootView;
+
+    public function run()
+    {
+        $this->rootView = 'super_admin.index';
+    }
+
+    public function __construct()
+    {
+        $this->rootView = 'super_admin.index';
+    }
+}
+
+?>
diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php
@@ -14,6 +14,7 @@
 use Rector\Core\NodeManipulator\PropertyManipulator;
 use Rector\Core\PhpParser\NodeFinder\PropertyFetchFinder;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Core\ValueObject\MethodName;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\DeadCode\PhpDoc\TagRemover\VarTagRemover;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
@@ -138,6 +139,14 @@ private function isDefaultToBeNull(Property $property, Class_ $class): bool
 
         foreach ($propertyFetches as $propertyFetch) {
             $classMethod = $this->betterNodeFinder->findParentType($propertyFetch, ClassMethod::class);
+            if (! $classMethod instanceof ClassMethod) {
+                continue;
+            }
+
+            if (! $this->nodeNameResolver->isName($classMethod, MethodName::CONSTRUCT)) {
+                continue;
+            }
+
             if (! $this->propertyManipulator->isInlineStmtWithConstructMethod($propertyFetch, $classMethod)) {
                 return false;
             }