We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | $this->assertDatabaseHas('uploaders', [ |
61 | 61 | 'upload' => 'avatar.jpg', |
62 | - 'upload_multiple' => json_encode(['avatar1.jpg', 'avatar2.jpg']), |
|
62 | + 'upload_multiple' => json_encode(['avatar1.jpg', 'avatar2.jpg']), |
|
63 | 63 | ]); |
64 | 64 | |
65 | 65 | $this->assertTrue(Storage::disk('uploaders')->exists('avatar.jpg')); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $response = $this->put($this->testBaseUrl.'/1', [ |
95 | 95 | 'upload' => UploadedFile::fake()->image('avatar4.jpg'), |
96 | 96 | 'upload_multiple' => [UploadedFile::fake()->image('avatar5.jpg'), UploadedFile::fake()->image('avatar6.jpg')], |
97 | - 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
97 | + 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
98 | 98 | 'id' => 1, |
99 | 99 | ]); |
100 | 100 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | $this->assertDatabaseHas('uploaders', [ |
108 | 108 | 'upload' => 'avatar4.jpg', |
109 | - 'upload_multiple' => json_encode(['avatar5.jpg', 'avatar6.jpg']), |
|
109 | + 'upload_multiple' => json_encode(['avatar5.jpg', 'avatar6.jpg']), |
|
110 | 110 | ]); |
111 | 111 | |
112 | 112 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | |
136 | 136 | $this->assertDatabaseHas('uploaders', [ |
137 | 137 | 'upload' => null, |
138 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
138 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
139 | 139 | ]); |
140 | 140 | |
141 | 141 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | self::initUploaderWithFiles(); |
166 | 166 | |
167 | 167 | $response = $this->put($this->testBaseUrl.'/1', [ |
168 | - 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
168 | + 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
169 | 169 | 'id' => 1, |
170 | 170 | ]); |
171 | 171 | |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | $this->assertDatabaseHas('uploaders', [ |
179 | 179 | 'upload' => 'avatar1.jpg', |
180 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
180 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
181 | 181 | ]); |
182 | 182 | |
183 | 183 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | |
208 | 208 | $this->assertDatabaseHas('uploaders', [ |
209 | 209 | 'upload' => 'avatar1.jpg', |
210 | - 'upload_multiple' => json_encode(['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg']), |
|
210 | + 'upload_multiple' => json_encode(['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg']), |
|
211 | 211 | ]); |
212 | 212 | |
213 | 213 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | |
229 | 229 | Uploader::create([ |
230 | 230 | 'upload' => 'avatar1.jpg', |
231 | - 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
231 | + 'upload_multiple' => json_encode(['avatar2.jpg', 'avatar3.jpg']), |
|
232 | 232 | ]); |
233 | 233 | } |
234 | 234 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | private bool $deleteWhenEntryIsDeleted = true; |
27 | 27 | |
28 | - private bool|string $attachedToFakeField = false; |
|
28 | + private bool | string $attachedToFakeField = false; |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * Cloud disks have the ability to generate temporary URLs to files, should we do it? |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | /******************************* |
63 | 63 | * Static methods |
64 | 64 | *******************************/ |
65 | - public static function for(array $crudObject, array $definition): UploaderInterface |
|
65 | + public static function for (array $crudObject, array $definition): UploaderInterface |
|
66 | 66 | { |
67 | 67 | return new static($crudObject, $definition); |
68 | 68 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | public function deleteUploadedFiles(Model $entry): void |
104 | 104 | { |
105 | 105 | if ($this->deleteWhenEntryIsDeleted) { |
106 | - if (! in_array(SoftDeletes::class, class_uses_recursive($entry), true)) { |
|
106 | + if (!in_array(SoftDeletes::class, class_uses_recursive($entry), true)) { |
|
107 | 107 | $this->performFileDeletion($entry); |
108 | 108 | |
109 | 109 | return; |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | |
180 | 180 | public function getPreviousFiles(Model $entry): mixed |
181 | 181 | { |
182 | - if (! $this->attachedToFakeField) { |
|
182 | + if (!$this->attachedToFakeField) { |
|
183 | 183 | return $this->getOriginalValue($entry); |
184 | 184 | } |
185 | 185 | $value = $this->getOriginalValue($entry, $this->attachedToFakeField); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | return $this->attachedToFakeField !== false; |
199 | 199 | } |
200 | 200 | |
201 | - public function getFakeAttribute(): bool|string |
|
201 | + public function getFakeAttribute(): bool | string |
|
202 | 202 | { |
203 | 203 | return $this->attachedToFakeField; |
204 | 204 | } |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | return $this; |
221 | 221 | } |
222 | 222 | |
223 | - public function fake(bool|string $isFake): self |
|
223 | + public function fake(bool | string $isFake): self |
|
224 | 224 | { |
225 | 225 | $this->attachedToFakeField = $isFake; |
226 | 226 | |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | } |
252 | 252 | |
253 | 253 | if ($this->handleMultipleFiles) { |
254 | - if (! isset($entry->getCasts()[$this->getName()]) && is_string($value)) { |
|
254 | + if (!isset($entry->getCasts()[$this->getName()]) && is_string($value)) { |
|
255 | 255 | $entry->{$this->getAttributeName()} = json_decode($value, true); |
256 | 256 | } |
257 | 257 | |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | |
266 | 266 | private function deleteFiles(Model $entry) |
267 | 267 | { |
268 | - if (! $this->shouldDeleteFiles()) { |
|
268 | + if (!$this->shouldDeleteFiles()) { |
|
269 | 269 | return; |
270 | 270 | } |
271 | 271 | |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | |
284 | 284 | if ($this->handleMultipleFiles) { |
285 | 285 | // ensure we have an array of values when field is not casted in model. |
286 | - if (! isset($entry->getCasts()[$this->name]) && is_string($values)) { |
|
286 | + if (!isset($entry->getCasts()[$this->name]) && is_string($values)) { |
|
287 | 287 | $values = json_decode($values, true); |
288 | 288 | } |
289 | 289 | foreach ($values ?? [] as $value) { |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | |
301 | 301 | private function performFileDeletion(Model $entry) |
302 | 302 | { |
303 | - if (! $this->handleRepeatableFiles) { |
|
303 | + if (!$this->handleRepeatableFiles) { |
|
304 | 304 | $this->deleteFiles($entry); |
305 | 305 | |
306 | 306 | return; |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | |
330 | 330 | $previousValue = $entry->getOriginal($field); |
331 | 331 | |
332 | - if (! $previousValue) { |
|
332 | + if (!$previousValue) { |
|
333 | 333 | return $previousValue; |
334 | 334 | } |
335 | 335 |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | '_method' => 'PUT', |
89 | 89 | 'upload' => $this->getUploadedFile('avatar4.jpg'), |
90 | 90 | 'upload_multiple' => $this->getUploadedFiles(['avatar5.jpg', 'avatar6.jpg']), |
91 | - 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
91 | + 'clear_upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], |
|
92 | 92 | 'id' => 1, |
93 | 93 | ]); |
94 | 94 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $this->assertDatabaseCount('uploaders', 1); |
169 | 169 | |
170 | 170 | $this->assertDatabaseHas('uploaders', [ |
171 | - 'extras' => json_encode(['upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], 'upload' => 'avatar1.jpg']), |
|
171 | + 'extras' => json_encode(['upload_multiple' => ['avatar2.jpg', 'avatar3.jpg'], 'upload' => 'avatar1.jpg']), |
|
172 | 172 | ]); |
173 | 173 | |
174 | 174 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | self::initUploaderWithFiles(); |
186 | 186 | |
187 | 187 | $response = $this->put($this->testBaseUrl.'/1', [ |
188 | - 'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg', 'avatar5.jpg']), |
|
188 | + 'upload_multiple' => $this->getUploadedFiles(['avatar4.jpg', 'avatar5.jpg']), |
|
189 | 189 | 'clear_upload_multiple' => ['avatar2.jpg'], |
190 | 190 | 'id' => 1, |
191 | 191 | ]); |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | $this->assertDatabaseCount('uploaders', 1); |
198 | 198 | |
199 | 199 | $this->assertDatabaseHas('uploaders', [ |
200 | - 'extras' => json_encode(['upload_multiple' => ['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg'], 'upload' => 'avatar1.jpg']), |
|
200 | + 'extras' => json_encode(['upload_multiple' => ['avatar3.jpg', 'avatar4.jpg', 'avatar5.jpg'], 'upload' => 'avatar1.jpg']), |
|
201 | 201 | ]); |
202 | 202 | |
203 | 203 | $files = Storage::disk('uploaders')->allFiles(); |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | UploadedFile::fake()->image('avatar3.jpg')->storeAs('', 'avatar3.jpg', ['disk' => 'uploaders']); |
218 | 218 | |
219 | 219 | FakeUploader::create([ |
220 | - 'extras' => ['upload' => 'avatar1.jpg', 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg']], |
|
220 | + 'extras' => ['upload' => 'avatar1.jpg', 'upload_multiple' => ['avatar2.jpg', 'avatar3.jpg']], |
|
221 | 221 | ]); |
222 | 222 | } |
223 | 223 | |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | protected function getUploadedFiles(array $fileNames) |
237 | 237 | { |
238 | - return array_map(function ($fileName) { |
|
238 | + return array_map(function($fileName) { |
|
239 | 239 | return new UploadedFile(__DIR__.'/../config/assets/'.$fileName, $fileName, 'image/jpg', null, true); |
240 | 240 | }, $fileNames); |
241 | 241 | } |