Fix styling

Author: jyrkidn

config/livewire-forms.php

@@ -23,5 +23,5 @@
         'buttonClass' => 'btn btn--primary',
         'buttonIcon' => null,
         'textareaRows' => 5,
-    ]
+    ],
 ];

src/Fields/CurrencyField.php

@@ -7,6 +7,7 @@
 class CurrencyField extends TextField
 {
     public $symbol = '';
+
     public $symbolAfter = '';
 
     public function getValue($doConditionalChecks = false)
@@ -18,11 +19,11 @@ public function getValue($doConditionalChecks = false)
         }
 
         if (! Str::startsWith($value, $this->symbol)) {
-            $value = $this->symbol . $value;
+            $value = $this->symbol.$value;
         }
 
         if (! Str::endsWith($value, $this->symbolAfter)) {
-            $value = $value . $this->symbolAfter;
+            $value = $value.$this->symbolAfter;
         }
 
         return $value;

src/Fields/DateField.php

@@ -5,5 +5,6 @@
 class DateField extends Field
 {
     public $component = 'livewire-forms::fields.date';
+
     public $debounce = 'debounce.1500ms';
 }

src/Fields/Field.php

@@ -64,7 +64,7 @@ public function getName($usePrefixes = true)
         }
 
         if ($usePrefixes && $this->groupPrefixes !== []) {
-            return implode('.', $this->groupPrefixes) . '.' . $name;
+            return implode('.', $this->groupPrefixes).'.'.$name;
         }
 
         return $name;
@@ -76,7 +76,7 @@ public function getId()
             return $this->fieldId;
         }
 
-        return $this->fieldId = Str::slug($this->getName() . '-' . Str::random(8));
+        return $this->fieldId = Str::slug($this->getName().'-'.Str::random(8));
     }
 
     public function getValue($doConditionalChecks = false)

src/Fields/Link.php

@@ -34,6 +34,6 @@ public function isJson($value)
     {
         json_decode($value);
 
-        return (json_last_error() == JSON_ERROR_NONE);
+        return json_last_error() == JSON_ERROR_NONE;
     }
 }

src/Form.php

@@ -7,6 +7,7 @@
 abstract class Form
 {
     public $fields = null;
+
     public $binding = 'livewire';
 
     abstract public function fields();
@@ -19,8 +20,9 @@ public function __construct()
 
     /**
      * Return only the fields and nested fields (without Row, Group, ...)
-     * @param bool $doConditionalChecks  Return all the fields, or filter them on conditionals
-     * @param array   $stack                Return the fieldStack of a stack of fields
+     *
+     * @param  bool  $doConditionalChecks  Return all the fields, or filter them on conditionals
+     * @param  array  $stack  Return the fieldStack of a stack of fields
      */
     public function fieldStack($doConditionalChecks = false, $stack = null): array
     {
@@ -69,8 +71,8 @@ public function validation($stack = null, $skipChecks = false): array
         $fields->each(function (Field $value) use (&$rules, &$messages, $skipChecks) {
             if ($skipChecks || $value->conditionalCheck()) {
                 $target = ($value->containsFile ? 'files' : 'fields');
-                $rules->put($target . '.' . $value->getName(), $value->rules ?? '');
-                $messages->put($target . '.' . $value->getName(), $value->validationMessages ?? '');
+                $rules->put($target.'.'.$value->getName(), $value->rules ?? '');
+                $messages->put($target.'.'.$value->getName(), $value->validationMessages ?? '');
             }
         });
 

src/FormController.php

@@ -2,13 +2,13 @@
 
 namespace Wotz\LivewireForms;
 
-use Wotz\LivewireForms\Fields\Field;
 use Exception;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\View;
 use Livewire\Component;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 use Livewire\WithFileUploads;
+use Wotz\LivewireForms\Fields\Field;
 
 class FormController extends Component
 {
@@ -18,17 +18,25 @@ class FormController extends Component
     use WithFileUploads;
 
     public string $formClass;
+
     public string $modelClass;
 
-    public null | string $locale = null;
-    public null | string $component;
+    public ?string $locale = null;
+
+    public ?string $component;
+
     public array $fields = [];
+
     public array $validation = [];
+
     public array $syncs = [];
+
     public array $flashes = [];
 
     protected array $messages = [];
-    protected null | Form $form = null;
+
+    protected ?Form $form = null;
+
     protected array $fieldStack = [];
 
     public function hydrate()
@@ -107,7 +115,7 @@ public function setValidation()
 
     public function getForm()
     {
-        return (new $this->formClass);
+        return new $this->formClass;
     }
 
     public function flash($name, $message)

src/LivewireFormsServiceProvider.php

@@ -10,7 +10,7 @@ public function boot()
     {
         $this->loadViews();
         $this->mergeConfigFrom(
-            __DIR__ . '/../config/livewire-forms.php',
+            __DIR__.'/../config/livewire-forms.php',
             'livewire-forms'
         );
 
@@ -19,18 +19,18 @@ public function boot()
 
     public function loadViews()
     {
-        $this->loadViewsFrom(__DIR__ . '/../resources/views', 'livewire-forms');
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'livewire-forms');
     }
 
     public function publishData()
     {
         $this->publishes(
-            [__DIR__ . '/../resources/views' => resource_path('views/vendor/livewire-forms')],
+            [__DIR__.'/../resources/views' => resource_path('views/vendor/livewire-forms')],
             'laravel-livewire-forms-views'
         );
 
         $this->publishes([
-            __DIR__ . '/../config/livewire-forms.php' => config_path('livewire-forms.php'),
+            __DIR__.'/../config/livewire-forms.php' => config_path('livewire-forms.php'),
         ], 'laravel-livewire-forms-config');
     }
 

src/Traits/HandleFiles.php

@@ -40,7 +40,7 @@ private function uploadFile($field, $file)
             return $file->save($field->disk ?? 'public');
         } catch (ValidationException $e) {
             throw ValidationException::withMessages([
-                'files.' . $field->getName() => $e->getMessage(),
+                'files.'.$field->getName() => $e->getMessage(),
             ]);
         }
     }

tests/Feature/FormControllerTest.php

@@ -1,6 +1,5 @@
 <?php
 
-use Wotz\LivewireForms\FormController;
 use Illuminate\Http\UploadedFile;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 use Livewire\Livewire;
@@ -12,6 +11,7 @@
 use Tests\Fixtures\TestWithFileStepForm;
 use Tests\Fixtures\TestWithFlashForm;
 use Tests\Fixtures\TestWithModelForm;
+use Wotz\LivewireForms\FormController;
 
 test('form controller throws exception if formClass is not passed', function () {
     $this->expectException(Exception::class);