styleci

resources/lang/zh-CN/admin.php

@@ -172,7 +172,7 @@ return [
         'selected_files'         => '选中:num个文件，共:size。',
         'selected_has_failed'    => '已成功上传:success个文件，:fail个文件上传失败，<a class="retry"  href="javascript:"";">重新上传</a>失败文件或<a class="ignore" href="javascript:"";">忽略</a>',
         'selected_success'       => '共:num个(:size)，已上传:success个。',
-        'dot'                    =>                 '，',
+        'dot'                    => '，',
         'failed_num'             => '失败:fail个。',
         'pause_upload'           => '暂停上传',
         'go_on_upload'           => '继续上传',

src/Admin.php

@@ -68,6 +68,7 @@ class Admin
      * Left sider-bar menu.
      *
      * @param Closure|null $builder
+     *
      * @return Menu
      */
     public static function menu(Closure $builder = null)

src/AdminServiceProvider.php

@@ -26,7 +26,7 @@ class AdminServiceProvider extends ServiceProvider
         Console\ResetPasswordCommand::class,
         Console\ExtendCommand::class,
         Console\ExportSeedCommand::class,
-        Console\IdeHelperCommand::class
+        Console\IdeHelperCommand::class,
     ];
 
     /**
@@ -40,7 +40,7 @@ class AdminServiceProvider extends ServiceProvider
         'admin.log'        => Middleware\LogOperation::class,
         'admin.permission' => Middleware\Permission::class,
         'admin.bootstrap'  => Middleware\Bootstrap::class,
-        'admin.session'    => Middleware\Session::class
+        'admin.session'    => Middleware\Session::class,
     ];
 
     /**
@@ -55,7 +55,7 @@ class AdminServiceProvider extends ServiceProvider
             'admin.log',
             'admin.bootstrap',
             'admin.permission',
-            'admin.session'
+            'admin.session',
         ],
     ];
 
@@ -113,7 +113,7 @@ class AdminServiceProvider extends ServiceProvider
     }
 
     /**
-     * Register routes
+     * Register routes.
      */
     protected function registerRoutes()
     {
@@ -188,12 +188,11 @@ class AdminServiceProvider extends ServiceProvider
 
             // Register menu
             Admin::menu()->register();
-
         }, true);
     }
 
     /**
-     * Register admin services
+     * Register admin services.
      */
     protected function registerServices()
     {

src/Console/IdeHelperCommand.php

@@ -299,6 +299,7 @@ class IdeHelperCommand extends Command
         });
 
         $space = str_repeat(' ', 5);
