z-song / laravel-admin

src/Form/Field.php

Spacing +14 added lines, -14 removed lines

@@ -244,7 +244,7 @@ 
     {
         $column = is_array($this->column) ? current($this->column) : $this->column;
 
-        $trans_key = 'validation.attributes.' . strtolower($column);
+        $trans_key = 'validation.attributes.'.strtolower($column);
         if (isset($arguments[0])) {
             $label = $arguments[0];
         } else if (Lang::has($trans_key)) {
@@ -619,9 +619,9 @@ 
                 if (!array_key_exists($column, $input)) {
                     continue;
                 }
-                $input[$column . $key] = array_get($input, $column);
-                $rules[$column . $key] = $fieldRules;
-                $attributes[$column . $key] = $this->label . "[$column]";
+                $input[$column.$key] = array_get($input, $column);
+                $rules[$column.$key] = $fieldRules;
+                $attributes[$column.$key] = $this->label."[$column]";
             }
         }
 
@@ -659,7 +659,7 @@ 
         if (is_array($attribute)) {
             $this->attributes = array_merge($this->attributes, $attribute);
         } else {
-            $this->attributes[$attribute] = (string)$value;
+            $this->attributes[$attribute] = (string) $value;
         }
 
         return $this;
@@ -696,7 +696,7 @@ 
      */
     public function getPlaceholder()
     {
-        return $this->placeholder ?: trans('admin.input') . ' ' . $this->label;
+        return $this->placeholder ?: trans('admin.input').' '.$this->label;
     }
 
     /**
@@ -721,7 +721,7 @@ 
         $html = [];
 
         foreach ($this->attributes as $name => $value) {
-            $html[] = $name . '="' . e($value) . '"';
+            $html[] = $name.'="'.e($value).'"';
         }
 
         return implode(' ', $html);
@@ -766,7 +766,7 @@ 
      */
     public function setElementClass($class)
     {
-        $this->elementClass = (array)$class;
+        $this->elementClass = (array) $class;
 
         return $this;
     }
