Fix access to uninitialized property via extension in additional constructor

Author: ondrejmirtes

src/Node/ClassPropertiesNode.php

@@ -109,6 +109,9 @@ public function getUninitializedProperties(
 $originalProperties = [];
 $initialInitializedProperties = [];
 $initializedProperties = [];
+if ($extensions === null) {
+$extensions = $this->readWritePropertiesExtensionProvider->getExtensions();
+}
 foreach ($this->getProperties() as $property) {
 if ($property->isStatic()) {
 continue;
@@ -121,34 +124,29 @@ public function getUninitializedProperties(
 }
 $originalProperties[$property->getName()] = $property;
 $is = TrinaryLogic::createFromBoolean($property->isPromoted() && !$property->isPromotedFromTrait());
+if (!$is->yes()) {
+foreach ($extensions as $extension) {
+if (!$classReflection->hasNativeProperty($property->getName())) {
+continue;
+}
+$propertyReflection = $classReflection->getNativeProperty($property->getName());
+if (!$extension->isInitialized($propertyReflection, $property->getName())) {
+continue;
+}
+$is = TrinaryLogic::createYes();
+break;
+}
+}
 $initialInitializedProperties[$property->getName()] = $is;
 foreach ($constructors as $constructor) {
 $initializedProperties[$constructor][$property->getName()] = $is;
 }
-if ($property->isPromoted() && !$property->isPromotedFromTrait()) {
+if ($is->yes()) {
 continue;
 }
 $uninitializedProperties[$property->getName()] = $property;
 }
 
-if ($extensions === null) {
-$extensions = $this->readWritePropertiesExtensionProvider->getExtensions();
-}
-
-foreach (array_keys($uninitializedProperties) as $name) {
-foreach ($extensions as $extension) {
-if (!$classReflection->hasNativeProperty($name)) {
-continue;
-}
-$propertyReflection = $classReflection->getNativeProperty($name);
-if (!$extension->isInitialized($propertyReflection, $name)) {
-continue;
-}
-unset($uninitializedProperties[$name]);
-break;
-}
-}
-
 if ($constructors === []) {
 return [$uninitializedProperties, [], []];
 }

tests/PHPStan/Rules/Properties/UninitializedPropertyRuleTest.php

@@ -6,6 +6,7 @@
 use PHPStan\Reflection\PropertyReflection;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use function strpos;
 
 /**
  * @extends RuleTestCase<UninitializedPropertyRule>
@@ -20,6 +21,7 @@ protected function getRule(): Rule
 self::getContainer(),
 [
 'UninitializedProperty\\TestCase::setUp',
+'Bug9619\\AdminPresenter::startup',
 ],
 ),
 );
@@ -46,6 +48,27 @@ public function isInitialized(PropertyReflection $property, string $propertyName
 }
 
 },
+
+// bug-9619
+new class() implements ReadWritePropertiesExtension {
+
+public function isAlwaysRead(PropertyReflection $property, string $propertyName): bool
+{
+return false;
+}
+
+public function isAlwaysWritten(PropertyReflection $property, string $propertyName): bool
+{
+return $this->isInitialized($property, $propertyName);
+}
+
+public function isInitialized(PropertyReflection $property, string $propertyName): bool
+{
+return $property->isPublic() &&
+strpos($property->getDocComment() ?? '', '@inject') !== false;
+}
+
+},
 ];
 }
 
@@ -156,4 +179,9 @@ public function testEfabricaLatteBug(): void
 $this->analyse([__DIR__ . '/data/efabrica-latte-bug.php'], []);
 }
 
+public function testBug9619(): void
+{
+$this->analyse([__DIR__ . '/data/bug-9619.php'], []);
+}
+
 }

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

@@ -0,0 +1,23 @@
+<?php // lint >= 7.4
+
+namespace Bug9619;
+
+interface User
+{
+
+public function isLoggedIn(): bool;
+
+}
+
+class AdminPresenter
+{
+/** @inject */
+public User $user;
+
+public function startup()
+{
+if (!$this->user->isLoggedIn()) {
+// do something
+}
+}
+}