Fixed display scopes

LaravelRUS · May 11, 2016 · d1fa13d · d1fa13d
1 parent cd50433
commit d1fa13d
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/Display/Extension/Scopes.php b/src/Display/Extension/Scopes.php
@@ -2,6 +2,8 @@
 
 namespace SleepingOwl\Admin\Display\Extension;
 
+use Illuminate\Database\Eloquent\Builder;
+
 class Scopes extends Extension
 {
     /**
@@ -24,13 +26,9 @@ public function all()
      */
     public function set(array $scopes)
     {
-        if (! is_array($scopes)) {
-            $scopes = func_get_args();
-        }
+        $this->scopes = func_get_args();
 
-        $this->scopes = $scopes;
-
-        return $this;
+        return $this->getDisplay();
     }
 
     /**
@@ -62,18 +60,24 @@ public function toArray()
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @param Builder $query
      */
-    public function modifyQuery(\Illuminate\Database\Eloquent\Builder $query)
+    public function modifyQuery(Builder $query)
     {
         foreach ($this->scopes as $scope) {
             if (! is_null($scope)) {
-                $method = array_shift($scope);
+                if (is_array($scope)) {
+                    $method = array_shift($scope);
+                    $params = $scope;
+                } else {
+                    $method = $scope;
+                    $params = [];
+                }
 
                 call_user_func_array([
                     $query,
                     $method,
-                ], $scope);
+                ], $params);
             }
         }
     }