Merge pull request #4 from nrayann/master

Add support for Laravel 6
ajcastro · Sep 25, 2019 · 55ffe94 · 55ffe94
2 parents ff87634 + 1a49d9e
commit 55ffe94
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/EagerLoadPivotBuilder.php b/src/EagerLoadPivotBuilder.php
@@ -5,6 +5,8 @@
 use Closure;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 class EagerLoadPivotBuilder extends Builder
 {
@@ -74,7 +76,7 @@ protected function isPivotAccessor($name)
      */
     protected function eagerLoadPivotRelations($models, $pivotAccessor)
     {
-        $pivots = array_pluck($models, $pivotAccessor);
+        $pivots = Arr::pluck($models, $pivotAccessor);
         $pivots = head($pivots)->newCollection($pivots);
         $pivots->load($this->getPivotEagerLoadRelations($pivotAccessor));
     }
@@ -88,7 +90,7 @@ protected function eagerLoadPivotRelations($models, $pivotAccessor)
     protected function getPivotEagerLoadRelations($pivotAccessor)
     {
         $relations = array_filter($this->eagerLoad, function ($relation) use ($pivotAccessor) {
-            return $relation != $pivotAccessor && str_contains($relation, $pivotAccessor);
+            return $relation != $pivotAccessor && Str::contains($relation, $pivotAccessor);
         }, ARRAY_FILTER_USE_KEY);
 
         return array_combine(