From 85f3dca11b4fa05cc4cd21d04f1f23bf943c8f0a Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Fri, 7 Feb 2020 22:07:36 +0000
Subject: [PATCH] HandlerListManager: make resolveNearestHandleableParent() a
 little easier to follow and also sidestep phpstan complaining about using
 loop vars outside of loop

---
 src/event/HandlerListManager.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/event/HandlerListManager.php b/src/event/HandlerListManager.php
index 46ac79c90..a9814657b 100644
--- a/src/event/HandlerListManager.php
+++ b/src/event/HandlerListManager.php
@@ -71,10 +71,13 @@ class HandlerListManager{
 	 * @phpstan-return \ReflectionClass<Event>|null
 	 */
 	private static function resolveNearestHandleableParent(\ReflectionClass $class) : ?\ReflectionClass{
-		for($parent = $class->getParentClass(); $parent !== false && !self::isValidClass($parent); $parent = $parent->getParentClass()){
+		for($parent = $class->getParentClass(); $parent !== false; $parent = $parent->getParentClass()){
+			if(self::isValidClass($parent)){
+				return $parent;
+			}
 			//NOOP
 		}
-		return $parent ?: null;
+		return null;
 	}
 
 	/**