Laravel-Backpack / CRUD

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']),
         ]);
     }
 

tests/config/Uploads/HasUploadedFiles.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
     protected function getUploadedFiles(array $fileNames, string $mime = 'image/jpg')
     {
-        return array_map(function ($fileName) use ($mime) {
+        return array_map(function($fileName) use ($mime) {
             return new UploadedFile(__DIR__.'/assets/'.$fileName, $fileName, $mime, null, true);
         }, $fileNames);
     }

src/app/Library/Uploaders/Support/RegisterUploadEvents.php

Spacing +14 added lines, -14 removed lines

@@ -14,18 +14,18 @@ 
     private string $crudObjectType;
 
     public function __construct(
-        private readonly CrudField|CrudColumn $crudObject,
+        private readonly CrudField | CrudColumn $crudObject,
         private readonly array $uploaderConfiguration,
         private readonly string $macro
         ) {
         $this->crudObjectType = is_a($crudObject, CrudField::class) ? 'field' : (is_a($crudObject, CrudColumn::class) ? 'column' : null);
 
-        if (! $this->crudObjectType) {
+        if (!$this->crudObjectType) {
             abort(500, 'Upload handlers only work for CrudField and CrudColumn classes.');
         }
     }
 
-    public static function handle(CrudField|CrudColumn $crudObject, array $uploaderConfiguration, string $macro, ?array $subfield = null, ?bool $registerModelEvents = true): void
+    public static function handle(CrudField | CrudColumn $crudObject, array $uploaderConfiguration, string $macro, ?array $subfield = null, ?bool $registerModelEvents = true): void
     {
         $instance = new self($crudObject, $uploaderConfiguration, $macro);
 
@@ -35,9 +35,9 @@ 
     /*******************************
      * Private methods - implementation
      *******************************/
-    private function registerEvents(array|null $subfield = [], ?bool $registerModelEvents = true): void
+    private function registerEvents(array | null $subfield = [], ?bool $registerModelEvents = true): void
     {
-        if (! empty($subfield)) {
+        if (!empty($subfield)) {
             $this->registerSubfieldEvent($subfield, $registerModelEvents);
 
             return;
@@ -82,7 +82,7 @@ 
         }
 
         $subfields = collect($this->crudObject->getAttributes()['subfields']);
-        $subfields = $subfields->map(function ($item) use ($subfield, $uploader) {
+        $subfields = $subfields->map(function($item) use ($subfield, $uploader) {
             if ($item['name'] === $subfield['name']) {
                 $item['upload'] = true;
                 $item['disk'] = $uploader->getDisk();
@@ -112,7 +112,7 @@ 
         }
 
         if ($this->crudObjectType === 'field') {
-            $model::saving(function ($entry) use ($uploader) {
+            $model::saving(function($entry) use ($uploader) {
                 $entry = $uploader->storeUploadedFiles($entry);
             });
         }
@@ -125,7 +125,7 @@ 
             // is not called in pivot models when loading the relations.
             $retrieveModel = $this->getModelForRetrieveEvent($model, $uploader);
 
-            $retrieveModel::retrieved(function ($entry) use ($uploader) {
+            $retrieveModel::retrieved(function($entry) use ($uploader) {
                 if ($entry->translationEnabled()) {
                     $locale = request('_locale', app()->getLocale());
                     if (in_array($locale, array_keys($entry->getAvailableLocales()))) {
@@ -136,7 +136,7 @@ 
             });
         }
 
-        $model::deleting(function ($entry) use ($uploader) {
+        $model::deleting(function($entry) use ($uploader) {
             $uploader->deleteUploadedFiles($entry);
         });
 
@@ -157,18 +157,18 @@ 
     {
         $hasCustomUploader = isset($uploaderConfiguration['uploader']);
 
-        if ($hasCustomUploader && ! is_a($uploaderConfiguration['uploader'], UploaderInterface::class, true)) {
+        if ($hasCustomUploader && !is_a($uploaderConfiguration['uploader'], UploaderInterface::class, true)) {
             throw new Exception('Invalid uploader class provided for '.$this->crudObjectType.' type: '.$crudObject['type']);
         }
 
         if ($hasCustomUploader) {
-            return $uploaderConfiguration['uploader']::for($crudObject, $uploaderConfiguration);
+            return $uploaderConfiguration['uploader']::for ($crudObject, $uploaderConfiguration);
         }
 
         $uploader = app('UploadersRepository')->hasUploadFor($crudObject['type'], $this->macro);
 
         if ($uploader) {
-            return app('UploadersRepository')->getUploadFor($crudObject['type'], $this->macro)::for($crudObject, $uploaderConfiguration);
+            return app('UploadersRepository')->getUploadFor($crudObject['type'], $this->macro)::for ($crudObject, $uploaderConfiguration);
         }
 
         throw new Exception('Undefined upload type for '.$this->crudObjectType.' type: '.$crudObject['type']);
@@ -189,7 +189,7 @@ 
 
     private function getSubfieldModel(array $subfield, UploaderInterface $uploader)
     {
-        if (! $uploader->isRelationship()) {
+        if (!$uploader->isRelationship()) {
             return $subfield['baseModel'] ?? get_class(app('crud')->getModel());
         }
 
@@ -202,7 +202,7 @@ 
 
     private function getModelForRetrieveEvent(string $model, UploaderInterface $uploader)
     {
-        if (! $uploader->isRelationship()) {
+        if (!$uploader->isRelationship()) {
             return $model;
         }
 

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

Spacing +16 added lines, -16 removed lines

@@ -17,7 +17,7 @@ 
 {
     public bool $handleRepeatableFiles = false;
 
-    public null|string $repeatableContainerName = null;
+    public null | string $repeatableContainerName = null;
 
     /*******************************
      * Setters - fluently configure the uploader
@@ -34,7 +34,7 @@ 
     /*******************************
      * Getters
      *******************************/
-    public function getRepeatableContainerName(): null|string
+    public function getRepeatableContainerName(): null | string
     {
         return $this->repeatableContainerName;
     }
@@ -162,7 +162,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;
@@ -193,7 +193,7 @@ 
 
         $values = $entry->{$this->getRepeatableContainerName()};
         $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);
             }
@@ -208,7 +208,7 @@ 
 
     private function retrieveRepeatableRelationFiles(Model $entry)
     {
-        switch($this->getRepeatableRelationType()) {
+        switch ($this->getRepeatableRelationType()) {
             case 'BelongsToMany':
             case 'MorphToMany':
                 $pivotClass = app('crud')->getModel()->{$this->getUploaderSubfield()['baseEntity']}()->getPivotClass();
@@ -261,12 +261,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;
                 }
 
@@ -289,7 +289,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) {
@@ -311,7 +311,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;
         });
@@ -323,22 +323,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);
         }
@@ -357,19 +357,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/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->string('image')->nullable();

src/app/Library/Database/DatabaseSchema.php

Spacing +6 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
     {
         $connection = $connection ?: config('database.default');
 
-        self::$schema[$connection] = LazyCollection::make(self::getCreateSchema($connection)->getTables())->mapWithKeys(function ($table, $key) use ($connection) {
+        self::$schema[$connection] = LazyCollection::make(self::getCreateSchema($connection)->getTables())->mapWithKeys(function($table, $key) use ($connection) {
             $tableName = is_array($table) ? $table['name'] : $table->getName();
 
             if ($existingTable = self::$schema[$connection][$tableName] ?? false) {
@@ -65,7 +65,7 @@ 
      */
     private static function generateDatabaseSchema(string $connection, string $table)
     {
-        if (! isset(self::$schema[$connection][$table])) {
+        if (!isset(self::$schema[$connection][$table])) {
             self::$schema[$connection][$table] = self::mapTable($connection, $table);
         }
     }
@@ -74,13 +74,12 @@ 
     {
         try {
             $table = method_exists(self::getCreateSchema($connection), 'getTable') ?
-                        self::getCreateSchema($connection)->getTable($tableName) :
-                        self::getCreateSchema($connection)->getColumns($tableName);
+                        self::getCreateSchema($connection)->getTable($tableName) : self::getCreateSchema($connection)->getColumns($tableName);
         } catch (\Exception $e) {
             return new Table($tableName, []);
         }
 
-        if (! is_array($table)) {
+        if (!is_array($table)) {
             return $table;
         }
 
@@ -91,7 +90,7 @@ 
         $schemaManager = self::getSchemaManager($connection);
         $indexes = $schemaManager->getIndexes($tableName);
 
-        $indexes = array_map(function ($index) {
+        $indexes = array_map(function($index) {
             return $index['columns'];
         }, $indexes);
 
@@ -109,7 +108,7 @@ 
 
         $indexes = self::$schema[$connection][$table]->getIndexes();
 
-        $indexes = \Illuminate\Support\Arr::flatten(array_map(function ($index) {
+        $indexes = \Illuminate\Support\Arr::flatten(array_map(function($index) {
             return is_string($index) ? $index : $index->getColumns();
         }, $indexes));
 

src/app/Library/Uploaders/Support/UploadersRepository.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function markAsHandled(string $objectName): void
     {
-        if (! in_array($objectName, $this->handledUploaders)) {
+        if (!in_array($objectName, $this->handledUploaders)) {
             $this->handledUploaders[] = $objectName;
         }
     }
@@ -60,7 +60,7 @@ 
      */
     public function getUploadFor(string $objectType, string $group): string
     {
-        if (! $this->hasUploadFor($objectType, $group)) {
+        if (!$this->hasUploadFor($objectType, $group)) {
             throw new \Exception('There is no uploader defined for the given field type.');
         }
 
@@ -82,7 +82,7 @@ 
     {
         // ensure all uploaders implement the UploaderInterface
         foreach ($uploaders as $uploader) {
-            if (! is_a($uploader, UploaderInterface::class, true)) {
+            if (!is_a($uploader, UploaderInterface::class, true)) {
                 throw new \Exception('The uploader class must implement the UploaderInterface.');
             }
         }
@@ -102,7 +102,7 @@ 
      */
     public function registerRepeatableUploader(string $uploadName, UploaderInterface $uploader): void
     {
-        if (! array_key_exists($uploadName, $this->repeatableUploaders) || ! in_array($uploader, $this->repeatableUploaders[$uploadName])) {
+        if (!array_key_exists($uploadName, $this->repeatableUploaders) || !in_array($uploader, $this->repeatableUploaders[$uploadName])) {
             $this->repeatableUploaders[$uploadName][] = $uploader;
         }
     }
@@ -136,7 +136,7 @@ 
      */
     public function getRegisteredUploadNames(string $uploadName): array
     {
-        return array_map(function ($uploader) {
+        return array_map(function($uploader) {
             return $uploader->getName();
         }, $this->getRepeatableUploadersFor($uploadName));
     }
@@ -167,11 +167,11 @@ 
 
             $uploaders = $this->getRepeatableUploadersFor($repeatableContainerName);
 
-            $uploader = Arr::first($uploaders, function ($uploader) use ($requestInputName) {
+            $uploader = Arr::first($uploaders, function($uploader) use ($requestInputName) {
                 return $uploader->getName() === $requestInputName;
             });
 
-            if (! $uploader) {
+            if (!$uploader) {
                 abort(500, 'Could not find the field in the repeatable uploaders.');
             }
 
@@ -182,16 +182,16 @@ 
             abort(500, 'Could not find the field in the CRUD fields.');
         }
 
-        if (! $uploaderMacro = $this->getUploadCrudObjectMacroType($crudObject)) {
+        if (!$uploaderMacro = $this->getUploadCrudObjectMacroType($crudObject)) {
             abort(500, 'There is no uploader defined for the given field type.');
         }
 
-        if (! $this->isValidUploadField($crudObject, $uploaderMacro)) {
+        if (!$this->isValidUploadField($crudObject, $uploaderMacro)) {
             abort(500, 'Invalid field for upload.');
         }
 
         $uploaderConfiguration = $crudObject[$uploaderMacro] ?? [];
-        $uploaderConfiguration = ! is_array($uploaderConfiguration) ? [] : $uploaderConfiguration;
+        $uploaderConfiguration = !is_array($uploaderConfiguration) ? [] : $uploaderConfiguration;
         $uploaderClass = $this->getUploadFor($crudObject['type'], $uploaderMacro);
 
         return new $uploaderClass(['name' => $requestInputName], $uploaderConfiguration);
@@ -200,7 +200,7 @@ 
     /**
      * Get the upload field macro type for the given object.
      */
-    private function getUploadCrudObjectMacroType(array $crudObject): string|null
+    private function getUploadCrudObjectMacroType(array $crudObject): string | null
     {
         $uploadersGroups = $this->getUploadersGroupsNames();
 
@@ -217,11 +217,11 @@ 
     {
         if (Str::contains($crudObject['name'], '#')) {
             $container = Str::before($crudObject['name'], '#');
-            $field = array_filter(CRUD::fields()[$container]['subfields'] ?? [], function ($item) use ($crudObject, $uploaderMacro) {
+            $field = array_filter(CRUD::fields()[$container]['subfields'] ?? [], function($item) use ($crudObject, $uploaderMacro) {
                 return $item['name'] === $crudObject['name'] && in_array($item['type'], $this->getAjaxUploadTypes($uploaderMacro));
             });
 
-            return ! empty($field);
+            return !empty($field);
         }
 
         return in_array($crudObject['type'], $this->getAjaxUploadTypes($uploaderMacro));

src/app/Library/Uploaders/SingleFile.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
             return $this->getPath().$fileName;
         }
 
-        if (! $value && CrudPanelFacade::getRequest()->has($this->getNameForRequest()) && $previousFile) {
+        if (!$value && CrudPanelFacade::getRequest()->has($this->getNameForRequest()) && $previousFile) {
             Storage::disk($this->getDisk())->delete($previousFile);
 
             return null;
@@ -55,10 +55,10 @@ 
 
         foreach ($previousRepeatableValues as $row => $file) {
             if ($file) {
-                if (! isset($orderedFiles[$row])) {
+                if (!isset($orderedFiles[$row])) {
                     $orderedFiles[$row] = null;
                 }
-                if (! in_array($file, $orderedFiles)) {
+                if (!in_array($file, $orderedFiles)) {
                     Storage::disk($this->getDisk())->delete($file);
                 }
             }