z-song / laravel-admin

src/Form/Builder.php

Spacing +4 added lines, -4 removed lines

@@ -259,7 +259,7 @@ 
      */
     public function field($name)
     {
-        return $this->fields()->first(function (Field $field) use ($name) {
+        return $this->fields()->first(function(Field $field) use ($name) {
             return $field->column() == $name;
         });
     }
@@ -502,7 +502,7 @@ 
             $this->form->model()->getUpdatedAtColumn(),
         ];
 
-        $this->fields = $this->fields()->reject(function (Field $field) use ($reservedColumns) {
+        $this->fields = $this->fields()->reject(function(Field $field) use ($reservedColumns) {
             return in_array($field->column(), $reservedColumns);
         });
 
@@ -528,7 +528,7 @@ 
     {
         $rules = [];
         foreach ($this->fields() as $item) {
-            if(!empty($item->getRules())){
+            if (!empty($item->getRules())) {
                 $rules[$item->id] = $item->getRules();
             }
         }
@@ -544,7 +544,7 @@ 
     public function getRuleMessages()
     {
         $rules = [];
-        foreach ($this->fields() as $item ) {
+        foreach ($this->fields() as $item) {
             foreach ($item->validationMessages as $key => $value) {
                 $rules[$key] = $value;
             }

Braces +3 added lines, -1 removed lines

@@ -366,7 +366,9 @@
      */
     public function title()
     {
-        if ($this->Title != "") return $this->Title;
+        if ($this->Title != "") {
+            return $this->Title;
+        }
 
         if ($this->mode == static::MODE_CREATE) {
             return trans('admin.create');

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/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;

src/Grid/Column.php

Spacing +7 added lines, -7 removed lines

@@ -410,7 +410,7 @@ 
         $grid = $this->grid;
         $column = $this;
 
-        $this->display(function ($value) use ($grid, $column, $class) {
+        $this->display(function($value) use ($grid, $column, $class) {
             $definition = new $class($value, $grid, $column, $this);
 
             return $definition->display();
@@ -427,7 +427,7 @@ 
     protected function htmlEntityEncode($item)
     {
         if (is_array($item)) {
-            array_walk_recursive($item, function (&$value) {
+            array_walk_recursive($item, function(&$value) {
                 $value = htmlentities($value);
             });
         } else {
@@ -507,7 +507,7 @@ 
      */
     protected function callSupportDisplayer($abstract, $arguments)
     {
-        return $this->display(function ($value) use ($abstract, $arguments) {
+        return $this->display(function($value) use ($abstract, $arguments) {
             if (is_array($value) || $value instanceof Arrayable) {
                 return call_user_func_array([collect($value), $abstract], $arguments);
             }
@@ -531,7 +531,7 @@ 
     protected function callBuiltinDisplayer($abstract, $arguments)
     {
         if ($abstract instanceof Closure) {
-            return $this->display(function ($value) use ($abstract, $arguments) {
+            return $this->display(function($value) use ($abstract, $arguments) {
                 return $abstract->call($this, ...array_merge([$value], $arguments));
             });
         }
@@ -540,7 +540,7 @@ 
             $grid = $this->grid;
             $column = $this;
 
-            return $this->display(function ($value) use ($abstract, $grid, $column, $arguments) {
+            return $this->display(function($value) use ($abstract, $grid, $column, $arguments) {
                 $displayer = new $abstract($value, $grid, $column, $this);
 
                 return call_user_func_array([$displayer, 'display'], $arguments);
@@ -551,14 +551,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;

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;

src/Grid/Displayers/Actions.php

Spacing +2 added lines, -2 removed lines

@@ -223,7 +223,7 @@ 
 
     protected function editAction()
     {
-        $_edit =  trans('admin.edit');
+        $_edit = trans('admin.edit');
         return <<<EOT
 <a class="btn btn-xs btn-default" href="{$this->getResource()}/{$this->getKey()}/edit">
     <i class="fa fa-edit"></i> $_edit
@@ -235,7 +235,7 @@ 
     protected function deleteAction()
     {
         $this->___deleteAction();
-        $_delete =  trans('admin.delete');
+        $_delete = trans('admin.delete');
         return <<<EOT
 <a href="javascript:void(0);" data-id="{$this->getKey()}" class="grid-row-delete btn btn-xs btn-danger">
     <i class="fa fa-trash"></i> $_delete

src/Form/Tab.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
     {
         $fields = $this->collectFields($content);
 
-        $id = 'form-' . ($this->tabs->count() + 1);
+        $id = 'form-'.($this->tabs->count() + 1);
         //if define tab and row inside of tab ,you cant define row in form or simple field in tab
         $rows = $this->form->builder()->getRows();
         $this->form->builder()->setRows([]);
@@ -84,7 +84,7 @@ 
     public function getTabs()
     {
         // If there is no active tab, then active the first.
-        if ($this->tabs->filter(function ($tab) {
+        if ($this->tabs->filter(function($tab) {
             return $tab['active'];
         })->isEmpty()) {
             $first = $this->tabs->first();

src/Widgets/Form.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\MessageBag;
-use phpDocumentor\Reflection\Types\This;
 
 /**
  * Class Form.

Spacing +3 added lines, -3 removed lines

@@ -172,7 +172,7 @@ 
      */
     public function setWidth($fieldWidth = 8, $labelWidth = 2)
     {
-        collect($this->fields)->each(function ($field) use ($fieldWidth, $labelWidth) {
+        collect($this->fields)->each(function($field) use ($fieldWidth, $labelWidth) {
             /* @var Field $field */
             $field->setWidth($fieldWidth, $labelWidth);
         });
@@ -341,7 +341,7 @@ 
     {
         $rules = [];
         foreach ($this->fields as $item) {
-            if(!empty($item->getRules())){
+            if (!empty($item->getRules())) {
                 $rules[$item->id] = $item->getRules();
             }
         }
@@ -357,7 +357,7 @@ 
     public function getRuleMessages()
     {
         $rules = [];
-        foreach ($this->fields as $item ) {
+        foreach ($this->fields as $item) {
             foreach ($item->validationMessages as $key => $value) {
                 $rules[$key] = $value;
             }

src/Form.php

Spacing +10 added lines, -10 removed lines

@@ -328,9 +328,9 @@ 
         $data = $this->model->with($this->getRelations())
             ->findOrFail($id)->toArray();
 
-        $this->builder->fields()->filter(function ($field) {
+        $this->builder->fields()->filter(function($field) {
             return $field instanceof Field\File;
-        })->each(function (File $file) use ($data) {
+        })->each(function(File $file) use ($data) {
             $file->setOriginal($data);
 
             $file->destroy();
@@ -355,7 +355,7 @@ 
             return $response;
         }
 
-        DB::transaction(function () {
+        DB::transaction(function() {
             $inserts = $this->prepareInsert($this->updates);
 
             foreach ($inserts as $column => $value) {
@@ -559,7 +559,7 @@ 
             return $response;
         }
 
-        DB::transaction(function () {
+        DB::transaction(function() {
             $updates = $this->prepareUpdate($this->updates);
 
             foreach ($updates as $column => $value) {
@@ -807,7 +807,7 @@ 
      */
     protected function invalidColumn($columns, $oneToOneRelation = false)
     {
-        foreach ((array)$columns as $column) {
+        foreach ((array) $columns as $column) {
             if ((!$oneToOneRelation && Str::contains($column, '.')) ||
                 ($oneToOneRelation && !Str::contains($column, '.'))
             ) {
@@ -916,7 +916,7 @@ 
      */
     public function ignore($fields)
     {
-        $this->ignored = array_merge($this->ignored, (array)$fields);
+        $this->ignored = array_merge($this->ignored, (array) $fields);
 
         return $this;
     }
@@ -956,7 +956,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());
                 }
@@ -977,7 +977,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);
         });
     }
@@ -999,7 +999,7 @@ 
 
         $data = $this->model->toArray();
 
-        $this->builder->fields()->each(function (Field $field) use ($data) {
+        $this->builder->fields()->each(function(Field $field) use ($data) {
             $field->fill($data);
         });
     }
@@ -1118,7 +1118,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);
         });

Braces +3 added lines, -1 removed lines

@@ -228,7 +228,9 @@
     public function edit($id, $show_mode = false)
     {
         $mode = Builder::MODE_EDIT;
-        if ($show_mode) $mode = Builder::MODE_SHOW;
+        if ($show_mode) {
+            $mode = Builder::MODE_SHOW;
+        }
         $this->builder->setMode($mode);
         $this->builder->setResourceId($id);