Process called methods looking for initialized properties only when called from constructor

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -3188,6 +3188,10 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 				if (
 					$scope->isInClass()
 					&& $scope->getClassReflection()->getName() === $methodReflection->getDeclaringClass()->getName()
+					&& (
+						!$this->narrowMethodScopeFromConstructor
+						|| ($scope->getFunctionName() !== null && strtolower($scope->getFunctionName()) === '__construct')
+					)
 					/*&& (
 						// should not be allowed but in practice has to be
 						$scope->getClassReflection()->isFinal()

tests/PHPStan/Rules/Properties/UninitializedPropertyRuleTest.php

@@ -7,6 +7,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPUnit\Framework\Attributes\RequiresPhp;
+use function array_merge;
 use function strpos;
 
 /**
@@ -78,9 +79,13 @@ public function isInitialized(PropertyReflection $property, string $propertyName
 
 	public static function getAdditionalConfigFiles(): array
 	{
-		return [
-			__DIR__ . '/uninitialized-property-rule.neon',
-		];
+		return array_merge(
+			parent::getAdditionalConfigFiles(),
+			[
+				__DIR__ . '/uninitialized-property-rule.neon',
+				__DIR__ . '/../../../../src/Testing/narrowMethodScopeFromConstructor.neon',
+			],
+		);
 	}
 
 	public function testRule(): void
@@ -153,28 +158,28 @@ public function testReadOnlyPhpDoc(): void
 	public function testBug7219(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-7219.php'], [
-			[
-				'Class Bug7219\Foo has an uninitialized property $id. Give it default value or assign it in the constructor.',
-				8,
-			],
 			[
 				'Class Bug7219\Foo has an uninitialized property $email. Give it default value or assign it in the constructor.',
 				15,
 			],
+			[
+				'Class Bug7219\Foo has an uninitialized property $id. Give it default value or assign it in the constructor.',
+				8,
+			],
 		]);
 	}
 
 	public function testAdditionalConstructorsExtension(): void
 	{
 		$this->analyse([__DIR__ . '/data/uninitialized-property-additional-constructors.php'], [
-			[
-				'Class TestInitializedProperty\TestAdditionalConstructor has an uninitialized property $one. Give it default value or assign it in the constructor.',
-				07,
-			],
 			[
 				'Class TestInitializedProperty\TestAdditionalConstructor has an uninitialized property $three. Give it default value or assign it in the constructor.',
 				11,
 			],
+			[
+				'Class TestInitializedProperty\TestAdditionalConstructor has an uninitialized property $one. Give it default value or assign it in the constructor.',
+				07,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Properties/data/uninitialized-property-additional-constructors.php

@@ -10,13 +10,21 @@ class TestAdditionalConstructor
 
 	protected int $three;
 
+	protected int $four;
+
 	public function setTwo(int $value): void
 	{
 		$this->two = $value;
+		$this->setFour();
 	}
 
 	public function setThree(int $value): void
 	{
 		$this->three = $value;
 	}
+
+	public function setFour(): void
+	{
+		$this->four = 1;
+	}
 }