Laravel-Backpack / CRUD

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

Spacing +3 added lines, -3 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.
@@ -34,7 +34,7 @@ 
 
     public function relationship(bool $isRelation): self;
 
-    public function fake(bool|string $isFake): self;
+    public function fake(bool | string $isFake): self;
 
     /**
      * Getters.
@@ -51,7 +51,7 @@ 
 
     public function getExpirationTimeInMinutes(): int;
 
-    public function getFileName(string|UploadedFile $file): string;
+    public function getFileName(string | UploadedFile $file): string;
 
     public function getRepeatableContainerName(): ?string;
 

src/app/Library/Uploaders/SingleBase64Image.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
     {
         $previousImage = $this->getPreviousFiles($entry);
 
-        if (! $value && $previousImage) {
+        if (!$value && $previousImage) {
             Storage::disk($this->getDisk())->delete($previousImage);
 
             return null;
@@ -67,7 +67,7 @@ 
 
     public function shouldKeepPreviousValueUnchanged(Model $entry, $entryValue): bool
     {
-        return $entry->exists && is_string($entryValue) && ! Str::startsWith($entryValue, 'data:image');
+        return $entry->exists && is_string($entryValue) && !Str::startsWith($entryValue, 'data:image');
     }
 
     public function getUploadedFilesFromRequest()

src/ThemeServiceProvider.php

Spacing +3 added lines, -3 removed lines

@@ -145,7 +145,7 @@ 
         }
 
         // Registering package commands.
-        if (! empty($this->commands)) {
+        if (!empty($this->commands)) {
             $this->commands($this->commands);
         }
     }
@@ -240,7 +240,7 @@ 
     protected function packageDirectoryExistsAndIsNotEmpty($name)
     {
         // check if directory exists
-        if (! is_dir($this->getPath().'/'.$name)) {
+        if (!is_dir($this->getPath().'/'.$name)) {
             return false;
         }
 
@@ -265,7 +265,7 @@ 
     public function registerPackageBladeComponents()
     {
         if ($this->componentsNamespace) {
-            $this->app->afterResolving(BladeCompiler::class, function () {
+            $this->app->afterResolving(BladeCompiler::class, function() {
                 Blade::componentNamespace($this->componentsNamespace, $this->packageName);
             });
         }

src/app/Http/Controllers/Auth/VerifyEmailController.php

Spacing +4 added lines, -4 removed lines

@@ -20,21 +20,21 @@ 
      */
     public function __construct()
     {
-        if (! app('router')->getMiddleware()['signed'] ?? null) {
+        if (!app('router')->getMiddleware()['signed'] ?? null) {
             throw new Exception('Missing "signed" alias middleware in App/Http/Kernel.php. More info: https://backpackforlaravel.com/docs/6.x/base-how-to#enable-email-verification-in-backpack-routes');
         }
 
         $this->middleware('signed')->only('verifyEmail');
         $this->middleware('throttle:'.config('backpack.base.email_verification_throttle_access'))->only('resendVerificationEmail');
 
-        if (! backpack_users_have_email()) {
+        if (!backpack_users_have_email()) {
             abort(500, trans('backpack::base.no_email_column'));
         }
         // where to redirect after the email is verified
         $this->redirectTo = $this->redirectTo ?? backpack_url('dashboard');
     }
 
-    public function emailVerificationRequired(Request $request): \Illuminate\Contracts\View\View|\Illuminate\Http\RedirectResponse
+    public function emailVerificationRequired(Request $request): \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
     {
         $this->getUserOrRedirect($request);
 
@@ -77,7 +77,7 @@ 
         return $request->user(backpack_guard_name()) ?? (new UserFromCookie())();
     }
 
-    private function getUserOrRedirect(Request $request): \Illuminate\Contracts\Auth\MustVerifyEmail|\Illuminate\Http\RedirectResponse
+    private function getUserOrRedirect(Request $request): \Illuminate\Contracts\Auth\MustVerifyEmail | \Illuminate\Http\RedirectResponse
     {
         if ($user = $this->getUser($request)) {
             return $user;

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

Spacing +21 added lines, -21 removed lines

@@ -152,7 +152,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;
@@ -183,7 +183,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);
             }
@@ -198,7 +198,7 @@ 
 
     private function retrieveRepeatableRelationFiles(Model $entry)
     {
-        switch($this->getRepeatableRelationType()) {
+        switch ($this->getRepeatableRelationType()) {
             case 'BelongsToMany':
             case 'MorphToMany':
                 $pivotClass = app('crud')->getModel()->{$this->getUploaderSubfield()['baseEntity']}()->getPivotClass();
@@ -251,12 +251,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;
                 }
 
@@ -279,7 +279,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) {
@@ -301,7 +301,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;
         });
@@ -313,22 +313,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);
         }
