z-song / laravel-admin

src/Controllers/AuthController.php

Spacing +6 added lines, -6 removed lines

@@ -76,11 +76,11 @@ 
      */
     public function getSetting()
     {
-        return Admin::content(function (Content $content) {
+        return Admin::content(function(Content $content) {
             $content->header(trans('admin.user_setting'));
             $form = $this->settingForm();
             $form->tools(
-                function (Form\Tools $tools) {
+                function(Form\Tools $tools) {
                     $tools->disableBackButton();
                     $tools->disableListButton();
                 }
@@ -106,13 +106,13 @@ 
      */
     protected function settingForm()
     {
-        return Administrator::form(function (Form $form) {
+        return Administrator::form(function(Form $form) {
             $form->display('username', trans('admin.username'));
             $form->text('name', trans('admin.name'))->rules('required');
             $form->image('avatar', trans('admin.avatar'));
             $form->password('password', trans('admin.password'))->rules('confirmed|required');
             $form->password('password_confirmation', trans('admin.password_confirmation'))->rules('required')
-                ->default(function ($form) {
+                ->default(function($form) {
                     return $form->model()->password;
                 });
 
@@ -120,13 +120,13 @@ 
 
             $form->ignore(['password_confirmation']);
 
-            $form->saving(function (Form $form) {
+            $form->saving(function(Form $form) {
                 if ($form->password && $form->model()->password != $form->password) {
                     $form->password = bcrypt($form->password);
                 }
             });
 
-            $form->saved(function () {
+            $form->saved(function() {
                 admin_toastr(trans('admin.update_succeeded'));
 
                 return redirect(admin_base_path('auth/setting'));

Doc Comments +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
      *
      * @param Request $request
      *
-     * @return mixed
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function postLogin(Request $request)
     {
@@ -62,7 +62,7 @@ 
     /**
      * User logout.
      *
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function getLogout(Request $request)
     {
@@ -76,7 +76,7 @@ 
     /**
      * User setting page.
      *
-     * @return mixed
+     * @return Content
      */
     public function getSetting()
     {
@@ -167,7 +167,7 @@ 
      *
      * @param \Illuminate\Http\Request $request
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     protected function sendLoginResponse(Request $request)
     {

src/Admin.php

Spacing +2 added lines, -2 removed lines

@@ -235,10 +235,10 @@
             'middleware' => config('admin.route.middleware'),
         ];
 
-        Route::group($attributes, function ($router) {
+        Route::group($attributes, function($router) {
 
             /* @var \Illuminate\Routing\Router $router */
-            $router->group([], function ($router) {
+            $router->group([], function($router) {
 
                 /* @var \Illuminate\Routing\Router $router */
                 $router->resource('auth/users', 'UserController');

resources/views/partials/error.blade.php

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 @if(Session::has('error'))
-    <?php $error = Session::get('error');?>
+    <?php $error = Session::get('error'); ?>
     <div class="alert alert-danger alert-dismissable">
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
         <h4><i class="icon fa fa-ban"></i>{{ array_get($error->get('title'), 0) }}</h4>
         <p>{!!  array_get($error->get('message'), 0) !!}</p>
     </div>
 @elseif (Session::has('errors'))
-    <?php $errors = Session::get('errors');?>
+    <?php $errors = Session::get('errors'); ?>
     @if ($errors->hasBag('error'))
       <div class="alert alert-danger alert-dismissable">
 

src/Middleware/Permission.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
             return $next($request);
         }
 
-        if (!Admin::user()->allPermissions()->first(function ($permission) use ($request) {
+        if (!Admin::user()->allPermissions()->first(function($permission) use ($request) {
             return $permission->shouldPassThrough($request);
         })) {
             Checker::error();
@@ -52,7 +52,7 @@ 
      */
     public function checkRoutePermission(Request $request)
     {
-        if (!$middleware = collect($request->route()->middleware())->first(function ($middleware) {
+        if (!$middleware = collect($request->route()->middleware())->first(function($middleware) {
             return Str::startsWith($middleware, $this->middlewarePrefix);
         })) {
             return false;

src/Auth/Database/Role.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
     {
         parent::boot();
 
-        static::deleting(function ($model) {
+        static::deleting(function($model) {
             $model->administrators()->detach();
 
             $model->permissions()->detach();

src/Auth/Database/Permission.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
 
         $method = $this->http_method;
 
-        $matches = array_map(function ($path) use ($method) {
+        $matches = array_map(function($path) use ($method) {
             $path = trim(config('admin.route.prefix'), '/').$path;
 
             if (Str::contains($path, ':')) {
@@ -100,7 +100,7 @@ 
             return false;
         }
 
-        $method = collect($match['method'])->filter()->map(function ($method) {
+        $method = collect($match['method'])->filter()->map(function($method) {
             return strtoupper($method);
         });
 
@@ -140,7 +140,7 @@ 
     {
         parent::boot();
 
-        static::deleting(function ($model) {
+        static::deleting(function($model) {
             $model->roles()->detach();
         });
     }

src/Auth/Database/Menu.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
     {
         static::treeBoot();
 
-        static::deleting(function ($model) {
+        static::deleting(function($model) {
             $model->roles()->detach();
         });
     }

src/Form/Field.php

Doc Comments +3 added lines, -3 removed lines

@@ -188,7 +188,7 @@ 
     /**
      * Field constructor.
      *
-     * @param $column
+     * @param string $column
      * @param array $arguments
      */
     public function __construct($column, $arguments = [])
@@ -387,7 +387,7 @@ 
     /**
      * Get or set rules.
      *
-     * @param null  $rules
+     * @param string  $rules
      * @param array $messages
      *
      * @return $this
@@ -629,7 +629,7 @@ 
     /**
      * Add html attributes to elements.
      *
-     * @param array|string $attribute
+     * @param string $attribute
      * @param mixed        $value
      *
      * @return $this

src/Form/Field/Select.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 *
 	 * @param array|callable|string $options
 	 *
-	 * @return $this|mixed
+	 * @return Select
 	 */
 	public function options($options = []) {
 		// remote options

Indentation +219 added lines, -219 removed lines

@@ -8,103 +8,103 @@ 
 use Illuminate\Support\Str;
 
 class Select extends Field {
-	/**
-	 * @var array
-	 */
-	protected static $css = [
-		'/vendor/laravel-admin/AdminLTE/plugins/select2/select2.min.css',
-	];
-
-	/**
-	 * @var array
-	 */
-	protected static $js = [
-		'/vendor/laravel-admin/AdminLTE/plugins/select2/select2.full.min.js',
-	];
-
-	/**
-	 * @var array
-	 */
-	protected $groups = [];
-
-	/**
-	 * @var array
-	 */
-	protected $config = [];
-
-	/**
-	 * Set options.
-	 *
-	 * @param array|callable|string $options
-	 *
-	 * @return $this|mixed
-	 */
-	public function options($options = []) {
-		// remote options
-		if (is_string($options)) {
-			return $this->loadRemoteOptions(...func_get_args());
-		}
-
-		if ($options instanceof Arrayable) {
-			$options = $options->toArray();
-		}
-
-		if (is_callable($options)) {
-			$this->options = $options;
-		} else {
-			$this->options = (array) $options;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @param array $groups
-	 */
-
-	/**
-	 * Set option groups.
-	 *
-	 * eg: $group = [
-	 *        [
-	 *        'label' => 'xxxx',
-	 *        'options' => [
-	 *            1 => 'foo',
-	 *            2 => 'bar',
-	 *            ...
-	 *        ],
-	 *        ...
-	 *     ]
-	 *
-	 * @param array $groups
-	 *
-	 * @return $this
-	 */
-	public function groups(array $groups) {
-		$this->groups = $groups;
-
-		return $this;
-	}
-
-	/**
-	 * Load options for other select on change.
-	 *
-	 * @param string $field
-	 * @param string $sourceUrl
-	 * @param string $idField
-	 * @param string $textField
-	 *
-	 * @return $this
-	 */
-	public function load($field, $sourceUrl, $idField = 'id', $textField = 'text') {
-		if (Str::contains($field, '.')) {
-			$field = $this->formatName($field);
-			$class = str_replace(['[', ']'], '_', $field);
-		} else {
-			$class = $field;
-		}
-
-		$script = <<<EOT
+    /**
+     * @var array
+     */
+    protected static $css = [
+        '/vendor/laravel-admin/AdminLTE/plugins/select2/select2.min.css',
+    ];
+
+    /**
+     * @var array
+     */
+    protected static $js = [
+        '/vendor/laravel-admin/AdminLTE/plugins/select2/select2.full.min.js',
+    ];
+
+    /**
+     * @var array
+     */
+    protected $groups = [];
+
+    /**
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     * Set options.
+     *
+     * @param array|callable|string $options
+     *
+     * @return $this|mixed
+     */
+    public function options($options = []) {
+        // remote options
+        if (is_string($options)) {
+            return $this->loadRemoteOptions(...func_get_args());
+        }
+
+        if ($options instanceof Arrayable) {
+            $options = $options->toArray();
+        }
+
+        if (is_callable($options)) {
+            $this->options = $options;
+        } else {
+            $this->options = (array) $options;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param array $groups
+     */
+
+    /**
+     * Set option groups.
+     *
+     * eg: $group = [
+     *        [
+     *        'label' => 'xxxx',
+     *        'options' => [
+     *            1 => 'foo',
+     *            2 => 'bar',
+     *            ...
+     *        ],
+     *        ...
+     *     ]
+     *
+     * @param array $groups
+     *
+     * @return $this
+     */
+    public function groups(array $groups) {
+        $this->groups = $groups;
+
+        return $this;
+    }
+
+    /**
+     * Load options for other select on change.
+     *
+     * @param string $field
+     * @param string $sourceUrl
+     * @param string $idField
+     * @param string $textField
+     *
+     * @return $this
+     */
+    public function load($field, $sourceUrl, $idField = 'id', $textField = 'text') {
+        if (Str::contains($field, '.')) {
+            $field = $this->formatName($field);
+            $class = str_replace(['[', ']'], '_', $field);
+        } else {
+            $class = $field;
+        }
+
+        $script = <<<EOT
 $(document).off('change', "{$this->getElementClassSelector()}");
 $(document).on('change', "{$this->getElementClassSelector()}", function () {
     var target = $(this).closest('.fields-group').find(".$class");
@@ -121,25 +121,25 @@ 
 });
 EOT;
 
-		Admin::script($script);
-
-		return $this;
-	}
-
-	/**
-	 * Load options for other selects on change.
-	 *
-	 * @param string $fields
-	 * @param string $sourceUrls
-	 * @param string $idField
-	 * @param string $textField
-	 *
-	 * @return $this
-	 */
-	public function loads($fields = [], $sourceUrls = [], $idField = 'id', $textField = 'text') {
-		$fieldsStr = implode('.', $fields);
-		$urlsStr = implode('^', $sourceUrls);
-		$script = <<<EOT
+        Admin::script($script);
+
+        return $this;
+    }
+
+    /**
+     * Load options for other selects on change.
+     *
+     * @param string $fields
+     * @param string $sourceUrls
+     * @param string $idField
+     * @param string $textField
+     *
+     * @return $this
+     */
+    public function loads($fields = [], $sourceUrls = [], $idField = 'id', $textField = 'text') {
+        $fieldsStr = implode('.', $fields);
+        $urlsStr = implode('^', $sourceUrls);
+        $script = <<<EOT
 var fields = '$fieldsStr'.split('.');
 var urls = '$urlsStr'.split('^');
 
@@ -172,28 +172,28 @@ 
 });
 EOT;
 
-		Admin::script($script);
+        Admin::script($script);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Load options from remote.
-	 *
-	 * @param string $url
-	 * @param array  $parameters
-	 * @param array  $options
-	 *
-	 * @return $this
-	 */
-	protected function loadRemoteOptions($url, $parameters = [], $options = []) {
-		$ajaxOptions = [
-			'url' => $url . '?' . http_build_query($parameters),
-		];
+    /**
+     * Load options from remote.
+     *
+     * @param string $url
+     * @param array  $parameters
+     * @param array  $options
+     *
+     * @return $this
+     */
+    protected function loadRemoteOptions($url, $parameters = [], $options = []) {
+        $ajaxOptions = [
+            'url' => $url . '?' . http_build_query($parameters),
+        ];
 
-		$ajaxOptions = json_encode(array_merge($ajaxOptions, $options));
+        $ajaxOptions = json_encode(array_merge($ajaxOptions, $options));
 
-		$this->script = <<<EOT
+        $this->script = <<<EOT
 
 $.ajax($ajaxOptions).done(function(data) {
   $("{$this->getElementClassSelector()}").select2({data: data});
@@ -201,20 +201,20 @@ 
 
 EOT;
 
-		return $this;
-	}
-
-	/**
-	 * Load options from ajax results.
-	 *
-	 * @param string $url
-	 * @param $idField
-	 * @param $textField
-	 *
-	 * @return $this
-	 */
-	public function ajax($url, $idField = 'id', $textField = 'text') {
-		$this->script = <<<EOT
+        return $this;
+    }
+
+    /**
+     * Load options from ajax results.
+     *
+     * @param string $url
+     * @param $idField
+     * @param $textField
+     *
+     * @return $this
+     */
+    public function ajax($url, $idField = 'id', $textField = 'text') {
+        $this->script = <<<EOT
 
 $("{$this->getElementClassSelector()}").select2({
   ajax: {
@@ -251,75 +251,75 @@ 
 
 EOT;
 
-		return $this;
-	}
-
-	/**
-	 * Set config for select2.
-	 *
-	 * all configurations see https://select2.org/configuration/options-api
-	 *
-	 * @param string $key
-	 * @param mixed  $val
-	 *
-	 * @return $this
-	 */
-	public function config($key, $val) {
-		$this->config[$key] = $val;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render() {
-		$configs = array_merge([
-			'allowClear' => true,
-			'placeholder' => $this->label,
-		], $this->config);
-
-		$configs = json_encode($configs);
-
-		if (empty($this->script)) {
-			$this->script = "$(\"{$this->getElementClassSelector()}\").select2($configs);";
-		}
-
-		if ($this->options instanceof \Closure) {
-			if ($this->form) {
-				$this->options = $this->options->bindTo($this->form->model());
-			}
-
-			$this->options(call_user_func($this->options, $this->value));
-		}
-
-		$this->options = array_filter($this->options);
-
-		return parent::render()->with([
-			'options' => $this->options,
-			'groups' => $this->groups,
-		]);
-	}
-
-	/**
-	 * Select Level 2 linkage, support ajax paging.
-	 *
-	 * @param string $field    parent field name
-	 * @param string $sourceUrl resource route
-	 * @param string $idField
-	 * @param string $textField
-	 *
-	 * @return $this
-	 */
-	public function ajaxLoad($field, $sourceUrl, $idField = 'id', $textField = 'text') {
-		if (Str::contains($field, '.')) {
-			$field = $this->formatName($field);
-			$class = str_replace(['[', ']'], '_', $field);
-		} else {
-			$class = $field;
-		}
-
-		$this->script = <<<EOT
+        return $this;
+    }
+
+    /**
+     * Set config for select2.
+     *
+     * all configurations see https://select2.org/configuration/options-api
+     *
+     * @param string $key
+     * @param mixed  $val
+     *
+     * @return $this
+     */
+    public function config($key, $val) {
+        $this->config[$key] = $val;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render() {
+        $configs = array_merge([
+            'allowClear' => true,
+            'placeholder' => $this->label,
+        ], $this->config);
+
+        $configs = json_encode($configs);
+
+        if (empty($this->script)) {
+            $this->script = "$(\"{$this->getElementClassSelector()}\").select2($configs);";
+        }
+
+        if ($this->options instanceof \Closure) {
+            if ($this->form) {
+                $this->options = $this->options->bindTo($this->form->model());
+            }
+
+            $this->options(call_user_func($this->options, $this->value));
+        }
+
+        $this->options = array_filter($this->options);
+
+        return parent::render()->with([
+            'options' => $this->options,
+            'groups' => $this->groups,
+        ]);
+    }
+
+    /**
+     * Select Level 2 linkage, support ajax paging.
+     *
+     * @param string $field    parent field name
+     * @param string $sourceUrl resource route
+     * @param string $idField
+     * @param string $textField
+     *
+     * @return $this
+     */
+    public function ajaxLoad($field, $sourceUrl, $idField = 'id', $textField = 'text') {
+        if (Str::contains($field, '.')) {
+            $field = $this->formatName($field);
+            $class = str_replace(['[', ']'], '_', $field);
+        } else {
+            $class = $field;
+        }
+
+        $this->script = <<<EOT
         var current=$("{$this->getElementClassSelector()}");
         var target = current.closest('.fields-group').find(".$class");
 
@@ -365,7 +365,7 @@ 
         });
 EOT;
 
-		return $this;
-	}
+        return $this;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
 	 */
 	protected function loadRemoteOptions($url, $parameters = [], $options = []) {
 		$ajaxOptions = [
-			'url' => $url . '?' . http_build_query($parameters),
+			'url' => $url.'?'.http_build_query($parameters),
 		];
 
 		$ajaxOptions = json_encode(array_merge($ajaxOptions, $options));