We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -29,13 +29,13 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | public bool $implicit = true; |
| 31 | 31 | |
| 32 | - public static function field(string|array|ValidationRule|Rule $rules = []): self |
|
| 32 | + public static function field(string | array | ValidationRule | Rule $rules = []): self |
|
| 33 | 33 | { |
| 34 | 34 | $instance = new static(); |
| 35 | 35 | $instance->fieldRules = self::getRulesAsArray($rules); |
| 36 | 36 | |
| 37 | 37 | if ($instance->validatesArrays()) { |
| 38 | - if (! in_array('array', $instance->getFieldRules())) { |
|
| 38 | + if (!in_array('array', $instance->getFieldRules())) { |
|
| 39 | 39 | $instance->fieldRules[] = 'array'; |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | public function getFieldRules(): array |
| 97 | 97 | { |
| 98 | - return tap($this->fieldRules, function ($rule) { |
|
| 98 | + return tap($this->fieldRules, function($rule) { |
|
| 99 | 99 | if (is_a($rule, BackpackCustomRule::class, true)) { |
| 100 | 100 | $rule = $rule->getFieldRules(); |
| 101 | 101 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $rules = explode('|', $rules); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - if (! is_array($rules)) { |
|
| 113 | + if (!is_array($rules)) { |
|
| 114 | 114 | $rules = [$rules]; |
| 115 | 115 | } |
| 116 | 116 | |
@@ -119,10 +119,10 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | protected function ensureValueIsValid($value) |
| 121 | 121 | { |
| 122 | - if ($this->validatesArrays() && ! is_array($value)) { |
|
| 122 | + if ($this->validatesArrays() && !is_array($value)) { |
|
| 123 | 123 | try { |
| 124 | 124 | $value = json_decode($value, true) ?? []; |
| 125 | - } catch(\Exception $e) { |
|
| 125 | + } catch (\Exception $e) { |
|
| 126 | 126 | return false; |
| 127 | 127 | } |
| 128 | 128 | } |
@@ -141,12 +141,12 @@ discard block |
||
| 141 | 141 | $attribute => $rules, |
| 142 | 142 | ], $this->validator->customMessages, $this->getValidatorCustomAttributes($attribute)); |
| 143 | 143 | |
| 144 | - return $validator->errors()->messages()[$attribute] ?? (! empty($validator->errors()->messages()) ? current($validator->errors()->messages()) : []); |
|
| 144 | + return $validator->errors()->messages()[$attribute] ?? (!empty($validator->errors()->messages()) ? current($validator->errors()->messages()) : []); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | private function getValidatorCustomAttributes(string $attribute): array |
| 148 | 148 | { |
| 149 | - if (! is_a($this, ValidGenericAjaxEndpoint::class) && ! Str::contains($attribute, '.*.')) { |
|
| 149 | + if (!is_a($this, ValidGenericAjaxEndpoint::class) && !Str::contains($attribute, '.*.')) { |
|
| 150 | 150 | return $this->validator->customAttributes; |
| 151 | 151 | } |
| 152 | 152 | |
@@ -157,8 +157,7 @@ discard block |
||
| 157 | 157 | protected function getValidationAttributeString(string $attribute) |
| 158 | 158 | { |
| 159 | 159 | return Str::substrCount($attribute, '.') > 1 ? |
| 160 | - Str::before($attribute, '.').'.*.'.Str::afterLast($attribute, '.') : |
|
| 161 | - $attribute; |
|
| 160 | + Str::before($attribute, '.').'.*.'.Str::afterLast($attribute, '.') : $attribute; |
|
| 162 | 161 | } |
| 163 | 162 | |
| 164 | 163 | protected function validateOnSubmit(string $attribute, mixed $value): array |
@@ -166,7 +165,7 @@ discard block |
||
| 166 | 165 | return $this->validateRules($attribute, $value); |
| 167 | 166 | } |
| 168 | 167 | |
| 169 | - protected function validateFieldAndFile(string $attribute, null|array $data = null, array|null $customRules = null): array |
|
| 168 | + protected function validateFieldAndFile(string $attribute, null | array $data = null, array | null $customRules = null): array |
|
| 170 | 169 | { |
| 171 | 170 | $fieldErrors = $this->validateFieldRules($attribute, $data, $customRules); |
| 172 | 171 | |
@@ -178,7 +177,7 @@ discard block |
||
| 178 | 177 | /** |
| 179 | 178 | * Implementation. |
| 180 | 179 | */ |
| 181 | - public function validateFieldRules(string $attribute, null|array|string|UploadedFile $data = null, array|null $customRules = null): array |
|
| 180 | + public function validateFieldRules(string $attribute, null | array | string | UploadedFile $data = null, array | null $customRules = null): array |
|
| 182 | 181 | { |
| 183 | 182 | $data = $data ?? $this->data; |
| 184 | 183 | $validationRuleAttribute = $this->getValidationAttributeString($attribute); |
@@ -187,16 +186,16 @@ discard block |
||
| 187 | 186 | return $this->validateAndGetErrors($validationRuleAttribute, $data, $customRules ?? $this->getFieldRules()); |
| 188 | 187 | } |
| 189 | 188 | |
| 190 | - protected function prepareValidatorData(array|string|UploadedFile $data, string $attribute): array |
|
| 189 | + protected function prepareValidatorData(array | string | UploadedFile $data, string $attribute): array |
|
| 191 | 190 | { |
| 192 | - if ($this->validatesArrays() && is_array($data) && ! Str::contains($attribute, '.')) { |
|
| 191 | + if ($this->validatesArrays() && is_array($data) && !Str::contains($attribute, '.')) { |
|
| 193 | 192 | return Arr::has($data, $attribute) ? $data : [$attribute => $data]; |
| 194 | 193 | } |
| 195 | 194 | |
| 196 | 195 | if (Str::contains($attribute, '.')) { |
| 197 | 196 | $validData = []; |
| 198 | 197 | |
| 199 | - Arr::set($validData, $attribute, ! is_array($data) ? $data : Arr::get($data, $attribute)); |
|
| 198 | + Arr::set($validData, $attribute, !is_array($data) ? $data : Arr::get($data, $attribute)); |
|
| 200 | 199 | |
| 201 | 200 | return $validData; |
| 202 | 201 | } |
@@ -211,7 +210,7 @@ discard block |
||
| 211 | 210 | $validationRuleAttribute = $this->getValidationAttributeString($attribute); |
| 212 | 211 | |
| 213 | 212 | $filesToValidate = Arr::get($items, $attribute); |
| 214 | - $filesToValidate = is_array($filesToValidate) ? array_filter($filesToValidate, function ($item) { |
|
| 213 | + $filesToValidate = is_array($filesToValidate) ? array_filter($filesToValidate, function($item) { |
|
| 215 | 214 | return $item instanceof UploadedFile; |
| 216 | 215 | }) : (is_a($filesToValidate, UploadedFile::class, true) ? [$filesToValidate] : []); |
| 217 | 216 | |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | class MultipleFiles extends Uploader |
| 12 | 12 | { |
| 13 | - public static function for(array $field, $configuration): UploaderInterface |
|
| 13 | + public static function for (array $field, $configuration): UploaderInterface |
|
| 14 | 14 | { |
| 15 | 15 | return (new self($field, $configuration))->multiple(); |
| 16 | 16 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | $previousFiles = []; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - if (! is_array($previousFiles) && is_string($previousFiles)) { |
|
| 32 | + if (!is_array($previousFiles) && is_string($previousFiles)) { |
|
| 33 | 33 | $previousFiles = json_decode($previousFiles, true); |
| 34 | 34 | } |
| 35 | 35 | |
@@ -38,14 +38,14 @@ discard block |
||
| 38 | 38 | if (in_array($previousFile, $filesToDelete)) { |
| 39 | 39 | Storage::disk($this->getDisk())->delete($previousFile); |
| 40 | 40 | |
| 41 | - $previousFiles = Arr::where($previousFiles, function ($value, $key) use ($previousFile) { |
|
| 41 | + $previousFiles = Arr::where($previousFiles, function($value, $key) use ($previousFile) { |
|
| 42 | 42 | return $value != $previousFile; |
| 43 | 43 | }); |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - if (! is_array($value)) { |
|
| 48 | + if (!is_array($value)) { |
|
| 49 | 49 | $value = []; |
| 50 | 50 | } |
| 51 | 51 | |
@@ -82,13 +82,13 @@ discard block |
||
| 82 | 82 | // create a temporary variable that we can unset keys |
| 83 | 83 | // everytime one is found. That way we avoid iterating |
| 84 | 84 | // already handled keys (notice we do a deep array copy) |
| 85 | - $tempFileOrder = array_map(function ($item) { |
|
| 85 | + $tempFileOrder = array_map(function($item) { |
|
| 86 | 86 | return $item; |
| 87 | 87 | }, $fileOrder); |
| 88 | 88 | |
| 89 | 89 | foreach ($previousRepeatableValues as $previousRow => $previousFiles) { |
| 90 | 90 | foreach ($previousFiles ?? [] as $key => $file) { |
| 91 | - $previousFileInArray = array_filter($tempFileOrder, function ($items, $key) use ($file, $tempFileOrder) { |
|
| 91 | + $previousFileInArray = array_filter($tempFileOrder, function($items, $key) use ($file, $tempFileOrder) { |
|
| 92 | 92 | $found = array_search($file, $items ?? [], true); |
| 93 | 93 | if ($found !== false) { |
| 94 | 94 | Arr::forget($tempFileOrder, $key.'.'.$found); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | return false; |
| 100 | 100 | }, ARRAY_FILTER_USE_BOTH); |
| 101 | - if ($file && ! $previousFileInArray) { |
|
| 101 | + if ($file && !$previousFileInArray) { |
|
| 102 | 102 | Storage::disk($this->getDisk())->delete($file); |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | /** |
| 11 | 11 | * Static constructor function. |
| 12 | 12 | */ |
| 13 | - public static function for(array $field, array $configuration): UploaderInterface; |
|
| 13 | + public static function for (array $field, array $configuration): UploaderInterface; |
|
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * Default implementation functions. |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | public function relationship(bool $isRelation): self; |
| 32 | 32 | |
| 33 | - public function fake(bool|string $isFake): self; |
|
| 33 | + public function fake(bool | string $isFake): self; |
|
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | 36 | * Getters. |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | public function getExpirationTimeInMinutes(): int; |
| 49 | 49 | |
| 50 | - public function getFileName(string|UploadedFile $file): string; |
|
| 50 | + public function getFileName(string | UploadedFile $file): string; |
|
| 51 | 51 | |
| 52 | 52 | public function getRepeatableContainerName(): ?string; |
| 53 | 53 | |
@@ -67,5 +67,5 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | public function isFake(): bool; |
| 69 | 69 | |
| 70 | - public function getFakeAttribute(): bool|string; |
|
| 70 | + public function getFakeAttribute(): bool | string; |
|
| 71 | 71 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | public bool $handleRepeatableFiles = false; |
| 16 | 16 | |
| 17 | - public null|string $repeatableContainerName = null; |
|
| 17 | + public null | string $repeatableContainerName = null; |
|
| 18 | 18 | |
| 19 | 19 | /******************************* |
| 20 | 20 | * Setters - fluently configure the uploader |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | /******************************* |
| 32 | 32 | * Getters |
| 33 | 33 | *******************************/ |
| 34 | - public function getRepeatableContainerName(): null|string |
|
| 34 | + public function getRepeatableContainerName(): null | string |
|
| 35 | 35 | { |
| 36 | 36 | return $this->repeatableContainerName; |
| 37 | 37 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $uploader) { |
| 160 | 160 | $uploadedValues = $uploader->uploadRepeatableFiles($values->pluck($uploader->getAttributeName())->toArray(), $this->getPreviousRepeatableValues($entry, $uploader)); |
| 161 | 161 | |
| 162 | - $values = $values->map(function ($item, $key) use ($uploadedValues, $uploader) { |
|
| 162 | + $values = $values->map(function($item, $key) use ($uploadedValues, $uploader) { |
|
| 163 | 163 | $item[$uploader->getAttributeName()] = $uploadedValues[$key] ?? null; |
| 164 | 164 | |
| 165 | 165 | return $item; |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | |
| 191 | 191 | $values = $entry->{$this->getAttributeName()}; |
| 192 | 192 | $values = is_string($values) ? json_decode($values, true) : $values; |
| 193 | - $values = array_map(function ($item) use ($repeatableUploaders) { |
|
| 193 | + $values = array_map(function($item) use ($repeatableUploaders) { |
|
| 194 | 194 | foreach ($repeatableUploaders as $upload) { |
| 195 | 195 | $item[$upload->getAttributeName()] = $this->getValuesWithPathStripped($item, $upload); |
| 196 | 196 | } |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | |
| 206 | 206 | private function retrieveRepeatableRelationFiles(Model $entry) |
| 207 | 207 | { |
| 208 | - switch($this->getRepeatableRelationType()) { |
|
| 208 | + switch ($this->getRepeatableRelationType()) { |
|
| 209 | 209 | case 'BelongsToMany': |
| 210 | 210 | case 'MorphToMany': |
| 211 | 211 | $pivotClass = app('crud')->getModel()->{$this->getUploaderSubfield()['baseEntity']}()->getPivotClass(); |
@@ -258,12 +258,12 @@ discard block |
||
| 258 | 258 | $repeatableValues ??= collect($entry->{$this->getRepeatableContainerName()}); |
| 259 | 259 | |
| 260 | 260 | foreach (app('UploadersRepository')->getRepeatableUploadersFor($this->getRepeatableContainerName()) as $upload) { |
| 261 | - if (! $upload->shouldDeleteFiles()) { |
|
| 261 | + if (!$upload->shouldDeleteFiles()) { |
|
| 262 | 262 | continue; |
| 263 | 263 | } |
| 264 | 264 | $values = $repeatableValues->pluck($upload->getName())->toArray(); |
| 265 | 265 | foreach ($values as $value) { |
| 266 | - if (! $value) { |
|
| 266 | + if (!$value) { |
|
| 267 | 267 | continue; |
| 268 | 268 | } |
| 269 | 269 | |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | /** |
| 287 | 287 | * Given two multidimensional arrays/collections, merge them recursively. |
| 288 | 288 | */ |
| 289 | - protected function mergeValuesRecursive(array|Collection $array1, array|Collection $array2): array|Collection |
|
| 289 | + protected function mergeValuesRecursive(array | Collection $array1, array | Collection $array2): array | Collection |
|
| 290 | 290 | { |
| 291 | 291 | $merged = $array1; |
| 292 | 292 | foreach ($array2 as $key => &$value) { |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | { |
| 309 | 309 | $items = CRUD::getRequest()->input('_order_'.$this->getRepeatableContainerName()) ?? []; |
| 310 | 310 | |
| 311 | - array_walk($items, function (&$key, $value) { |
|
| 311 | + array_walk($items, function(&$key, $value) { |
|
| 312 | 312 | $requestValue = $key[$this->getName()] ?? null; |
| 313 | 313 | $key = $this->handleMultipleFiles ? (is_string($requestValue) ? explode(',', $requestValue) : $requestValue) : $requestValue; |
| 314 | 314 | }); |
@@ -320,22 +320,22 @@ discard block |
||
| 320 | 320 | { |
| 321 | 321 | $previousValues = $entry->getOriginal($uploader->getRepeatableContainerName()); |
| 322 | 322 | |
| 323 | - if (! is_array($previousValues)) { |
|
| 323 | + if (!is_array($previousValues)) { |
|
| 324 | 324 | $previousValues = json_decode($previousValues, true); |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | - if (! empty($previousValues)) { |
|
| 327 | + if (!empty($previousValues)) { |
|
| 328 | 328 | $previousValues = array_column($previousValues, $uploader->getName()); |
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | return $previousValues ?? []; |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | - private function getValuesWithPathStripped(array|string|null $item, UploaderInterface $uploader) |
|
| 334 | + private function getValuesWithPathStripped(array | string | null $item, UploaderInterface $uploader) |
|
| 335 | 335 | { |
| 336 | 336 | $uploadedValues = $item[$uploader->getName()] ?? null; |
| 337 | 337 | if (is_array($uploadedValues)) { |
| 338 | - return array_map(function ($value) use ($uploader) { |
|
| 338 | + return array_map(function($value) use ($uploader) { |
|
| 339 | 339 | return $uploader->getValueWithoutPath($value); |
| 340 | 340 | }, $uploadedValues); |
| 341 | 341 | } |
@@ -354,19 +354,19 @@ discard block |
||
| 354 | 354 | { |
| 355 | 355 | if (in_array($this->getRepeatableRelationType(), ['BelongsToMany', 'MorphToMany'])) { |
| 356 | 356 | $pivotAttributes = $entry->getAttributes(); |
| 357 | - $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function ($item) use ($pivotAttributes) { |
|
| 357 | + $connectedPivot = $entry->pivotParent->{$this->getRepeatableContainerName()}->where(function($item) use ($pivotAttributes) { |
|
| 358 | 358 | $itemPivotAttributes = $item->pivot->only(array_keys($pivotAttributes)); |
| 359 | 359 | |
| 360 | 360 | return $itemPivotAttributes === $pivotAttributes; |
| 361 | 361 | })->first(); |
| 362 | 362 | |
| 363 | - if (! $connectedPivot) { |
|
| 363 | + if (!$connectedPivot) { |
|
| 364 | 364 | return; |
| 365 | 365 | } |
| 366 | 366 | |
| 367 | 367 | $files = $connectedPivot->getOriginal()['pivot_'.$this->getAttributeName()]; |
| 368 | 368 | |
| 369 | - if (! $files) { |
|
| 369 | + if (!$files) { |
|
| 370 | 370 | return; |
| 371 | 371 | } |
| 372 | 372 | |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | $app['config']->set('database.default', 'testing'); |
| 49 | 49 | $app['config']->set('backpack.base.route_prefix', 'admin'); |
| 50 | 50 | |
| 51 | - $app->bind('App\Http\Middleware\CheckIfAdmin', function () { |
|
| 51 | + $app->bind('App\Http\Middleware\CheckIfAdmin', function() { |
|
| 52 | 52 | return new class |
| 53 | 53 | { |
| 54 | 54 | public function handle($request, $next) |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | */ |
| 12 | 12 | public function up(): void |
| 13 | 13 | { |
| 14 | - Schema::create('uploaders', function (Blueprint $table) { |
|
| 14 | + Schema::create('uploaders', function(Blueprint $table) { |
|
| 15 | 15 | $table->increments('id'); |
| 16 | 16 | $table->string('upload')->nullable(); |
| 17 | 17 | $table->json('upload_multiple')->nullable(); |
@@ -21,8 +21,7 @@ discard block |
||
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | $previousValues = str_contains($attribute, '.') ? |
| 24 | - (Arr::get($entry?->{Str::before($attribute, '.')} ?? [], Str::after($attribute, '.')) ?? []) : |
|
| 25 | - ($entry?->{$attribute} ?? []); |
|
| 24 | + (Arr::get($entry?->{Str::before($attribute, '.')} ?? [], Str::after($attribute, '.')) ?? []) : ($entry?->{$attribute} ?? []); |
|
| 26 | 25 | |
| 27 | 26 | if (is_string($previousValues)) { |
| 28 | 27 | $previousValues = json_decode($previousValues, true) ?? []; |
@@ -39,7 +38,7 @@ discard block |
||
| 39 | 38 | |
| 40 | 39 | // if there is no entry, the values we are going to validate need to be files |
| 41 | 40 | // the request was tampered so we will set the attribute to null |
| 42 | - if (! $entry && ! empty(Arr::get($data, $attribute)) && ! $this->allFiles(Arr::get($data, $attribute))) { |
|
| 41 | + if (!$entry && !empty(Arr::get($data, $attribute)) && !$this->allFiles(Arr::get($data, $attribute))) { |
|
| 43 | 42 | Arr::set($data, $attribute, null); |
| 44 | 43 | } |
| 45 | 44 | |
@@ -50,7 +49,7 @@ discard block |
||
| 50 | 49 | private function allFiles(array $values): bool |
| 51 | 50 | { |
| 52 | 51 | foreach ($values as $value) { |
| 53 | - if (! $value instanceof \Illuminate\Http\UploadedFile) { |
|
| 52 | + if (!$value instanceof \Illuminate\Http\UploadedFile) { |
|
| 54 | 53 | return false; |
| 55 | 54 | } |
| 56 | 55 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | // if the attribute is not set in the request, and an entry exists, |
| 22 | 22 | // we will check if there is a previous value, as this field might not have changed. |
| 23 | - if (! Arr::has($this->data, $attribute) && $entry) { |
|
| 23 | + if (!Arr::has($this->data, $attribute) && $entry) { |
|
| 24 | 24 | if (str_contains($attribute, '.') && get_class($entry) === get_class(CrudPanelFacade::getModel())) { |
| 25 | 25 | $previousValue = Arr::get($this->data, '_order_'.Str::before($attribute, '.')); |
| 26 | 26 | $previousValue = Arr::get($previousValue, Str::after($attribute, '.')); |
@@ -37,25 +37,25 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | // if the value is an uploaded file, or the attribute is not |
| 39 | 39 | // set in the request, we force fill the data with the value |
| 40 | - if ($value instanceof UploadedFile || ! Arr::has($this->data, $attribute)) { |
|
| 40 | + if ($value instanceof UploadedFile || !Arr::has($this->data, $attribute)) { |
|
| 41 | 41 | Arr::set($this->data, $attribute, $value); |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // if there are no entry, and the new value it's not a file ... well we don't want it at all. |
| 45 | - if (! $entry && ! $value instanceof UploadedFile) { |
|
| 45 | + if (!$entry && !$value instanceof UploadedFile) { |
|
| 46 | 46 | Arr::set($this->data, $attribute, null); |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | $fieldErrors = $this->validateFieldRules($attribute); |
| 50 | 50 | |
| 51 | - if (! empty($value) && ! empty($this->getFileRules())) { |
|
| 51 | + if (!empty($value) && !empty($this->getFileRules())) { |
|
| 52 | 52 | $fileErrors = $this->validateFileRules($attribute, $value); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | return array_merge($fieldErrors, $fileErrors ?? []); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - public static function field(string|array|ValidationRule|Rule $rules = []): self |
|
| 58 | + public static function field(string | array | ValidationRule | Rule $rules = []): self |
|
| 59 | 59 | { |
| 60 | 60 | return parent::field($rules); |
| 61 | 61 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | $this->assertDatabaseHas('uploaders', [ |
| 55 | 55 | 'upload' => 'avatar.pdf', |
| 56 | - 'upload_multiple' => json_encode(['avatar1.pdf', 'avatar2.pdf']), |
|
| 56 | + 'upload_multiple' => json_encode(['avatar1.pdf', 'avatar2.pdf']), |
|
| 57 | 57 | ]); |
| 58 | 58 | |
| 59 | 59 | $this->assertTrue(Storage::disk('uploaders')->exists('avatar.pdf')); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 90 | 90 | 'upload' => UploadedFile::fake()->create('avatar4.pdf'), |
| 91 | 91 | 'upload_multiple' => [UploadedFile::fake()->create('avatar5.pdf'), UploadedFile::fake()->create('avatar6.pdf')], |
| 92 | - 'clear_upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'], |
|
| 92 | + 'clear_upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'], |
|
| 93 | 93 | 'id' => 1, |
| 94 | 94 | ]); |
| 95 | 95 | |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | $this->assertDatabaseHas('uploaders', [ |
| 103 | 103 | 'upload' => 'avatar4.pdf', |
| 104 | - 'upload_multiple' => json_encode(['avatar5.pdf', 'avatar6.pdf']), |
|
| 104 | + 'upload_multiple' => json_encode(['avatar5.pdf', 'avatar6.pdf']), |
|
| 105 | 105 | ]); |
| 106 | 106 | |
| 107 | 107 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | self::initUploaderWithFiles(); |
| 134 | 134 | |
| 135 | 135 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 136 | - 'upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'], |
|
| 136 | + 'upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'], |
|
| 137 | 137 | 'id' => 1, |
| 138 | 138 | ]); |
| 139 | 139 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | $this->assertDatabaseHas('uploaders', [ |
| 147 | 147 | 'upload' => 'avatar1.pdf', |
| 148 | - 'upload_multiple' => json_encode(['avatar2.pdf', 'avatar3.pdf']), |
|
| 148 | + 'upload_multiple' => json_encode(['avatar2.pdf', 'avatar3.pdf']), |
|
| 149 | 149 | ]); |
| 150 | 150 | |
| 151 | 151 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | |
| 176 | 176 | $this->assertDatabaseHas('uploaders', [ |
| 177 | 177 | 'upload' => 'avatar1.pdf', |
| 178 | - 'upload_multiple' => json_encode(['avatar3.pdf', 'avatar4.pdf', 'avatar5.pdf']), |
|
| 178 | + 'upload_multiple' => json_encode(['avatar3.pdf', 'avatar4.pdf', 'avatar5.pdf']), |
|
| 179 | 179 | ]); |
| 180 | 180 | |
| 181 | 181 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 334 | 334 | 'upload' => null, |
| 335 | 335 | 'upload_multiple' => null, |
| 336 | - 'clear_upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'], |
|
| 336 | + 'clear_upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'], |
|
| 337 | 337 | 'id' => 1, |
| 338 | 338 | ]); |
| 339 | 339 | |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 358 | 358 | 'upload_multiple' => [UploadedFile::fake()->create('avatar1.pdf')], |
| 359 | - 'clear_upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'], |
|
| 359 | + 'clear_upload_multiple' => ['avatar2.pdf', 'avatar3.pdf'], |
|
| 360 | 360 | 'id' => 1, |
| 361 | 361 | ]); |
| 362 | 362 | |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | |
| 379 | 379 | Uploader::create([ |
| 380 | 380 | 'upload' => 'avatar1.jpg', |
| 381 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 381 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 382 | 382 | ]); |
| 383 | 383 | } |
| 384 | 384 | |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | |
| 391 | 391 | Uploader::create([ |
| 392 | 392 | 'upload' => 'avatar1.pdf', |
| 393 | - 'upload_multiple' => json_encode(['avatar2.pdf', 'avatar3.pdf']), |
|
| 393 | + 'upload_multiple' => json_encode(['avatar2.pdf', 'avatar3.pdf']), |
|
| 394 | 394 | ]); |
| 395 | 395 | } |
| 396 | 396 | |