Handle non-promoted properties and additional constructors for inherited initialization

When a child class redeclares a property from a parent class, also consider
it initialized if the constructor-declaring ancestor class declares the same
non-private property (not just promoted parameters). Also handle inherited
additional constructors (e.g. setUp()) the same way.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: phpstan-bot

src/Node/ClassPropertiesNode.php

@@ -136,6 +136,28 @@ public function getUninitializedProperties(
 				$constructorDeclaringClass = $classReflection->getConstructor()->getDeclaringClass();
 				if ($constructorDeclaringClass->getName() !== $classReflection->getName()) {
 					$is = $this->isPromotedByConstructorChain($constructorDeclaringClass, $property->getName());
+					if (!$is->yes()) {
+						$is = $this->isPropertyDeclaredInAncestor($constructorDeclaringClass, $property->getName());
+					}
+				}
+			}
+			if (!$is->yes()) {
+				foreach ($constructors as $constructorName) {
+					if (strtolower($constructorName) === '__construct') {
+						continue;
+					}
+					if (!$classReflection->hasNativeMethod($constructorName)) {
+						continue;
+					}
+					$methodReflection = $classReflection->getNativeMethod($constructorName);
+					$declaringClass = $methodReflection->getDeclaringClass();
+					if ($declaringClass->getName() === $classReflection->getName()) {
+						continue;
+					}
+					$is = $this->isPropertyDeclaredInAncestor($declaringClass, $property->getName());
+					if ($is->yes()) {
+						break;
+					}
 				}
 			}
 			if (!$is->yes() && $classReflection->hasNativeProperty($property->getName())) {
@@ -425,6 +447,20 @@ public function getPropertyAssigns(): array
 		return $this->propertyAssigns;
 	}
 
+	private function isPropertyDeclaredInAncestor(ClassReflection $ancestorClass, string $propertyName): TrinaryLogic
+	{
+		$nativeReflection = $ancestorClass->getNativeReflection();
+		if (
+			$nativeReflection->hasProperty($propertyName)
+			&& !$nativeReflection->getProperty($propertyName)->isPrivate()
+			&& $nativeReflection->getProperty($propertyName)->getDeclaringClass()->getName() === $ancestorClass->getName()
+		) {
+			return TrinaryLogic::createYes();
+		}
+
+		return TrinaryLogic::createNo();
+	}
+
 	private function isPromotedByConstructorChain(ClassReflection $constructorDeclaringClass, string $propertyName): TrinaryLogic
 	{
 		$ancestor = $constructorDeclaringClass;

tests/PHPStan/Rules/Properties/UninitializedPropertyRuleTest.php

@@ -248,6 +248,14 @@ public function testBug13380(): void
 				'Class Bug13380\BarPrivate has an uninitialized property $prop. Give it default value or assign it in the constructor.',
 				69,
 			],
+			[
+				'Class Bug13380\BazBody has an uninitialized property $prop. Give it default value or assign it in the constructor.',
+				88,
+			],
+			[
+				'Class Bug13380\FooBodyNoInit has an uninitialized property $prop. Give it default value or assign it in the constructor.',
+				99,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Properties/data/bug-13380.php

@@ -68,3 +68,42 @@ public function __construct(
 class BarPrivate extends FooPrivate {
 	public string $prop;
 }
+
+// Non-promoted property initialized in parent constructor body
+class FooBody
+{
+	protected string $prop;
+
+	public function __construct()
+	{
+		$this->prop = "1232";
+	}
+}
+
+class BarBody extends FooBody {
+	public string $prop;
+}
+
+class BazBody extends FooBody {
+	public string $prop;
+
+	public function __construct()
+	{
+		// Does not call parent::__construct, so $prop is uninitialized
+	}
+}
+
+// Non-promoted property NOT initialized in parent constructor body
+class FooBodyNoInit
+{
+	protected string $prop;
+
+	public function __construct()
+	{
+		// doesn't initialize $prop
+	}
+}
+
+class BarBodyNoInit extends FooBodyNoInit {
+	public string $prop;
+}