Fix overriding trait methods and properties with annotations a different way

ondrejmirtes · ondrejmirtes · commit b1516012fbe0 · 2020-04-19T22:10:49.000+02:00
diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
@@ -300,8 +300,8 @@ public function getClassHierarchyDistances(): array
 	}
 
 	/**
-	 * @param \ReflectionClass $class
-	 * @return \ReflectionClass[]
+	 * @param \ReflectionClass<object> $class
+	 * @return \ReflectionClass<object>[]
 	 */
 	private function collectTraits(\ReflectionClass $class): array
 	{
diff --git a/src/Reflection/Php/PhpClassReflectionExtension.php b/src/Reflection/Php/PhpClassReflectionExtension.php
@@ -195,11 +195,17 @@ private function createProperty(
 			if (!isset($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()])) {
 				throw new \PHPStan\ShouldNotHappenException();
 			}
-			if (!isset($hierarchyDistances[$propertyReflection->getDeclaringClass()->getName()])) {
+
+			$distanceDeclaringClass = $propertyReflection->getDeclaringClass()->getName();
+			$propertyTrait = $this->findPropertyTrait($propertyReflection);
+			if ($propertyTrait !== null) {
+				$distanceDeclaringClass = $propertyTrait;
+			}
+			if (!isset($hierarchyDistances[$distanceDeclaringClass])) {
 				throw new \PHPStan\ShouldNotHappenException();
 			}
 
-			if ($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()] <= $hierarchyDistances[$propertyReflection->getDeclaringClass()->getName()]) {
+			if ($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()] < $hierarchyDistances[$distanceDeclaringClass]) {
 				return $annotationProperty;
 			}
 		}
@@ -391,11 +397,17 @@ private function createMethod(
 			if (!isset($hierarchyDistances[$annotationMethod->getDeclaringClass()->getName()])) {
 				throw new \PHPStan\ShouldNotHappenException();
 			}
-			if (!isset($hierarchyDistances[$methodReflection->getDeclaringClass()->getName()])) {
+
+			$distanceDeclaringClass = $methodReflection->getDeclaringClass()->getName();
+			$methodTrait = $this->findMethodTrait($methodReflection);
+			if ($methodTrait !== null) {
+				$distanceDeclaringClass = $methodTrait;
+			}
+			if (!isset($hierarchyDistances[$distanceDeclaringClass])) {
 				throw new \PHPStan\ShouldNotHappenException();
 			}
 
-			if ($hierarchyDistances[$annotationMethod->getDeclaringClass()->getName()] <= $hierarchyDistances[$methodReflection->getDeclaringClass()->getName()]) {
+			if ($hierarchyDistances[$annotationMethod->getDeclaringClass()->getName()] < $hierarchyDistances[$distanceDeclaringClass]) {
 				return $annotationMethod;
 			}
 		}
@@ -603,7 +615,7 @@ private function findPropertyTrait(\ReflectionProperty $propertyReflection): ?st
 	}
 
 	/**
-	 * @param \ReflectionClass[] $traits
+	 * @param \ReflectionClass<object>[] $traits
 	 * @param \ReflectionProperty $propertyReflection
 	 * @return string|null
 	 */

Original file line number	Diff line number	Diff line change
`@@ -300,8 +300,8 @@ public function getClassHierarchyDistances(): array`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`/**`
`303`		`- * @param \ReflectionClass $class`
`304`		`- * @return \ReflectionClass[]`
	`303`	`+ * @param \ReflectionClass<object> $class`
	`304`	`+ * @return \ReflectionClass<object>[]`
`305`	`305`	`*/`
`306`	`306`	`private function collectTraits(\ReflectionClass $class): array`
`307`	`307`	`{`
Original file line number	Diff line number	Diff line change
`@@ -195,11 +195,17 @@ private function createProperty(`
`195`	`195`	`if (!isset($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()])) {`
`196`	`196`	`throw new \PHPStan\ShouldNotHappenException();`
`197`	`197`	`}`
`198`		`- if (!isset($hierarchyDistances[$propertyReflection->getDeclaringClass()->getName()])) {`
	`198`	`+`
	`199`	`+ $distanceDeclaringClass = $propertyReflection->getDeclaringClass()->getName();`
	`200`	`+ $propertyTrait = $this->findPropertyTrait($propertyReflection);`
	`201`	`+ if ($propertyTrait !== null) {`
	`202`	`+ $distanceDeclaringClass = $propertyTrait;`
	`203`	`+ }`
	`204`	`+ if (!isset($hierarchyDistances[$distanceDeclaringClass])) {`
`199`	`205`	`throw new \PHPStan\ShouldNotHappenException();`
`200`	`206`	`}`
`201`	`207`
`202`		`- if ($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()] <= $hierarchyDistances[$propertyReflection->getDeclaringClass()->getName()]) {`
	`208`	`+ if ($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()] < $hierarchyDistances[$distanceDeclaringClass]) {`
`203`	`209`	`return $annotationProperty;`
`204`	`210`	`}`
`205`	`211`	`}`
`@@ -391,11 +397,17 @@ private function createMethod(`
`391`	`397`	`if (!isset($hierarchyDistances[$annotationMethod->getDeclaringClass()->getName()])) {`
`392`	`398`	`throw new \PHPStan\ShouldNotHappenException();`
`393`	`399`	`}`
`394`		`- if (!isset($hierarchyDistances[$methodReflection->getDeclaringClass()->getName()])) {`
	`400`	`+`
	`401`	`+ $distanceDeclaringClass = $methodReflection->getDeclaringClass()->getName();`
	`402`	`+ $methodTrait = $this->findMethodTrait($methodReflection);`
	`403`	`+ if ($methodTrait !== null) {`
	`404`	`+ $distanceDeclaringClass = $methodTrait;`
	`405`	`+ }`
	`406`	`+ if (!isset($hierarchyDistances[$distanceDeclaringClass])) {`
`395`	`407`	`throw new \PHPStan\ShouldNotHappenException();`
`396`	`408`	`}`
`397`	`409`
`398`		`- if ($hierarchyDistances[$annotationMethod->getDeclaringClass()->getName()] <= $hierarchyDistances[$methodReflection->getDeclaringClass()->getName()]) {`
	`410`	`+ if ($hierarchyDistances[$annotationMethod->getDeclaringClass()->getName()] < $hierarchyDistances[$distanceDeclaringClass]) {`
`399`	`411`	`return $annotationMethod;`
`400`	`412`	`}`
`401`	`413`	`}`
`@@ -603,7 +615,7 @@ private function findPropertyTrait(\ReflectionProperty $propertyReflection): ?st`
`603`	`615`	`}`
`604`	`616`
`605`	`617`	`/**`
`606`		`- * @param \ReflectionClass[] $traits`
	`618`	`+ * @param \ReflectionClass<object>[] $traits`
`607`	`619`	`* @param \ReflectionProperty $propertyReflection`
`608`	`620`	`* @return string\|null`
`609`	`621`	`*/`