@@ -781,7 +781,7 @@ 
         if (!$this->elementClass) {
             $name = $this->elementName ?: $this->formatName($this->column);
 
-            $this->elementClass = (array)str_replace([
+            $this->elementClass = (array) str_replace([
                 '[',
                 ']'
             ], '_', $name);
@@ -825,13 +825,13 @@ 
             $classes = [];
 
             foreach ($elementClass as $index => $class) {
-                $classes[$index] = '.' . (is_array($class) ? implode('.', $class) : $class);
+                $classes[$index] = '.'.(is_array($class) ? implode('.', $class) : $class);
             }
 
             return $classes;
         }
 
-        return '.' . implode('.', $elementClass);
+        return '.'.implode('.', $elementClass);
     }
 
     /**
@@ -844,7 +844,7 @@ 
     public function addElementClass($class)
     {
         if (is_array($class) || is_string($class)) {
-            $this->elementClass = array_merge($this->elementClass, (array)$class);
+            $this->elementClass = array_merge($this->elementClass, (array) $class);
 
             $this->elementClass = array_unique($this->elementClass);
         }
@@ -864,7 +864,7 @@ 
         $delClass = [];
 
         if (is_string($class) || is_array($class)) {
-            $delClass = (array)$class;
+            $delClass = (array) $class;
         }
 
         foreach ($delClass as $del) {
@@ -911,7 +911,7 @@ 
 
         $class = explode('\\', get_called_class());
 
-        return 'admin::form.' . strtolower(end($class));
+        return 'admin::form.'.strtolower(end($class));
     }
 
     /**

Doc Comments +2 added lines, -2 removed lines

@@ -407,7 +407,7 @@ 
     /**
      * Get or set rules.
      *
-     * @param null  $rules
+     * @param string  $rules
      * @param array $messages
      *
      * @return $this
@@ -650,7 +650,7 @@ 
      * Add html attributes to elements.
      *
      * @param array|string $attribute
-     * @param mixed        $value
+     * @param boolean|string        $value
      *
      * @return $this
      */

Indentation +1 added lines, -1 removed lines

@@ -906,7 +906,7 @@
      */
     public function popover($title = null, $content)
     {
-      return  $this->attribute([
+        return  $this->attribute([
             'data-popover-title' => $title,
             'data-popover'       => $content,
         ]);

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

@@ -76,7 +76,7 @@
     {
         parent::boot();
 
-        static::deleting(function ($model) {
+        static::deleting(function($model) {
             $model->roles()->detach();
         });
     }

src/Grid.php

Doc Comments +6 added lines, -3 removed lines

@@ -229,7 +229,7 @@ 
      * Get or set option for grid.
      *
      * @param string $key
-     * @param mixed  $value
+     * @param boolean  $value
      *
      * @return $this|mixed
      */
@@ -286,6 +286,9 @@ 
         return $column;
     }
 
+    /**
+     * @return string
+     */
     public function setLabel($label , $relationColumn)
     {
         $trans_key = 'validation.attributes.' . $relationColumn;
@@ -374,7 +377,7 @@ 
     /**
      * Get the grid paginator.
      *
-     * @return mixed
+     * @return Tools\Paginator
      */
     public function paginator()
     {
@@ -750,7 +753,7 @@ 
      *
      * @param Closure|null $closure
      *
-     * @return $this|Tools\Footer
+     * @return callable
      */
     public function footer(Closure $closure = null)
     {

Indentation +6 added lines, -6 removed lines

@@ -290,14 +290,14 @@
     {
         $trans_key = 'validation.attributes.' . $relationColumn;
         $trans_key_low = strtolower($trans_key);
-         if (empty($label) && Lang::has($trans_key)) {
-             $label = Lang::get($trans_key);
-         }
-         if (empty($label) && Lang::has($trans_key_low)) {
+            if (empty($label) && Lang::has($trans_key)) {
+                $label = Lang::get($trans_key);
+            }
+            if (empty($label) && Lang::has($trans_key_low)) {
             $label = Lang::get($trans_key_low);
         }else if (empty($label)) {
-             $label = ucfirst($relationColumn);
-         }
+                $label = ucfirst($relationColumn);
+            }
         return $label;
     }
 

Spacing +10 added lines, -10 removed lines

@@ -271,7 +271,7 @@ 
 
             $relation = $this->model()->eloquent()->$relationName();
 
-            $label = $this->setLabel($label,$relationColumn);
+            $label = $this->setLabel($label, $relationColumn);
 //            $label = empty($label) ? ucfirst($relationColumn) : $label;
             $name = snake_case($relationName).'.'.$relationColumn;
         }
@@ -286,16 +286,16 @@ 
         return $column;
     }
 
-    public function setLabel($label , $relationColumn)
+    public function setLabel($label, $relationColumn)
     {
-        $trans_key = 'validation.attributes.' . $relationColumn;
+        $trans_key = 'validation.attributes.'.$relationColumn;
         $trans_key_low = strtolower($trans_key);
          if (empty($label) && Lang::has($trans_key)) {
              $label = Lang::get($trans_key);
          }
          if (empty($label) && Lang::has($trans_key_low)) {
             $label = Lang::get($trans_key_low);
-        }else if (empty($label)) {
+        } else if (empty($label)) {
              $label = ucfirst($relationColumn);
          }
         return $label;
@@ -454,7 +454,7 @@ 
         $callback = $this->actionsCallback;
         $column = $this->addColumn('__actions__', trans('admin.action'));
 
-        $column->display(function ($value) use ($grid, $column, $callback) {
+        $column->display(function($value) use ($grid, $column, $callback) {
             $actions = new Actions($value, $grid, $column, $this);
 
             return $actions->display($callback);
@@ -468,7 +468,7 @@ 
      */
     public function disableRowSelector()
     {
-        $this->tools(function ($tools) {
+        $this->tools(function($tools) {
             /* @var Grid\Tools $tools */
             $tools->disableBatchActions();
         });
@@ -492,7 +492,7 @@ 
         $column = new Column(Column::SELECT_COLUMN_NAME, ' ');
         $column->setGrid($this);
 
-        $column->display(function ($value) use ($grid, $column) {
+        $column->display(function($value) use ($grid, $column) {
             $actions = new RowSelector($value, $grid, $column, $this);
 
             return $actions->display();
@@ -519,7 +519,7 @@ 
 
         Column::setOriginalGridData($data);
 
-        $this->columns->map(function (Column $column) use (&$data) {
+        $this->columns->map(function(Column $column) use (&$data) {
             $data = $column->fill($data);
 
             $this->columnNames[] = $column->getName();
@@ -597,7 +597,7 @@ 
      */
     protected function buildRows(array $data)
     {
-        $this->rows = collect($data)->map(function ($model, $number) {
+        $this->rows = collect($data)->map(function($model, $number) {
             return new Row($number, $model);
         });
 
@@ -895,7 +895,7 @@ 
     public function __call($method, $arguments)
     {
         $label = isset($arguments[0]) ? $arguments[0] : null;
-        $label = $this->setLabel($label,$method);
+        $label = $this->setLabel($label, $method);
 
         if ($this->model()->eloquent() instanceof MongodbModel) {
             return $this->addColumn($method, $label);

Braces +1 added lines, -1 removed lines

@@ -295,7 +295,7 @@
          }
          if (empty($label) && Lang::has($trans_key_low)) {
             $label = Lang::get($trans_key_low);
-        }else if (empty($label)) {
+        } else if (empty($label)) {
              $label = ucfirst($relationColumn);
          }
         return $label;

src/Grid/Filter/AbstractFilter.php

Doc Comments +5 added lines, -1 removed lines

@@ -106,6 +106,10 @@ 
     {
         $this->setPresenter(new Text($this->label));
     }
+
+    /**
+     * @param string $label
+     */
     public function setLabel($label)
     {
         $trans_key = 'validation.attributes.' . $label;
@@ -350,7 +354,7 @@ 
      *
      * @param Presenter $presenter
      *
-     * @return mixed
+     * @return Presenter
      */
     protected function setPresenter(Presenter $presenter)
     {

Spacing +3 added lines, -3 removed lines

@@ -108,14 +108,14 @@ 
     }
     public function setLabel($label)
     {
-        $trans_key = 'validation.attributes.' . $label;
+        $trans_key = 'validation.attributes.'.$label;
         $trans_key_low = strtolower($trans_key);
         if (Lang::has($trans_key)) {
             $label = Lang::get($trans_key);
         }
         if (Lang::has($trans_key_low)) {
             $label = Lang::get($trans_key_low);
-        }else {
+        } else {
             $label = ucfirst($label);
         }
         return $label;
@@ -442,7 +442,7 @@ 
 
         list($relation, $args[0]) = explode('.', $this->column);
 
-        return ['whereHas' => [$relation, function ($relation) use ($args) {
+        return ['whereHas' => [$relation, function($relation) use ($args) {
             call_user_func_array([$relation, $this->query], $args);
         }]];
     }

Braces +1 added lines, -1 removed lines

@@ -558,7 +558,7 @@
         }
         if (Lang::has($trans_key_low)) {
             $label = Lang::get($trans_key_low);
-        }else {
+        } else {
             $label = ucfirst($label);
         }
         return $label;