Merge pull request #590 from z-song/analysis-z33ORY

Apply fixes from StyleCI

Author: z-song

src/Controllers/AuthController.php

@@ -47,7 +47,6 @@ public function postLogin(Request $request)
         }
 
         if (Auth::guard('admin')->attempt($credentials)) {
-
             admin_toastr(trans('admin::lang.login_successful'));
 
             return redirect()->intended(config('admin.prefix'));

src/Form.php

@@ -559,11 +559,12 @@ protected function handleEditable(array $input = [])
 
     /**
      * @param array $input
+     *
      * @return array
      */
     protected function handleFileDelete(array $input = [])
     {
-        if (array_key_exists(Field::FILE_DELETE_FLAG , $input)) {
+        if (array_key_exists(Field::FILE_DELETE_FLAG, $input)) {
             $input[Field::FILE_DELETE_FLAG] = $input['key'];
             unset($input['key']);
         }

src/Form/Builder.php

@@ -292,7 +292,7 @@ public function options($options = [])
      * Get or set option.
      *
      * @param string $option
-     * @param mixed $value
+     * @param mixed  $value
      *
      * @return $this
      */

src/Form/Field.php

@@ -660,7 +660,7 @@ protected function formatAttributes()
      */
     public function setElementClass($class)
     {
-        $this->elementClass = (array)$class;
+        $this->elementClass = (array) $class;
 
         return $this;
     }
@@ -675,14 +675,14 @@ protected function getElementClass()
         if (!$this->elementClass) {
             $name = $this->elementName ?: $this->formatName($this->column);
 
-            $this->elementClass = (array)str_replace(['[', ']'], '_', $name);
+            $this->elementClass = (array) str_replace(['[', ']'], '_', $name);
         }
 
         return $this->elementClass;
     }
 
     /**
-     * Get element class string
+     * Get element class string.
      *
      * @return mixed
      */
@@ -698,7 +698,7 @@ protected function getElementClassString()
     }
 
     /**
-     * Get element class selector
+     * Get element class selector.
      *
      * @return string
      */
@@ -707,60 +707,58 @@ protected function getElementClassSelector()
         $elementClass = $this->getElementClass();
 
         if (Arr::isAssoc($elementClass)) {
-
             $classes = [];
 
             foreach ($elementClass as $index => $class) {
-                $classes[$index] = '.' . $class;
+                $classes[$index] = '.'.$class;
             }
 
             return $classes;
         }
 
-        return '.' . implode('.', $elementClass);
+        return '.'.implode('.', $elementClass);
     }
 
     /**
-     * Add the element class
+     * Add the element class.
      *
      * @param $class
+     *
      * @return $this
      */
     public function addElementClass($class)
     {
-        if(is_array($class) || is_string($class)){
-
-            $this->elementClass = array_merge($this->elementClass, (array)$class);
+        if (is_array($class) || is_string($class)) {
+            $this->elementClass = array_merge($this->elementClass, (array) $class);
 
             $this->elementClass = array_unique($this->elementClass);
         }
 
         return $this;
     }
 
-
     /**
-     * Remove element class
+     * Remove element class.
      *
      * @param $class
+     *
      * @return $this
      */
     public function removeElementClass($class)
     {
         $delClass = [];
 
-        if(is_string($class) || is_array($class)){
-            $delClass = (array)$class;
+        if (is_string($class) || is_array($class)) {
+            $delClass = (array) $class;
         }
 
-        foreach($delClass as $del){
-            if(($key = array_search($del, $this->elementClass))){
+        foreach ($delClass as $del) {
+            if (($key = array_search($del, $this->elementClass))) {
                 unset($this->elementClass[$key]);
             }
         }
 
         return $this;
-
     }
 
     /**

src/Form/Field/File.php

@@ -33,7 +33,7 @@ class File extends Field
      * Create a new File instance.
      *
      * @param string $column
-     * @param array $arguments
+     * @param array  $arguments
      */
     public function __construct($column, $arguments = [])
     {
@@ -57,7 +57,7 @@ public function defaultDirectory()
      */
     public function getValidator(array $input)
     {
-        /**
+        /*
          * If has original value, means the form is in edit mode,
          * then remove required rule from rules.
          */

src/Form/Field/MultipleFile.php

@@ -33,7 +33,7 @@ class MultipleFile extends Field
      * Create a new File instance.
      *
      * @param string $column
-     * @param array $arguments
+     * @param array  $arguments
      */
     public function __construct($column, $arguments = [])
     {
@@ -86,8 +86,8 @@ protected function hydrateFiles(array $value)
         $rules = $input = [];
 
         foreach ($value as $key => $file) {
-            $rules[$this->column . $key] = $this->getRules();
-            $input[$this->column . $key] = $file;
+            $rules[$this->column.$key] = $this->getRules();
+            $input[$this->column.$key] = $file;
         }
 
         return [$rules, $input];

src/Form/Field/MultipleImage.php

@@ -2,7 +2,6 @@
 
 namespace Encore\Admin\Form\Field;
 
-
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class MultipleImage extends MultipleFile

src/Form/Field/UploadField.php

@@ -61,17 +61,17 @@ protected function setupDefaultOptions()
             'browseLabel'          => trans('admin::lang.browse'),
             'showRemove'           => false,
             'showUpload'           => false,
-            'initialCaption'   => $this->initialCaption($this->value),
-            'deleteExtraData'  => [
-                $this->column       => '',
+            'initialCaption'       => $this->initialCaption($this->value),
+            'deleteExtraData'      => [
+                $this->column            => '',
                 static::FILE_DELETE_FLAG => '',
-                '_token'            => csrf_token(),
-                '_method'           => 'PUT'
-            ]
+                '_token'                 => csrf_token(),
+                '_method'                => 'PUT',
+            ],
         ];
 
         if ($this->form instanceof Form) {
-            $defaultOptions['deleteUrl'] = $this->form->resource() . '/'. $this->form->model()->getKey();
+            $defaultOptions['deleteUrl'] = $this->form->resource().'/'.$this->form->model()->getKey();
         }
 
         $this->options($defaultOptions);
@@ -130,7 +130,7 @@ public function disk($disk)
     /**
      * Specify the directory and name for upload file.
      *
-     * @param string $directory
+     * @param string      $directory
      * @param null|string $name
      *
      * @return $this
@@ -239,7 +239,7 @@ protected function upload(UploadedFile $file)
     {
         $this->renameIfExists($file);
 
-        $target = $this->getDirectory() . '/' . $this->name;
+        $target = $this->getDirectory().'/'.$this->name;
 
         $this->storage->put($target, file_get_contents($file->getRealPath()));
 
@@ -273,7 +273,7 @@ public function objectUrl($path)
             return $path;
         }
 
-        return rtrim(config('admin.upload.host'), '/') . '/' . trim($path, '/');
+        return rtrim(config('admin.upload.host'), '/').'/'.trim($path, '/');
     }
 
     /**

src/Form/Tools.php

@@ -68,7 +68,7 @@ protected function backButton()
 
     public function listButton()
     {
-        $slice = Str::contains($this->form->getResource(0), "/edit") ? null : -1;
+        $slice = Str::contains($this->form->getResource(0), '/edit') ? null : -1;
         $resource = $this->form->getResource($slice);
 
         $text = trans('admin::lang.list');

src/Grid.php

@@ -269,7 +269,7 @@ public function column($name, $label = '')
 
             $label = empty($label) ? ucfirst($relationColumn) : $label;
 
-            $name = snake_case($relationName) . '.' . $relationColumn;
+            $name = snake_case($relationName).'.'.$relationColumn;
         }
 
         $column = $this->addColumn($name, $label);