@@ -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 | |
@@ -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 | |
@@ -39,14 +39,14 @@ discard block |
||
| 39 | 39 | $grid->column('created_at', trans('admin.created_at')); |
| 40 | 40 | $grid->column('updated_at', trans('admin.updated_at')); |
| 41 | 41 | |
| 42 | - $grid->actions(function (Grid\Displayers\Actions $actions) { |
|
| 42 | + $grid->actions(function(Grid\Displayers\Actions $actions) { |
|
| 43 | 43 | if ($actions->getKey() == 1) { |
| 44 | 44 | $actions->disableDelete(); |
| 45 | 45 | } |
| 46 | 46 | }); |
| 47 | 47 | |
| 48 | - $grid->tools(function (Grid\Tools $tools) { |
|
| 49 | - $tools->batch(function (Grid\Tools\BatchActions $actions) { |
|
| 48 | + $grid->tools(function(Grid\Tools $tools) { |
|
| 49 | + $tools->batch(function(Grid\Tools\BatchActions $actions) { |
|
| 50 | 50 | $actions->disableDelete(); |
| 51 | 51 | }); |
| 52 | 52 | }); |
@@ -70,10 +70,10 @@ discard block |
||
| 70 | 70 | $show->field('id', 'ID'); |
| 71 | 71 | $show->field('username', trans('admin.username')); |
| 72 | 72 | $show->field('name', trans('admin.name')); |
| 73 | - $show->field('roles', trans('admin.roles'))->as(function ($roles) { |
|
| 73 | + $show->field('roles', trans('admin.roles'))->as(function($roles) { |
|
| 74 | 74 | return $roles->pluck('name'); |
| 75 | 75 | })->label(); |
| 76 | - $show->field('permissions', trans('admin.permissions'))->as(function ($permission) { |
|
| 76 | + $show->field('permissions', trans('admin.permissions'))->as(function($permission) { |
|
| 77 | 77 | return $permission->pluck('name'); |
| 78 | 78 | })->label(); |
| 79 | 79 | $show->field('created_at', trans('admin.created_at')); |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | $form->image('avatar', trans('admin.avatar')); |
| 110 | 110 | $form->password('password', trans('admin.password'))->rules('required|confirmed'); |
| 111 | 111 | $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required') |
| 112 | - ->default(function ($form) { |
|
| 112 | + ->default(function($form) { |
|
| 113 | 113 | return $form->model()->password; |
| 114 | 114 | }); |
| 115 | 115 | |
@@ -121,13 +121,13 @@ discard block |
||
| 121 | 121 | $form->display('created_at', trans('admin.created_at')); |
| 122 | 122 | $form->display('updated_at', trans('admin.updated_at')); |
| 123 | 123 | |
| 124 | - $form->saving(function (Form $form) { |
|
| 124 | + $form->saving(function(Form $form) { |
|
| 125 | 125 | if ($form->password && $form->model()->password != $form->password) { |
| 126 | 126 | $form->password = Hash::make($form->password); |
| 127 | 127 | } |
| 128 | 128 | }); |
| 129 | 129 | |
| 130 | - $form->saved(function (Form $form) { |
|
| 130 | + $form->saved(function(Form $form) { |
|
| 131 | 131 | /** @var Administrator $model */ |
| 132 | 132 | $model = $form->model(); |
| 133 | 133 | $model->clearCaches(); |
@@ -26,10 +26,10 @@ discard block |
||
| 26 | 26 | return $content |
| 27 | 27 | ->title(trans('admin.menu')) |
| 28 | 28 | ->description(trans('admin.list')) |
| 29 | - ->row(function (Row $row) { |
|
| 29 | + ->row(function(Row $row) { |
|
| 30 | 30 | $row->column(6, $this->treeView()->render()); |
| 31 | 31 | |
| 32 | - $row->column(6, function (Column $column) { |
|
| 32 | + $row->column(6, function(Column $column) { |
|
| 33 | 33 | $form = new \Encore\Admin\Widgets\Form(); |
| 34 | 34 | $form->action(admin_url('auth/menu')); |
| 35 | 35 | |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | $tree->disableCreate(); |
| 77 | 77 | |
| 78 | - $tree->branch(function ($branch) { |
|
| 78 | + $tree->branch(function($branch) { |
|
| 79 | 79 | $payload = "<i class='fa-regular {$branch['icon']}'></i> <strong>{$branch['title']}</strong>"; |
| 80 | 80 | |
| 81 | 81 | if (!isset($branch['children'])) { |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | protected function getAllPermissionsCacheKey(): string |
| 16 | 16 | { |
| 17 | - return $this->getGeneralCacheKey() . '.all-permissions'; |
|
| 17 | + return $this->getGeneralCacheKey().'.all-permissions'; |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | */ |
| 25 | 25 | public function allPermissions(): Collection |
| 26 | 26 | { |
| 27 | - return Cache::remember($this->getAllPermissionsCacheKey(), now()->addHour(), function () { |
|
| 27 | + return Cache::remember($this->getAllPermissionsCacheKey(), now()->addHour(), function() { |
|
| 28 | 28 | return $this->roles()->with('permissions')->get()->pluck('permissions')->flatten()->merge($this->permissions); |
| 29 | 29 | }); |
| 30 | 30 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | */ |
| 145 | 145 | protected static function bootHasPermissions() |
| 146 | 146 | { |
| 147 | - static::deleting(function ($model) { |
|
| 147 | + static::deleting(function($model) { |
|
| 148 | 148 | $model->roles()->detach(); |
| 149 | 149 | |
| 150 | 150 | $model->permissions()->detach(); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $connection = config('admin.database.connection') ?: config('database.default'); |
| 69 | 69 | $orderColumn = DB::connection($connection)->getQueryGrammar()->wrap($this->orderColumn); |
| 70 | 70 | |
| 71 | - $byOrder = 'ROOT ASC,' . $orderColumn; |
|
| 71 | + $byOrder = 'ROOT ASC,'.$orderColumn; |
|
| 72 | 72 | |
| 73 | 73 | $query = static::query(); |
| 74 | 74 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | return Cache::remember( |
| 80 | 80 | 'laravel-admin.menu.all-nodes', |
| 81 | 81 | now()->addHour(), |
| 82 | - fn () => $query->selectRaw('*, ' . $orderColumn . ' ROOT')->orderByRaw($byOrder)->get()->toArray() |
|
| 82 | + fn () => $query->selectRaw('*, '.$orderColumn.' ROOT')->orderByRaw($byOrder)->get()->toArray() |
|
| 83 | 83 | ); |
| 84 | 84 | } |
| 85 | 85 | |
@@ -102,11 +102,11 @@ discard block |
||
| 102 | 102 | { |
| 103 | 103 | static::treeBoot(); |
| 104 | 104 | |
| 105 | - static::deleting(function ($model) { |
|
| 105 | + static::deleting(function($model) { |
|
| 106 | 106 | $model->roles()->detach(); |
| 107 | 107 | }); |
| 108 | 108 | |
| 109 | - static::saved(function ($model) { |
|
| 109 | + static::saved(function($model) { |
|
| 110 | 110 | Cache::forget('laravel-admin.menu.all-nodes'); |
| 111 | 111 | }); |
| 112 | 112 | } |