@@ -65,7 +65,7 @@ |
||
| 65 | 65 | |
| 66 | 66 | $this->value = Arr::get($inputs, $this->column); |
| 67 | 67 | |
| 68 | - $value = array_filter($this->value, function ($val) { |
|
| 68 | + $value = array_filter($this->value, function($val) { |
|
| 69 | 69 | return $val !== ''; |
| 70 | 70 | }); |
| 71 | 71 | |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | { |
| 198 | 198 | static::$branchOrder = array_flip(Arr::flatten($order)); |
| 199 | 199 | |
| 200 | - static::$branchOrder = array_map(function ($item) { |
|
| 200 | + static::$branchOrder = array_map(function($item) { |
|
| 201 | 201 | return ++$item; |
| 202 | 202 | }, static::$branchOrder); |
| 203 | 203 | } |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | { |
| 295 | 295 | parent::boot(); |
| 296 | 296 | |
| 297 | - static::saving(function (Model $branch) { |
|
| 297 | + static::saving(function(Model $branch) { |
|
| 298 | 298 | $parentColumn = $branch->getParentColumn(); |
| 299 | 299 | |
| 300 | 300 | if (Request::has($parentColumn) && Request::input($parentColumn) == $branch->getKey()) { |
@@ -21,20 +21,20 @@ |
||
| 21 | 21 | public static function environment() |
| 22 | 22 | { |
| 23 | 23 | $envs = [ |
| 24 | - ['name' => 'PHP version', 'value' => 'PHP/'.PHP_VERSION], |
|
| 25 | - ['name' => 'Laravel version', 'value' => app()->version()], |
|
| 26 | - ['name' => 'CGI', 'value' => php_sapi_name()], |
|
| 27 | - ['name' => 'Uname', 'value' => php_uname()], |
|
| 28 | - ['name' => 'Server', 'value' => Arr::get($_SERVER, 'SERVER_SOFTWARE')], |
|
| 24 | + ['name' => 'PHP version', 'value' => 'PHP/'.PHP_VERSION], |
|
| 25 | + ['name' => 'Laravel version', 'value' => app()->version()], |
|
| 26 | + ['name' => 'CGI', 'value' => php_sapi_name()], |
|
| 27 | + ['name' => 'Uname', 'value' => php_uname()], |
|
| 28 | + ['name' => 'Server', 'value' => Arr::get($_SERVER, 'SERVER_SOFTWARE')], |
|
| 29 | 29 | |
| 30 | - ['name' => 'Cache driver', 'value' => config('cache.default')], |
|
| 31 | - ['name' => 'Session driver', 'value' => config('session.driver')], |
|
| 32 | - ['name' => 'Queue driver', 'value' => config('queue.default')], |
|
| 30 | + ['name' => 'Cache driver', 'value' => config('cache.default')], |
|
| 31 | + ['name' => 'Session driver', 'value' => config('session.driver')], |
|
| 32 | + ['name' => 'Queue driver', 'value' => config('queue.default')], |
|
| 33 | 33 | |
| 34 | - ['name' => 'Timezone', 'value' => config('app.timezone')], |
|
| 35 | - ['name' => 'Locale', 'value' => config('app.locale')], |
|
| 36 | - ['name' => 'Env', 'value' => config('app.env')], |
|
| 37 | - ['name' => 'URL', 'value' => config('app.url')], |
|
| 34 | + ['name' => 'Timezone', 'value' => config('app.timezone')], |
|
| 35 | + ['name' => 'Locale', 'value' => config('app.locale')], |
|
| 36 | + ['name' => 'Env', 'value' => config('app.env')], |
|
| 37 | + ['name' => 'URL', 'value' => config('app.url')], |
|
| 38 | 38 | ]; |
| 39 | 39 | |
| 40 | 40 | return view('admin::dashboard.environment', compact('envs')); |
@@ -65,9 +65,9 @@ |
||
| 65 | 65 | |
| 66 | 66 | $prepare = $form->prepare($input); |
| 67 | 67 | |
| 68 | - return collect($prepare)->reject(function ($item) { |
|
| 68 | + return collect($prepare)->reject(function($item) { |
|
| 69 | 69 | return $item[NestedForm::REMOVE_FLAG_NAME] == 1; |
| 70 | - })->map(function ($item) { |
|
| 70 | + })->map(function($item) { |
|
| 71 | 71 | unset($item[NestedForm::REMOVE_FLAG_NAME]); |
| 72 | 72 | |
| 73 | 73 | return $item; |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | * |
| 437 | 437 | * @param array $data |
| 438 | 438 | * |
| 439 | - * @return mixed |
|
| 439 | + * @return Response|null |
|
| 440 | 440 | */ |
| 441 | 441 | protected function prepare($data = []) |
| 442 | 442 | { |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | /** |
| 577 | 577 | * Get RedirectResponse after update. |
| 578 | 578 | * |
| 579 | - * @param mixed $key |
|
| 579 | + * @param integer $key |
|
| 580 | 580 | * |
| 581 | 581 | * @return \Illuminate\Http\RedirectResponse |
| 582 | 582 | */ |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | return $ret; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | - collect(explode(',', $id))->filter()->each(function ($id) { |
|
| 380 | + collect(explode(',', $id))->filter()->each(function($id) { |
|
| 381 | 381 | $builder = $this->model()->newQuery(); |
| 382 | 382 | |
| 383 | 383 | if ($this->isSoftDeletes) { |
@@ -430,9 +430,9 @@ discard block |
||
| 430 | 430 | |
| 431 | 431 | $data = $model->toArray(); |
| 432 | 432 | |
| 433 | - $this->builder->fields()->filter(function ($field) { |
|
| 433 | + $this->builder->fields()->filter(function($field) { |
|
| 434 | 434 | return $field instanceof Field\File; |
| 435 | - })->each(function (Field\File $file) use ($data) { |
|
| 435 | + })->each(function(Field\File $file) use ($data) { |
|
| 436 | 436 | $file->setOriginal($data); |
| 437 | 437 | |
| 438 | 438 | $file->destroy(); |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | return $response; |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | - DB::transaction(function () { |
|
| 460 | + DB::transaction(function() { |
|
| 461 | 461 | $inserts = $this->prepareInsert($this->updates); |
| 462 | 462 | |
| 463 | 463 | foreach ($inserts as $column => $value) { |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | return $response; |
| 626 | 626 | } |
| 627 | 627 | |
| 628 | - DB::transaction(function () { |
|
| 628 | + DB::transaction(function() { |
|
| 629 | 629 | $updates = $this->prepareUpdate($this->updates); |
| 630 | 630 | |
| 631 | 631 | foreach ($updates as $column => $value) { |
@@ -1105,7 +1105,7 @@ discard block |
||
| 1105 | 1105 | protected function getFieldByColumn($column) |
| 1106 | 1106 | { |
| 1107 | 1107 | return $this->builder->fields()->first( |
| 1108 | - function (Field $field) use ($column) { |
|
| 1108 | + function(Field $field) use ($column) { |
|
| 1109 | 1109 | if (is_array($field->column())) { |
| 1110 | 1110 | return in_array($column, $field->column()); |
| 1111 | 1111 | } |
@@ -1124,7 +1124,7 @@ discard block |
||
| 1124 | 1124 | { |
| 1125 | 1125 | $values = $this->model->toArray(); |
| 1126 | 1126 | |
| 1127 | - $this->builder->fields()->each(function (Field $field) use ($values) { |
|
| 1127 | + $this->builder->fields()->each(function(Field $field) use ($values) { |
|
| 1128 | 1128 | $field->setOriginal($values); |
| 1129 | 1129 | }); |
| 1130 | 1130 | } |
@@ -1152,7 +1152,7 @@ discard block |
||
| 1152 | 1152 | |
| 1153 | 1153 | $data = $this->model->toArray(); |
| 1154 | 1154 | |
| 1155 | - $this->builder->fields()->each(function (Field $field) use ($data) { |
|
| 1155 | + $this->builder->fields()->each(function(Field $field) use ($data) { |
|
| 1156 | 1156 | if (!in_array($field->column(), $this->ignored, true)) { |
| 1157 | 1157 | $field->fill($data); |
| 1158 | 1158 | } |
@@ -1282,7 +1282,7 @@ discard block |
||
| 1282 | 1282 | */ |
| 1283 | 1283 | public function setWidth($fieldWidth = 8, $labelWidth = 2): self |
| 1284 | 1284 | { |
| 1285 | - $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) { |
|
| 1285 | + $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) { |
|
| 1286 | 1286 | /* @var Field $field */ |
| 1287 | 1287 | $field->setWidth($fieldWidth, $labelWidth); |
| 1288 | 1288 | }); |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | protected function minifyCSS() |
| 79 | 79 | { |
| 80 | 80 | $css = collect(array_merge(Admin::$css, Admin::baseCss())) |
| 81 | - ->unique()->map(function ($css) { |
|
| 81 | + ->unique()->map(function($css) { |
|
| 82 | 82 | |
| 83 | 83 | if (url()->isValidUrl($css)) { |
| 84 | 84 | $this->assets['css'][] = $css; |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | protected function minifyJS() |
| 103 | 103 | { |
| 104 | 104 | $js = collect(array_merge(Admin::$js, Admin::baseJs())) |
| 105 | - ->unique()->map(function ($js) { |
|
| 105 | + ->unique()->map(function($js) { |
|
| 106 | 106 | |
| 107 | 107 | if (url()->isValidUrl($js)) { |
| 108 | 108 | $this->assets['js'][] = $js; |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | protected function generateManifest() |
| 127 | 127 | { |
| 128 | - $min = collect(Admin::$min)->mapWithKeys(function ($path, $type) { |
|
| 128 | + $min = collect(Admin::$min)->mapWithKeys(function($path, $type) { |
|
| 129 | 129 | return [$type => sprintf('%s?id=%s', $path, md5(uniqid()))]; |
| 130 | 130 | }); |
| 131 | 131 | |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | public function up() |
| 23 | 23 | { |
| 24 | - Schema::create(config('admin.database.users_table'), function (Blueprint $table) { |
|
| 24 | + Schema::create(config('admin.database.users_table'), function(Blueprint $table) { |
|
| 25 | 25 | $table->increments('id'); |
| 26 | 26 | $table->string('username', 190)->unique(); |
| 27 | 27 | $table->string('password', 60); |
@@ -31,14 +31,14 @@ discard block |
||
| 31 | 31 | $table->timestamps(); |
| 32 | 32 | }); |
| 33 | 33 | |
| 34 | - Schema::create(config('admin.database.roles_table'), function (Blueprint $table) { |
|
| 34 | + Schema::create(config('admin.database.roles_table'), function(Blueprint $table) { |
|
| 35 | 35 | $table->increments('id'); |
| 36 | 36 | $table->string('name', 50)->unique(); |
| 37 | 37 | $table->string('slug', 50)->unique(); |
| 38 | 38 | $table->timestamps(); |
| 39 | 39 | }); |
| 40 | 40 | |
| 41 | - Schema::create(config('admin.database.permissions_table'), function (Blueprint $table) { |
|
| 41 | + Schema::create(config('admin.database.permissions_table'), function(Blueprint $table) { |
|
| 42 | 42 | $table->increments('id'); |
| 43 | 43 | $table->string('name', 50)->unique(); |
| 44 | 44 | $table->string('slug', 50)->unique(); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | $table->timestamps(); |
| 48 | 48 | }); |
| 49 | 49 | |
| 50 | - Schema::create(config('admin.database.menu_table'), function (Blueprint $table) { |
|
| 50 | + Schema::create(config('admin.database.menu_table'), function(Blueprint $table) { |
|
| 51 | 51 | $table->increments('id'); |
| 52 | 52 | $table->integer('parent_id')->default(0); |
| 53 | 53 | $table->integer('order')->default(0); |
@@ -59,35 +59,35 @@ discard block |
||
| 59 | 59 | $table->timestamps(); |
| 60 | 60 | }); |
| 61 | 61 | |
| 62 | - Schema::create(config('admin.database.role_users_table'), function (Blueprint $table) { |
|
| 62 | + Schema::create(config('admin.database.role_users_table'), function(Blueprint $table) { |
|
| 63 | 63 | $table->integer('role_id'); |
| 64 | 64 | $table->integer('user_id'); |
| 65 | 65 | $table->index(['role_id', 'user_id']); |
| 66 | 66 | $table->timestamps(); |
| 67 | 67 | }); |
| 68 | 68 | |
| 69 | - Schema::create(config('admin.database.role_permissions_table'), function (Blueprint $table) { |
|
| 69 | + Schema::create(config('admin.database.role_permissions_table'), function(Blueprint $table) { |
|
| 70 | 70 | $table->integer('role_id'); |
| 71 | 71 | $table->integer('permission_id'); |
| 72 | 72 | $table->index(['role_id', 'permission_id']); |
| 73 | 73 | $table->timestamps(); |
| 74 | 74 | }); |
| 75 | 75 | |
| 76 | - Schema::create(config('admin.database.user_permissions_table'), function (Blueprint $table) { |
|
| 76 | + Schema::create(config('admin.database.user_permissions_table'), function(Blueprint $table) { |
|
| 77 | 77 | $table->integer('user_id'); |
| 78 | 78 | $table->integer('permission_id'); |
| 79 | 79 | $table->index(['user_id', 'permission_id']); |
| 80 | 80 | $table->timestamps(); |
| 81 | 81 | }); |
| 82 | 82 | |
| 83 | - Schema::create(config('admin.database.role_menu_table'), function (Blueprint $table) { |
|
| 83 | + Schema::create(config('admin.database.role_menu_table'), function(Blueprint $table) { |
|
| 84 | 84 | $table->integer('role_id'); |
| 85 | 85 | $table->integer('menu_id'); |
| 86 | 86 | $table->index(['role_id', 'menu_id']); |
| 87 | 87 | $table->timestamps(); |
| 88 | 88 | }); |
| 89 | 89 | |
| 90 | - Schema::create(config('admin.database.operation_log_table'), function (Blueprint $table) { |
|
| 90 | + Schema::create(config('admin.database.operation_log_table'), function(Blueprint $table) { |
|
| 91 | 91 | $table->increments('id'); |
| 92 | 92 | $table->integer('user_id'); |
| 93 | 93 | $table->string('path'); |
@@ -107,6 +107,7 @@ |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
| 110 | + * @param string $name |
|
| 110 | 111 | * @return string |
| 111 | 112 | */ |
| 112 | 113 | protected function elementNameWithPrefix($name) |
@@ -287,10 +287,10 @@ |
||
| 287 | 287 | 'middleware' => config('admin.route.middleware'), |
| 288 | 288 | ]; |
| 289 | 289 | |
| 290 | - app('router')->group($attributes, function ($router) { |
|
| 290 | + app('router')->group($attributes, function($router) { |
|
| 291 | 291 | |
| 292 | 292 | /* @var \Illuminate\Support\Facades\Route $router */ |
| 293 | - $router->namespace('\Encore\Admin\Controllers')->group(function ($router) { |
|
| 293 | + $router->namespace('\Encore\Admin\Controllers')->group(function($router) { |
|
| 294 | 294 | |
| 295 | 295 | /* @var \Illuminate\Routing\Router $router */ |
| 296 | 296 | $router->resource('auth/users', 'UserController')->names('admin.auth.users'); |