Merge pull request #2258 from z-song/analysis-zY5aNG

Apply fixes from StyleCI

Author: z-song

src/Grid.php

@@ -681,7 +681,7 @@ public function getCreateUrl()
 
         return sprintf('%s/create%s',
             $this->resource(),
-            $queryString ? ('?' . $queryString) : ''
+            $queryString ? ('?'.$queryString) : ''
         );
     }
 
@@ -1000,6 +1000,7 @@ public function setView($view, $variables = [])
      * Set grid title.
      *
      * @param string $title
+     *
      * @return $this
      */
     public function setTitle($title)
@@ -1013,6 +1014,7 @@ public function setTitle($title)
      * Set relation for grid.
      *
      * @param Relation $relation
+     *
      * @return $this
      */
     public function setRelation(Relation $relation)

src/Grid/Column.php

@@ -306,7 +306,8 @@ public function display(Closure $callback)
      * Set value mapping.
      *
      * @param array $values
-     * @param null $default
+     * @param null  $default
+     *
      * @return $this
      */
     public function values(array $values, $default = null)

src/Grid/Displayers/Actions.php

@@ -128,7 +128,7 @@ public function display($callback = null)
         $actions = $this->prepends;
 
         foreach ($this->actions as $action) {
-            $method = 'render' . ucfirst($action);
+            $method = 'render'.ucfirst($action);
             array_push($actions, $this->{$method}());
         }
 
@@ -139,7 +139,7 @@ public function display($callback = null)
 
     /**
      * Render view action.
-     * 
+     *
      * @return string
      */
     protected function renderView()

src/Grid/Filter.php

@@ -137,6 +137,7 @@ public function setModalId($filterModalId)
 
     /**
      * @param $name
+     *
      * @return $this
      */
     public function setName($name)
@@ -213,6 +214,7 @@ public function conditions()
 
     /**
      * @param $inputs
+     *
      * @return array
      */
     protected function sanitizeInputs(&$inputs)

src/Grid/HasElementNames.php

@@ -29,6 +29,7 @@ trait HasElementNames
      * Set name to grid.
      *
      * @param string $name
+     *
      * @return $this
      */
     public function setName($name)
@@ -100,7 +101,7 @@ public function getSelectedRowsName()
         $elementName = $this->elementNames['selected_rows'];
 
         if ($this->name) {
-            return sprintf("%s%s", $this->name, ucfirst($elementName));
+            return sprintf('%s%s', $this->name, ucfirst($elementName));
         }
 
         return $elementName;
@@ -114,7 +115,7 @@ protected function elementNameWithPrefix($name)
         $elementName = $this->elementNames[$name];
 
         if ($this->name) {
-            return sprintf("%s-%s", $this->name, $elementName);
+            return sprintf('%s-%s', $this->name, $elementName);
         }
 
         return $elementName;

src/Grid/Model.php

@@ -185,6 +185,7 @@ public function setSortName($name)
 
     /**
      * @param Grid $grid
+     *
      * @return $this
      */
     public function setGrid(Grid $grid)
@@ -196,6 +197,7 @@ public function setGrid(Grid $grid)
 
     /**
      * @param Relation $relation
+     *
      * @return $this
      */
     public function setRelation(Relation $relation)

src/Grid/Tools/BatchAction.php

@@ -7,7 +7,7 @@
 abstract class BatchAction
 {
     /**
-     * @var integer
+     * @var int
      */
     protected $id;
 
@@ -69,6 +69,7 @@ public function getToken()
 
     /**
      * @param bool $dotPrefix
+     *
      * @return string
      */
     public function getElementClass($dotPrefix = true)

src/Grid/Tools/BatchActions.php

@@ -54,6 +54,7 @@ public function disableDelete()
      *
      * @param $title
      * @param BatchAction|null $action
+     *
      * @return $this
      */
     public function add($title, BatchAction $action = null)

src/Show.php

@@ -69,7 +69,7 @@ class Show implements Renderable
      */
     public function __construct($model, $builder = null)
     {
-        $this->model   = $model;
+        $this->model = $model;
         $this->builder = $builder;
 
         $this->initPanel();
@@ -81,12 +81,12 @@ public function __construct($model, $builder = null)
      */
     protected function initContents()
     {
-        $this->fields    = new Collection();
+        $this->fields = new Collection();
         $this->relations = new Collection();
     }
 
     /**
-     * Initialize panel
+     * Initialize panel.
      */
     protected function initPanel()
     {
@@ -161,7 +161,7 @@ public function relation($name, $label, $builder = null)
     {
         if (is_null($builder)) {
             $builder = $label;
-            $label   = '';
+            $label = '';
         }
 
         return $this->addRelation($name, $builder, $label);

src/Show/Field.php

@@ -274,7 +274,7 @@ public function setRelation($relation)
     public function __call($method, $arguments = [])
     {
         if ($this->relation) {
-            $this->name  = $method;
+            $this->name = $method;
             $this->label = $this->formatLabel(array_get($arguments, 0));
         }
 
@@ -298,7 +298,7 @@ public function render()
         }
 
         $content = $this->value;
-        $label   = $this->getLabel();
+        $label = $this->getLabel();
 
         return view($this->view, compact('content', 'label'));
     }

src/Show/Panel.php

@@ -106,7 +106,7 @@ public function style($style = 'info')
      */
     public function title($title)
     {
-        $this->data['title'] =  $title;
+        $this->data['title'] = $title;
 
         return $this;
     }

src/Show/Relation.php

@@ -53,9 +53,9 @@ class Relation extends Field
      */
     public function __construct($name, $builder, $title = '')
     {
-        $this->name    = $name;
+        $this->name = $name;
         $this->builder = $builder;
-        $this->title   = $this->formatLabel($title);
+        $this->title = $this->formatLabel($title);
     }
 
     /**
@@ -79,7 +79,7 @@ public function setModel(Model $model)
      */
     protected function getNullRenderable()
     {
-        return new class implements Renderable {
+        return new class() implements Renderable {
             public function render()
             {
             }

src/Show/Tools.php

@@ -135,7 +135,7 @@ public function disableEdit()
      */
     protected function getListPath()
     {
-        return '/' . ltrim($this->getResource(), '/');
+        return '/'.ltrim($this->getResource(), '/');
     }
 
     /**
@@ -147,7 +147,7 @@ protected function getEditPath()
     {
         $key = $this->panel->getParent()->getModel()->getKey();
 
-        return $this->getListPath() . '/' . $key . '/edit';
+        return $this->getListPath().'/'.$key.'/edit';
     }
 
     /**
@@ -159,7 +159,7 @@ protected function getDeletePath()
     {
         $key = $this->panel->getParent()->getModel()->getKey();
 
-        return $this->getListPath() . '/' . $key;
+        return $this->getListPath().'/'.$key;
     }
 
     /**
@@ -202,8 +202,8 @@ protected function renderEdit()
     protected function renderDelete()
     {
         $deleteConfirm = trans('admin.delete_confirm');
-        $confirm       = trans('admin.confirm');
-        $cancel        = trans('admin.cancel');
+        $confirm = trans('admin.confirm');
+        $cancel = trans('admin.cancel');
 
         $class = uniqid();
 
@@ -266,10 +266,10 @@ public function render()
         $output = implode('', $this->prepends);
 
         foreach ($this->tools as $tool) {
-            $renderMethod = 'render' . ucfirst($tool);
+            $renderMethod = 'render'.ucfirst($tool);
             $output .= $this->$renderMethod();
         }
 
-        return $output . implode('', $this->appends);
+        return $output.implode('', $this->appends);
     }
 }