Allow overriding PHPDoc type of a protected property in a subclass

Author: ondrejmirtes

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -430,7 +430,11 @@ private function createProperty(
 && !$propertyReflection->isStatic()
 && ($classReflection->allowsDynamicProperties() || !$propertyReflection->isPrivate())
 && $this->annotationsPropertiesClassReflectionExtension->hasProperty($classReflection, $propertyName)
-&& (!$scope->canReadProperty($nativeProperty) || $nativeProperty->isPublic())
+&& (
+!$scope->canReadProperty($nativeProperty)
+|| $nativeProperty->isPublic()
+|| ($scope->isInClass() && $scope->getClassReflection()->getName() !== $declaringClassReflection->getName())
+)
 ) {
 $hierarchyDistances = $classReflection->getClassHierarchyDistances();
 $annotationProperty = $this->annotationsPropertiesClassReflectionExtension->getProperty($classReflection, $propertyName);

tests/PHPStan/Analyser/nsrt/bug-1216.php

@@ -34,7 +34,7 @@ class Baz extends Foo
 
 public function __construct()
 {
-assertType('int', $this->foo);
+assertType('string', $this->foo);
 assertType('string', $this->bar);
 assertType('string', $this->untypedBar);
 }

tests/PHPStan/Analyser/nsrt/overriding-phpdoc-type-of-protected-property.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace OverridingPhpDocTypeOfProtectedProperty;
+
+use stdClass;
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+/** @var array|object */
+protected $config;
+
+}
+
+/**
+ * @property stdClass $config
+ */
+class Bar extends Foo
+{
+
+public function doFoo()
+{
+assertType(stdClass::class, $this->config);
+}
+
+}

tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php

@@ -126,10 +126,6 @@ public function testTypesAssignedToProperties(): void
 public function testBug1216(): void
 {
 $this->analyse([__DIR__ . '/data/bug-1216.php'], [
-[
-'Property Bug1216PropertyTest\Foo::$foo (int) does not accept string.',
-36,
-],
 [
 'Property Bug1216PropertyTest\Baz::$untypedBar (string) does not accept int.',
 38,

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

@@ -33,7 +33,7 @@ class Baz extends Foo
 
 public function __construct()
 {
-$this->foo = 'foo'; // error because property is protected so in this scope "int" type is used
+$this->foo = 'foo'; // OK
 $this->bar = 'bar'; // OK
 $this->untypedBar = 123; // error
 }