z-song / laravel-admin

src/Controllers/HandleController.php

Unused Use Statements +9 added lines, -9 removed lines

@@ -2,15 +2,15 @@
 

 namespace Encore\Admin\Controllers;

 

-use Encore\Admin\Actions\Action;

-use Encore\Admin\Actions\GridAction;

-use Encore\Admin\Actions\Response;

-use Encore\Admin\Actions\RowAction;

-use Encore\Admin\Widgets\Form;

-use Exception;

-use Illuminate\Database\Eloquent\Model;

-use Illuminate\Http\Request;

-use Illuminate\Routing\Controller;

+use Encore\Admin\Actions\Action;
+use Encore\Admin\Actions\GridAction;
+use Encore\Admin\Actions\Response;
+use Encore\Admin\Actions\RowAction;
+use Encore\Admin\Widgets\Form;
+use Exception;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
 use Illuminate\Support\Collection;

 

 class HandleController extends Controller

src/Controllers/LogController.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 

 namespace Encore\Admin\Controllers;

 

-use Encore\Admin\Auth\Database\OperationLog;

-use Encore\Admin\Grid;

+use Encore\Admin\Auth\Database\OperationLog;
+use Encore\Admin\Grid;
 use Illuminate\Support\Arr;

 

 class LogController extends AdminController

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/Controllers/MenuController.php

Unused Use Statements +6 added lines, -6 removed lines

@@ -2,12 +2,12 @@
 

 namespace Encore\Admin\Controllers;

 

-use Encore\Admin\Form;

-use Encore\Admin\Layout\Column;

-use Encore\Admin\Layout\Content;

-use Encore\Admin\Layout\Row;

-use Encore\Admin\Tree;

-use Encore\Admin\Widgets\Box;

+use Encore\Admin\Form;
+use Encore\Admin\Layout\Column;
+use Encore\Admin\Layout\Content;
+use Encore\Admin\Layout\Row;
+use Encore\Admin\Tree;
+use Encore\Admin\Widgets\Box;
 use Illuminate\Routing\Controller;

 

 class MenuController extends Controller

Spacing +4 added lines, -4 removed lines

@@ -26,10 +26,10 @@ 
         return $content

             ->title(trans('admin.menu'))

             ->description(trans('admin.list'))

