Merge pull request #2 from jasonlewis/eager-load-constraints

Allow eager load constraints to still apply for pivot relations.
ajcastro · May 29, 2019 · c837a52 · c837a52
2 parents 4478d82 + 4fbcb8b
commit c837a52
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.6.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/EagerLoadPivotBuilder.php b/src/EagerLoadPivotBuilder.php
@@ -87,11 +87,15 @@ protected function eagerLoadPivotRelations($models, $pivotAccessor)
      */
     protected function getPivotEagerLoadRelations($pivotAccessor)
     {
-        $relations = array_filter(array_keys($this->eagerLoad), function ($relation) use ($pivotAccessor) {
+        $relations = array_filter($this->eagerLoad, function ($relation) use ($pivotAccessor) {
             return $relation != $pivotAccessor && str_contains($relation, $pivotAccessor);
-        });
-        return array_map(function ($relation) use ($pivotAccessor) {
-            return substr($relation, strlen("{$pivotAccessor}."));
-        }, $relations);
+        }, ARRAY_FILTER_USE_KEY);
+
+        return array_combine(
+            array_map(function ($relation) use ($pivotAccessor) {
+                return substr($relation, strlen("{$pivotAccessor}."));
+            }, array_keys($relations)),
+            array_values($relations)
+        );
     }
 }