+
         return trim(
             $columns
                 ->map(function ($value) use (&$space) {
@@ -373,7 +374,7 @@ class IdeHelperCommand extends Command
      */
     public function getFileNameByClass($class)
     {
-        if (! class_exists($class)) {
+        if (!class_exists($class)) {
             return;
         }
 

src/Controllers/AuthController.php

@@ -188,7 +188,7 @@ class AuthController extends Controller
                 $form->password = bcrypt($form->password);
             }
 
-            if (! $form->password) {
+            if (!$form->password) {
                 $form->deleteInput('password');
             }
         });

src/Controllers/ExtensionController.php

@@ -2,18 +2,15 @@
 
 namespace Dcat\Admin\Controllers;
 
-use Dcat\Admin\Admin;
 use Dcat\Admin\Extension\Grid\BuildExtensionButton;
 use Dcat\Admin\Extension\Grid\ImportButton;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Models\Repositories\Extension;
-use Dcat\Admin\Widgets\Alert;
 use Dcat\Admin\Widgets\Box;
 use Dcat\Admin\Widgets\Table;
 use Dcat\Admin\Widgets\Terminal;
-use Dcat\Admin\Widgets\Tooltip;
 use Illuminate\Routing\Controller;
 
 class ExtensionController extends Controller
@@ -24,6 +21,7 @@ class ExtensionController extends Controller
      * Index interface.
      *
      * @param Content $content
+     *
      * @return Content
      */
     public function index(Content $content)
@@ -80,7 +78,7 @@ class ExtensionController extends Controller
      */
     protected function grid()
     {
-        $grid = new Grid(new Extension);
+        $grid = new Grid(new Extension());
 
         $grid->disablePagination();
         $grid->disableCreateButton();
@@ -113,7 +111,9 @@ class ExtensionController extends Controller
             })
             ->limit(14)
             ->expand(function ($expand) {
-                if (!$this->description) return;
+                if (!$this->description) {
+                    return;
+                }
 
                 return "<div style='padding:10px 20px'>{$this->description}</div>";
             });
@@ -153,7 +153,7 @@ class ExtensionController extends Controller
      */
     public function form()
     {
-        $form = new Form(new Extension);
+        $form = new Form(new Extension());
 
         $form->hidden('enable');
 
@@ -167,10 +167,12 @@ class ExtensionController extends Controller
     protected function getExpandHandler($key = 'require')
     {
         return function () use ($key) {
-            if (!$this->{$key}) return;
+            if (!$this->{$key}) {
+                return;
+            }
 
             $rows = [];
-            foreach ((array)$this->{$key} as $k => $v) {
+            foreach ((array) $this->{$key} as $k => $v) {
                 $k = "<b class='text-80'>$k</b>";
 
                 $rows[$k] = $v;
@@ -201,16 +203,19 @@ class ExtensionController extends Controller
         };
 
         $authors = function ($v) {
-            if (!$v) return;
+            if (!$v) {
+                return;
+            }
             foreach ($v as &$item) {
                 $item = "<span class='text-80 bold'>{$item['name']}</span> <<code>{$item['email']}</code>>";
             }
-            return join('<br/>', $v);
+            return implode('<br/>', $v);
         };
 
         $imported = function ($v) {
             if (!$v) {
                 $text = trans('admin.is_not_import');
+
                 return "<label class='label label-default'>$text</label>";
             }
 
@@ -222,5 +227,4 @@ class ExtensionController extends Controller
         Grid\Column::define('authors', $authors);
         Grid\Column::define('imported', $imported);
     }
-
 }

src/Controllers/LogController.php

@@ -2,10 +2,10 @@
 
 namespace Dcat\Admin\Controllers;
 
-use Dcat\Admin\Models\Repositories\OperationLog;
-use Dcat\Admin\Models\OperationLog as OperationLogModel;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
+use Dcat\Admin\Models\Repositories\OperationLog;
+use Dcat\Admin\Models\OperationLog as OperationLogModel;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Arr;
 
@@ -69,7 +69,9 @@ class LogController extends Controller
             $filter->equal('user_id', trans('admin.user'))
                 ->selectResource('auth/users')
                 ->options(function ($v) {
-                    if (!$v) return $v;
+                    if (!$v) {
+                        return $v;
+                    }
                     $userModel = config('admin.database.users_model');
 
                     return $userModel::findOrFail($v)->pluck('name', 'id');

src/Controllers/MenuController.php

@@ -2,13 +2,12 @@
 
 namespace Dcat\Admin\Controllers;
 
-use Dcat\Admin\Models\Repositories\Menu;
 use Dcat\Admin\Form;
 use Dcat\Admin\Layout\Column;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Row;
+use Dcat\Admin\Models\Repositories\Menu;
 use Dcat\Admin\Tree;
-use Dcat\Admin\Widgets\Box;
 use Dcat\Admin\Widgets\Card;
 use Illuminate\Routing\Controller;
 
@@ -46,7 +45,7 @@ class MenuController extends Controller
                     $form->multipleSelect('roles', trans('admin.roles'))
                         ->options($roleModel::all()->pluck('name', 'id'));
                     if ($menuModel::withPermission()) {
-                        $form->tree('permissions', trans('admin.permission'))->nodes((new $permissionModel)->allNodes());
+                        $form->tree('permissions', trans('admin.permission'))->nodes((new $permissionModel())->allNodes());
                     }
                     $form->hidden('_token')->default(csrf_token());
 
@@ -64,7 +63,7 @@ class MenuController extends Controller
     {
         $menuModel = config('admin.database.menu_model');
 
-        $tree = new Tree(new $menuModel);
+        $tree = new Tree(new $menuModel());
 
         $tree->disableCreateButton();
         $tree->disableQuickCreateButton();
@@ -139,7 +138,7 @@ class MenuController extends Controller
         if ($menuModel::withPermission()) {
             $form->tree('permissions', trans('admin.permission'))
                 ->nodes(function () use ($permissionModel) {
-                    return (new $permissionModel)->allNodes();
+                    return (new $permissionModel())->allNodes();
                 })
                 ->customFormat(function ($v) {
                     if (!$v) {

src/Controllers/PermissionController.php

@@ -3,12 +3,12 @@
 namespace Dcat\Admin\Controllers;
 
 use Dcat\Admin\Admin;
-use Dcat\Admin\Models\Repositories\Permission;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\MiniGrid;
+use Dcat\Admin\Models\Repositories\Permission;
 use Dcat\Admin\Show;
 use Dcat\Admin\Tree;
 use Illuminate\Routing\Controller;
@@ -92,7 +92,7 @@ class PermissionController extends Controller
 
     protected function miniGrid()
     {
-        $grid = new MiniGrid(new Permission);
+        $grid = new MiniGrid(new Permission());
 
         $grid->id->bold()->sortable();
         $grid->slug;
@@ -114,7 +114,7 @@ class PermissionController extends Controller
     {
         $model = config('admin.database.permissions_model');
 
-        $tree = new Tree(new $model);
+        $tree = new Tree(new $model());
 
         $tree->disableCreateButton();
 
@@ -129,7 +129,9 @@ class PermissionController extends Controller
 
             $path = array_filter($branch['http_path']);
 
-            if (!$path) return $payload.'</div>&nbsp;';
+            if (!$path) {
+                return $payload.'</div>&nbsp;';
+            }
 
             $max = 3;
             if (count($path) > $max) {
@@ -153,10 +155,10 @@ class PermissionController extends Controller
             })->implode('&nbsp;&nbsp;');
 
             $method = collect($method ?: ['ANY'])->unique()->map(function ($name) {
-                    return strtoupper($name);
-                })->map(function ($name) {
-                    return "<span class='label label-primary'>{$name}</span>";
-                })->implode('&nbsp;').'&nbsp;';
+                return strtoupper($name);
+            })->map(function ($name) {
+                return "<span class='label label-primary'>{$name}</span>";
+            })->implode('&nbsp;').'&nbsp;';
 
             $payload .= "</div>&nbsp; $method<a class=\"dd-nodrag\">$path</a>";
 
@@ -164,7 +166,6 @@ class PermissionController extends Controller
         });
 
         return $tree;
-
     }
 
     /**
@@ -183,14 +184,16 @@ class PermissionController extends Controller
         $grid->name;
 
         $grid->http_path->display(function ($path) {
-            if (!$path) return;
+            if (!$path) {
+                return;
+            }
 
             $method = $this->http_method ?: ['ANY'];
             $method = collect($method)->map(function ($name) {
-                    return strtoupper($name);
-                })->map(function ($name) {
-                    return "<span class='label label-primary'>{$name}</span>";
-                })->implode('&nbsp;').'&nbsp;';
+                return strtoupper($name);
+            })->map(function ($name) {
+                return "<span class='label label-primary'>{$name}</span>";
+            })->implode('&nbsp;').'&nbsp;';
 
             return collect($path)->filter()->map(function ($path) use ($method) {
                 if (Str::contains($path, ':')) {
@@ -287,7 +290,7 @@ class PermissionController extends Controller
     {
         return Admin::form(new Permission(), function (Form $form) {
             $permissionTable = config('admin.database.permissions_table');
-            $connection      = config('admin.database.connection');
+            $connection = config('admin.database.connection');
 
             $id = $form->getKey();
 
@@ -325,6 +328,7 @@ class PermissionController extends Controller
             if (!Str::startsWith($uri = $route->uri(), $prefix)) {
                 return;
             }
+
             return Str::replaceFirst($prefix, '', preg_replace('/{.*}+/', '*', $uri));
         })->filter()->all();
     }

src/Controllers/RoleController.php

@@ -4,12 +4,12 @@ namespace Dcat\Admin\Controllers;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Auth\Permission;
-use Dcat\Admin\Models\Repositories\Role;
-use Dcat\Admin\Models\Role as RoleModel;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\MiniGrid;
+use Dcat\Admin\Models\Repositories\Role;
+use Dcat\Admin\Models\Role as RoleModel;
 use Dcat\Admin\Show;
 use Dcat\Admin\Support\Helper;
 use Illuminate\Routing\Controller;
@@ -160,7 +160,7 @@ class RoleController extends Controller
     public function form()
     {
         return Admin::form(new Role('permissions'), function (Form $form) {
-            $roleTable  = config('admin.database.roles_table');
+            $roleTable = config('admin.database.roles_table');
             $connection = config('admin.database.connection');
 
             $id = $form->getKey();
@@ -177,12 +177,14 @@ class RoleController extends Controller
             $form->tree('permissions')
                 ->nodes(function () {
                     $permissionModel = config('admin.database.permissions_model');
-                    $permissionModel = new $permissionModel;
+                    $permissionModel = new $permissionModel();
 
                     return $permissionModel->allNodes();
                 })
                 ->customFormat(function ($v) {
-                    if (!$v) return [];
+                    if (!$v) {
+                        return [];
+                    }
 
                     return array_column($v, 'id');
                 });

src/Controllers/RouteController.php

@@ -14,7 +14,7 @@ class RouteController extends Controller
 {
     public function index()
     {
-        $content = new Content;
+        $content = new Content();
 
         $content->header(trans('admin.routes'))->description(trans('admin.list'));
 
@@ -29,7 +29,7 @@ class RouteController extends Controller
                 'OPTIONS'=> 'blue',
             ];
 
-            $grid = new Grid;
+            $grid = new Grid();
 
             $grid->model()->setData(function (Grid\Model $model) {
                 return $this->getModel()->setRoutes($this->getRoutes())->get($model);
@@ -171,7 +171,6 @@ class RouteController extends Controller
                 'middleware' => $this->getRouteMiddleware($route),
             ];
         }
-
     }
 
     /**

src/Controllers/ScaffoldController.php

@@ -4,11 +4,12 @@ namespace Dcat\Admin\Controllers;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Auth\Permission;
+use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Scaffold\ControllerCreator;
+use Dcat\Admin\Scaffold\LangCreator;
 use Dcat\Admin\Scaffold\MigrationCreator;
 use Dcat\Admin\Scaffold\ModelCreator;
 use Dcat\Admin\Scaffold\RepositoryCreator;
-use Dcat\Admin\Layout\Content;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Arr;
@@ -16,7 +17,6 @@ use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\MessageBag;
-use Dcat\Admin\Scaffold\LangCreator;
 use Illuminate\Support\Str;
 
 class ScaffoldController extends Controller
@@ -30,35 +30,35 @@ class ScaffoldController extends Controller
     ];
 
     public static $dataTypeMap = [
-        'int' => 'integer',
-        'int@unsigned' => 'unsignedInteger',
-        'tinyint' => 'tinyInteger',
-        'tinyint@unsigned' => 'unsignedTinyInteger',
-        'smallint' => 'smallInteger',
-        'smallint@unsigned' => 'unsignedSmallInteger',
-        'mediumint' => 'mediumInteger',
+        'int'                => 'integer',
+        'int@unsigned'       => 'unsignedInteger',
+        'tinyint'            => 'tinyInteger',
+        'tinyint@unsigned'   => 'unsignedTinyInteger',
+        'smallint'           => 'smallInteger',
+        'smallint@unsigned'  => 'unsignedSmallInteger',
+        'mediumint'          => 'mediumInteger',
         'mediumint@unsigned' => 'unsignedMediumInteger',
-        'bigint' => 'bigInteger',
-        'bigint@unsigned' => 'unsignedBigInteger',
+        'bigint'             => 'bigInteger',
+        'bigint@unsigned'    => 'unsignedBigInteger',
 
-        'date' => 'date',
-        'time' => 'time',
-        'datetime' => 'dateTime',
+        'date'      => 'date',
+        'time'      => 'time',
+        'datetime'  => 'dateTime',
         'timestamp' => 'timestamp',
 
-        'enum' => 'enum',
-        'json' => 'json',
+        'enum'   => 'enum',
+        'json'   => 'json',
         'binary' => 'binary',
 
-        'float' => 'float',
-        'double' => 'double',
+        'float'   => 'float',
+        'double'  => 'double',
         'decimal' => 'decimal',
 
-        'varchar' => 'string',
-        'char' => 'char',
-        'text' => 'text',
+        'varchar'    => 'string',
+        'char'       => 'char',
+        'text'       => 'text',
         'mediumtext' => 'mediumText',
-        'longtext' => 'longText',
+        'longtext'   => 'longText',
     ];
 
     public function index(Content $content)
@@ -91,7 +91,7 @@ class ScaffoldController extends Controller
         $paths = [];
         $message = '';
         
-        $creates = (array)$request->get('create');
+        $creates = (array) $request->get('create');
 
         try {
 
@@ -130,7 +130,7 @@ class ScaffoldController extends Controller
             }
 
             if (in_array('repository', $creates)) {
-                $paths['repository'] = (new RepositoryCreator)
+                $paths['repository'] = (new RepositoryCreator())
                     ->create($request->get('controller_name'), $request->get('model_name'));
             }
 
@@ -202,7 +202,9 @@ class ScaffoldController extends Controller
 
         try {
             foreach ($databases as $connectName => $value) {
-                if ($db && $db != $value['database']) continue;
+                if ($db && $db != $value['database']) {
+                    continue;
+                }
 
                 $sql = sprintf('SELECT * FROM information_schema.columns WHERE table_schema = "%s"', $value['database']);
 
@@ -214,9 +216,9 @@ class ScaffoldController extends Controller
 
                 $collection = collect($tmp)->map(function ($v) use ($value) {
                     if (!$p = Arr::get($value, 'prefix')) {
-                        return (array)$v;
+                        return (array) $v;
                     }
-                    $v = (array)$v;
+                    $v = (array) $v;
 
                     $v['TABLE_NAME'] = Str::replaceFirst($p, '', $v['TABLE_NAME']);
 
@@ -233,18 +235,17 @@ class ScaffoldController extends Controller
                         }
 
                         return [
-                            'type' => $v['DATA_TYPE'],
-                            'default' => $v['COLUMN_DEFAULT'],
+                            'type'     => $v['DATA_TYPE'],
+                            'default'  => $v['COLUMN_DEFAULT'],
                             'nullable' => $v['IS_NULLABLE'],
-                            'key' => $v['COLUMN_KEY'],
-                            'id' => $v['COLUMN_KEY'] === 'PRI',
-                            'comment' => $v['COLUMN_COMMENT'],
+                            'key'      => $v['COLUMN_KEY'],
+                            'id'       => $v['COLUMN_KEY'] === 'PRI',
+                            'comment'  => $v['COLUMN_COMMENT'],
                         ];
                     })->toArray();
                 })->toArray();
             }
         } catch (\Throwable $e) {
-
         }
 
         return $data;

src/Controllers/UserController.php

@@ -4,12 +4,12 @@ namespace Dcat\Admin\Controllers;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Auth\Permission;
-use Dcat\Admin\Models\Repositories\Administrator;
-use Dcat\Admin\Models\Administrator as AdministratorModel;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\MiniGrid;
+use Dcat\Admin\Models\Administrator as AdministratorModel;
+use Dcat\Admin\Models\Repositories\Administrator;
 use Dcat\Admin\Show;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Widgets\Tree;
@@ -97,10 +97,10 @@ class UserController extends Controller
 
             $permissionModel = config('admin.database.permissions_model');
             $roleModel = config('admin.database.roles_model');
-            $nodes = (new $permissionModel)->allNodes();
+            $nodes = (new $permissionModel())->allNodes();
             $grid->permissions
                 ->if(function () {
-                    return ! empty($this->roles);
+                    return !empty($this->roles);
                 })
                 ->tree(function (Grid\Displayers\Tree $tree) use (&$nodes, $roleModel) {
                     $tree->nodes($nodes);
@@ -114,7 +114,6 @@ class UserController extends Controller
                 ->else()
                 ->showEmpty();
 
-
             $grid->created_at;
             $grid->updated_at->sortable();
 
@@ -130,7 +129,6 @@ class UserController extends Controller
                     $actions->disableDelete();
                 }
             });
-
         });
     }
 
@@ -178,7 +176,9 @@ class UserController extends Controller
             $show->divider();
 
             $show->roles->width(6)->as(function ($roles) {
-                if (! $roles) return;
+                if (! $roles) {
+                    return;
+                }
 
                 return collect($roles)->pluck('name');
             })->label('primary');
@@ -188,7 +188,7 @@ class UserController extends Controller
 
                 $permissionModel = config('admin.database.permissions_model');
                 $roleModel = config('admin.database.roles_model');
-                $permissionModel = new $permissionModel;
+                $permissionModel = new $permissionModel();
                 $nodes = $permissionModel->allNodes();
 
                 $tree = Tree::make($nodes);
@@ -214,7 +214,6 @@ class UserController extends Controller
             if ($show->getKey() == AdministratorModel::DEFAULT_ID) {
                 $show->disableDeleteButton();
             }
-
         });
     }
 
@@ -249,6 +248,7 @@ class UserController extends Controller
                         if ($v == $this->password) {
                             return;
                         }
+
                         return $v;
                     });
             } else {
@@ -283,7 +283,7 @@ class UserController extends Controller
                 $form->password = bcrypt($form->password);
             }
 
-            if (! $form->password) {
+            if (!$form->password) {
                 $form->deleteInput('password');
             }
         });
@@ -304,5 +304,4 @@ class UserController extends Controller
 
         return $this->delete($id);
     }
-
 }

src/Exception/Handler.php

@@ -56,5 +56,4 @@ class Handler
 
         logger()->error($message, $context);
     }
-
 }

src/Extension.php

@@ -2,11 +2,10 @@
 
 namespace Dcat\Admin;
 
+use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Str;
-use Illuminate\Console\Command;
 
 abstract class Extension
 {
@@ -234,12 +233,12 @@ abstract class Extension
                     $command->warn("Menu [$path] already exists!");
                 } else {
                     $this->createMenu($title, $path, $icon);
-                    $command->info("Import extension menu succeeded!");
+                    $command->info('Import extension menu succeeded!');
                 }
             }
         }
 
-        if ($permission =  $this->permission()) {
+        if ($permission = $this->permission()) {
             if ($this->validatePermission($permission)) {
                 extract($permission);
 
@@ -247,7 +246,7 @@ abstract class Extension
                     $command->warn("Permission [$slug] already exists!");
                 } else {
                     $this->createPermission($name, $slug, $path);
-                    $command->info("Import extension permission succeeded!");
+                    $command->info('Import extension permission succeeded!');
                 }
             }
         }
@@ -260,7 +259,6 @@ abstract class Extension
      */
     public function uninstall(Command $command)
     {
-
     }
 
     /**
@@ -275,7 +273,7 @@ abstract class Extension
     public function validateMenu(array $menu)
     {
         /** @var \Illuminate\Validation\Validator $validator */
-        $validator = Validator::make($menu,  $this->menuValidationRules);
+        $validator = Validator::make($menu, $this->menuValidationRules);
 
         if ($validator->passes()) {
             return true;
@@ -316,7 +314,7 @@ abstract class Extension
     public function validatePermission(array $permission)
     {
         /** @var \Illuminate\Validation\Validator $validator */
-        $validator = Validator::make($permission,  $this->permissionValidationRules);
+        $validator = Validator::make($permission, $this->permissionValidationRules);
 
         if ($validator->passes()) {
             return true;
@@ -352,6 +350,7 @@ abstract class Extension
 
     /**
      * @param $slug
+     *
      * @return bool
      */
     protected function checkPermissionExist($slug)
@@ -364,8 +363,8 @@ abstract class Extension
         $result = $query->where('slug', $slug)
             ->get()
             ->first();
-        return $result ? true : false;
 
+        return $result ? true : false;
     }
 
     /**
@@ -409,7 +408,6 @@ abstract class Extension
      */
     public static function make()
     {
-        return new static;
+        return new static();
     }
-
 }

src/Extension/Grid/ImportButton.php

@@ -35,9 +35,9 @@ HTML;
 
     protected function setupScript()
     {
-        $text    = trans('admin.import_extension_confirm');
+        $text = trans('admin.import_extension_confirm');
         $confirm = trans('admin.confirm');
-        $cancel  = trans('admin.cancel');
+        $cancel = trans('admin.cancel');
 
         $url = admin_url('helpers/extensions/import');
 
@@ -70,5 +70,4 @@ $('.import-extension').click(function () {
 JS
         );
     }
-
 }

src/Form.php

@@ -3,12 +3,13 @@
 namespace Dcat\Admin;
 
 use Closure;
+use Dcat\Admin\Contracts\Repository;
 use Dcat\Admin\Form\Builder;
+use Dcat\Admin\Form\Concerns;
 use Dcat\Admin\Form\Condition;
 use Dcat\Admin\Form\Field;
 use Dcat\Admin\Form\Row;
 use Dcat\Admin\Form\Tab;
-use Dcat\Admin\Contracts\Repository;
 use Dcat\Admin\Traits\HasBuilderEvents;
 use Dcat\Admin\Widgets\ModalForm;
 use Illuminate\Contracts\Support\MessageProvider;
@@ -22,62 +23,60 @@ use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Validation\Validator;
 use Symfony\Component\HttpFoundation\Response;
-use Dcat\Admin\Form\Concerns;
 
 /**
  * Class Form.
  *
- * @method Field\Text           text($column, $label = '')
- * @method Field\Checkbox       checkbox($column, $label = '')
- * @method Field\Radio          radio($column, $label = '')
- * @method Field\Select         select($column, $label = '')
- * @method Field\MultipleSelect multipleSelect($column, $label = '')
- * @method Field\Textarea       textarea($column, $label = '')
- * @method Field\Hidden         hidden($column, $label = '')
- * @method Field\Id             id($column, $label = '')
- * @method Field\Ip             ip($column, $label = '')
- * @method Field\Url            url($column, $label = '')
- * @method Field\Color          color($column, $label = '')
- * @method Field\Email          email($column, $label = '')
- * @method Field\Mobile         mobile($column, $label = '')
- * @method Field\Slider         slider($column, $label = '')
- * @method Field\Map            map($latitude, $longitude, $label = '')
- * @method Field\Editor         editor($column, $label = '')
- * @method Field\Date           date($column, $label = '')
- * @method Field\Datetime       datetime($column, $label = '')
- * @method Field\Time           time($column, $label = '')
- * @method Field\Year           year($column, $label = '')
- * @method Field\Month          month($column, $label = '')
- * @method Field\DateRange      dateRange($start, $end, $label = '')
- * @method Field\DateTimeRange  datetimeRange($start, $end, $label = '')
- * @method Field\TimeRange      timeRange($start, $end, $label = '')
- * @method Field\Number         number($column, $label = '')
- * @method Field\Currency       currency($column, $label = '')
- * @method Field\SwitchField    switch($column, $label = '')
- * @method Field\Display        display($column, $label = '')
- * @method Field\Rate           rate($column, $label = '')
- * @method Field\Divide         divider()
- * @method Field\Password       password($column, $label = '')
- * @method Field\Decimal        decimal($column, $label = '')
- * @method Field\Html           html($html, $label = '')
- * @method Field\Tags           tags($column, $label = '')
- * @method Field\Icon           icon($column, $label = '')
- * @method Field\Embeds         embeds($column, $label = '')
- * @method Field\Captcha        captcha()
- * @method Field\Listbox        listbox($column, $label = '')
- * @method Field\SelectResource selectResource($column, $label = '')
- * @method Field\File           file($column, $label = '')
- * @method Field\Image          image($column, $label = '')
- * @method Field\MultipleFile   multipleFile($column, $label = '')
- * @method Field\MultipleImage  multipleImage($column, $label = '')
- * @method Field\HasMany        hasMany($column, $labelOrCallback, $callback = null)
- * @method Field\Tree           tree($column, $label = '')
- * @method Field\Table          table($column, $labelOrCallback, $callback = null)
- * @method Field\ListField      list($column, $label = '')
- * @method Field\Timezone       timezone($column, $label = '')
- * @method Field\KeyValue       keyValue($column, $label = '')
- * @method Field\Tel            tel($column, $label = '')
- *
+ * @method Field\Text                   text($column, $label = '')
+ * @method Field\Checkbox               checkbox($column, $label = '')
+ * @method Field\Radio                  radio($column, $label = '')
+ * @method Field\Select                 select($column, $label = '')
+ * @method Field\MultipleSelect         multipleSelect($column, $label = '')
+ * @method Field\Textarea               textarea($column, $label = '')
+ * @method Field\Hidden                 hidden($column, $label = '')
+ * @method Field\Id                     id($column, $label = '')
+ * @method Field\Ip                     ip($column, $label = '')
+ * @method Field\Url                    url($column, $label = '')
+ * @method Field\Color                  color($column, $label = '')
+ * @method Field\Email                  email($column, $label = '')
+ * @method Field\Mobile                 mobile($column, $label = '')
+ * @method Field\Slider                 slider($column, $label = '')
+ * @method Field\Map                    map($latitude, $longitude, $label = '')
+ * @method Field\Editor                 editor($column, $label = '')
+ * @method Field\Date                   date($column, $label = '')
+ * @method Field\Datetime               datetime($column, $label = '')
+ * @method Field\Time                   time($column, $label = '')
+ * @method Field\Year                   year($column, $label = '')
+ * @method Field\Month                  month($column, $label = '')
+ * @method Field\DateRange              dateRange($start, $end, $label = '')
+ * @method Field\DateTimeRange          datetimeRange($start, $end, $label = '')
+ * @method Field\TimeRange              timeRange($start, $end, $label = '')
+ * @method Field\Number                 number($column, $label = '')
+ * @method Field\Currency               currency($column, $label = '')
+ * @method Field\SwitchField            switch($column, $label = '')
+ * @method Field\Display                display($column, $label = '')
+ * @method Field\Rate                   rate($column, $label = '')
+ * @method Field\Divide                 divider()
+ * @method Field\Password               password($column, $label = '')
+ * @method Field\Decimal                decimal($column, $label = '')
+ * @method Field\Html                   html($html, $label = '')
+ * @method Field\Tags                   tags($column, $label = '')
+ * @method Field\Icon                   icon($column, $label = '')
+ * @method Field\Embeds                 embeds($column, $label = '')
+ * @method Field\Captcha                captcha()
+ * @method Field\Listbox                listbox($column, $label = '')
+ * @method Field\SelectResource         selectResource($column, $label = '')
+ * @method Field\File                   file($column, $label = '')
+ * @method Field\Image                  image($column, $label = '')
+ * @method Field\MultipleFile           multipleFile($column, $label = '')
+ * @method Field\MultipleImage          multipleImage($column, $label = '')
+ * @method Field\HasMany                hasMany($column, $labelOrCallback, $callback = null)
+ * @method Field\Tree                   tree($column, $label = '')
+ * @method Field\Table                  table($column, $labelOrCallback, $callback = null)
+ * @method Field\ListField              list($column, $label = '')
+ * @method Field\Timezone               timezone($column, $label = '')
+ * @method Field\KeyValue               keyValue($column, $label = '')
+ * @method Field\Tel                    tel($column, $label = '')
  * @method Field\BootstrapFile          bootstrapFile($column, $label = '')
  * @method Field\BootstrapImage         bootstrapImage($column, $label = '')
  * @method Field\BootstrapMultipleImage bootstrapMultipleImage($column, $label = '')
@@ -272,14 +271,14 @@ class Form implements Renderable
      * Create a new form instance.
      *
      * @param Repository $model
-     * @param \Closure $callback
+     * @param \Closure   $callback
      */
     public function __construct(?Repository $repository = null, ?Closure $callback = null, Request $request = null)
     {
-        $this->repository    = $repository ? Admin::repository($repository) : null;
-        $this->callback      = $callback;
-        $this->request       = $request ?: request();
-        $this->builder       = new Builder($this);
+        $this->repository = $repository ? Admin::repository($repository) : null;
+        $this->callback = $callback;
+        $this->request = $request ?: request();
+        $this->builder = new Builder($this);
         $this->isSoftDeletes = $repository ? $this->repository->isSoftDeletes() : false;
 
         $this->setModel(new Fluent());
@@ -291,6 +290,7 @@ class Form implements Renderable
      * Create a form instance.
      *
      * @param mixed ...$params
+     *
      * @return $this
      */
     public static function make(...$params)
@@ -322,6 +322,7 @@ class Form implements Renderable
      * Get specify field.
      *
      * @param string|null $name
+     *
      * @return Field|Collection|Field[]|null
      */
     public function field($name = null)
@@ -331,6 +332,7 @@ class Form implements Renderable
 
     /**
      * @param $column
+     *
      * @return $this
      */
     public function removeField($column)
@@ -394,6 +396,7 @@ class Form implements Renderable
      * Disable submit with ajax.
      *
      * @param bool $disable
+     *
      * @return $this
      */
     public function disableAjaxSubmit(bool $disable = true)
@@ -413,6 +416,7 @@ class Form implements Renderable
 
     /**
      * @param \Closure $closure
+     *
      * @return $this;
      */
     public function wrap(\Closure $closure)
@@ -562,8 +566,9 @@ class Form implements Renderable
     /**
      * Store a new record.
      *
-     * @param array|null $data
+     * @param array|null    $data
      * @param string|string $redirectTo
+     *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\Http\JsonResponse|Response
      */
     public function store(?array $data = null, $redirectTo = null)
@@ -599,6 +604,7 @@ class Form implements Renderable
      * Before store.
      *
      * @param array $data
+     *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|Response|void
      */
     protected function beforeStore(array $data)
@@ -728,6 +734,7 @@ class Form implements Renderable
      * Set data for insert or update.
      *
      * @param array $updates
+     *
      * @return $this
      */
     public function setUpdates(array $updates)
@@ -759,8 +766,9 @@ class Form implements Renderable
      * Handle update.
      *
      * @param $id
-     * @param array|null $data
+     * @param array|null  $data
      * @param string|null $redirectTo
+     *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse||Response
      */
     public function update(
@@ -793,6 +801,7 @@ class Form implements Renderable
      * Before update.
      *
      * @param array $data
+     *
      * @return Response|void
      */
     protected function beforeUpdate($id, array &$data)
@@ -837,6 +846,7 @@ class Form implements Renderable
 
     /**
      * @param array|MessageBag $validationMessages
+     *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
      */
     protected function makeValidationErrorsResponse($validationMessages)
@@ -855,6 +865,7 @@ class Form implements Renderable
      *
      * @param string $url
      * @param array|string $options
+     *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function redirect(?string $url, $options = null)
@@ -887,6 +898,7 @@ class Form implements Renderable
     /**
      * @param $key
      * @param $redirectTo
+     *
      * @return string|false
      */
     public function getRedirectUrl($key, $redirectTo = null)
@@ -1453,6 +1465,7 @@ class Form implements Renderable
      * Tools setting for form.
      *
      * @param Closure $callback
+     *
      * @return $this;
      */
     public function tools(Closure $callback)
@@ -1464,6 +1477,7 @@ class Form implements Renderable
 
     /**
      * @param bool $disable
+     *
      * @return $this
      */
     public function disableHeader(bool $disable = true)
@@ -1475,6 +1489,7 @@ class Form implements Renderable
 
     /**
      * @param bool $disable
+     *
      * @return $this
      */
     public function disableFooter(bool $disable = true)
@@ -1584,6 +1599,7 @@ class Form implements Renderable
      * Footer setting for form.
      *
      * @param Closure $callback
+     *
      * @return $this
      */
     public function footer(Closure $callback)
@@ -1617,6 +1633,7 @@ class Form implements Renderable
      * Set resource path.
      *
      * @param string $resource
+     *
      * @return $this
      */
     public function resource(string $resource)
@@ -1686,6 +1703,7 @@ class Form implements Renderable
 
     /**
      * @param int $width
+     *
      * @return $this
      */
     public function setDefaultBlockWidth(int $width)
@@ -1707,6 +1725,7 @@ class Form implements Renderable
 
     /**
      * @param Closure $callback
+     *
      * @return bool|void
      */
     public function inModal(\Closure $callback = null)
@@ -1724,6 +1743,7 @@ class Form implements Renderable
      * Create a modal form.
      *
      * @param string|null $title
+     *
      * @return ModalForm
      */
     public static function modal(?string $title = null)