z-song / laravel-admin

src/Traits/ModelTree.php

Spacing +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
     {
         static::$branchOrder = array_flip(Arr::flatten($order));
 
-        static::$branchOrder = array_map(function ($item) {
+        static::$branchOrder = array_map(function($item) {
             return ++$item;
         }, static::$branchOrder);
     }
@@ -294,7 +294,7 @@ 
     {
         parent::boot();
 
-        static::saving(function (Model $branch) {
+        static::saving(function(Model $branch) {
             $parentColumn = $branch->getParentColumn();
 
             if (Request::has($parentColumn) && Request::input($parentColumn) == $branch->getKey()) {

src/Controllers/Dashboard.php

Spacing +12 added lines, -12 removed lines

@@ -21,20 +21,20 @@
     public static function environment()
     {
         $envs = [
-            ['name' => 'PHP version',       'value' => 'PHP/'.PHP_VERSION],
-            ['name' => 'Laravel version',   'value' => app()->version()],
-            ['name' => 'CGI',               'value' => php_sapi_name()],
-            ['name' => 'Uname',             'value' => php_uname()],
-            ['name' => 'Server',            'value' => Arr::get($_SERVER, 'SERVER_SOFTWARE')],
+            ['name' => 'PHP version', 'value' => 'PHP/'.PHP_VERSION],
+            ['name' => 'Laravel version', 'value' => app()->version()],
+            ['name' => 'CGI', 'value' => php_sapi_name()],
+            ['name' => 'Uname', 'value' => php_uname()],
+            ['name' => 'Server', 'value' => Arr::get($_SERVER, 'SERVER_SOFTWARE')],
 
-            ['name' => 'Cache driver',      'value' => config('cache.default')],
-            ['name' => 'Session driver',    'value' => config('session.driver')],
-            ['name' => 'Queue driver',      'value' => config('queue.default')],
+            ['name' => 'Cache driver', 'value' => config('cache.default')],
+            ['name' => 'Session driver', 'value' => config('session.driver')],
+            ['name' => 'Queue driver', 'value' => config('queue.default')],
 
-            ['name' => 'Timezone',          'value' => config('app.timezone')],
-            ['name' => 'Locale',            'value' => config('app.locale')],
-            ['name' => 'Env',               'value' => config('app.env')],
-            ['name' => 'URL',               'value' => config('app.url')],
+            ['name' => 'Timezone', 'value' => config('app.timezone')],
+            ['name' => 'Locale', 'value' => config('app.locale')],
+            ['name' => 'Env', 'value' => config('app.env')],
+            ['name' => 'URL', 'value' => config('app.url')],
         ];
 
         return view('admin::dashboard.environment', compact('envs'));

src/Form/Field/Table.php

Spacing +2 added lines, -2 removed lines

@@ -65,9 +65,9 @@
 
         $prepare = $form->prepare($input);
 
-        return collect($prepare)->reject(function ($item) {
+        return collect($prepare)->reject(function($item) {
             return $item[NestedForm::REMOVE_FLAG_NAME] == 1;
-        })->map(function ($item) {
+        })->map(function($item) {
             unset($item[NestedForm::REMOVE_FLAG_NAME]);
 
             return $item;

src/Form.php

Doc Comments +2 added lines, -2 removed lines

@@ -436,7 +436,7 @@ 
      *
      * @param array $data
      *
-     * @return mixed
+     * @return Response|null
      */
     protected function prepare($data = [])
     {
@@ -576,7 +576,7 @@ 
     /**
      * Get RedirectResponse after update.
      *
-     * @param mixed $key
+     * @param integer $key
      *
      * @return \Illuminate\Http\RedirectResponse
      */

Spacing +27 added lines, -27 removed lines

@@ -377,7 +377,7 @@ 
                 return $ret;
             }
 
-            collect(explode(',', $id))->filter()->each(function ($id) {
+            collect(explode(',', $id))->filter()->each(function($id) {
                 $builder = $this->model()->newQuery();
 
                 if ($this->isSoftDeletes) {
@@ -424,15 +424,15 @@ 
     protected function deleteFiles(Model $model, $forceDelete = false)
     {
         // If it's a soft delete, the files in the data will not be deleted.
-        if (! $forceDelete && $this->isSoftDeletes) {
+        if (!$forceDelete && $this->isSoftDeletes) {
             return;
         }
 
         $data = $model->toArray();
 
-        $this->builder->fields()->filter(function ($field) {
+        $this->builder->fields()->filter(function($field) {
             return $field instanceof Field\File;
-        })->each(function (Field\File $file) use ($data) {
+        })->each(function(Field\File $file) use ($data) {
             $file->setOriginal($data);
 
             $file->destroy();
@@ -457,7 +457,7 @@ 
             return $response;
         }
 
-        DB::transaction(function () {
+        DB::transaction(function() {
             $inserts = $this->prepareInsert($this->updates);
 
             foreach ($inserts as $column => $value) {
@@ -487,7 +487,7 @@ 
      */
     protected function responseValidationError(MessageBag $message)
     {
-        if (\request()->ajax() && ! \request()->pjax()) {
+        if (\request()->ajax() && !\request()->pjax()) {
             return response()->json([
                 'status'     => false,
                 'validation' => $message,
@@ -510,7 +510,7 @@ 
         $request = Request::capture();
 
         // ajax but not pjax
-        if ($request->ajax() && ! $request->pjax()) {
+        if ($request->ajax() && !$request->pjax()) {
             return response()->json([
                 'status'  => true,
                 'message' => $message,
@@ -614,7 +614,7 @@ 
 
         // Handle validation errors.
         if ($validationMessages = $this->validationMessages($data)) {
-            if (! $isEditable) {
+            if (!$isEditable) {
                 return back()->withInput()->withErrors($validationMessages);
             }
 
@@ -625,7 +625,7 @@ 
             return $response;
         }
 
-        DB::transaction(function () {
+        DB::transaction(function() {
             $updates = $this->prepareUpdate($this->updates);
 
             foreach ($updates as $column => $value) {
@@ -787,7 +787,7 @@ 
      */
     protected function handleFileSort(array $input = []): array
     {
-        if (! array_key_exists(Field::FILE_SORT_FLAG, $input)) {
+        if (!array_key_exists(Field::FILE_SORT_FLAG, $input)) {
             return $input;
         }
 
@@ -839,7 +839,7 @@ 
     protected function updateRelation($relationsData)
     {
         foreach ($relationsData as $name => $values) {
-            if (! method_exists($this->model, $name)) {
+            if (!method_exists($this->model, $name)) {
                 continue;
             }
 
@@ -898,7 +898,7 @@ 
 
                     // When in creating, associate two models
                     $foreignKeyMethod = version_compare(app()->version(), '5.8.0', '<') ? 'getForeignKey' : 'getForeignKeyName';
-                    if (! $this->model->{$relation->{$foreignKeyMethod}()}) {
+                    if (!$this->model->{$relation->{$foreignKeyMethod}()}) {
                         $this->model->{$relation->{$foreignKeyMethod}()} = $parent->getKey();
 
                         $this->model->save();
@@ -961,7 +961,7 @@ 
             $columns = $field->column();
 
             // If column not in input array data, then continue.
-            if (! Arr::has($updates, $columns)) {
+            if (!Arr::has($updates, $columns)) {
                 continue;
             }
 
@@ -994,8 +994,8 @@ 
     protected function isInvalidColumn($columns, $containsDot = false): bool
     {
         foreach ((array) $columns as $column) {
-            if ((! $containsDot && Str::contains($column, '.')) ||
-                ($containsDot && ! Str::contains($column, '.'))) {
+            if ((!$containsDot && Str::contains($column, '.')) ||
+                ($containsDot && !Str::contains($column, '.'))) {
                 return true;
             }
         }
@@ -1045,7 +1045,7 @@ 
     {
         $first = current($inserts);
 
-        if (! is_array($first)) {
+        if (!is_array($first)) {
             return false;
         }
 
@@ -1085,7 +1085,7 @@ 
         if (is_array($columns)) {
             $value = [];
             foreach ($columns as $name => $column) {
-                if (! Arr::has($data, $column)) {
+                if (!Arr::has($data, $column)) {
                     continue;
                 }
                 $value[$name] = Arr::get($data, $column);
@@ -1105,7 +1105,7 @@ 
     protected function getFieldByColumn($column)
     {
         return $this->builder->fields()->first(
-            function (Field $field) use ($column) {
+            function(Field $field) use ($column) {
                 if (is_array($field->column())) {
                     return in_array($column, $field->column());
                 }
@@ -1124,7 +1124,7 @@ 
     {
         $values = $this->model->toArray();
 
-        $this->builder->fields()->each(function (Field $field) use ($values) {
+        $this->builder->fields()->each(function(Field $field) use ($values) {
             $field->setOriginal($values);
         });
     }
@@ -1152,8 +1152,8 @@ 
 
         $data = $this->model->toArray();
 
-        $this->builder->fields()->each(function (Field $field) use ($data) {
-            if (! in_array($field->column(), $this->ignored, true)) {
+        $this->builder->fields()->each(function(Field $field) use ($data) {
+            if (!in_array($field->column(), $this->ignored, true)) {
                 $field->fill($data);
             }
         });
@@ -1193,11 +1193,11 @@ 
 
         /** @var Field $field */
         foreach ($this->builder->fields() as $field) {
-            if (! $validator = $field->getValidator($input)) {
+            if (!$validator = $field->getValidator($input)) {
                 continue;
             }
 
-            if (($validator instanceof Validator) && ! $validator->passes()) {
+            if (($validator instanceof Validator) && !$validator->passes()) {
                 $failedValidators[] = $validator;
             }
         }
@@ -1249,7 +1249,7 @@ 
                     $relations[] = $relation;
                 }
             } elseif (method_exists($this->model, $column) &&
-                ! method_exists(Model::class, $column)
+                !method_exists(Model::class, $column)
             ) {
                 $relations[] = $column;
             }
@@ -1282,7 +1282,7 @@ 
      */
     public function setWidth($fieldWidth = 8, $labelWidth = 2): self
     {
-        $this->builder()->fields()->each(function ($field) use ($fieldWidth, $labelWidth) {
+        $this->builder()->fields()->each(function($field) use ($fieldWidth, $labelWidth) {
             /* @var Field $field  */
             $field->setWidth($fieldWidth, $labelWidth);
         });
@@ -1583,7 +1583,7 @@ 
      */
     public static function collectFieldAssets(): array
     {
-        if (! empty(static::$collectedAssets)) {
+        if (!empty(static::$collectedAssets)) {
             return static::$collectedAssets;
         }
 
@@ -1591,7 +1591,7 @@ 
         $js = collect();
 
         foreach (static::$availableFields as $field) {
-            if (! method_exists($field, 'getAssets')) {
+            if (!method_exists($field, 'getAssets')) {
                 continue;
             }
 

database/migrations/2016_01_04_173148_create_admin_tables.php

Spacing +9 added lines, -9 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function up()
     {
-        Schema::create(config('admin.database.users_table'), function (Blueprint $table) {
+        Schema::create(config('admin.database.users_table'), function(Blueprint $table) {
             $table->increments('id');
             $table->string('username', 190)->unique();
             $table->string('password', 60);
@@ -31,14 +31,14 @@ 
             $table->timestamps();
         });
 
-        Schema::create(config('admin.database.roles_table'), function (Blueprint $table) {
+        Schema::create(config('admin.database.roles_table'), function(Blueprint $table) {
             $table->increments('id');
             $table->string('name', 50)->unique();
             $table->string('slug', 50)->unique();
             $table->timestamps();
         });
 
-        Schema::create(config('admin.database.permissions_table'), function (Blueprint $table) {
+        Schema::create(config('admin.database.permissions_table'), function(Blueprint $table) {
             $table->increments('id');
             $table->string('name', 50)->unique();
             $table->string('slug', 50)->unique();
@@ -47,7 +47,7 @@ 
             $table->timestamps();
         });
 
-        Schema::create(config('admin.database.menu_table'), function (Blueprint $table) {
+        Schema::create(config('admin.database.menu_table'), function(Blueprint $table) {
             $table->increments('id');
             $table->integer('parent_id')->default(0);
             $table->integer('order')->default(0);
@@ -59,35 +59,35 @@ 
             $table->timestamps();
         });
 
-        Schema::create(config('admin.database.role_users_table'), function (Blueprint $table) {
+        Schema::create(config('admin.database.role_users_table'), function(Blueprint $table) {
             $table->integer('role_id');
             $table->integer('user_id');
             $table->index(['role_id', 'user_id']);
             $table->timestamps();
         });
 
-        Schema::create(config('admin.database.role_permissions_table'), function (Blueprint $table) {
+        Schema::create(config('admin.database.role_permissions_table'), function(Blueprint $table) {
             $table->integer('role_id');
             $table->integer('permission_id');
             $table->index(['role_id', 'permission_id']);
             $table->timestamps();
         });
 
-        Schema::create(config('admin.database.user_permissions_table'), function (Blueprint $table) {
+        Schema::create(config('admin.database.user_permissions_table'), function(Blueprint $table) {
             $table->integer('user_id');
             $table->integer('permission_id');
             $table->index(['user_id', 'permission_id']);
             $table->timestamps();
         });
 
-        Schema::create(config('admin.database.role_menu_table'), function (Blueprint $table) {
+        Schema::create(config('admin.database.role_menu_table'), function(Blueprint $table) {
             $table->integer('role_id');
             $table->integer('menu_id');
             $table->index(['role_id', 'menu_id']);
             $table->timestamps();
         });
 
-        Schema::create(config('admin.database.operation_log_table'), function (Blueprint $table) {
+        Schema::create(config('admin.database.operation_log_table'), function(Blueprint $table) {
             $table->increments('id');
             $table->integer('user_id');
             $table->string('path');

src/Grid/Concerns/HasElementNames.php

Doc Comments +1 added lines

@@ -107,6 +107,7 @@
     }
 
     /**
+     * @param string $name
      * @return string
      */
     protected function elementNameWithPrefix($name)

src/Controllers/RoleController.php

Spacing +4 added lines, -4 removed lines

@@ -36,14 +36,14 @@ 
         $grid->column('created_at', trans('admin.created_at'));
         $grid->column('updated_at', trans('admin.updated_at'));
 
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
             if ($actions->row->slug == 'administrator') {
                 $actions->disableDelete();
             }
         });
 
-        $grid->tools(function (Grid\Tools $tools) {
-            $tools->batch(function (Grid\Tools\BatchActions $actions) {
+        $grid->tools(function(Grid\Tools $tools) {
+            $tools->batch(function(Grid\Tools\BatchActions $actions) {
                 $actions->disableDelete();
             });
         });
@@ -67,7 +67,7 @@ 
         $show->field('id', 'ID');
         $show->field('slug', trans('admin.slug'));
         $show->field('name', trans('admin.name'));
-        $show->field('permissions', trans('admin.permissions'))->as(function ($permission) {
+        $show->field('permissions', trans('admin.permissions'))->as(function($permission) {
             return $permission->pluck('name');
         })->label();
         $show->field('created_at', trans('admin.created_at'));

src/Controllers/LogController.php

Spacing +4 added lines, -4 removed lines

@@ -27,14 +27,14 @@ 
 
         $grid->column('id', 'ID')->sortable();
         $grid->column('user.name', 'User');
-        $grid->column('method')->display(function ($method) {
+        $grid->column('method')->display(function($method) {
             $color = Arr::get(OperationLog::$methodColors, $method, 'grey');
 
             return "<span class=\"badge bg-$color\">$method</span>";
         });
         $grid->column('path')->label('info');
         $grid->column('ip')->label('primary');
-        $grid->column('input')->display(function ($input) {
+        $grid->column('input')->display(function($input) {
             $input = json_decode($input, true);
             $input = Arr::except($input, ['_pjax', '_token', '_method', '_previous_']);
             if (empty($input)) {
@@ -46,14 +46,14 @@ 
 
         $grid->column('created_at', trans('admin.created_at'));
 
-        $grid->actions(function (Grid\Displayers\Actions $actions) {
+        $grid->actions(function(Grid\Displayers\Actions $actions) {
             $actions->disableEdit();
             $actions->disableView();
         });
 
         $grid->disableCreateButton();
 
-        $grid->filter(function (Grid\Filter $filter) {
+        $grid->filter(function(Grid\Filter $filter) {
             $userModel = config('admin.database.users_model');
 
             $filter->equal('user_id', 'User')->select($userModel::all()->pluck('name', 'id'));

src/Form/Field/Timezone.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
     public function render()
     {
-        $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function ($timezone) {
+        $this->options = collect(DateTimeZone::listIdentifiers(DateTimeZone::ALL))->mapWithKeys(function($timezone) {
             return [$timezone => $timezone];
         })->toArray();