-            ->row(function (Row $row) {

+            ->row(function(Row $row) {

                 $row->column(6, $this->treeView()->render());

 

-                $row->column(6, function (Column $column) {

+                $row->column(6, function(Column $column) {

                     $form = new \Encore\Admin\Widgets\Form();

                     $form->action(admin_url('auth/menu'));

 

@@ -71,10 +71,10 @@ 
     {

         $menuModel = config('admin.database.menu_model');

 

-        return $menuModel::tree(function (Tree $tree) {

+        return $menuModel::tree(function(Tree $tree) {

             $tree->disableCreate();

 

-            $tree->branch(function ($branch) {

+            $tree->branch(function($branch) {

                 $payload = "<i class='fa {$branch['icon']}'></i>&nbsp;<strong>{$branch['title']}</strong>";

 

                 if (!isset($branch['children'])) {

src/Controllers/PermissionController.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
     /**

      * Get options of HTTP methods select field.

      *

-     * @return array

+     * @return callable

      */

     protected function getHttpMethodsOptions()

     {

Unused Use Statements +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@
 

 namespace Encore\Admin\Controllers;

 

-use Encore\Admin\Form;

-use Encore\Admin\Grid;

-use Encore\Admin\Show;

+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
 use Illuminate\Support\Str;

 

 class PermissionController extends AdminController

Spacing +10 added lines, -10 removed lines

@@ -32,8 +32,8 @@ 
         $grid->column('slug', trans('admin.slug'));

         $grid->column('name', trans('admin.name'));

 

-        $grid->column('http_path', trans('admin.route'))->display(function ($path) {

-            return collect(explode("\n", $path))->map(function ($path) {

+        $grid->column('http_path', trans('admin.route'))->display(function($path) {

+            return collect(explode("\n", $path))->map(function($path) {

                 $method = $this->http_method ?: ['ANY'];

 

                 if (Str::contains($path, ':')) {

@@ -41,9 +41,9 @@ 
                     $method = explode(',', $method);

                 }

 

-                $method = collect($method)->map(function ($name) {

+                $method = collect($method)->map(function($name) {

                     return strtoupper($name);

-                })->map(function ($name) {

+                })->map(function($name) {

                     return "<span class='label label-primary'>{$name}</span>";

                 })->implode('&nbsp;');

 

@@ -58,8 +58,8 @@ 
         $grid->column('created_at', trans('admin.created_at'));

         $grid->column('updated_at', trans('admin.updated_at'));

 

-        $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();

             });

         });

@@ -84,8 +84,8 @@ 
         $show->field('slug', trans('admin.slug'));

         $show->field('name', trans('admin.name'));

 

-        $show->field('http_path', trans('admin.route'))->unescape()->as(function ($path) {

-            return collect(explode("\r\n", $path))->map(function ($path) {

+        $show->field('http_path', trans('admin.route'))->unescape()->as(function($path) {

+            return collect(explode("\r\n", $path))->map(function($path) {

                 $method = $this->http_method ?: ['ANY'];

 

                 if (Str::contains($path, ':')) {

@@ -93,9 +93,9 @@ 
                     $method = explode(',', $method);

                 }

 

-                $method = collect($method)->map(function ($name) {

+                $method = collect($method)->map(function($name) {

                     return strtoupper($name);

-                })->map(function ($name) {

+                })->map(function($name) {

                     return "<span class='label label-primary'>{$name}</span>";

                 })->implode('&nbsp;');

 

src/Controllers/RoleController.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 

 namespace Encore\Admin\Controllers;

 

-use Encore\Admin\Form;

-use Encore\Admin\Grid;

+use Encore\Admin\Form;
+use Encore\Admin\Grid;
 use Encore\Admin\Show;

 

 class RoleController extends AdminController

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/UserController.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 

 namespace Encore\Admin\Controllers;

 

-use Encore\Admin\Form;

-use Encore\Admin\Grid;

+use Encore\Admin\Form;
+use Encore\Admin\Grid;
 use Encore\Admin\Show;

 

 class UserController extends AdminController

Spacing +7 added lines, -7 removed lines

@@ -34,14 +34,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->getKey() == 1) {

                 $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();

             });

         });

@@ -65,10 +65,10 @@ 
         $show->field('id', 'ID');

         $show->field('username', trans('admin.username'));

         $show->field('name', trans('admin.name'));

-        $show->field('roles', trans('admin.roles'))->as(function ($roles) {

+        $show->field('roles', trans('admin.roles'))->as(function($roles) {

             return $roles->pluck('name');

         })->label();

-        $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'));

@@ -102,7 +102,7 @@ 
         $form->image('avatar', trans('admin.avatar'));

         $form->password('password', trans('admin.password'))->rules('required|confirmed');

         $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')

-            ->default(function ($form) {

+            ->default(function($form) {

                 return $form->model()->password;

             });

 

@@ -114,7 +114,7 @@ 
         $form->display('created_at', trans('admin.created_at'));

         $form->display('updated_at', trans('admin.updated_at'));

 

-        $form->saving(function (Form $form) {

+        $form->saving(function(Form $form) {

             if ($form->password && $form->model()->password != $form->password) {

                 $form->password = bcrypt($form->password);

             }

src/Exception/Handler.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 

 namespace Encore\Admin\Exception;

 

-use Illuminate\Support\MessageBag;

+use Illuminate\Support\MessageBag;
 use Illuminate\Support\ViewErrorBag;

 

 class Handler

src/Extension.php

Doc Comments +1 added lines, -1 removed lines

@@ -391,7 +391,7 @@
      *

      * @param       $name

      * @param       $slug

-     * @param       $path

+     * @param       string $path

      * @param array $methods

      */

     protected static function createPermission($name, $slug, $path, $methods = [])

Unused Use Statements +7 added lines, -7 removed lines

@@ -2,13 +2,13 @@
 

 namespace Encore\Admin;

 

-use Encore\Admin\Auth\Database\Permission;

-use Illuminate\Database\Eloquent\Model;

-use Illuminate\Support\Arr;

-use Illuminate\Support\Facades\Config;

-use Illuminate\Support\Facades\DB;

-use Illuminate\Support\Facades\Route;

-use Illuminate\Support\Facades\Validator;

+use Encore\Admin\Auth\Database\Permission;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;

 

 abstract class Extension

Spacing +1 added lines, -1 removed lines

@@ -236,7 +236,7 @@
     public static function import()

     {

         $extension = static::getInstance();

-        DB::transaction(function () use ($extension) {

+        DB::transaction(function() use ($extension) {

             if ($menu = $extension->menu()) {

                 if ($extension->validateMenu($menu)) {

                     extract($menu);

src/Form.php

Doc Comments +2 added lines, -2 removed lines

@@ -515,7 +515,7 @@ 
      *

      * @param array $data

      *

-     * @return mixed

+     * @return Response|null

      */

     protected function prepare($data = [])

     {

@@ -658,7 +658,7 @@ 
     /**

      * Get RedirectResponse after update.

      *

-     * @param mixed $key

+     * @param integer $key

      *

      * @return \Illuminate\Http\RedirectResponse

      */

Unused Use Statements +19 added lines, -19 removed lines

@@ -2,25 +2,25 @@
 

 namespace Encore\Admin;

 

-use Closure;

-use Encore\Admin\Exception\Handler;

-use Encore\Admin\Form\Builder;

-use Encore\Admin\Form\Field;

-use Encore\Admin\Form\HasHooks;

-use Encore\Admin\Form\Layout\Layout;

-use Encore\Admin\Form\Row;

-use Encore\Admin\Form\Tab;

-use Illuminate\Contracts\Support\Renderable;

-use Illuminate\Database\Eloquent\Model;

-use Illuminate\Database\Eloquent\Relations;

-use Illuminate\Database\Eloquent\SoftDeletes;

-use Illuminate\Http\Request;

-use Illuminate\Support\Arr;

-use Illuminate\Support\Facades\DB;

-use Illuminate\Support\MessageBag;

-use Illuminate\Support\Str;

-use Illuminate\Validation\Validator;

-use Spatie\EloquentSortable\Sortable;

+use Closure;
+use Encore\Admin\Exception\Handler;
+use Encore\Admin\Form\Builder;
+use Encore\Admin\Form\Field;
+use Encore\Admin\Form\HasHooks;
+use Encore\Admin\Form\Layout\Layout;
+use Encore\Admin\Form\Row;
+use Encore\Admin\Form\Tab;
+use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\MessageBag;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Validator;
+use Spatie\EloquentSortable\Sortable;
 use Symfony\Component\HttpFoundation\Response;

 

 /**

Spacing +9 added lines, -9 removed lines

@@ -367,7 +367,7 @@ 
                 return $ret;

             }

 

-            collect(explode(',', $id))->filter()->each(function ($id) {

+            collect(explode(',', $id))->filter()->each(function($id) {

                 $builder = $this->model()->newQuery();

 

                 if ($this->isSoftDeletes) {

@@ -420,9 +420,9 @@ 
 

         $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();

@@ -447,7 +447,7 @@ 
             return $response;

         }

 

-        DB::transaction(function () {

+        DB::transaction(function() {

             $inserts = $this->prepareInsert($this->updates);

 

             foreach ($inserts as $column => $value) {

@@ -617,7 +617,7 @@ 
             return $response;

         }

 

-        DB::transaction(function () {

+        DB::transaction(function() {

             $updates = $this->prepareUpdate($this->updates);

 

             foreach ($updates as $column => $value) {

@@ -1097,7 +1097,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());

                 }

@@ -1118,7 +1118,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);

         });

     }

@@ -1148,7 +1148,7 @@ 
 

         $data = $this->model->toArray();

 

-        $this->builder->fields()->each(function (Field $field) use ($data) {

+        $this->builder->fields()->each(function(Field $field) use ($data) {

             if (!in_array($field->column(), $this->ignored)) {

                 $field->fill($data);

             }

@@ -1292,7 +1292,7 @@ 
      */

     public function setWidth($fieldWidth = 8, $labelWidth = 2)

     {

-        $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);

         });