Understand that promoted property can come from renamed trait constructor

ondrejmirtes · ondrejmirtes · commit eafba2e09164 · 2023-07-05T22:23:01.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -527,7 +527,8 @@ private function processStmtNode(
 				throw new ShouldNotHappenException();
 			}
 
-			if ($stmt->name->toLowerString() === '__construct') {
+			$isFromTrait = $stmt->getAttribute('originalTraitMethodName') === '__construct';
+			if ($stmt->name->toLowerString() === '__construct' || $isFromTrait) {
 				foreach ($stmt->params as $param) {
 					if ($param->flags === 0) {
 						continue;
@@ -548,6 +549,7 @@ private function processStmtNode(
 						$phpDoc,
 						$phpDocParameterTypes[$param->var->name] ?? null,
 						true,
+						$isFromTrait,
 						$param,
 						false,
 						$scope->isInTrait(),
@@ -723,6 +725,7 @@ private function processStmtNode(
 						$docComment,
 						$phpDocType,
 						false,
+						false,
 						$prop,
 						$isReadOnly,
 						$scope->isInTrait(),
diff --git a/src/Node/ClassPropertiesNode.php b/src/Node/ClassPropertiesNode.php
@@ -118,12 +118,12 @@ public function getUninitializedProperties(
 				continue;
 			}
 			$originalProperties[$property->getName()] = $property;
-			$is = TrinaryLogic::createFromBoolean($property->isPromoted());
+			$is = TrinaryLogic::createFromBoolean($property->isPromoted() && !$property->isPromotedFromTrait());
 			$initialInitializedProperties[$property->getName()] = $is;
 			foreach ($constructors as $constructor) {
 				$initializedProperties[$constructor][$property->getName()] = $is;
 			}
-			if ($property->isPromoted()) {
+			if ($property->isPromoted() && !$property->isPromotedFromTrait()) {
 				continue;
 			}
 			$uninitializedProperties[$property->getName()] = $property;
diff --git a/src/Node/ClassPropertyNode.php b/src/Node/ClassPropertyNode.php
@@ -22,6 +22,7 @@ public function __construct(
 		private ?string $phpDoc,
 		private ?Type $phpDocType,
 		private bool $isPromoted,
+		private bool $isPromotedFromTrait,
 		Node $originalNode,
 		private bool $isReadonlyByPhpDoc,
 		private bool $isDeclaredInTrait,
@@ -52,6 +53,11 @@ public function isPromoted(): bool
 		return $this->isPromoted;
 	}
 
+	public function isPromotedFromTrait(): bool
+	{
+		return $this->isPromotedFromTrait;
+	}
+
 	public function getPhpDoc(): ?string
 	{
 		return $this->phpDoc;
diff --git a/tests/PHPStan/Rules/Classes/data/bug-9577.php b/tests/PHPStan/Rules/Classes/data/bug-9577.php
@@ -24,3 +24,17 @@ public function __construct(
 		$this->__traitConstruct($message);
 	}
 }
+
+class SpecializedException2
+{
+	use StringableMessageTrait {
+		StringableMessageTrait::__construct as __traitConstruct;
+	}
+
+	public function __construct(
+		public int $code,
+		string $message,
+	) {
+		//$this->__traitConstruct($message);
+	}
+}
diff --git a/tests/PHPStan/Rules/Properties/MissingReadOnlyPropertyAssignRuleTest.php b/tests/PHPStan/Rules/Properties/MissingReadOnlyPropertyAssignRuleTest.php
@@ -213,4 +213,18 @@ public function testBug7649(): void
 		]);
 	}
 
+	public function testBug9577(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->analyse([__DIR__ . '/../Classes/data/bug-9577.php'], [
+			[
+				'Class Bug9577\SpecializedException2 has an uninitialized readonly property $message. Assign it in the constructor.',
+				8,
+			],
+		]);
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,12 @@ public function getUninitializedProperties(`
`118`	`118`	`continue;`
`119`	`119`	`}`
`120`	`120`	`$originalProperties[$property->getName()] = $property;`
`121`		`- $is = TrinaryLogic::createFromBoolean($property->isPromoted());`
	`121`	`+ $is = TrinaryLogic::createFromBoolean($property->isPromoted() && !$property->isPromotedFromTrait());`
`122`	`122`	`$initialInitializedProperties[$property->getName()] = $is;`
`123`	`123`	`foreach ($constructors as $constructor) {`
`124`	`124`	`$initializedProperties[$constructor][$property->getName()] = $is;`
`125`	`125`	`}`
`126`		`- if ($property->isPromoted()) {`
	`126`	`+ if ($property->isPromoted() && !$property->isPromotedFromTrait()) {`
`127`	`127`	`continue;`
`128`	`128`	`}`
`129`	`129`	`$uninitializedProperties[$property->getName()] = $property;`