Fix overriding trait properties in PHPDocs

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -199,7 +199,7 @@ private function createProperty(
 				throw new \PHPStan\ShouldNotHappenException();
 			}
 
-			if ($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()] < $hierarchyDistances[$propertyReflection->getDeclaringClass()->getName()]) {
+			if ($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()] <= $hierarchyDistances[$propertyReflection->getDeclaringClass()->getName()]) {
 				return $annotationProperty;
 			}
 		}

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -9834,6 +9834,11 @@ public function dataArrayShapeKeysStrings(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/array-shapes-keys-strings.php');
 	}
 
+	public function dataBug1216(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-1216.php');
+	}
+
 	/**
 	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
@@ -9871,6 +9876,7 @@ public function dataArrayShapeKeysStrings(): array
 	 * @dataProvider dataIsNumeric
 	 * @dataProvider dataBug3142
 	 * @dataProvider dataArrayShapeKeysStrings
+	 * @dataProvider dataBug1216
 	 * @param ConstantStringType $expectedType
 	 * @param Type $actualType
 	 */

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

@@ -0,0 +1,46 @@
+<?php
+
+namespace Bug1216;
+
+use function PHPStan\Analyser\assertType;
+
+abstract class Foo
+{
+	/**
+	 * @var int
+	 */
+	protected $foo;
+}
+
+trait Bar
+{
+	/**
+	 * @var int
+	 */
+	protected $bar;
+
+	protected $untypedBar;
+}
+
+/**
+ * @property string $foo
+ * @property string $bar
+ * @property string $untypedBar
+ */
+class Baz extends Foo
+{
+
+	public function __construct()
+	{
+		assertType('string', $this->foo);
+		assertType('string', $this->bar);
+		assertType('string', $this->untypedBar);
+	}
+
+}
+
+function (Baz $baz): void {
+	assertType('string', $baz->foo);
+	assertType('string', $baz->bar);
+	assertType('string', $baz->untypedBar);
+};

tests/PHPStan/Reflection/Annotations/AnnotationsPropertiesClassReflectionExtensionTest.php

@@ -100,7 +100,7 @@ public function dataProperties(): array
 					],
 					'conflictingAnnotationProperty' => [
 						'class' => \AnnotationsProperties\Bar::class,
-						'type' => \AnnotationsProperties\Bar::class,
+						'type' => \AnnotationsProperties\Foo::class,
 						'writable' => true,
 						'readable' => true,
 					],

tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php

@@ -77,4 +77,18 @@ public function testTypesAssignedToProperties(): void
 		]);
 	}
 
+	public function testBug1216(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-1216.php'], [
+			[
+				'Property Bug1216PropertyTest\Baz::$untypedBar (string) does not accept int.',
+				35,
+			],
+			[
+				'Property Bug1216PropertyTest\Dummy::$foo (Exception) does not accept stdClass.',
+				59,
+			],
+		]);
+	}
+
 }

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

@@ -0,0 +1,64 @@
+<?php
+
+namespace Bug1216PropertyTest;
+
+abstract class Foo
+{
+	/**
+	 * @var int
+	 */
+	protected $foo;
+}
+
+trait Bar
+{
+	/**
+	 * @var int
+	 */
+	protected $bar;
+
+	protected $untypedBar;
+}
+
+/**
+ * @property string $foo
+ * @property string $bar
+ * @property string $untypedBar
+ */
+class Baz extends Foo
+{
+
+	public function __construct()
+	{
+		$this->foo = 'foo'; // OK
+		$this->bar = 'bar'; // OK
+		$this->untypedBar = 123; // error
+	}
+
+}
+
+trait DecoratorTrait
+{
+
+	/** @var \stdClass */
+	public $foo;
+
+}
+
+/**
+ * @property \Exception $foo
+ */
+class Dummy
+{
+
+	use DecoratorTrait;
+
+}
+
+function (Dummy $dummy): void {
+	$dummy->foo = new \stdClass();
+};
+
+function (Dummy $dummy): void {
+	$dummy->foo = new \Exception();
+};