Laravel-Backpack / CRUD

src/app/Library/Uploaders/Support/Traits/HandleRepeatableUploads.php

Spacing +16 added lines, -16 removed lines

@@ -14,7 +14,7 @@ 
 {
     public bool $handleRepeatableFiles = false;
 
-    public null|string $repeatableContainerName = null;
+    public null | string $repeatableContainerName = null;
 
     /*******************************
      * Setters - fluently configure the uploader
@@ -31,7 +31,7 @@ 
     /*******************************
      * Getters
      *******************************/
-    public function getRepeatableContainerName(): null|string
+    public function getRepeatableContainerName(): null | string
     {
         return $this->repeatableContainerName;
     }
@@ -159,7 +159,7 @@ 
         foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $uploader) {
             $uploadedValues = $uploader->uploadRepeatableFiles($values->pluck($uploader->getAttributeName())->toArray(), $this->getPreviousRepeatableValues($entry, $uploader));
 
-            $values = $values->map(function ($item, $key) use ($uploadedValues, $uploader) {
+            $values = $values->map(function($item, $key) use ($uploadedValues, $uploader) {
                 $item[$uploader->getAttributeName()] = $uploadedValues[$key] ?? null;
 
                 return $item;
@@ -190,7 +190,7 @@ 
 
         $values = $entry->{$this->getAttributeName()};
         $values = is_string($values) ? json_decode($values, true) : $values;
-        $values = array_map(function ($item) use ($repeatableUploaders) {
+        $values = array_map(function($item) use ($repeatableUploaders) {
             foreach ($repeatableUploaders as $upload) {
                 $item[$upload->getAttributeName()] = $this->getValuesWithPathStripped($item, $upload);
             }
@@ -205,7 +205,7 @@ 
 
     private function retrieveRepeatableRelationFiles(Model $entry)
     {
-        switch($this->getRepeatableRelationType()) {
+        switch ($this->getRepeatableRelationType()) {
             case 'BelongsToMany':
             case 'MorphToMany':
                 $pivotClass = app('crud')->getModel()->{$this->getUploaderSubfield()['baseEntity']}()->getPivotClass();
@@ -258,12 +258,12 @@ 
         $repeatableValues ??= collect($entry->{$this->getRepeatableContainerName()});
 
         foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $upload) {
-            if (! $upload->shouldDeleteFiles()) {
+            if (!$upload->shouldDeleteFiles()) {
                 continue;
             }
             $values = $repeatableValues->pluck($upload->getName())->toArray();
             foreach ($values as $value) {
-                if (! $value) {
+                if (!$value) {
                     continue;
                 }
 
@@ -286,7 +286,7 @@ 
     /**
      * Given two multidimensional arrays/collections, merge them recursively.
      */
-    protected function mergeValuesRecursive(array|Collection $array1, array|Collection $array2): array|Collection
+    protected function mergeValuesRecursive(array | Collection $array1, array | Collection $array2): array | Collection
     {
         $merged = $array1;
         foreach ($array2 as $key => &$value) {
@@ -308,7 +308,7 @@ 
     {
         $items = CRUD::getRequest()->input('_order_'.$this->getRepeatableContainerName()) ?? [];
 
-        array_walk($items, function (&$key, $value) {
+        array_walk($items, function(&$key, $value) {
             $requestValue = $key[$this->getName()] ?? null;
             $key = $this->handleMultipleFiles ? (is_string($requestValue) ? explode(',', $requestValue) : $requestValue) : $requestValue;
         });
@@ -320,22 +320,22 @@ 
     {
         $previousValues = $entry->getOriginal($uploader->getRepeatableContainerName());
 
-        if (! is_array($previousValues)) {
+        if (!is_array($previousValues)) {
             $previousValues = json_decode($previousValues, true);
         }
 
-        if (! empty($previousValues)) {
+        if (!empty($previousValues)) {
             $previousValues = array_column($previousValues, $uploader->getName());
         }
 
         return $previousValues ?? [];
     }
 
-    private function getValuesWithPathStripped(array|string|null $item, UploaderInterface $uploader)
+    private function getValuesWithPathStripped(array | string | null $item, UploaderInterface $uploader)
     {
         $uploadedValues = $item[$uploader->getName()] ?? null;
         if (is_array($uploadedValues)) {
-            return array_map(function ($value) use ($uploader) {
+            return array_map(function($value) use ($uploader) {
                 return $uploader->getValueWithoutPath($value);
             }, $uploadedValues);
         }
@@ -354,19 +354,19 @@ 
     {
         if (in_array($this->getRepeatableRelationType(), ['BelongsToMany', 'MorphToMany'])) {
             $pivotAttributes = $entry->getAttributes();
-            $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function ($item) use ($pivotAttributes) {
+            $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function($item) use ($pivotAttributes) {
                 $itemPivotAttributes = $item->pivot->only(array_keys($pivotAttributes));
 
                 return $itemPivotAttributes === $pivotAttributes;
             })->first();
 
-            if (! $connectedPivot) {
+            if (!$connectedPivot) {
                 return;
             }
 
             $files = $connectedPivot->getOriginal()['pivot_'.$this->getAttributeName()];
 
-            if (! $files) {
+            if (!$files) {
                 return;
             }
 

tests/config/CrudPanel/BaseDBCrudPanel.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         $app['config']->set('database.default', 'testing');
         $app['config']->set('backpack.base.route_prefix', 'admin');
 
-        $app->bind('App\Http\Middleware\CheckIfAdmin', function () {
+        $app->bind('App\Http\Middleware\CheckIfAdmin', function() {
             return new class
             {
                 public function handle($request, $next)

tests/config/database/migrations/2024_02_15_125654_create_uploaders_table.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function up(): void
     {
-        Schema::create('uploaders', function (Blueprint $table) {
+        Schema::create('uploaders', function(Blueprint $table) {
             $table->increments('id');
             $table->string('upload')->nullable();
             $table->json('upload_multiple')->nullable();

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);
     }

src/app/Library/Uploaders/Uploader.php

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
 
     private bool $deleteWhenEntryIsDeleted = true;
 
-    private bool|string $attachedToFakeField = false;
+    private bool | string $attachedToFakeField = false;
 
     /**
      * Cloud disks have the ability to generate temporary URLs to files, should we do it?
@@ -62,7 +62,7 @@ 
     /*******************************
      * Static methods
      *******************************/
-    public static function for(array $crudObject, array $definition): UploaderInterface
+    public static function for (array $crudObject, array $definition): UploaderInterface
     {
         return new static($crudObject, $definition);
     }
@@ -103,7 +103,7 @@ 
     public function deleteUploadedFiles(Model $entry): void
     {
         if ($this->deleteWhenEntryIsDeleted) {
-            if (! in_array(SoftDeletes::class, class_uses_recursive($entry), true)) {
+            if (!in_array(SoftDeletes::class, class_uses_recursive($entry), true)) {
                 $this->performFileDeletion($entry);
 
                 return;
@@ -179,7 +179,7 @@ 
 
     public function getPreviousFiles(Model $entry): mixed
     {
-        if (! $this->attachedToFakeField) {
+        if (!$this->attachedToFakeField) {
             return $this->getOriginalValue($entry);
         }
         $value = $this->getOriginalValue($entry, $this->attachedToFakeField);
@@ -198,7 +198,7 @@ 
         return $this->attachedToFakeField !== false;
     }
 
-    public function getFakeAttribute(): bool|string
+    public function getFakeAttribute(): bool | string
     {
         return $this->attachedToFakeField;
     }
@@ -220,7 +220,7 @@ 
         return $this;
     }
 
-    public function fake(bool|string $isFake): self
+    public function fake(bool | string $isFake): self
     {
         $this->attachedToFakeField = $isFake;
 
@@ -251,7 +251,7 @@ 
         }
 
         if ($this->handleMultipleFiles) {
-            if (! isset($entry->getCasts()[$this->getName()]) && is_string($value)) {
+            if (!isset($entry->getCasts()[$this->getName()]) && is_string($value)) {
                 $entry->{$this->getAttributeName()} = json_decode($value, true);
             }
 
@@ -265,7 +265,7 @@ 
 
     private function deleteFiles(Model $entry)
     {
-        if (! $this->shouldDeleteFiles()) {
+        if (!$this->shouldDeleteFiles()) {
             return;
         }
 
@@ -300,7 +300,7 @@ 
 
     private function performFileDeletion(Model $entry)
     {
-        if (! $this->handleRepeatableFiles) {
+        if (!$this->handleRepeatableFiles) {
             $this->deleteFiles($entry);
 
             return;
@@ -329,7 +329,7 @@ 
 
         $previousValue = $entry->getOriginal($field);
 
-        if (! $previousValue) {
+        if (!$previousValue) {
             return $previousValue;
         }
 

tests/Feature/UploadersTest.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload' => 'avatar1.jpg',
-            'upload_multiple' => json_encode(['avatar2.jpg',  'avatar3.jpg']),
+            'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']),
         ]);
 
         $this->assertTrue(Storage::disk('uploaders')->exists('avatar1.jpg'));
@@ -97,7 +97,7 @@ 
         $response = $this->put($this->testBaseUrl.'/1', [
             'upload' => $this->getUploadedFile('avatar4.jpg'),
             'upload_multiple' => $this->getUploadedFiles(['avatar5.jpg', 'avatar6.jpg']),
-            'clear_upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'],
+            'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'],
             'id' => 1,
         ]);
 
@@ -109,7 +109,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();
@@ -138,7 +138,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();
@@ -168,7 +168,7 @@ 
         self::initUploaderWithFiles();
 
         $response = $this->put($this->testBaseUrl.'/1', [
-            'upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'],
+            'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'],
             'id' => 1,
         ]);
 
@@ -180,7 +180,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();
@@ -210,7 +210,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();
@@ -231,7 +231,7 @@ 
 
         Uploader::create([
             'upload' => 'avatar1.jpg',
-            'upload_multiple' => json_encode(['avatar2.jpg',  'avatar3.jpg']),
+            'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']),
         ]);
     }
 

tests/Feature/FakeUploadersTest.php

Spacing +5 added lines, -5 removed lines

@@ -93,7 +93,7 @@ 
             '_method' => 'PUT',
             'upload' => $this->getUploadedFile('avatar4.jpg'),
             'upload_multiple' => $this->getUploadedFiles(['avatar5.jpg', 'avatar6.jpg']),
-            'clear_upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'],
+            'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'],
             'id' => 1,
         ]);
 
@@ -173,7 +173,7 @@ 
         $this->assertDatabaseCount('uploaders', 1);
 
         $this->assertDatabaseHas('uploaders', [
-            'extras' => json_encode(['upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'], 'upload' => 'avatar1.jpg']),
+            'extras' => json_encode(['upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], 'upload' => 'avatar1.jpg']),
         ]);
 
         $files = Storage::disk('uploaders')->allFiles();
@@ -190,7 +190,7 @@ 
         self::initUploaderWithFiles();
 
         $response = $this->put($this->testBaseUrl.'/1', [
-            'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg',  'avatar5.jpg']),
+            'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg', 'avatar5.jpg']),
             'clear_upload_multiple' => ['avatar2.jpg'],
             'id' => 1,
         ]);
@@ -202,7 +202,7 @@ 
         $this->assertDatabaseCount('uploaders', 1);
 
         $this->assertDatabaseHas('uploaders', [
-            'extras' => json_encode(['upload_multiple' => ['avatar3.jpg', 'avatar4.jpg',  'avatar5.jpg'], 'upload' => 'avatar1.jpg']),
+            'extras' => json_encode(['upload_multiple' => ['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg'], 'upload' => 'avatar1.jpg']),
         ]);
 
         $files = Storage::disk('uploaders')->allFiles();
@@ -222,7 +222,7 @@ 
         UploadedFile::fake()->image('avatar3.jpg')->storeAs('', 'avatar3.jpg', ['disk' => 'uploaders']);
 
         FakeUploader::create([
-            'extras' => ['upload' => 'avatar1.jpg', 'upload_multiple' => ['avatar2.jpg',  'avatar3.jpg']],
+            'extras' => ['upload' => 'avatar1.jpg', 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg']],
         ]);
     }
 

tests/Feature/UploadersValidationTest.php

Spacing +12 added lines, -12 removed lines

@@ -62,7 +62,7 @@ 
 
         $this->assertDatabaseHas('uploaders', [
             'upload' => 'avatar1.jpg',
-            'upload_multiple' => json_encode(['avatar2.jpg',  'avatar3.jpg']),
+            'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']),
         ]);
 
         $this->assertTrue(Storage::disk('uploaders')->exists('avatar1.jpg'));
@@ -97,8 +97,8 @@ 
 
         $response = $this->put($this->testBaseUrl.'/1', [
             'upload' => $this->getUploadedFile('avatar4.jpg'),
-            'upload_multiple' => $this->getUploadedFiles(['avatar5.jpg',  'avatar6.jpg']),
-            'clear_upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'],
+            'upload_multiple' => $this->getUploadedFiles(['avatar5.jpg', 'avatar6.jpg']),
+            'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'],
             'id' => 1,
         ]);
 
@@ -110,7 +110,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();
@@ -142,7 +142,7 @@ 
         self::initUploaderWithFiles();
 
         $response = $this->put($this->testBaseUrl.'/1', [
-            'upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'],
+            'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'],
             'id' => 1,
         ]);
 
@@ -154,7 +154,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();
@@ -171,7 +171,7 @@ 
         self::initUploaderWithFiles();
 
         $response = $this->put($this->testBaseUrl.'/1', [
-            'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg',  'avatar5.jpg']),
+            'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg', 'avatar5.jpg']),
             'clear_upload_multiple' => ['avatar2.jpg'],
             'id' => 1,
         ]);
@@ -184,7 +184,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();
@@ -341,7 +341,7 @@ 
         $response = $this->put($this->testBaseUrl.'/1', [
             'upload' => null,
             'upload_multiple' => null,
-            'clear_upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'],
+            'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'],
             'id' => 1,
         ]);
 
@@ -364,7 +364,7 @@ 
 
         $response = $this->put($this->testBaseUrl.'/1', [
             'upload_multiple' => $this->getUploadedFiles(['avatar2.jpg']),
-            'clear_upload_multiple' => ['avatar2.jpg',  'avatar3.jpg'],
+            'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'],
             'id' => 1,
         ]);
 
@@ -386,7 +386,7 @@ 
 
         Uploader::create([
             'upload' => 'avatar1.jpg',
-            'upload_multiple' => json_encode(['avatar2.jpg',  'avatar3.jpg']),
+            'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']),
         ]);
     }
 
@@ -398,7 +398,7 @@ 
 
         Uploader::create([
             'upload' => 'avatar1.jpg',
-            'upload_multiple' => json_encode(['avatar2.jpg',  'avatar3.jpg']),
+            'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']),
         ]);
     }