Do not infer property types from constructor if the property already has a native type

Author: ondrejmirtes

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -303,6 +303,7 @@ private function createProperty(
 			&& $this->inferPrivatePropertyTypeFromConstructor
 			&& $declaringClassReflection->getFileName() !== false
 			&& $propertyReflection->isPrivate()
+			&& (!method_exists($propertyReflection, 'hasType') || !$propertyReflection->hasType())
 			&& $declaringClassReflection->hasConstructor()
 			&& $declaringClassReflection->getConstructor()->getDeclaringClass()->getName() === $declaringClassReflection->getName()
 		) {

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -10511,15 +10511,6 @@ public function dataBug2945(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-2945.php');
 	}
 
-	public function dataInferPrivateTypedPropertyTypeFromConstructor(): array
-	{
-		if (!self::$useStaticReflectionProvider && PHP_VERSION_ID < 70400) {
-			$this->markTestSkipped('Test requires PHP 7.4.');
-		}
-
-		return $this->gatherAssertTypes(__DIR__ . '/data/infer-private-typed-property-type-from-constructor.php');
-	}
-
 	public function dataBug4207(): array
 	{
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4207.php');
@@ -10723,7 +10714,6 @@ private function gatherAssertTypes(string $file): array
 	 * @dataProvider dataBug2997
 	 * @dataProvider dataBug1657
 	 * @dataProvider dataBug2945
-	 * @dataProvider dataInferPrivateTypedPropertyTypeFromConstructor
 	 * @dataProvider dataBug4207
 	 * @dataProvider dataBug4206
 	 * @dataProvider dataBugEmptyArray