Use a single chain with a flatMap to perform the same operation (#13741)

laravel · May 27, 2016 · e3986a4 · e3986a4
1 parent 8e394fc
commit e3986a4
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -196,13 +196,11 @@ protected function getEagerLoadsForInstance(Model $instance)
     {
         $eagers = BaseCollection::make($this->query->getEagerLoads());
 
-        $eagers = $eagers->filter(function ($constraint, $relation) {
+        return $eagers->filter(function ($constraint, $relation) {
             return Str::startsWith($relation, $this->relation.'.');
-        });
-
-        return $eagers->keys()->map(function ($key) {
-            return Str::replaceFirst($this->relation.'.', '', $key);
-        })->combine($eagers)->merge($instance->getEagerLoads())->all();
+        })->flatMap(function ($constraint, $relation) {
+            return [Str::replaceFirst($this->relation.'.', '', $relation) => $constraint];
+        })->merge($instance->getEagerLoads())->all();
     }
 
     /**