Laravel-Backpack / CRUD

tests/Feature/UploadersValidationTest.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload'          => 'avatar.pdf',
-            'upload_multiple' => json_encode(['avatar1.pdf',  'avatar2.pdf']),
+            'upload_multiple' => json_encode(['avatar1.pdf', 'avatar2.pdf']),
         ]);
 
         $this->assertTrue(Storage::disk('uploaders')->exists('avatar.pdf'));
@@ -90,7 +90,7 @@ 
         $response = $this->put($this->testBaseUrl.'/1', [
             'upload'                => UploadedFile::fake()->create('avatar4.pdf'),
             'upload_multiple'       => [UploadedFile::fake()->create('avatar5.pdf'), UploadedFile::fake()->create('avatar6.pdf')],
-            'clear_upload_multiple' => ['avatar2.pdf',  'avatar3.pdf'],
+            'clear_upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'],
             'id'                    => 1,
         ]);
 
@@ -102,7 +102,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload'          => 'avatar4.pdf',
-            'upload_multiple' => json_encode(['avatar5.pdf',  'avatar6.pdf']),
+            'upload_multiple' => json_encode(['avatar5.pdf', 'avatar6.pdf']),
         ]);
 
         $files = Storage::disk('uploaders')->allFiles();
@@ -134,7 +134,7 @@ 
         self::initUploaderWithFiles();
 
         $response = $this->put($this->testBaseUrl.'/1', [
-            'upload_multiple' => ['avatar2.pdf',  'avatar3.pdf'],
+            'upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'],
             'id'              => 1,
         ]);
 
@@ -146,7 +146,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload'          => 'avatar1.pdf',
-            'upload_multiple' => json_encode(['avatar2.pdf',  'avatar3.pdf']),
+            'upload_multiple' => json_encode(['avatar2.pdf', 'avatar3.pdf']),
         ]);
 
         $files = Storage::disk('uploaders')->allFiles();
@@ -176,7 +176,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload'          => 'avatar1.pdf',
-            'upload_multiple' => json_encode(['avatar3.pdf', 'avatar4.pdf',  'avatar5.pdf']),
+            'upload_multiple' => json_encode(['avatar3.pdf', 'avatar4.pdf', 'avatar5.pdf']),
         ]);
 
         $files = Storage::disk('uploaders')->allFiles();
@@ -334,7 +334,7 @@ 
         $response = $this->put($this->testBaseUrl.'/1', [
             'upload'          => null,
             'upload_multiple' => null,
-            'clear_upload_multiple' => ['avatar2.pdf',  'avatar3.pdf'],
+            'clear_upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'],
             'id'              => 1,
         ]);
 
@@ -357,7 +357,7 @@ 
 
         $response = $this->put($this->testBaseUrl.'/1', [
             'upload_multiple' => [UploadedFile::fake()->create('avatar1.pdf')],
-            'clear_upload_multiple' => ['avatar2.pdf',  'avatar3.pdf'],
+            'clear_upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'],
             'id'              => 1,
         ]);
 
@@ -379,7 +379,7 @@ 
 
         Uploader::create([
             'upload'          => 'avatar1.jpg',
-            'upload_multiple' => json_encode(['avatar2.jpg',  'avatar3.jpg']),
+            'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']),
         ]);
     }
 
@@ -391,7 +391,7 @@ 
 
         Uploader::create([
             'upload'          => 'avatar1.pdf',
-            'upload_multiple' => json_encode(['avatar2.pdf',  'avatar3.pdf']),
+            'upload_multiple' => json_encode(['avatar2.pdf', 'avatar3.pdf']),
         ]);
     }
 

tests/Feature/UploadersTest.php

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload'          => 'avatar.jpg',
-            'upload_multiple' => json_encode(['avatar1.jpg',  'avatar2.jpg']),
+            'upload_multiple' => json_encode(['avatar1.jpg', 'avatar2.jpg']),
         ]);
 
         $this->assertTrue(Storage::disk('uploaders')->exists('avatar.jpg'));
@@ -95,7 +95,7 @@ 
         $response = $this->put($this->testBaseUrl.'/1', [
             'upload'                => UploadedFile::fake()->image('avatar4.jpg'),
             'upload_multiple'       => [UploadedFile::fake()->image('avatar5.jpg'), UploadedFile::fake()->image('avatar6.jpg')],
-            'clear_upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'],
+            'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'],
             'id'                    => 1,
         ]);
 
@@ -107,7 +107,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload'          => 'avatar4.jpg',
-            'upload_multiple' => json_encode(['avatar5.jpg',  'avatar6.jpg']),
+            'upload_multiple' => json_encode(['avatar5.jpg', 'avatar6.jpg']),
         ]);
 
         $files = Storage::disk('uploaders')->allFiles();
