Laravel-Backpack / CRUD

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

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

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