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 | } |
@@ -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) |
@@ -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 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $this->assertDatabaseHas('uploaders', [ |
| 64 | 64 | 'upload' => 'avatar1.jpg', |
| 65 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 65 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 66 | 66 | ]); |
| 67 | 67 | |
| 68 | 68 | $this->assertTrue(Storage::disk('uploaders')->exists('avatar1.jpg')); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 98 | 98 | 'upload' => $this->getUploadedFile('avatar4.jpg'), |
| 99 | 99 | 'upload_multiple' => $this->getUploadedFiles(['avatar5.jpg', 'avatar6.jpg']), |
| 100 | - 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 100 | + 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 101 | 101 | 'id' => 1, |
| 102 | 102 | ]); |
| 103 | 103 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | $this->assertDatabaseHas('uploaders', [ |
| 111 | 111 | 'upload' => 'avatar4.jpg', |
| 112 | - 'upload_multiple' => json_encode(['avatar5.jpg', 'avatar6.jpg']), |
|
| 112 | + 'upload_multiple' => json_encode(['avatar5.jpg', 'avatar6.jpg']), |
|
| 113 | 113 | ]); |
| 114 | 114 | |
| 115 | 115 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | $this->assertDatabaseHas('uploaders', [ |
| 140 | 140 | 'upload' => null, |
| 141 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 141 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 142 | 142 | ]); |
| 143 | 143 | |
| 144 | 144 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | self::initUploaderWithFiles(); |
| 169 | 169 | |
| 170 | 170 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 171 | - 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 171 | + 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 172 | 172 | 'id' => 1, |
| 173 | 173 | ]); |
| 174 | 174 | |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | |
| 181 | 181 | $this->assertDatabaseHas('uploaders', [ |
| 182 | 182 | 'upload' => 'avatar1.jpg', |
| 183 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 183 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 184 | 184 | ]); |
| 185 | 185 | |
| 186 | 186 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | |
| 211 | 211 | $this->assertDatabaseHas('uploaders', [ |
| 212 | 212 | 'upload' => 'avatar1.jpg', |
| 213 | - 'upload_multiple' => json_encode(['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg']), |
|
| 213 | + 'upload_multiple' => json_encode(['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg']), |
|
| 214 | 214 | ]); |
| 215 | 215 | |
| 216 | 216 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | |
| 232 | 232 | Uploader::create([ |
| 233 | 233 | 'upload' => 'avatar1.jpg', |
| 234 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 234 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 235 | 235 | ]); |
| 236 | 236 | } |
| 237 | 237 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | '_method' => 'PUT', |
| 94 | 94 | 'upload' => $this->getUploadedFile('avatar4.jpg'), |
| 95 | 95 | 'upload_multiple' => $this->getUploadedFiles(['avatar5.jpg', 'avatar6.jpg']), |
| 96 | - 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 96 | + 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 97 | 97 | 'id' => 1, |
| 98 | 98 | ]); |
| 99 | 99 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $this->assertDatabaseCount('uploaders', 1); |
| 174 | 174 | |
| 175 | 175 | $this->assertDatabaseHas('uploaders', [ |
| 176 | - 'extras' => json_encode(['upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], 'upload' => 'avatar1.jpg']), |
|
| 176 | + 'extras' => json_encode(['upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], 'upload' => 'avatar1.jpg']), |
|
| 177 | 177 | ]); |
| 178 | 178 | |
| 179 | 179 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | self::initUploaderWithFiles(); |
| 191 | 191 | |
| 192 | 192 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 193 | - 'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg', 'avatar5.jpg']), |
|
| 193 | + 'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg', 'avatar5.jpg']), |
|
| 194 | 194 | 'clear_upload_multiple' => ['avatar2.jpg'], |
| 195 | 195 | 'id' => 1, |
| 196 | 196 | ]); |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | $this->assertDatabaseCount('uploaders', 1); |
| 203 | 203 | |
| 204 | 204 | $this->assertDatabaseHas('uploaders', [ |
| 205 | - 'extras' => json_encode(['upload_multiple' => ['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg'], 'upload' => 'avatar1.jpg']), |
|
| 205 | + 'extras' => json_encode(['upload_multiple' => ['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg'], 'upload' => 'avatar1.jpg']), |
|
| 206 | 206 | ]); |
| 207 | 207 | |
| 208 | 208 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | UploadedFile::fake()->image('avatar3.jpg')->storeAs('', 'avatar3.jpg', ['disk' => 'uploaders']); |
| 223 | 223 | |
| 224 | 224 | FakeUploader::create([ |
| 225 | - 'extras' => ['upload' => 'avatar1.jpg', 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg']], |
|
| 225 | + 'extras' => ['upload' => 'avatar1.jpg', 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg']], |
|
| 226 | 226 | ]); |
| 227 | 227 | } |
| 228 | 228 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $this->assertDatabaseHas('uploaders', [ |
| 64 | 64 | 'upload' => 'avatar1.jpg', |
| 65 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 65 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 66 | 66 | ]); |
| 67 | 67 | |
| 68 | 68 | $this->assertTrue(Storage::disk('uploaders')->exists('avatar1.jpg')); |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 99 | 99 | 'upload' => $this->getUploadedFile('avatar4.jpg'), |
| 100 | - 'upload_multiple' => $this->getUploadedFiles(['avatar5.jpg', 'avatar6.jpg']), |
|
| 101 | - 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 100 | + 'upload_multiple' => $this->getUploadedFiles(['avatar5.jpg', 'avatar6.jpg']), |
|
| 101 | + 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 102 | 102 | 'id' => 1, |
| 103 | 103 | ]); |
| 104 | 104 | |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | $this->assertDatabaseHas('uploaders', [ |
| 112 | 112 | 'upload' => 'avatar4.jpg', |
| 113 | - 'upload_multiple' => json_encode(['avatar5.jpg', 'avatar6.jpg']), |
|
| 113 | + 'upload_multiple' => json_encode(['avatar5.jpg', 'avatar6.jpg']), |
|
| 114 | 114 | ]); |
| 115 | 115 | |
| 116 | 116 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | self::initUploaderWithFiles(); |
| 143 | 143 | |
| 144 | 144 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 145 | - 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 145 | + 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 146 | 146 | 'id' => 1, |
| 147 | 147 | ]); |
| 148 | 148 | |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | $this->assertDatabaseHas('uploaders', [ |
| 156 | 156 | 'upload' => 'avatar1.jpg', |
| 157 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 157 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 158 | 158 | ]); |
| 159 | 159 | |
| 160 | 160 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | self::initUploaderWithFiles(); |
| 172 | 172 | |
| 173 | 173 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 174 | - 'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg', 'avatar5.jpg']), |
|
| 174 | + 'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg', 'avatar5.jpg']), |
|
| 175 | 175 | 'clear_upload_multiple' => ['avatar2.jpg'], |
| 176 | 176 | 'id' => 1, |
| 177 | 177 | ]); |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | |
| 185 | 185 | $this->assertDatabaseHas('uploaders', [ |
| 186 | 186 | 'upload' => 'avatar1.jpg', |
| 187 | - 'upload_multiple' => json_encode(['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg']), |
|
| 187 | + 'upload_multiple' => json_encode(['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg']), |
|
| 188 | 188 | ]); |
| 189 | 189 | |
| 190 | 190 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 342 | 342 | 'upload' => null, |
| 343 | 343 | 'upload_multiple' => null, |
| 344 | - 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 344 | + 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 345 | 345 | 'id' => 1, |
| 346 | 346 | ]); |
| 347 | 347 | |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | |
| 365 | 365 | $response = $this->put($this->testBaseUrl.'/1', [ |
| 366 | 366 | 'upload_multiple' => $this->getUploadedFiles(['avatar2.jpg']), |
| 367 | - 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 367 | + 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
| 368 | 368 | 'id' => 1, |
| 369 | 369 | ]); |
| 370 | 370 | |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | |
| 387 | 387 | Uploader::create([ |
| 388 | 388 | 'upload' => 'avatar1.jpg', |
| 389 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 389 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 390 | 390 | ]); |
| 391 | 391 | } |
| 392 | 392 | |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | |
| 399 | 399 | Uploader::create([ |
| 400 | 400 | 'upload' => 'avatar1.jpg', |
| 401 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 401 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
| 402 | 402 | ]); |
| 403 | 403 | } |
| 404 | 404 | |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | |
| 14 | 14 | protected function getUploadedFiles(array $fileNames, string $mime = 'image/jpg') |
| 15 | 15 | { |
| 16 | - return array_map(function ($fileName) use ($mime) { |
|
| 16 | + return array_map(function($fileName) use ($mime) { |
|
| 17 | 17 | return new UploadedFile(__DIR__.'/assets/'.$fileName, $fileName, $mime, null, true); |
| 18 | 18 | }, $fileNames); |
| 19 | 19 | } |