Cleaner attempt

ondrejmirtes · ondrejmirtes · commit 55ac5780e55c · 2021-03-18T16:08:24.000+01:00
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -116,9 +116,8 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 		$resolvedClassReflection = null;
 		if ($ancestor !== null) {
 			$resolvedClassReflection = $ancestor->getClassReflection();
-			$nakedAncestorClassReflection = $ancestor->getNakedClassReflection();
-			if ($nakedAncestorClassReflection !== null && $nakedAncestorClassReflection->hasProperty($propertyName)) {
-				$property = $nakedAncestorClassReflection->getProperty($propertyName, $scope);
+			if ($ancestor !== $this) {
+				$property = $ancestor->getUnresolvedPropertyPrototype($propertyName, $scope)->getNakedProperty();
 			}
 		}
 		if ($resolvedClassReflection === null) {
@@ -535,9 +534,8 @@ public function getUnresolvedMethodPrototype(string $methodName, ClassMemberAcce
 		$resolvedClassReflection = null;
 		if ($ancestor !== null) {
 			$resolvedClassReflection = $ancestor->getClassReflection();
-			$nakedAncestorClassReflection = $ancestor->getNakedClassReflection();
-			if ($nakedAncestorClassReflection !== null && $nakedAncestorClassReflection->hasMethod($methodName)) {
-				$method = $nakedAncestorClassReflection->getMethod($methodName, $scope);
+			if ($ancestor !== $this) {
+				$method = $ancestor->getUnresolvedMethodPrototype($methodName, $scope)->getNakedMethod();
 			}
 		}
 		if ($resolvedClassReflection === null) {

Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,8 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember`
`116`	`116`	`$resolvedClassReflection = null;`
`117`	`117`	`if ($ancestor !== null) {`
`118`	`118`	`$resolvedClassReflection = $ancestor->getClassReflection();`
`119`		`- $nakedAncestorClassReflection = $ancestor->getNakedClassReflection();`
`120`		`- if ($nakedAncestorClassReflection !== null && $nakedAncestorClassReflection->hasProperty($propertyName)) {`
`121`		`- $property = $nakedAncestorClassReflection->getProperty($propertyName, $scope);`
	`119`	`+ if ($ancestor !== $this) {`
	`120`	`+ $property = $ancestor->getUnresolvedPropertyPrototype($propertyName, $scope)->getNakedProperty();`
`122`	`121`	`}`
`123`	`122`	`}`
`124`	`123`	`if ($resolvedClassReflection === null) {`
`@@ -535,9 +534,8 @@ public function getUnresolvedMethodPrototype(string $methodName, ClassMemberAcce`
`535`	`534`	`$resolvedClassReflection = null;`
`536`	`535`	`if ($ancestor !== null) {`
`537`	`536`	`$resolvedClassReflection = $ancestor->getClassReflection();`
`538`		`- $nakedAncestorClassReflection = $ancestor->getNakedClassReflection();`
`539`		`- if ($nakedAncestorClassReflection !== null && $nakedAncestorClassReflection->hasMethod($methodName)) {`
`540`		`- $method = $nakedAncestorClassReflection->getMethod($methodName, $scope);`
	`537`	`+ if ($ancestor !== $this) {`
	`538`	`+ $method = $ancestor->getUnresolvedMethodPrototype($methodName, $scope)->getNakedMethod();`
`541`	`539`	`}`
`542`	`540`	`}`
`543`	`541`	`if ($resolvedClassReflection === null) {`