Laravel-Backpack / CRUD

src/app/Library/CrudPanel/Traits/FieldsProtectedMethods.php

Spacing +13 added lines, -13 removed lines

@@ -115,7 +115,7 @@ 
             return ['name' => Str::replace(' ', '', $field)];
         }
 
-        if (is_array($field) && ! isset($field['name'])) {
+        if (is_array($field) && !isset($field['name'])) {
             abort(500, 'All fields must have their name defined');
         }
 
@@ -189,7 +189,7 @@ 
         }
         // if there's a model defined, but no attribute
         // guess an attribute using the identifiableAttribute functionality in CrudTrait
-        if (isset($field['model']) && ! isset($field['attribute']) && method_exists($field['model'], 'identifiableAttribute')) {
+        if (isset($field['model']) && !isset($field['attribute']) && method_exists($field['model'], 'identifiableAttribute')) {
             $field['attribute'] = (new $field['model']())->identifiableAttribute();
         }
 
@@ -205,7 +205,7 @@ 
      */
     protected function makeSureFieldHasLabel($field)
     {
-        if (! isset($field['label'])) {
+        if (!isset($field['label'])) {
             $name = str_replace(',', ' ', $field['name']);
             $name = str_replace('_id', '', $name);
             $field['label'] = mb_ucfirst(str_replace('_', ' ', $name));
@@ -223,7 +223,7 @@ 
      */
     protected function makeSureFieldHasType($field)
     {
-        if (! isset($field['type'])) {
+        if (!isset($field['type'])) {
             $field['type'] = isset($field['relation_type']) ? $this->inferFieldTypeFromRelationType($field['relation_type']) : $this->inferFieldTypeFromDbColumnType($field['name']);
         }
 
@@ -256,16 +256,16 @@ 
      */
     protected function makeSureSubfieldsHaveNecessaryAttributes($field)
     {
-        if (! isset($field['subfields']) || ! is_array($field['subfields'])) {
+        if (!isset($field['subfields']) || !is_array($field['subfields'])) {
             return $field;
         }
 
-        if (! is_multidimensional_array($field['subfields'], true)) {
+        if (!is_multidimensional_array($field['subfields'], true)) {
             abort(500, 'Subfields of «'.$field['name'].'» are malformed. Make sure you provide an array of subfields.');
         }
 
         foreach ($field['subfields'] as $key => $subfield) {
-            if (empty($subfield) || ! isset($subfield['name'])) {
+            if (empty($subfield) || !isset($subfield['name'])) {
                 abort(500, 'A subfield of «'.$field['name'].'» is malformed. Subfield attribute name can\'t be empty.');
             }
 
@@ -280,7 +280,7 @@ 
             $subfield['baseFieldName'] = is_array($subfield['name']) ? implode(',', $subfield['name']) : $subfield['name'];
             $subfield['baseFieldName'] = Str::afterLast($subfield['baseFieldName'], '.');
 
-            if (! isset($field['model'])) {
+            if (!isset($field['model'])) {
                 // we're inside a simple 'repeatable' with no model/relationship, so
                 // we assume all subfields are supposed to be text fields
                 $subfield['type'] = $subfield['type'] ?? 'text';
@@ -305,11 +305,11 @@ 
                 case 'BelongsToMany':
                     $pivotSelectorField = static::getPivotFieldStructure($field);
 
-                    $pivot = Arr::where($field['subfields'], function ($item) use ($pivotSelectorField) {
+                    $pivot = Arr::where($field['subfields'], function($item) use ($pivotSelectorField) {
                         return $item['name'] === $pivotSelectorField['name'];
                     });
 
-                    if (! empty($pivot)) {
+                    if (!empty($pivot)) {
                         break;
                     }
 
@@ -322,11 +322,11 @@ 
                     $entity = isset($field['baseEntity']) ? $field['baseEntity'].'.'.$field['entity'] : $field['entity'];
                     $relationInstance = $this->getRelationInstance(['entity' => $entity]);
 
-                    $localKeyField = Arr::where($field['subfields'], function ($item) use ($relationInstance) {
+                    $localKeyField = Arr::where($field['subfields'], function($item) use ($relationInstance) {
                         return $item['name'] === $relationInstance->getRelated()->getKeyName();
                     });
 
-                    if (! empty($localKeyField)) {
+                    if (!empty($localKeyField)) {
                         break;
                     }
 
@@ -351,7 +351,7 @@ 
     {
         // if a tab was mentioned, we should enable it
         if (isset($field['tab'])) {
-            if (! $this->tabsEnabled()) {
+            if (!$this->tabsEnabled()) {
                 $this->enableTabs();
             }
         }

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

Spacing +15 added lines, -16 removed lines

@@ -29,13 +29,13 @@ 
 
     public bool $implicit = true;
 
-    public static function field(string|array|ValidationRule|Rule $rules = []): self
+    public static function field(string | array | ValidationRule | Rule $rules = []): self
     {
         $instance = new static();
         $instance->fieldRules = self::getRulesAsArray($rules);
 
         if ($instance->validatesArrays()) {
-            if (! in_array('array', $instance->getFieldRules())) {
+            if (!in_array('array', $instance->getFieldRules())) {
                 $instance->fieldRules[] = 'array';
             }
         }
@@ -95,7 +95,7 @@ 
 
     public function getFieldRules(): array
     {
-        return tap($this->fieldRules, function ($rule) {
+        return tap($this->fieldRules, function($rule) {
             if (is_a($rule, BackpackCustomRule::class, true)) {
                 $rule = $rule->getFieldRules();
             }
@@ -110,7 +110,7 @@ 
             $rules = explode('|', $rules);
         }
 
-        if (! is_array($rules)) {
+        if (!is_array($rules)) {
             $rules = [$rules];
         }
 
@@ -119,10 +119,10 @@ 
 
     protected function ensureValueIsValid($value)
     {
-        if ($this->validatesArrays() && ! is_array($value)) {
+        if ($this->validatesArrays() && !is_array($value)) {
             try {
                 $value = json_decode($value, true) ?? [];
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 return false;
             }
         }
@@ -141,12 +141,12 @@ 
             $attribute => $rules,
         ], $this->validator->customMessages, $this->getValidatorCustomAttributes($attribute));
 
-        return $validator->errors()->messages()[$attribute] ?? (! empty($validator->errors()->messages()) ? current($validator->errors()->messages()) : []);
+        return $validator->errors()->messages()[$attribute] ?? (!empty($validator->errors()->messages()) ? current($validator->errors()->messages()) : []);
     }
 
     private function getValidatorCustomAttributes(string $attribute): array
     {
-        if (! is_a($this, ValidGenericAjaxEndpoint::class) && ! Str::contains($attribute, '.*.')) {
+        if (!is_a($this, ValidGenericAjaxEndpoint::class) && !Str::contains($attribute, '.*.')) {
             return $this->validator->customAttributes;
         }
 
@@ -157,8 +157,7 @@ 
     protected function getValidationAttributeString(string $attribute)
     {
         return Str::substrCount($attribute, '.') > 1 ?
-                Str::before($attribute, '.').'.*.'.Str::afterLast($attribute, '.') :
-                $attribute;
+                Str::before($attribute, '.').'.*.'.Str::afterLast($attribute, '.') : $attribute;
     }
 
     protected function validateOnSubmit(string $attribute, mixed $value): array
@@ -166,7 +165,7 @@ 
         return $this->validateRules($attribute, $value);
     }
 
-    protected function validateFieldAndFile(string $attribute, null|array $data = null, array|null $customRules = null): array
+    protected function validateFieldAndFile(string $attribute, null | array $data = null, array | null $customRules = null): array
     {
         $fieldErrors = $this->validateFieldRules($attribute, $data, $customRules);
 
@@ -178,7 +177,7 @@ 
     /**
      * Implementation.
      */
-    public function validateFieldRules(string $attribute, null|array|string|UploadedFile $data = null, array|null $customRules = null): array
+    public function validateFieldRules(string $attribute, null | array | string | UploadedFile $data = null, array | null $customRules = null): array
     {
         $data = $data ?? $this->data;
         $validationRuleAttribute = $this->getValidationAttributeString($attribute);
@@ -187,16 +186,16 @@ 
         return $this->validateAndGetErrors($validationRuleAttribute, $data, $customRules ?? $this->getFieldRules());
     }
 
-    protected function prepareValidatorData(array|string|UploadedFile $data, string $attribute): array
+    protected function prepareValidatorData(array | string | UploadedFile $data, string $attribute): array
     {
-        if ($this->validatesArrays() && is_array($data) && ! Str::contains($attribute, '.')) {
+        if ($this->validatesArrays() && is_array($data) && !Str::contains($attribute, '.')) {
             return Arr::has($data, $attribute) ? $data : [$attribute => $data];
         }
 
         if (Str::contains($attribute, '.')) {
             $validData = [];
 
-            Arr::set($validData, $attribute, ! is_array($data) ? $data : Arr::get($data, $attribute));
+            Arr::set($validData, $attribute, !is_array($data) ? $data : Arr::get($data, $attribute));
 
             return $validData;
         }
@@ -211,7 +210,7 @@ 
         $validationRuleAttribute = $this->getValidationAttributeString($attribute);
 
         $filesToValidate = Arr::get($items, $attribute);
-        $filesToValidate = is_array($filesToValidate) ? array_filter($filesToValidate, function ($item) {
+        $filesToValidate = is_array($filesToValidate) ? array_filter($filesToValidate, function($item) {
             return $item instanceof UploadedFile;
         }) : (is_a($filesToValidate, UploadedFile::class, true) ? [$filesToValidate] : []);
 

src/app/Library/Uploaders/MultipleFiles.php

Spacing +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
 
 class MultipleFiles extends Uploader
 {
-    public static function for(array $field, $configuration): UploaderInterface
+    public static function for (array $field, $configuration): UploaderInterface
     {
         return (new self($field, $configuration))->multiple();
     }
@@ -29,7 +29,7 @@ 
             $previousFiles = [];
         }
 
-        if (! is_array($previousFiles) && is_string($previousFiles)) {
+        if (!is_array($previousFiles) && is_string($previousFiles)) {
             $previousFiles = json_decode($previousFiles, true);
         }
 
@@ -38,14 +38,14 @@ 
                 if (in_array($previousFile, $filesToDelete)) {
                     Storage::disk($this->getDisk())->delete($previousFile);
 
-                    $previousFiles = Arr::where($previousFiles, function ($value, $key) use ($previousFile) {
+                    $previousFiles = Arr::where($previousFiles, function($value, $key) use ($previousFile) {
                         return $value != $previousFile;
                     });
                 }
             }
         }
 
-        if (! is_array($value)) {
+        if (!is_array($value)) {
             $value = [];
         }
 
@@ -82,13 +82,13 @@ 
         // create a temporary variable that we can unset keys
         // everytime one is found. That way we avoid iterating
         // already handled keys (notice we do a deep array copy)
-        $tempFileOrder = array_map(function ($item) {
+        $tempFileOrder = array_map(function($item) {
             return $item;
         }, $fileOrder);
 
         foreach ($previousRepeatableValues as $previousRow => $previousFiles) {
             foreach ($previousFiles ?? [] as $key => $file) {
-                $previousFileInArray = array_filter($tempFileOrder, function ($items, $key) use ($file, $tempFileOrder) {
+                $previousFileInArray = array_filter($tempFileOrder, function($items, $key) use ($file, $tempFileOrder) {
                     $found = array_search($file, $items ?? [], true);
                     if ($found !== false) {
                         Arr::forget($tempFileOrder, $key.'.'.$found);
@@ -98,7 +98,7 @@ 
 
                     return false;
                 }, ARRAY_FILTER_USE_BOTH);
-                if ($file && ! $previousFileInArray) {
+                if ($file && !$previousFileInArray) {
                     Storage::disk($this->getDisk())->delete($file);
                 }
             }

src/app/Library/Uploaders/Support/Interfaces/UploaderInterface.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
     /**
      * Static constructor function.
      */
-    public static function for(array $field, array $configuration): UploaderInterface;
+    public static function for (array $field, array $configuration): UploaderInterface;
 
     /**
      * Default implementation functions.
@@ -30,7 +30,7 @@ 
 
     public function relationship(bool $isRelation): self;
 
-    public function fake(bool|string $isFake): self;
+    public function fake(bool | string $isFake): self;
 
     /**
      * Getters.
@@ -47,7 +47,7 @@ 
 
     public function getExpirationTimeInMinutes(): int;
 
-    public function getFileName(string|UploadedFile $file): string;
+    public function getFileName(string | UploadedFile $file): string;
 
     public function getRepeatableContainerName(): ?string;
 
@@ -67,5 +67,5 @@ 
 
     public function isFake(): bool;
 
-    public function getFakeAttribute(): bool|string;
+    public function getFakeAttribute(): bool | string;
 }

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)

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