PHPDoc tag @property should only be taken into account for protected properties and outside access when the declaring class allows dynamic properties

Author: ondrejmirtes

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -425,11 +425,10 @@ private function createProperty(
 			$includingAnnotations
 			&& !$declaringClassReflection->isEnum()
 			&& !$propertyReflection->isStatic()
-			&& ($classReflection->allowsDynamicProperties() || !$propertyReflection->isPrivate())
+			&& ($classReflection->allowsDynamicProperties() || $scope->canReadProperty($nativeProperty))
 			&& $this->annotationsPropertiesClassReflectionExtension->hasProperty($classReflection, $propertyName)
 			&& (
-				!$scope->canReadProperty($nativeProperty)
-				|| $nativeProperty->isPublic()
+				$nativeProperty->isPublic()
 				|| ($scope->isInClass() && $scope->getClassReflection()->getName() !== $declaringClassReflection->getName())
 			)
 		) {

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -187,6 +187,8 @@ private static function findTestFiles(): iterable
 		yield __DIR__ . '/../Rules/Classes/data/bug-5333.php';
 		yield __DIR__ . '/../Rules/Methods/data/bug-8174.php';
 
+		yield __DIR__ . '/../Rules/Properties/data/bug-13537.php';
+
 		if (PHP_VERSION_ID >= 80000) {
 			yield __DIR__ . '/../Rules/Comparison/data/bug-8169.php';
 		}

tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php

@@ -1216,4 +1216,21 @@ public function testPrivatePropertyWithAllowedPropertyTagIsPublic(): void
 		$this->analyse([__DIR__ . '/data/private-property-with-allowed-property-tag-is-public.php'], []);
 	}
 
+	public function testBug13537(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkUnionTypes = true;
+		$this->checkDynamicProperties = true;
+		$this->analyse([__DIR__ . '/data/bug-13537.php'], [
+			[
+				'Cannot access property $bob on array<string, mixed>.',
+				25,
+			],
+			[
+				'Access to protected property Bug13537\Bar::$test.',
+				25,
+			],
+		]);
+	}
+
 }

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

@@ -0,0 +1,63 @@
+<?php
+
+namespace Bug13537;
+
+use stdClass;
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+	/**
+	 * @var array<non-empty-string, mixed>
+	 */
+	protected array $test = [];
+}
+
+/**
+ * @property stdClass $test
+ */
+class Bar extends Foo
+{
+
+}
+
+function (): void {
+	$bob = new Bar()->test->bob;
+};
+
+class BaseModel
+{
+	/**
+	 * @var array<non-empty-string, mixed>
+	 */
+	protected array $attributes = [];
+
+	public function __get(string $key): mixed {
+		return $this->attributes[$key] ?? null;
+	}
+
+	public function __isset(string $key): bool {
+		return isset($this->attributes[$key]);
+	}
+}
+
+/**
+ * @property stdClass $attributes
+ * @property bool $other
+ */
+class Bar2 extends BaseModel
+{
+	public function __constructor(): void {
+		$this->attributes = [
+			'attributes' => (object) array('foo' => 'bar'),
+			'other' => true
+		];
+	}
+}
+
+function (): void {
+	$bar = new Bar2();
+	echo $bar->attributes->foo;
+
+	assertType(stdClass::class, $bar->attributes);
+};