| @@ -46,7 +46,6 @@ | ||
| 46 | 46 | /** | 
| 47 | 47 | * Send error response page. | 
| 48 | 48 | * | 
| 49 | - * @param \Exception $e | |
| 50 | 49 | */ | 
| 51 | 50 | protected static function error() | 
| 52 | 51 |      { | 
| @@ -50,7 +50,7 @@ | ||
| 50 | 50 | */ | 
| 51 | 51 | protected static function error() | 
| 52 | 52 |      { | 
| 53 | -        $content = Admin::content(function ($content) { | |
| 53 | +        $content = Admin::content(function($content) { | |
| 54 | 54 |              $content->body(view('admin::deny')); | 
| 55 | 55 | }); | 
| 56 | 56 | |
| @@ -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 |      { | 
| @@ -200,7 +200,7 @@ discard block | ||
| 200 | 200 | * | 
| 201 | 201 | * @param $id | 
| 202 | 202 | * | 
| 203 | - * @return mixed | |
| 203 | + * @return boolean | |
| 204 | 204 | */ | 
| 205 | 205 | public function destroy($id) | 
| 206 | 206 |      { | 
| @@ -269,7 +269,7 @@ discard block | ||
| 269 | 269 | * Prepare input data for insert or update. | 
| 270 | 270 | * | 
| 271 | 271 | * @param array $data | 
| 272 | - * @param callable $callback | |
| 272 | + * @param Closure $callback | |
| 273 | 273 | */ | 
| 274 | 274 | protected function prepare($data = [], Closure $callback = null) | 
| 275 | 275 |      { | 
| @@ -483,7 +483,7 @@ discard block | ||
| 483 | 483 | /** | 
| 484 | 484 | * Set saving callback. | 
| 485 | 485 | * | 
| 486 | - * @param callable $callback | |
| 486 | + * @param Closure $callback | |
| 487 | 487 | * | 
| 488 | 488 | * @return void | 
| 489 | 489 | */ | 
| @@ -495,7 +495,7 @@ discard block | ||
| 495 | 495 | /** | 
| 496 | 496 | * Set saved callback. | 
| 497 | 497 | * | 
| 498 | - * @param callable $callback | |
| 498 | + * @param Closure $callback | |
| 499 | 499 | * | 
| 500 | 500 | * @return void | 
| 501 | 501 | */ | 
| @@ -739,6 +739,9 @@ discard block | ||
| 739 | 739 | } | 
| 740 | 740 | } | 
| 741 | 741 | |
| 742 | + /** | |
| 743 | + * @param string $method | |
| 744 | + */ | |
| 742 | 745 | public static function findFieldClass($method) | 
| 743 | 746 |      { | 
| 744 | 747 | $className = __NAMESPACE__.'\\Form\\Field\\'.ucfirst($method); | 
| @@ -224,9 +224,9 @@ discard block | ||
| 224 | 224 | $data = $this->model->with($this->getRelations()) | 
| 225 | 225 | ->findOrFail($id)->toArray(); | 
| 226 | 226 | |
| 227 | -        $this->builder->fields()->filter(function ($field) { | |
| 227 | +        $this->builder->fields()->filter(function($field) { | |
| 228 | 228 | return $field instanceof Field\File; | 
| 229 | -        })->each(function (File $file) use ($data) { | |
| 229 | +        })->each(function(File $file) use ($data) { | |
| 230 | 230 | $file->setOriginal($data); | 
| 231 | 231 | |
| 232 | 232 | $file->destroy(); | 
| @@ -248,7 +248,7 @@ discard block | ||
| 248 | 248 | |
| 249 | 249 | $this->prepare($data, $this->saving); | 
| 250 | 250 | |
| 251 | -        DB::transaction(function () { | |
| 251 | +        DB::transaction(function() { | |
| 252 | 252 | $inserts = $this->prepareInsert($this->updates); | 
| 253 | 253 | |
| 254 | 254 |              foreach ($inserts as $column => $value) { | 
| @@ -279,7 +279,7 @@ discard block | ||
| 279 | 279 | $callback($this); | 
| 280 | 280 | } | 
| 281 | 281 | |
| 282 | -        $this->updates = array_filter($this->inputs, function ($val) { | |
| 282 | +        $this->updates = array_filter($this->inputs, function($val) { | |
| 283 | 283 | return is_string($val) or ($val instanceof UploadedFile); | 
| 284 | 284 | }); | 
| 285 | 285 | |
| @@ -353,7 +353,7 @@ discard block | ||
| 353 | 353 | |
| 354 | 354 | $this->prepare($data, $this->saving); | 
| 355 | 355 | |
| 356 | -        DB::transaction(function () { | |
| 356 | +        DB::transaction(function() { | |
| 357 | 357 | $updates = $this->prepareUpdate($this->updates); | 
| 358 | 358 | |
| 359 | 359 |              foreach ($updates as $column => $value) { | 
| @@ -539,7 +539,7 @@ discard block | ||
| 539 | 539 | protected function getFieldByColumn($column) | 
| 540 | 540 |      { | 
| 541 | 541 | return $this->builder->fields()->first( | 
| 542 | -            function ($index, Field $field) use ($column) { | |
| 542 | +            function($index, Field $field) use ($column) { | |
| 543 | 543 |                  if (is_array($field->column())) { | 
| 544 | 544 | return in_array($column, $field->column()); | 
| 545 | 545 | } | 
| @@ -558,7 +558,7 @@ discard block | ||
| 558 | 558 |      { | 
| 559 | 559 | $values = $this->model->toArray(); | 
| 560 | 560 | |
| 561 | -        $this->builder->fields()->each(function (Field $field) use ($values) { | |
| 561 | +        $this->builder->fields()->each(function(Field $field) use ($values) { | |
| 562 | 562 | $field->setOriginal($values); | 
| 563 | 563 | }); | 
| 564 | 564 | } | 
| @@ -578,7 +578,7 @@ discard block | ||
| 578 | 578 | |
| 579 | 579 | $data = $this->model->toArray(); | 
| 580 | 580 | |
| 581 | -        $this->builder->fields()->each(function (Field $field) use ($data) { | |
| 581 | +        $this->builder->fields()->each(function(Field $field) use ($data) { | |
| 582 | 582 | $field->fill($data); | 
| 583 | 583 | }); | 
| 584 | 584 | } | 
| @@ -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 | */ | 
| @@ -65,7 +65,7 @@ | ||
| 65 | 65 | /** | 
| 66 | 66 | * @param $file | 
| 67 | 67 | * | 
| 68 | - * @return mixed | |
| 68 | + * @return \Symfony\Component\HttpFoundation\File\File | |
| 69 | 69 | */ | 
| 70 | 70 | protected function uploadAndDeleteOriginal(UploadedFile $file) | 
| 71 | 71 |      { | 
| @@ -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; |