Overriding @property tags - take native type into account if the scope can read the native property

Author: ondrejmirtes

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -430,7 +430,8 @@ private function createProperty(
 			&& $this->annotationsPropertiesClassReflectionExtension->hasProperty($classReflection, $propertyName)
 			&& (
 				$nativeProperty->isPublic()
-				|| ($scope->isInClass() && $scope->getClassReflection()->getName() !== $declaringClassReflection->getName())
+				|| !$scope->isInClass()
+				|| $scope->getClassReflection()->getName() !== $declaringClassReflection->getName()
 			)
 		) {
 			$hierarchyDistances = $classReflection->getClassHierarchyDistances();
@@ -451,7 +452,7 @@ private function createProperty(
 			if (
 				$hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()] <= $hierarchyDistances[$distanceDeclaringClass]
 			) {
-				if ($nativeType->isSuperTypeOf($annotationProperty->getReadableType())->yes()) {
+				if ($nativeType->isSuperTypeOf($annotationProperty->getReadableType())->yes() || !$scope->canReadProperty($nativeProperty)) {
 					$nativeType = new MixedType();
 				}
 

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

@@ -62,3 +62,14 @@ function (): void {
 
 	assertType(stdClass::class, $bar->attributes);
 };
+
+class Test
+{
+	public function doFoo(): void
+	{
+		$bar = new Bar2();
+		echo $bar->attributes->foo;
+
+		assertType(stdClass::class, $bar->attributes);
+	}
+}