| @@ -174,7 +174,7 @@ | ||
| 174 | 174 | /** | 
| 175 | 175 | * Get stub contents. | 
| 176 | 176 | * | 
| 177 | - * @param $name | |
| 177 | + * @param string $name | |
| 178 | 178 | * | 
| 179 | 179 | * @return string | 
| 180 | 180 | */ | 
| @@ -25,7 +25,7 @@ | ||
| 25 | 25 | /** | 
| 26 | 26 | * Execute the console command. | 
| 27 | 27 | * | 
| 28 | - * @return void | |
| 28 | + * @return false|null | |
| 29 | 29 | */ | 
| 30 | 30 | public function handle() | 
| 31 | 31 |      { | 
| @@ -55,7 +55,7 @@ | ||
| 55 | 55 | /** | 
| 56 | 56 | * Returns builder is $mode. | 
| 57 | 57 | * | 
| 58 | - * @param $mode | |
| 58 | + * @param string $mode | |
| 59 | 59 | * | 
| 60 | 60 | * @return bool | 
| 61 | 61 | */ | 
| @@ -119,7 +119,7 @@ discard block | ||
| 119 | 119 | * Create a new grid instance. | 
| 120 | 120 | * | 
| 121 | 121 | * @param Eloquent $model | 
| 122 | - * @param callable $builder | |
| 122 | + * @param Closure $builder | |
| 123 | 123 | */ | 
| 124 | 124 | public function __construct(Eloquent $model, Closure $builder) | 
| 125 | 125 |      { | 
| @@ -301,7 +301,7 @@ discard block | ||
| 301 | 301 | /** | 
| 302 | 302 | * Set grid row callback function. | 
| 303 | 303 | * | 
| 304 | - * @param callable $callable | |
| 304 | + * @param Closure $callable | |
| 305 | 305 | * | 
| 306 | 306 | * @return Collection|void | 
| 307 | 307 | */ | 
| @@ -373,7 +373,7 @@ discard block | ||
| 373 | 373 | /** | 
| 374 | 374 | * Set the grid filter. | 
| 375 | 375 | * | 
| 376 | - * @param callable $callback | |
| 376 | + * @param Closure $callback | |
| 377 | 377 | */ | 
| 378 | 378 | public function filter(Closure $callback) | 
| 379 | 379 |      { | 
| @@ -469,7 +469,7 @@ discard block | ||
| 469 | 469 | * @param $method | 
| 470 | 470 | * @param $arguments | 
| 471 | 471 | * | 
| 472 | - * @return $this|Column | |
| 472 | + * @return Column|null | |
| 473 | 473 | */ | 
| 474 | 474 | public function __call($method, $arguments) | 
| 475 | 475 |      { | 
| @@ -264,7 +264,7 @@ discard block | ||
| 264 | 264 | |
| 265 | 265 | $data = $this->filter->execute(); | 
| 266 | 266 | |
| 267 | -        $this->columns->map(function (Column $column) use (&$data) { | |
| 267 | +        $this->columns->map(function(Column $column) use (&$data) { | |
| 268 | 268 | $data = $column->map($data); | 
| 269 | 269 | |
| 270 | 270 | $this->columnNames[] = $column->getName(); | 
| @@ -284,7 +284,7 @@ discard block | ||
| 284 | 284 | */ | 
| 285 | 285 | protected function buildRows(array $data) | 
| 286 | 286 |      { | 
| 287 | -        $this->rows = collect($data)->map(function ($val, $key) { | |
| 287 | +        $this->rows = collect($data)->map(function($val, $key) { | |
| 288 | 288 | $row = new Row($key, $val); | 
| 289 | 289 | |
| 290 | 290 | $row->setKeyName($this->keyName); | 
| @@ -109,7 +109,7 @@ | ||
| 109 | 109 | * @param string $method | 
| 110 | 110 | * @param array $arguments | 
| 111 | 111 | * | 
| 112 | - * @return $this | |
| 112 | + * @return AbstractFilter|null | |
| 113 | 113 | */ | 
| 114 | 114 | public function __call($method, $arguments) | 
| 115 | 115 |      { | 
| @@ -46,7 +46,7 @@ | ||
| 46 | 46 | */ | 
| 47 | 47 | public function conditions() | 
| 48 | 48 |      { | 
| 49 | -        $inputs = array_filter(Input::all(), function ($input) { | |
| 49 | +        $inputs = array_filter(Input::all(), function($input) { | |
| 50 | 50 | return $input !== ''; | 
| 51 | 51 | }); | 
| 52 | 52 | |
| @@ -11,6 +11,9 @@ | ||
| 11 | 11 | */ | 
| 12 | 12 | protected $filter; | 
| 13 | 13 | |
| 14 | + /** | |
| 15 | + * @param \Encore\Admin\Grid\Filter\AbstractFilter $filter | |
| 16 | + */ | |
| 14 | 17 | public function __construct($filter) | 
| 15 | 18 |      { | 
| 16 | 19 | $this->filter = $filter; | 
| @@ -140,7 +140,7 @@ | ||
| 140 | 140 | /** | 
| 141 | 141 | * Find query by method name. | 
| 142 | 142 | * | 
| 143 | - * @param $method | |
| 143 | + * @param string $method | |
| 144 | 144 | * | 
| 145 | 145 | * @return static | 
| 146 | 146 | */ | 
| @@ -111,7 +111,7 @@ discard block | ||
| 111 | 111 | $this->setSort(); | 
| 112 | 112 | $this->setPaginate(); | 
| 113 | 113 | |
| 114 | -        $this->queries->each(function ($query) { | |
| 114 | +        $this->queries->each(function($query) { | |
| 115 | 115 | $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']); | 
| 116 | 116 | }); | 
| 117 | 117 | |
| @@ -127,7 +127,7 @@ discard block | ||
| 127 | 127 |      { | 
| 128 | 128 |          $paginate = $this->findQueryByMethod('paginate')->first(); | 
| 129 | 129 | |
| 130 | -        $this->queries = $this->queries->reject(function ($query) { | |
| 130 | +        $this->queries = $this->queries->reject(function($query) { | |
| 131 | 131 | return $query['method'] == 'paginate'; | 
| 132 | 132 | }); | 
| 133 | 133 | |
| @@ -146,7 +146,7 @@ discard block | ||
| 146 | 146 | */ | 
| 147 | 147 | protected function findQueryByMethod($method) | 
| 148 | 148 |      { | 
| 149 | -        return $this->queries->filter(function ($query) use ($method) { | |
| 149 | +        return $this->queries->filter(function($query) use ($method) { | |
| 150 | 150 | return $query['method'] == $method; | 
| 151 | 151 | }); | 
| 152 | 152 | } | 
| @@ -188,7 +188,7 @@ discard block | ||
| 188 | 188 |      { | 
| 189 | 189 |          list($relationName, $relationColumn) = explode('.', $column); | 
| 190 | 190 | |
| 191 | -        if ($this->queries->contains(function ($key, $query) use ($relationName) { | |
| 191 | +        if ($this->queries->contains(function($key, $query) use ($relationName) { | |
| 192 | 192 | return $query['method'] == 'with' && in_array($relationName, $query['arguments']); | 
| 193 | 193 |          })) { | 
| 194 | 194 | $relation = $this->model->$relationName(); | 
| @@ -55,6 +55,9 @@ | ||
| 55 | 55 | return $data; | 
| 56 | 56 | } | 
| 57 | 57 | |
| 58 | + /** | |
| 59 | + * @return string | |
| 60 | + */ | |
| 58 | 61 | public function script() | 
| 59 | 62 |      { | 
| 60 | 63 | $this->data = $this->fillColor($this->data); | 
| @@ -54,7 +54,7 @@ | ||
| 54 | 54 | |
| 55 | 55 | $this->value = array_get($inputs, $this->column); | 
| 56 | 56 | |
| 57 | -        $value = array_filter($this->value, function ($val) { | |
| 57 | +        $value = array_filter($this->value, function($val) { | |
| 58 | 58 | return $val !== ''; | 
| 59 | 59 | }); | 
| 60 | 60 | |