Get rid of array_combine for traits list

ondrejmirtes · Feb 7, 2025 · 36f3291 · 36f3291
1 parent c7ba439
commit 36f3291
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -41,6 +41,7 @@
 use Traversable;
 use UnitEnum;
 
+use function array_combine;
 use function array_filter;
 use function array_key_exists;
 use function array_keys;
@@ -419,14 +420,21 @@ private function createMethodsFromTrait(ReflectionMethod $method): array
         }
 
         if ($this->traitsData['aliases'] !== []) {
-            $traits = array_combine($this->traitClassNames, $this->getTraits());
+            $traits = [];
+            foreach ($this->getTraits() as $trait) {
+                $traits[$trait->getName()] = $trait;
+            }
 
             foreach ($this->traitsData['aliases'] as $traitClassName => $traitAliasDefinitions) {
                 foreach ($traitAliasDefinitions as $traitAliasDefinition) {
                     if ($lowerCasedMethodHash !== $traitAliasDefinition['hash']) {
                         continue;
                     }
 
+                    if (!array_key_exists($traitClassName, $traits)) {
+                        continue;
+                    }
+
                     if (! $traits[$traitClassName]->hasMethod($traitAliasDefinition['method'])) {
                         continue;
                     }
@@ -1433,11 +1441,17 @@ public function getTraitAliases(): array
             return [];
         }
 
-        $traits       = array_combine($this->traitClassNames, $this->getTraits());
+        $traits       = [];
+        foreach ($this->getTraits() as $trait) {
+            $traits[$trait->getName()] = $trait;
+        }
         $traitAliases = [];
 
         foreach ($this->traitsData['aliases'] as $traitClassName => $traitAliasDefinitions) {
             foreach ($traitAliasDefinitions as $traitAliasDefinition) {
+                if (!array_key_exists($traitClassName, $traits)) {
+                    continue;
+                }
                 if (! $traits[$traitClassName]->hasMethod($traitAliasDefinition['method'])) {
                     continue;
                 }