@@ -136,7 +136,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload'          => null,
-            'upload_multiple' => json_encode(['avatar2.jpg',  'avatar3.jpg']),
+            'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']),
         ]);
 
         $files = Storage::disk('uploaders')->allFiles();
@@ -166,7 +166,7 @@ 
         self::initUploaderWithFiles();
 
         $response = $this->put($this->testBaseUrl.'/1', [
-            'upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'],
+            'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'],
             'id'              => 1,
         ]);
 
@@ -178,7 +178,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload'          => 'avatar1.jpg',
-            'upload_multiple' => json_encode(['avatar2.jpg',  'avatar3.jpg']),
+            'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']),
         ]);
 
         $files = Storage::disk('uploaders')->allFiles();
@@ -208,7 +208,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload'          => 'avatar1.jpg',
-            'upload_multiple' => json_encode(['avatar3.jpg', 'avatar4.jpg',  'avatar5.jpg']),
+            'upload_multiple' => json_encode(['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg']),
         ]);
 
         $files = Storage::disk('uploaders')->allFiles();
@@ -229,7 +229,7 @@ 
 
         Uploader::create([
             'upload'          => 'avatar1.jpg',
-            'upload_multiple' => json_encode(['avatar2.jpg',  'avatar3.jpg']),
+            'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']),
         ]);
     }
 

src/app/Library/Validation/Rules/ValidUploadMultiple.php

Spacing +3 added lines, -4 removed lines

@@ -21,8 +21,7 @@ 
         }
 
         $previousValues = str_contains($attribute, '.') ?
-                            (Arr::get($entry?->{Str::before($attribute, '.')} ?? [], Str::after($attribute, '.')) ?? []) :
-                            ($entry?->{$attribute} ?? []);
+                            (Arr::get($entry?->{Str::before($attribute, '.')} ?? [], Str::after($attribute, '.')) ?? []) : ($entry?->{$attribute} ?? []);
 
         if (is_string($previousValues)) {
             $previousValues = json_decode($previousValues, true) ?? [];
@@ -39,7 +38,7 @@ 
        
         // if there is no entry, the values we are going to validate need to be files
         // the request was tampered so we will set the attribute to null
-        if (! $entry && ! empty(Arr::get($data, $attribute)) && ! $this->allFiles(Arr::get($data, $attribute))) {
+        if (!$entry && !empty(Arr::get($data, $attribute)) && !$this->allFiles(Arr::get($data, $attribute))) {
             Arr::set($data, $attribute, null);
         }
 
@@ -50,7 +49,7 @@ 
     private function allFiles(array $values): bool
     {
         foreach ($values as $value) {
-            if (! $value instanceof \Illuminate\Http\UploadedFile) {
+            if (!$value instanceof \Illuminate\Http\UploadedFile) {
                 return false;
             }
         }

src/app/Library/Validation/Rules/ValidUpload.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 
         // if the attribute is not set in the request, and an entry exists,
         // we will check if there is a previous value, as this field might not have changed.
-        if (! Arr::has($this->data, $attribute) && $entry) {
+        if (!Arr::has($this->data, $attribute) && $entry) {
             if (str_contains($attribute, '.') && get_class($entry) === get_class(CrudPanelFacade::getModel())) {
                 $previousValue = Arr::get($this->data, '_order_'.Str::before($attribute, '.'));
                 $previousValue = Arr::get($previousValue, Str::after($attribute, '.'));
@@ -37,25 +37,25 @@ 
 
         // if the value is an uploaded file, or the attribute is not
         // set in the request, we force fill the data with the value
-        if ($value instanceof UploadedFile || ! Arr::has($this->data, $attribute)) {
+        if ($value instanceof UploadedFile || !Arr::has($this->data, $attribute)) {
             Arr::set($this->data, $attribute, $value);
         }
 
         // if there are no entry, and the new value it's not a file ... well we don't want it at all.
-        if (! $entry && ! $value instanceof UploadedFile) {
+        if (!$entry && !$value instanceof UploadedFile) {
             Arr::set($this->data, $attribute, null);
         }
         
         $fieldErrors = $this->validateFieldRules($attribute);
 
-        if (! empty($value) && ! empty($this->getFileRules())) {
+        if (!empty($value) && !empty($this->getFileRules())) {
             $fileErrors = $this->validateFileRules($attribute, $value);
         }
 
         return array_merge($fieldErrors, $fileErrors ?? []);
     }
 
-    public static function field(string|array|ValidationRule|Rule $rules = []): self
+    public static function field(string | array | ValidationRule | Rule $rules = []): self
     {
         return parent::field($rules);
     }