Sort foreign keys in with() method (#17730)

laravel · Feb 3, 2017 · 0ba0887 · 0ba0887
1 parent a67aeeb
commit 0ba0887
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php
@@ -134,6 +134,8 @@ protected function getEagerModelKeys(array $models)
             return [$this->relationHasIncrementingId() ? 0 : null];
         }
 
+        sort($keys);
+
         return array_values(array_unique($keys));
     }
 

diff --git a/src/Illuminate/Database/Eloquent/Relations/Relation.php b/src/Illuminate/Database/Eloquent/Relations/Relation.php
@@ -205,7 +205,7 @@ protected function getKeys(array $models, $key = null)
     {
         return collect($models)->map(function ($value) use ($key) {
             return $key ? $value->getAttribute($key) : $value->getKey();
-        })->values()->unique()->all();
+        })->values()->unique()->sort()->all();
     }
 
     /**