z-song / laravel-admin

src/Grid/Model.php

Doc Comments +4 added lines, -4 removed lines

@@ -466,7 +466,7 @@ 
     /**
      * Resolve perPage for pagination.
      *
-     * @param array|null $paginate
+     * @param Model $paginate
      *
      * @return array
      */
@@ -496,7 +496,7 @@ 
     /**
      * Find query by method name.
      *
-     * @param $method
+     * @param string $method
      *
      * @return static
      */
@@ -620,7 +620,7 @@ 
      *
      * @throws \Exception
      *
-     * @return array
+     * @return string[]
      */
     protected function joinParameters(Relation $relation)
     {
@@ -649,7 +649,7 @@ 
 
     /**
      * @param string $method
-     * @param array  $arguments
+     * @param integer[]  $arguments
      *
      * @return $this
      */

Spacing +10 added lines, -10 removed lines

@@ -325,9 +325,9 @@ 
 
         $this->setSort();
 
-        $this->queries->reject(function ($query) {
+        $this->queries->reject(function($query) {
             return $query['method'] == 'paginate';
-        })->each(function ($query) {
+        })->each(function($query) {
             $this->model = $this->model->{$query['method']}(...$query['arguments']);
         });
 
@@ -378,7 +378,7 @@ 
         $this->setSort();
         $this->setPaginate();
 
-        $this->queries->unique()->each(function ($query) {
+        $this->queries->unique()->each(function($query) {
             $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']);
         });
 
@@ -408,9 +408,9 @@ 
 
         $queryBuilder = $this->originalModel;
 
-        $this->queries->reject(function ($query) {
+        $this->queries->reject(function($query) {
             return in_array($query['method'], ['get', 'paginate']);
-        })->each(function ($query) use (&$queryBuilder) {
+        })->each(function($query) use (&$queryBuilder) {
             $queryBuilder = $queryBuilder->{$query['method']}(...$query['arguments']);
         });
 
@@ -444,7 +444,7 @@ 
     {
         $paginate = $this->findQueryByMethod('paginate');
 
-        $this->queries = $this->queries->reject(function ($query) {
+        $this->queries = $this->queries->reject(function($query) {
             return $query['method'] == 'paginate';
         });
 
@@ -502,7 +502,7 @@ 
      */
     protected function findQueryByMethod($method)
     {
-        return $this->queries->first(function ($query) use ($method) {
+        return $this->queries->first(function($query) use ($method) {
             return $query['method'] == $method;
         });
     }
@@ -525,7 +525,7 @@ 
         }
 
         $columnNameContainsDots = Str::contains($columnName, '.');
-        $isRelation = $this->queries->contains(function ($query) use ($columnName) {
+        $isRelation = $this->queries->contains(function($query) use ($columnName) {
             $relationName = explode('.', $columnName)[0];
 
             return $query['method'] === 'with' && in_array($relationName, $query['arguments'], true);
@@ -573,7 +573,7 @@ 
     {
         list($relationName, $relationColumn) = explode('.', $column);
 
-        if ($this->queries->contains(function ($query) use ($relationName) {
+        if ($this->queries->contains(function($query) use ($relationName) {
             return $query['method'] == 'with' && in_array($relationName, $query['arguments']);
         })) {
             $relation = $this->model->$relationName();
@@ -607,7 +607,7 @@ 
      */
     public function resetOrderBy()
     {
-        $this->queries = $this->queries->reject(function ($query) {
+        $this->queries = $this->queries->reject(function($query) {
             return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc';
         });
     }