@@ -338,8 +338,8 @@ 
 
     private function deleteRelationshipFiles(Model $entry): void
     {
-        if (! is_a($entry, Pivot::class, true) &&
-            ! $entry->relationLoaded($this->getRepeatableContainerName()) &&
+        if (!is_a($entry, Pivot::class, true) &&
+            !$entry->relationLoaded($this->getRepeatableContainerName()) &&
             method_exists($entry, $this->getRepeatableContainerName())
         ) {
             $entry->loadMissing($this->getRepeatableContainerName());
@@ -366,8 +366,8 @@ 
             $relatedEntries = $entry->{$this->getRepeatableContainerName()} ?? [];
         }
 
-        if (! is_a($relatedEntries ?? '', Collection::class, true)) {
-            $relatedEntries = ! empty($relatedEntries) ? [$relatedEntries] : [$entry];
+        if (!is_a($relatedEntries ?? '', Collection::class, true)) {
+            $relatedEntries = !empty($relatedEntries) ? [$relatedEntries] : [$entry];
         }
 
         foreach ($relatedEntries as $relatedEntry) {
@@ -375,9 +375,9 @@ 
         }
     }
 
-    protected function deletePivotFiles(Pivot|Model $entry)
+    protected function deletePivotFiles(Pivot | Model $entry)
     {
-        if (! is_a($entry, Pivot::class, true)) {
+        if (!is_a($entry, Pivot::class, true)) {
             $pivots = $entry->{$this->getRepeatableContainerName()};
             foreach ($pivots as $pivot) {
                 $this->deletePivotModelFiles($pivot);
@@ -387,24 +387,24 @@ 
         }
 
         $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;
         }
 
         $this->deletePivotModelFiles($connectedPivot);
     }
 
-    private function deletePivotModelFiles(Pivot|Model $entry)
+    private function deletePivotModelFiles(Pivot | Model $entry)
     {
         $files = $entry->getOriginal()['pivot_'.$this->getAttributeName()];
 
-        if (! $files) {
+        if (!$files) {
             return;
         }
 

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

Spacing +12 added lines, -12 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);
@@ -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/Http/Controllers/Operations/ListOperation.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
             'operation' => 'list',
         ]);
 
-        if (! isset($this->setupDetailsRowRoute) || $this->setupDetailsRowRoute === true) {
+        if (!isset($this->setupDetailsRowRoute) || $this->setupDetailsRowRoute === true) {
             Route::get($segment.'/{id}/details', [
                 'as' => $routeName.'.showDetailsRow',
                 'uses' => $controller.'@showDetailsRow',
@@ -44,7 +44,7 @@ 
     {
         $this->crud->allowAccess('list');
 
-        LifecycleHook::hookInto('list:before_setup', function () {
+        LifecycleHook::hookInto('list:before_setup', function() {
             $this->crud->loadDefaultOperationSettingsFromConfig();
             $this->crud->setOperationSetting('datatablesUrl', $this->crud->getRoute());
         });
@@ -82,7 +82,7 @@ 
         $search = request()->input('search');
 
         // check if length is allowed by developer
-        if ($length && ! in_array($length, $this->crud->getPageLengthMenu()[0])) {
+        if ($length && !in_array($length, $this->crud->getPageLengthMenu()[0])) {
             return response()->json([
                 'error' => 'Unknown page length.',
             ], 400);

src/BackpackServiceProvider.php

Spacing +14 added lines, -16 removed lines

@@ -83,28 +83,28 @@ 
         $this->registerBackpackErrorViews();
 
         // Bind the CrudPanel object to Laravel's service container
-        $this->app->scoped('crud', function ($app) {
+        $this->app->scoped('crud', function($app) {
             return new CrudPanel();
         });
 
-        $this->app->scoped('DatabaseSchema', function ($app) {
+        $this->app->scoped('DatabaseSchema', function($app) {
             return new DatabaseSchema();
         });
 
-        $this->app->scoped('BackpackLifecycleHooks', function ($app) {
+        $this->app->scoped('BackpackLifecycleHooks', function($app) {
             return new app\Library\CrudPanel\Hooks\LifecycleHooks();
         });
 
-        $this->app->singleton('BackpackViewNamespaces', function ($app) {
+        $this->app->singleton('BackpackViewNamespaces', function($app) {
             return new ViewNamespaces();
         });
 
         // Bind the widgets collection object to Laravel's service container
-        $this->app->singleton('widgets', function ($app) {
+        $this->app->singleton('widgets', function($app) {
             return new Collection();
         });
 
-        $this->app->scoped('UploadersRepository', function ($app) {
+        $this->app->scoped('UploadersRepository', function($app) {
             return new UploadersRepository();
         });
 
@@ -120,7 +120,7 @@ 
         $middleware_key = config('backpack.base.middleware_key');
         $middleware_class = config('backpack.base.middleware_class');
 
-        if (! is_array($middleware_class)) {
+        if (!is_array($middleware_class)) {
             $router->pushMiddlewareToGroup($middleware_key, $middleware_class);
 
             return;
@@ -235,7 +235,7 @@ 
         $configs = scandir(__DIR__."/config/backpack/$dir/");
         $configs = array_diff($configs, ['.', '..']);
 
-        if (! count($configs)) {
+        if (!count($configs)) {
             return;
         }
 
@@ -284,8 +284,7 @@ 
         // add the backpack_users password broker to the configuration
         $laravelAuthPasswordBrokers = app()->config['auth.passwords'];
         $laravelFirstPasswordBroker = is_array($laravelAuthPasswordBrokers) && current($laravelAuthPasswordBrokers) ?
-                                        current($laravelAuthPasswordBrokers)['table'] :
-                                        '';
+                                        current($laravelAuthPasswordBrokers)['table'] : '';
 
         $backpackPasswordBrokerTable = config('backpack.base.password_resets_table') ??
                                         config('auth.passwords.users.table') ??
@@ -313,7 +312,7 @@ 
 
     public function loadViewComponents()
     {
-        $this->app->afterResolving(BladeCompiler::class, function () {
+        $this->app->afterResolving(BladeCompiler::class, function() {
             Blade::componentNamespace('Backpack\\CRUD\\app\\View\\Components', 'backpack');
         });
     }
@@ -339,13 +338,13 @@ 
     private function registerBackpackErrorViews()
     {
         // register the backpack error when the exception handler is resolved from the container
-        $this->callAfterResolving(ExceptionHandler::class, function ($handler) {
-            if (! Str::startsWith(request()->path(), config('backpack.base.route_prefix'))) {
+        $this->callAfterResolving(ExceptionHandler::class, function($handler) {
+            if (!Str::startsWith(request()->path(), config('backpack.base.route_prefix'))) {
                 return;
             }
 
             // parse the namespaces set in config
-            [$themeNamespace, $themeFallbackNamespace] = (function () {
+            [$themeNamespace, $themeFallbackNamespace] = (function() {
                 $themeNamespace = config('backpack.ui.view_namespace');
                 $themeFallbackNamespace = config('backpack.ui.view_namespace_fallback');
 
@@ -362,8 +361,7 @@ 
             // - fallback theme paths
             // - ui path
             $themeErrorPaths = $viewFinderHints[$themeNamespace] ?? [];
-            $themeErrorPaths = $themeNamespace === $themeFallbackNamespace ? $themeErrorPaths :
-                array_merge($viewFinderHints[$themeFallbackNamespace] ?? [], $themeErrorPaths);
+            $themeErrorPaths = $themeNamespace === $themeFallbackNamespace ? $themeErrorPaths : array_merge($viewFinderHints[$themeFallbackNamespace] ?? [], $themeErrorPaths);
             $uiErrorPaths = [base_path('vendor/backpack/crud/src/resources/views/ui')];
             $themeErrorPaths = array_merge($themeErrorPaths, $uiErrorPaths);
 

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

Spacing +14 added lines, -15 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
@@ -178,7 +177,7 @@ 
     /**
      * Implementation.
      */
-    public function validateFieldRules(string $attribute, null|array|string|UploadedFile $data = null, ?array $customRules = null): array
+    public function validateFieldRules(string $attribute, null | array | string | UploadedFile $data = null, ?array $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] : []);