@@ -13,7 +13,7 @@ |
||
| 13 | 13 | $this->value = $this->value->toArray(); |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | - return collect((array) $this->value)->map(function ($item) use ($style) { |
|
| 16 | + return collect((array) $this->value)->map(function($item) use ($style) { |
|
| 17 | 17 | if (is_array($style)) { |
| 18 | 18 | $columnValue = $this->getColumn()->getOriginal(); |
| 19 | 19 | |
@@ -157,16 +157,16 @@ discard block |
||
| 157 | 157 | call_user_func($this->callback, $this); |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - $response = function () { |
|
| 160 | + $response = function() { |
|
| 161 | 161 | $handle = fopen('php://output', 'w'); |
| 162 | 162 | $titles = []; |
| 163 | 163 | fwrite($handle, chr(0xEF).chr(0xBB).chr(0xBF)); //导出的CSV文件是无BOM编码UTF-8,而我们通常使用UTF-8编码格式都是有BOM的。所以添加BOM于CSV中 |
| 164 | - $this->chunk(function ($collection) use ($handle, &$titles) { |
|
| 164 | + $this->chunk(function($collection) use ($handle, &$titles) { |
|
| 165 | 165 | Column::setOriginalGridModels($collection); |
| 166 | 166 | |
| 167 | 167 | $original = $current = $collection->toArray(); |
| 168 | 168 | |
| 169 | - $this->grid->getColumns()->map(function (Column $column) use (&$current) { |
|
| 169 | + $this->grid->getColumns()->map(function(Column $column) use (&$current) { |
|
| 170 | 170 | $current = $column->fill($current); |
| 171 | 171 | $this->grid->columnNames[] = $column->getName(); |
| 172 | 172 | }); |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | protected function getVisiableTitles() |
| 196 | 196 | { |
| 197 | 197 | $titles = $this->grid->visibleColumns() |
| 198 | - ->mapWithKeys(function (Column $column) { |
|
| 198 | + ->mapWithKeys(function(Column $column) { |
|
| 199 | 199 | $columnName = $column->getName(); |
| 200 | 200 | $columnTitle = $column->getLabel(); |
| 201 | 201 | if (isset($this->titleCallbacks[$columnName])) { |
@@ -325,9 +325,9 @@ discard block |
||
| 325 | 325 | |
| 326 | 326 | $this->setSort(); |
| 327 | 327 | |
| 328 | - $this->queries->reject(function ($query) { |
|
| 328 | + $this->queries->reject(function($query) { |
|
| 329 | 329 | return $query['method'] == 'paginate'; |
| 330 | - })->each(function ($query) { |
|
| 330 | + })->each(function($query) { |
|
| 331 | 331 | $this->model = $this->model->{$query['method']}(...$query['arguments']); |
| 332 | 332 | }); |
| 333 | 333 | |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | $this->setSort(); |
| 379 | 379 | $this->setPaginate(); |
| 380 | 380 | |
| 381 | - $this->queries->unique()->each(function ($query) { |
|
| 381 | + $this->queries->unique()->each(function($query) { |
|
| 382 | 382 | $this->model = call_user_func_array([$this->model, $query['method']], $query['arguments']); |
| 383 | 383 | }); |
| 384 | 384 | |
@@ -408,9 +408,9 @@ discard block |
||
| 408 | 408 | |
| 409 | 409 | $queryBuilder = $this->originalModel; |
| 410 | 410 | |
| 411 | - $this->queries->reject(function ($query) { |
|
| 411 | + $this->queries->reject(function($query) { |
|
| 412 | 412 | return in_array($query['method'], ['get', 'paginate']); |
| 413 | - })->each(function ($query) use (&$queryBuilder) { |
|
| 413 | + })->each(function($query) use (&$queryBuilder) { |
|
| 414 | 414 | $queryBuilder = $queryBuilder->{$query['method']}(...$query['arguments']); |
| 415 | 415 | }); |
| 416 | 416 | |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | { |
| 445 | 445 | $paginate = $this->findQueryByMethod('paginate'); |
| 446 | 446 | |
| 447 | - $this->queries = $this->queries->reject(function ($query) { |
|
| 447 | + $this->queries = $this->queries->reject(function($query) { |
|
| 448 | 448 | return $query['method'] == 'paginate'; |
| 449 | 449 | }); |
| 450 | 450 | |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | */ |
| 503 | 503 | protected function findQueryByMethod($method) |
| 504 | 504 | { |
| 505 | - return $this->queries->first(function ($query) use ($method) { |
|
| 505 | + return $this->queries->first(function($query) use ($method) { |
|
| 506 | 506 | return $query['method'] == $method; |
| 507 | 507 | }); |
| 508 | 508 | } |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | } |
| 526 | 526 | |
| 527 | 527 | $columnNameContainsDots = Str::contains($columnName, '.'); |
| 528 | - $isRelation = $this->queries->contains(function ($query) use ($columnName) { |
|
| 528 | + $isRelation = $this->queries->contains(function($query) use ($columnName) { |
|
| 529 | 529 | // relationship should be camel case |
| 530 | 530 | $columnName = Str::camel(Str::before($columnName, '.')); |
| 531 | 531 | |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | // relationship should be camel case |
| 577 | 577 | $relationName = Str::camel($relationName); |
| 578 | 578 | |
| 579 | - if ($this->queries->contains(function ($query) use ($relationName) { |
|
| 579 | + if ($this->queries->contains(function($query) use ($relationName) { |
|
| 580 | 580 | return $query['method'] == 'with' && in_array($relationName, $query['arguments']); |
| 581 | 581 | })) { |
| 582 | 582 | $relation = $this->model->$relationName(); |
@@ -610,7 +610,7 @@ discard block |
||
| 610 | 610 | */ |
| 611 | 611 | public function resetOrderBy() |
| 612 | 612 | { |
| 613 | - $this->queries = $this->queries->reject(function ($query) { |
|
| 613 | + $this->queries = $this->queries->reject(function($query) { |
|
| 614 | 614 | return $query['method'] == 'orderBy' || $query['method'] == 'orderByDesc'; |
| 615 | 615 | }); |
| 616 | 616 | } |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | public function handle() |
| 50 | 50 | { |
| 51 | 51 | $prefix = config('admin.route.prefix'); |
| 52 | - $routes = collect($this->router->getRoutes())->filter(function (Route $route) use ($prefix) { |
|
| 52 | + $routes = collect($this->router->getRoutes())->filter(function(Route $route) use ($prefix) { |
|
| 53 | 53 | $uri = $route->uri(); |
| 54 | 54 | // built-in, parameterized and no-GET are ignored |
| 55 | 55 | return Str::startsWith($uri, "{$prefix}/") |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | && in_array('GET', $route->methods()) |
| 60 | 60 | && !in_array(substr($route->uri(), strlen("{$prefix}/")), config('admin.menu_exclude')); |
| 61 | 61 | }) |
| 62 | - ->map(function (Route $route) use ($prefix) { |
|
| 62 | + ->map(function(Route $route) use ($prefix) { |
|
| 63 | 63 | $uri = substr($route->uri(), strlen("{$prefix}/")); |
| 64 | 64 | |
| 65 | 65 | return [ |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | $menus = Menu::all()->pluck('title', 'uri'); |
| 75 | 75 | // exclude exist ones |
| 76 | - $news = $routes->diffKeys($menus)->map(function ($item, $key) { |
|
| 76 | + $news = $routes->diffKeys($menus)->map(function($item, $key) { |
|
| 77 | 77 | return [ |
| 78 | 78 | 'title' => $item, |
| 79 | 79 | 'uri' => $key, |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | } else { |
| 88 | 88 | if ($this->hasOption('dry-run') && $this->option('dry-run')) { |
| 89 | 89 | $this->line('<info>The following menu items will be created</info>: '); |
| 90 | - $this->table(['Title', 'Uri'], array_map(function ($item) { |
|
| 90 | + $this->table(['Title', 'Uri'], array_map(function($item) { |
|
| 91 | 91 | return [ |
| 92 | 92 | $item['title'], |
| 93 | 93 | $item['uri'], |
@@ -108,7 +108,7 @@ |
||
| 108 | 108 | if (empty($this->ackUrl)) { |
| 109 | 109 | throw new Exception('Invalid filepond ack URL. At least set default api URL in admin config file.'); |
| 110 | 110 | } |
| 111 | - $this->ackUrl = rtrim($this->ackUrl, '/') . '/ack'; |
|
| 111 | + $this->ackUrl = rtrim($this->ackUrl, '/').'/ack'; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | $this->dir($dir); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | $this->rules('nullable'); |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | - $this->rules('in:' . implode(',', array_keys($this->options))); |
|
| 80 | + $this->rules('in:'.implode(',', array_keys($this->options))); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | return $this; |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | throw new \InvalidArgumentException("[$model] must be a valid model class"); |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | - $this->options = function ($value) use ($model, $idField, $textField) { |
|
| 244 | + $this->options = function($value) use ($model, $idField, $textField) { |
|
| 245 | 245 | if (empty($value)) { |
| 246 | 246 | return []; |
| 247 | 247 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | return $content |
| 88 | 88 | ->title($this->title()) |
| 89 | 89 | ->description($this->description['edit'] ?? trans('admin.edit')) |
| 90 | - ->row(function (Row $row) use (&$id) { |
|
| 90 | + ->row(function(Row $row) use (&$id) { |
|
| 91 | 91 | $row->column(2, ''); |
| 92 | 92 | $row->column(8, $this->form()->edit($id)); |
| 93 | 93 | }); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | return $content |
| 106 | 106 | ->title($this->title()) |
| 107 | 107 | ->description($this->description['create'] ?? trans('admin.create')) |
| 108 | - ->row(function (Row $row) { |
|
| 108 | + ->row(function(Row $row) { |
|
| 109 | 109 | $row->column(2, ''); |
| 110 | 110 | $row->column(8, $this->form()); |
| 111 | 111 | }); |
@@ -35,8 +35,8 @@ |
||
| 35 | 35 | $tok = $this->tokenizeValue($value); |
| 36 | 36 | |
| 37 | 37 | $input[$this->column()] = |
| 38 | - str_pad($tok[0], 4, '0', STR_PAD_LEFT) . |
|
| 39 | - str_pad($tok[1], 2, '0', STR_PAD_LEFT) . |
|
| 38 | + str_pad($tok[0], 4, '0', STR_PAD_LEFT). |
|
| 39 | + str_pad($tok[1], 2, '0', STR_PAD_LEFT). |
|
| 40 | 40 | str_pad($tok[2], 2, '0', STR_PAD_LEFT); |
| 41 | 41 | } catch (Exception $e) { |
| 42 | 42 | |
@@ -59,7 +59,9 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function prepare($value) |
| 61 | 61 | { |
| 62 | - if (empty($value)) return null; |
|
| 62 | + if (empty($value)) { |
|
| 63 | + return null; |
|
| 64 | + } |
|
| 63 | 65 | |
| 64 | 66 | $tok = $this->tokenizeValue($value); |
| 65 | 67 | |
@@ -79,7 +81,9 @@ discard block |
||
| 79 | 81 | |
| 80 | 82 | $tok = preg_split('/(\-|\/)/', $value, 3); |
| 81 | 83 | |
| 82 | - if (count($tok) < 3) throw new Exception('Invalid JalaliDate!'); |
|
| 84 | + if (count($tok) < 3) { |
|
| 85 | + throw new Exception('Invalid JalaliDate!'); |
|
| 86 | + } |
|
| 83 | 87 | } |
| 84 | 88 | |
| 85 | 89 | // Test is able to create jalalian |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | $grid = new Grid(new $permissionModel()); |
| 31 | 31 | |
| 32 | - $grid->filter(function (Filter $filter) { |
|
| 32 | + $grid->filter(function(Filter $filter) { |
|
| 33 | 33 | $filter->like('slug', trans('admin.slug')); |
| 34 | 34 | $filter->like('name', trans('admin.name')); |
| 35 | 35 | $filter->like('http_path', trans('admin.route')); |
@@ -39,8 +39,8 @@ discard block |
||
| 39 | 39 | $grid->column('slug', trans('admin.slug')); |
| 40 | 40 | $grid->column('name', trans('admin.name')); |
| 41 | 41 | |
| 42 | - $grid->column('http_path', trans('admin.route'))->display(function ($path) { |
|
| 43 | - return collect(explode("\n", $path))->map(function ($path) { |
|
| 42 | + $grid->column('http_path', trans('admin.route'))->display(function($path) { |
|
| 43 | + return collect(explode("\n", $path))->map(function($path) { |
|
| 44 | 44 | $method = $this->http_method ?: ['ANY']; |
| 45 | 45 | |
| 46 | 46 | if (Str::contains($path, ':')) { |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | $method = explode(',', $method); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - $method = collect($method)->map(function ($name) { |
|
| 51 | + $method = collect($method)->map(function($name) { |
|
| 52 | 52 | return strtoupper($name); |
| 53 | - })->map(function ($name) { |
|
| 53 | + })->map(function($name) { |
|
| 54 | 54 | return "<span class='label label-primary'>{$name}</span>"; |
| 55 | 55 | })->implode(' '); |
| 56 | 56 | |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | $grid->column('created_at', trans('admin.created_at')); |
| 66 | 66 | $grid->column('updated_at', trans('admin.updated_at')); |
| 67 | 67 | |
| 68 | - $grid->tools(function (Grid\Tools $tools) { |
|
| 69 | - $tools->batch(function (Grid\Tools\BatchActions $actions) { |
|
| 68 | + $grid->tools(function(Grid\Tools $tools) { |
|
| 69 | + $tools->batch(function(Grid\Tools\BatchActions $actions) { |
|
| 70 | 70 | $actions->disableDelete(); |
| 71 | 71 | }); |
| 72 | 72 | }); |
@@ -91,8 +91,8 @@ discard block |
||
| 91 | 91 | $show->field('slug', trans('admin.slug')); |
| 92 | 92 | $show->field('name', trans('admin.name')); |
| 93 | 93 | |
| 94 | - $show->field('http_path', trans('admin.route'))->unescape()->as(function ($path) { |
|
| 95 | - return collect(explode("\r\n", $path))->map(function ($path) { |
|
| 94 | + $show->field('http_path', trans('admin.route'))->unescape()->as(function($path) { |
|
| 95 | + return collect(explode("\r\n", $path))->map(function($path) { |
|
| 96 | 96 | $method = $this->http_method ?: ['ANY']; |
| 97 | 97 | |
| 98 | 98 | if (Str::contains($path, ':')) { |
@@ -100,9 +100,9 @@ discard block |
||
| 100 | 100 | $method = explode(',', $method); |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - $method = collect($method)->map(function ($name) { |
|
| 103 | + $method = collect($method)->map(function($name) { |
|
| 104 | 104 | return strtoupper($name); |
| 105 | - })->map(function ($name) { |
|
| 105 | + })->map(function($name) { |
|
| 106 | 106 | return "<span class='label label-primary'>{$name}</span>"; |
| 107 | 107 | })->implode(' '); |
| 108 | 108 | |