Allow @property and @method to override above the same class

Author: ondrejmirtes

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -244,7 +244,7 @@ private function createProperty(
 				throw new ShouldNotHappenException();
 			}
 
-			if ($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()] < $hierarchyDistances[$distanceDeclaringClass]) {
+			if ($hierarchyDistances[$annotationProperty->getDeclaringClass()->getName()] <= $hierarchyDistances[$distanceDeclaringClass]) {
 				return $annotationProperty;
 			}
 		}
@@ -468,7 +468,7 @@ private function createMethod(
 				throw new ShouldNotHappenException();
 			}
 
-			if ($hierarchyDistances[$annotationMethod->getDeclaringClass()->getName()] < $hierarchyDistances[$distanceDeclaringClass]) {
+			if ($hierarchyDistances[$annotationMethod->getDeclaringClass()->getName()] <= $hierarchyDistances[$distanceDeclaringClass]) {
 				return $annotationMethod;
 			}
 		}

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

@@ -35,7 +35,7 @@ public function sayHello()
 function (): void {
 	$hw = new HelloWorld();
 	assertType('string', $hw->sayHi());
-	assertType('int', $hw->sayHello());
+	assertType('string', $hw->sayHello());
 };
 
 interface DecoratorInterface

tests/PHPStan/Reflection/Annotations/AnnotationsMethodsClassReflectionExtensionTest.php

@@ -459,7 +459,7 @@ public function dataMethods(): array
 				],
 				'conflictingMethod' => [
 					'class' => Bar::class,
-					'returnType' => Bar::class,
+					'returnType' => Foo::class,
 					'isStatic' => false,
 					'isVariadic' => false,
 					'parameters' => [],

tests/PHPStan/Reflection/Annotations/AnnotationsPropertiesClassReflectionExtensionTest.php

@@ -120,8 +120,8 @@ public function dataProperties(): array
 					],
 					'conflictingAnnotationProperty' => [
 						'class' => Bar::class,
-						'readableType' => Bar::class,
-						'writableType' => Bar::class,
+						'readableType' => Foo::class,
+						'writableType' => Foo::class,
 						'writable' => true,
 						'readable' => true,
 					],