Merge pull request #1414 from staabm/parent

More efficient `ReflectionClass->getParentClass()`
Roave · Mar 26, 2024 · bc1d04b · bc1d04b
2 parents d63ad67 + f757f21
commit bc1d04b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -100,6 +100,7 @@
       <code><![CDATA[reflectClass]]></code>
       <code><![CDATA[reflectClass]]></code>
       <code><![CDATA[reflectClass]]></code>
+      <code><![CDATA[reflectClass]]></code>
       <code><![CDATA[toLowerString]]></code>
     </ImpureMethodCall>
   </file>

diff --git a/src/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -1086,12 +1086,16 @@ public function getEndColumn(): int
      */
     public function getParentClass(): ReflectionClass|null
     {
-        $parentClass = $this->getParentClasses()[0] ?? null;
-
-        if ($parentClass === null) {
+        $parentClassName = $this->getParentClassName();
+        if ($parentClassName === null) {
             return null;
         }
 
+        if ($this->name === $parentClassName) {
+            throw CircularReference::fromClassName($parentClassName);
+        }
+
+        $parentClass = $this->reflector->reflectClass($parentClassName);
         if ($parentClass->isInterface() || $parentClass->isTrait()) {
             throw NotAClassReflection::fromReflectionClass($parentClass);
         }