AnnotationsPropertiesClassReflectionExtension: More specific property prevail

Restore the behaviour from before asymmetric properties were introduced,
when `@property-read` and `@property-write` would shadow `@property`.
This is slightly more intuitive since those tags are more specific.

Author: jtojnar

Diff for: src/PhpDoc/PhpDocNodeResolver.php

@@ -110,20 +110,20 @@ public function resolvePropertyTags(PhpDocNode $phpDocNode, NameScope $nameScope
 			}
 		}
 
-		$readable = [];
 		foreach (['@property-read', '@phpstan-property-read'] as $tagName) {
 			foreach ($phpDocNode->getPropertyReadTagValues($tagName) as $tagValue) {
 				$propertyName = substr($tagValue->propertyName, 1);
 				$propertyType = $this->typeNodeResolver->resolve($tagValue->type, $nameScope);
 
+				$writableType = null;
 				if (array_key_exists($propertyName, $resolved)) {
-					continue;
+					$writableType = $resolved[$propertyName]->getWritableType();
 				}
 
-				$readable[$propertyName] = new PropertyTag(
+				$resolved[$propertyName] = new PropertyTag(
 					$propertyType,
 					$propertyType,
-					null,
+					$writableType,
 				);
 			}
 		}
@@ -133,33 +133,19 @@ public function resolvePropertyTags(PhpDocNode $phpDocNode, NameScope $nameScope
 				$propertyName = substr($tagValue->propertyName, 1);
 				$propertyType = $this->typeNodeResolver->resolve($tagValue->type, $nameScope);
 
+				$readableType = null;
 				if (array_key_exists($propertyName, $resolved)) {
-					continue;
-				}
-
-				if (array_key_exists($propertyName, $readable)) {
-					$readableProperty = $readable[$propertyName];
-					$resolved[$propertyName] = new PropertyTag(
-						$propertyType,
-						$readableProperty->getReadableType(),
-						$propertyType,
-					);
-					unset($readable[$propertyName]);
-					continue;
+					$readableType = $resolved[$propertyName]->getReadableType();
 				}
 
 				$resolved[$propertyName] = new PropertyTag(
-					$propertyType,
-					null,
+					$readableType ?? $propertyType,
+					$readableType,
 					$propertyType,
 				);
 			}
 		}
 
-		foreach ($readable as $propertyName => $tag) {
-			$resolved[$propertyName] = $tag;
-		}
-
 		return $resolved;
 	}
 

Diff for: tests/PHPStan/Analyser/data/asymmetric-properties.php

@@ -23,7 +23,7 @@ public function doFoo(): void
 	{
 		assertType('int', $this->asymmetricPropertyRw);
 		assertType('int', $this->asymmetricPropertyXw);
-		assertType('int|string', $this->asymmetricPropertyRx);
+		assertType('int', $this->asymmetricPropertyRx);
 	}
 
 }

Diff for: tests/PHPStan/Reflection/Annotations/AnnotationsPropertiesClassReflectionExtensionTest.php

@@ -255,13 +255,13 @@ public function dataProperties(): array
 					'asymmetricPropertyXw' => [
 						'class' => Asymmetric::class,
 						'readableType' => 'int',
-						'writableType' => 'int',
+						'writableType' => 'int|string',
 						'writable' => true,
 						'readable' => true,
 					],
 					'asymmetricPropertyRx' => [
 						'class' => Asymmetric::class,
-						'readableType' => 'int|string',
+						'readableType' => 'int',
 						'writableType' => 'int|string',
 						'writable' => true,
 						'readable' => true,