Be more resilient against non-existent traits and interfaces

ondrejmirtes · Apr 26, 2022 · 72bb305 · 72bb305
1 parent e594f06
commit 72bb305
Showing 1 changed file with 27 additions and 17 deletions.
diff --git a/src/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -1197,10 +1197,17 @@ public function getTraits(): array
         if ($this->cachedTraits !== null) {
             return $this->cachedTraits;
         }
-        return $this->cachedTraits = array_values(array_map(
-            fn (string $importedTrait): ReflectionClass => $this->reflector->reflectClass($importedTrait),
-            $this->traitNames,
-        ));
+
+        $traits = [];
+        foreach ($this->traitNames as $traitName) {
+            try {
+                $traits[] = $this->reflector->reflectClass($traitName);
+            } catch (IdentifierNotFound) {
+                // pass
+            }
+        }
+
+        return $this->cachedTraits = $traits;
     }
 
     /**
@@ -1463,12 +1470,12 @@ private function getCurrentClassImplementedInterfacesIndexedByName(): array
         foreach ($this->implementsNames as $name) {
             try {
                 $interface = $this->reflector->reflectClass($name);
+                foreach ($interface->getInterfacesHierarchy() as $n => $i) {
+                    $interfaces[$n] = $i;
+                }
             } catch (IdentifierNotFound $e) {
                 continue;
             }
-            foreach ($interface->getInterfacesHierarchy() as $n => $i) {
-                $interfaces[$n] = $i;
-            }
         }
 
         return $interfaces;
@@ -1510,16 +1517,19 @@ private function getInterfacesHierarchy(): array
             throw NotAnInterfaceReflection::fromReflectionClass($this);
         }
 
-        /** @var array<class-string, self> */
-        return array_merge(
-            [$this->getName() => $this],
-            ...array_map(
-                fn (string $interfaceName): array => $this
-                    ->reflector->reflectClass($interfaceName)
-                    ->getInterfacesHierarchy(),
-                $this->interfaceExtendsNames,
-            ),
-        );
+        $interfaces = [$this->getName() => $this];
+        foreach ($this->interfaceExtendsNames as $interfaceName) {
+            try {
+                $interface = $this->reflector->reflectClass($interfaceName);
+                foreach ($interface->getInterfacesHierarchy() as $hName => $hInterface) {
+                    $interfaces[$hName] = $hInterface;
+                }
+            } catch (IdentifierNotFound) {
+                continue;
+            }
+        }
+
+        return $interfaces;
     }
 
     /**