Use keyBy instead of flatMap (#13777)

laravel · May 30, 2016 · 0f66352 · 0f66352
1 parent 4d03be9
commit 0f66352
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -194,12 +194,12 @@ protected function getResultsByType($type)
      */
     protected function getEagerLoadsForInstance(Model $instance)
     {
-        $eagers = BaseCollection::make($this->query->getEagerLoads());
+        $relations = BaseCollection::make($this->query->getEagerLoads());
 
-        return $eagers->filter(function ($constraint, $relation) {
+        return $relations->filter(function ($constraint, $relation) {
             return Str::startsWith($relation, $this->relation.'.');
-        })->flatMap(function ($constraint, $relation) {
-            return [Str::replaceFirst($this->relation.'.', '', $relation) => $constraint];
+        })->keyBy(function ($constraint, $relation) {
+            return Str::replaceFirst($this->relation.'.', '', $relation);
         })->merge($instance->getEagerLoads())->all();
     }