Made parent class reflection resolving lazier

staabm · web-flow · commit 2d58174317c0 · 2023-08-25T13:31:39.000+02:00
diff --git a/src/Reflection/Annotations/AnnotationsMethodsClassReflectionExtension.php b/src/Reflection/Annotations/AnnotationsMethodsClassReflectionExtension.php
@@ -84,21 +84,23 @@ private function findClassReflectionWithMethod(
 			return $methodWithDeclaringClass;
 		}
 
-		foreach ($classReflection->getParents() as $parentClass) {
+		$parentClass = $classReflection->getParentClass();
+		while ($parentClass !== null) {
 			$methodWithDeclaringClass = $this->findClassReflectionWithMethod($parentClass, $parentClass, $methodName);
-			if ($methodWithDeclaringClass === null) {
-				foreach ($parentClass->getTraits() as $traitClass) {
-					$parentTraitMethodWithDeclaringClass = $this->findClassReflectionWithMethod($traitClass, $parentClass, $methodName);
-					if ($parentTraitMethodWithDeclaringClass === null) {
-						continue;
-					}
+			if ($methodWithDeclaringClass !== null) {
+				return $methodWithDeclaringClass;
+			}
 
-					return $parentTraitMethodWithDeclaringClass;
+			foreach ($parentClass->getTraits() as $traitClass) {
+				$parentTraitMethodWithDeclaringClass = $this->findClassReflectionWithMethod($traitClass, $parentClass, $methodName);
+				if ($parentTraitMethodWithDeclaringClass === null) {
+					continue;
 				}
-				continue;
+
+				return $parentTraitMethodWithDeclaringClass;
 			}
 
-			return $methodWithDeclaringClass;
+			$parentClass = $parentClass->getParentClass();
 		}
 
 		foreach ($classReflection->getInterfaces() as $interfaceClass) {
diff --git a/src/Reflection/Annotations/AnnotationsPropertiesClassReflectionExtension.php b/src/Reflection/Annotations/AnnotationsPropertiesClassReflectionExtension.php
@@ -74,21 +74,23 @@ private function findClassReflectionWithProperty(
 			return $methodWithDeclaringClass;
 		}
 
-		foreach ($classReflection->getParents() as $parentClass) {
+		$parentClass = $classReflection->getParentClass();
+		while ($parentClass !== null) {
 			$methodWithDeclaringClass = $this->findClassReflectionWithProperty($parentClass, $parentClass, $propertyName);
-			if ($methodWithDeclaringClass === null) {
-				foreach ($parentClass->getTraits() as $traitClass) {
-					$parentTraitMethodWithDeclaringClass = $this->findClassReflectionWithProperty($traitClass, $parentClass, $propertyName);
-					if ($parentTraitMethodWithDeclaringClass === null) {
-						continue;
-					}
+			if ($methodWithDeclaringClass !== null) {
+				return $methodWithDeclaringClass;
+			}
 
-					return $parentTraitMethodWithDeclaringClass;
+			foreach ($parentClass->getTraits() as $traitClass) {
+				$parentTraitMethodWithDeclaringClass = $this->findClassReflectionWithProperty($traitClass, $parentClass, $propertyName);
+				if ($parentTraitMethodWithDeclaringClass === null) {
+					continue;
 				}
-				continue;
+
+				return $parentTraitMethodWithDeclaringClass;
 			}
 
-			return $methodWithDeclaringClass;
+			$parentClass = $parentClass->getParentClass();
 		}
 
 		foreach ($classReflection->getInterfaces() as $interfaceClass) {
diff --git a/src/Reflection/Mixin/MixinMethodsClassReflectionExtension.php b/src/Reflection/Mixin/MixinMethodsClassReflectionExtension.php
@@ -74,13 +74,14 @@ private function findMethod(ClassReflection $classReflection, string $methodName
 			return new MixinMethodReflection($method, $static);
 		}
 
-		foreach ($classReflection->getParents() as $parentClass) {
+		$parentClass = $classReflection->getParentClass();
+		while ($parentClass !== null) {
 			$method = $this->findMethod($parentClass, $methodName);
-			if ($method === null) {
-				continue;
+			if ($method !== null) {
+				return $method;
 			}
 
-			return $method;
+			$parentClass = $parentClass->getParentClass();
 		}
 
 		return null;
diff --git a/src/Reflection/Mixin/MixinPropertiesClassReflectionExtension.php b/src/Reflection/Mixin/MixinPropertiesClassReflectionExtension.php
@@ -65,13 +65,14 @@ private function findProperty(ClassReflection $classReflection, string $property
 			return $property;
 		}
 
-		foreach ($classReflection->getParents() as $parentClass) {
+		$parentClass = $classReflection->getParentClass();
+		while ($parentClass !== null) {
 			$property = $this->findProperty($parentClass, $propertyName);
-			if ($property === null) {
-				continue;
+			if ($property !== null) {
+				return $property;
 			}
 
-			return $property;
+			$parentClass = $parentClass->getParentClass();
 		}
 
 		return null;

Original file line number	Diff line number	Diff line change
`@@ -74,13 +74,14 @@ private function findMethod(ClassReflection $classReflection, string $methodName`
`74`	`74`	`return new MixinMethodReflection($method, $static);`
`75`	`75`	`}`
`76`	`76`
`77`		`- foreach ($classReflection->getParents() as $parentClass) {`
	`77`	`+ $parentClass = $classReflection->getParentClass();`
	`78`	`+ while ($parentClass !== null) {`
`78`	`79`	`$method = $this->findMethod($parentClass, $methodName);`
`79`		`- if ($method === null) {`
`80`		`- continue;`
	`80`	`+ if ($method !== null) {`
	`81`	`+ return $method;`
`81`	`82`	`}`
`82`	`83`
`83`		`- return $method;`
	`84`	`+ $parentClass = $parentClass->getParentClass();`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -65,13 +65,14 @@ private function findProperty(ClassReflection $classReflection, string $property`
`65`	`65`	`return $property;`
`66`	`66`	`}`
`67`	`67`
`68`		`- foreach ($classReflection->getParents() as $parentClass) {`
	`68`	`+ $parentClass = $classReflection->getParentClass();`
	`69`	`+ while ($parentClass !== null) {`
`69`	`70`	`$property = $this->findProperty($parentClass, $propertyName);`
`70`		`- if ($property === null) {`
`71`		`- continue;`
	`71`	`+ if ($property !== null) {`
	`72`	`+ return $property;`
`72`	`73`	`}`
`73`	`74`
`74`		`- return $property;`
	`75`	`+ $parentClass = $parentClass->getParentClass();`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`return null;`