@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | if (method_exists($query->getModel(), 'translations')) { |
20 | 20 | $locale = $locale == null ? app()->getLocale() : $locale; |
21 | 21 | |
22 | - $query->whereHas('translations', function ($query) use ($locale) { |
|
22 | + $query->whereHas('translations', function($query) use ($locale) { |
|
23 | 23 | $query->whereActive(true); |
24 | 24 | $query->whereLocale($locale); |
25 | 25 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | } |
29 | 29 | }); |
30 | 30 | |
31 | - return $query->with(['translations' => function ($query) use ($locale) { |
|
31 | + return $query->with(['translations' => function($query) use ($locale) { |
|
32 | 32 | $query->whereActive(true); |
33 | 33 | $query->whereLocale($locale); |
34 | 34 | |
@@ -48,14 +48,14 @@ discard block |
||
48 | 48 | $locale = $locale == null ? app()->getLocale() : $locale; |
49 | 49 | |
50 | 50 | return $query |
51 | - ->join($translationTable, function (JoinClause $join) use ($translationTable, $localeKey, $table, $keyName) { |
|
51 | + ->join($translationTable, function(JoinClause $join) use ($translationTable, $localeKey, $table, $keyName) { |
|
52 | 52 | $join |
53 | - ->on($translationTable.'.'.$this->getRelationKey(), '=', $table.'.'.$keyName) |
|
54 | - ->where($translationTable.'.'.$localeKey, $this->locale()); |
|
53 | + ->on($translationTable . '.' . $this->getRelationKey(), '=', $table . '.' . $keyName) |
|
54 | + ->where($translationTable . '.' . $localeKey, $this->locale()); |
|
55 | 55 | }) |
56 | - ->where($translationTable.'.'.$this->getLocaleKey(), $locale) |
|
57 | - ->orderBy($translationTable.'.'.$orderField, $orderType) |
|
58 | - ->select($table.'.*') |
|
56 | + ->where($translationTable . '.' . $this->getLocaleKey(), $locale) |
|
57 | + ->orderBy($translationTable . '.' . $orderField, $orderType) |
|
58 | + ->select($table . '.*') |
|
59 | 59 | ->with('translations'); |
60 | 60 | } |
61 | 61 | |
@@ -91,14 +91,14 @@ discard block |
||
91 | 91 | |
92 | 92 | public function getActiveLanguages() |
93 | 93 | { |
94 | - return $this->translations->map(function ($translation) { |
|
94 | + return $this->translations->map(function($translation) { |
|
95 | 95 | return [ |
96 | 96 | 'shortlabel' => strtoupper($translation->locale), |
97 | 97 | 'label' => getLanguageLabelFromLocaleCode($translation->locale), |
98 | 98 | 'value' => $translation->locale, |
99 | 99 | 'published' => $translation->active ?? false, |
100 | 100 | ]; |
101 | - })->sortBy(function ($translation) { |
|
101 | + })->sortBy(function($translation) { |
|
102 | 102 | $localesOrdered = config('translatable.locales'); |
103 | 103 | return array_search($translation['value'], $localesOrdered); |
104 | 104 | })->values(); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | public function translatedAttribute($key) |
108 | 108 | { |
109 | - return $this->translations->mapWithKeys(function ($translation) use ($key) { |
|
109 | + return $this->translations->mapWithKeys(function($translation) use ($key) { |
|
110 | 110 | return [$translation->locale => $this->translate($translation->locale)->$key]; |
111 | 111 | }); |
112 | 112 | } |
@@ -51,13 +51,13 @@ |
||
51 | 51 | // anonymous functions are used to let configuration dictate |
52 | 52 | // the execution of the appropriate implementation |
53 | 53 | $endpointByType = [ |
54 | - 'local' => function () { |
|
54 | + 'local' => function() { |
|
55 | 55 | return $this->urlGenerator->route('admin.media-library.medias.store'); |
56 | 56 | }, |
57 | - 's3' => function () use ($libraryDisk) { |
|
57 | + 's3' => function() use ($libraryDisk) { |
|
58 | 58 | return s3Endpoint($libraryDisk); |
59 | 59 | }, |
60 | - 'azure' => function () use ($libraryDisk) { |
|
60 | + 'azure' => function() use ($libraryDisk) { |
|
61 | 61 | return azureEndpoint($libraryDisk); |
62 | 62 | }, |
63 | 63 | ]; |
@@ -51,13 +51,13 @@ |
||
51 | 51 | // anonymous functions are used to let configuration dictate |
52 | 52 | // the execution of the appropriate implementation |
53 | 53 | $endpointByType = [ |
54 | - 'local' => function () { |
|
54 | + 'local' => function() { |
|
55 | 55 | return $this->urlGenerator->route('admin.file-library.files.store'); |
56 | 56 | }, |
57 | - 's3' => function () use ($libraryDisk) { |
|
57 | + 's3' => function() use ($libraryDisk) { |
|
58 | 58 | return s3Endpoint($libraryDisk); |
59 | 59 | }, |
60 | - 'azure' => function () use ($libraryDisk) { |
|
60 | + 'azure' => function() use ($libraryDisk) { |
|
61 | 61 | return azureEndpoint($libraryDisk); |
62 | 62 | }, |
63 | 63 | ]; |
@@ -102,7 +102,7 @@ |
||
102 | 102 | 'hasFiles', |
103 | 103 | 'hasPosition', |
104 | 104 | 'hasRevisions', |
105 | - ])->filter(function ($enabled) { |
|
105 | + ])->filter(function($enabled) { |
|
106 | 106 | return $enabled; |
107 | 107 | }); |
108 | 108 |
@@ -23,12 +23,12 @@ discard block |
||
23 | 23 | |
24 | 24 | $submittedLanguages = Collection::make($fields['languages'] ?? []); |
25 | 25 | |
26 | - $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function ($language) { |
|
26 | + $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function($language) { |
|
27 | 27 | return $language['published']; |
28 | 28 | }); |
29 | 29 | |
30 | 30 | foreach ($locales as $index => $locale) { |
31 | - $submittedLanguage = Arr::first($submittedLanguages->filter(function ($lang) use ($locale) { |
|
31 | + $submittedLanguage = Arr::first($submittedLanguages->filter(function($lang) use ($locale) { |
|
32 | 32 | return $lang['value'] == $locale; |
33 | 33 | })); |
34 | 34 | |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | $fields[$locale] = [ |
40 | 40 | 'active' => $activeField, |
41 | - ] + $attributes->mapWithKeys(function ($attribute) use (&$fields, $locale, $localesCount, $index) { |
|
41 | + ] + $attributes->mapWithKeys(function($attribute) use (&$fields, $locale, $localesCount, $index) { |
|
42 | 42 | $attributeValue = $fields[$attribute] ?? null; |
43 | 43 | |
44 | 44 | // if we are at the last locale, |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | { |
80 | 80 | if ($this->model->isTranslatable()) { |
81 | 81 | $attributes = $this->model->translatedAttributes; |
82 | - $query->whereHas('translations', function ($q) use ($scopes, $attributes) { |
|
82 | + $query->whereHas('translations', function($q) use ($scopes, $attributes) { |
|
83 | 83 | foreach ($attributes as $attribute) { |
84 | 84 | if (isset($scopes[$attribute]) && is_string($scopes[$attribute])) { |
85 | 85 | $q->where($attribute, 'like', '%' . $scopes[$attribute] . '%'); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | $mediasCollection = Collection::make(); |
24 | 24 | $mediasFromFields = $this->getMedias($fields); |
25 | 25 | |
26 | - $mediasFromFields->each(function ($media) use ($object, $mediasCollection) { |
|
26 | + $mediasFromFields->each(function($media) use ($object, $mediasCollection) { |
|
27 | 27 | $newMedia = Media::withTrashed()->find(is_array($media['id']) ? Arr::first($media['id']) : $media['id']); |
28 | 28 | $pivot = $newMedia->newPivot($object, Arr::except($media, ['id']), config('twill.mediables_table', 'twill_mediables'), true); |
29 | 29 | $newMedia->setRelation('pivot', $pivot); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | $object->medias()->sync([]); |
50 | 50 | |
51 | - $this->getMedias($fields)->each(function ($media) use ($object) { |
|
51 | + $this->getMedias($fields)->each(function($media) use ($object) { |
|
52 | 52 | $object->medias()->attach($media['id'], Arr::except($media, ['id'])); |
53 | 53 | }); |
54 | 54 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | if (in_array($role, array_keys($this->model->mediasParams ?? [])) |
78 | 78 | || in_array($role, array_keys(config('twill.block_editor.crops', []))) |
79 | 79 | || in_array($role, array_keys(config('twill.settings.crops', [])))) { |
80 | - Collection::make($mediasForRole)->each(function ($media) use (&$medias, $role, $locale) { |
|
80 | + Collection::make($mediasForRole)->each(function($media) use (&$medias, $role, $locale) { |
|
81 | 81 | $customMetadatas = $media['metadatas']['custom'] ?? []; |
82 | 82 | if (isset($media['crops']) && !empty($media['crops'])) { |
83 | 83 | foreach ($media['crops'] as $cropName => $cropData) { |
@@ -57,7 +57,7 @@ |
||
57 | 57 | // TODO: document this and actually think about moving to queuable job after content type updates |
58 | 58 | public function handle() |
59 | 59 | { |
60 | - $this->db->table(config('twill.mediables_table', 'twill_mediables'))->orderBy('id')->chunk(100, function ($attached_medias) { |
|
60 | + $this->db->table(config('twill.mediables_table', 'twill_mediables'))->orderBy('id')->chunk(100, function($attached_medias) { |
|
61 | 61 | foreach ($attached_medias as $attached_media) { |
62 | 62 | $uuid = Media::withTrashed()->find($attached_media->media_id, ['uuid'])->uuid; |
63 | 63 |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | |
184 | 184 | foreach ($fields as $field) { |
185 | 185 | if (in_array($field, $translatedAttributes)) { |
186 | - $query->orWhereHas('translations', function ($q) use ($field, $search) { |
|
186 | + $query->orWhereHas('translations', function($q) use ($field, $search) { |
|
187 | 187 | $q->where($field, $this->getLikeOperator(), "%{$search}%"); |
188 | 188 | }); |
189 | 189 | } else { |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | */ |
211 | 211 | public function create($fields) |
212 | 212 | { |
213 | - return DB::transaction(function () use ($fields) { |
|
213 | + return DB::transaction(function() use ($fields) { |
|
214 | 214 | $original_fields = $fields; |
215 | 215 | |
216 | 216 | $fields = $this->prepareFieldsBeforeCreate($fields); |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | */ |
266 | 266 | public function update($id, $fields) |
267 | 267 | { |
268 | - DB::transaction(function () use ($id, $fields) { |
|
268 | + DB::transaction(function() use ($id, $fields) { |
|
269 | 269 | $object = $this->model->findOrFail($id); |
270 | 270 | |
271 | 271 | $this->beforeSave($object, $fields); |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | */ |
289 | 289 | public function updateBasic($id, $values, $scopes = []) |
290 | 290 | { |
291 | - return DB::transaction(function () use ($id, $values, $scopes) { |
|
291 | + return DB::transaction(function() use ($id, $values, $scopes) { |
|
292 | 292 | // apply scopes if no id provided |
293 | 293 | if (is_null($id)) { |
294 | 294 | $query = $this->model->query(); |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | |
300 | 300 | $query->update($values); |
301 | 301 | |
302 | - $query->get()->each(function ($object) use ($values) { |
|
302 | + $query->get()->each(function($object) use ($values) { |
|
303 | 303 | $this->afterUpdateBasic($object, $values); |
304 | 304 | }); |
305 | 305 | |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | $query = $this->model->whereIn('id', $id); |
312 | 312 | $query->update($values); |
313 | 313 | |
314 | - $query->get()->each(function ($object) use ($values) { |
|
314 | + $query->get()->each(function($object) use ($values) { |
|
315 | 315 | $this->afterUpdateBasic($object, $values); |
316 | 316 | }); |
317 | 317 | |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | */ |
335 | 335 | public function setNewOrder($ids) |
336 | 336 | { |
337 | - DB::transaction(function () use ($ids) { |
|
337 | + DB::transaction(function() use ($ids) { |
|
338 | 338 | $this->model->setNewOrder($ids); |
339 | 339 | }, 3); |
340 | 340 | } |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | */ |
346 | 346 | public function delete($id) |
347 | 347 | { |
348 | - return DB::transaction(function () use ($id) { |
|
348 | + return DB::transaction(function() use ($id) { |
|
349 | 349 | if (($object = $this->model->find($id)) === null) { |
350 | 350 | return false; |
351 | 351 | } |
@@ -365,9 +365,9 @@ discard block |
||
365 | 365 | */ |
366 | 366 | public function bulkDelete($ids) |
367 | 367 | { |
368 | - return DB::transaction(function () use ($ids) { |
|
368 | + return DB::transaction(function() use ($ids) { |
|
369 | 369 | try { |
370 | - Collection::make($ids)->each(function ($id) { |
|
370 | + Collection::make($ids)->each(function($id) { |
|
371 | 371 | $this->delete($id); |
372 | 372 | }); |
373 | 373 | } catch (\Exception $e) { |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | */ |
386 | 386 | public function forceDelete($id) |
387 | 387 | { |
388 | - return DB::transaction(function () use ($id) { |
|
388 | + return DB::transaction(function() use ($id) { |
|
389 | 389 | if (($object = $this->model->onlyTrashed()->find($id)) === null) { |
390 | 390 | return false; |
391 | 391 | } else { |
@@ -402,14 +402,14 @@ discard block |
||
402 | 402 | */ |
403 | 403 | public function bulkForceDelete($ids) |
404 | 404 | { |
405 | - return DB::transaction(function () use ($ids) { |
|
405 | + return DB::transaction(function() use ($ids) { |
|
406 | 406 | try { |
407 | 407 | $query = $this->model->onlyTrashed()->whereIn('id', $ids); |
408 | 408 | $objects = $query->get(); |
409 | 409 | |
410 | 410 | $query->forceDelete(); |
411 | 411 | |
412 | - $objects->each(function ($object) { |
|
412 | + $objects->each(function($object) { |
|
413 | 413 | $this->afterDelete($object); |
414 | 414 | }); |
415 | 415 | } catch (\Exception $e) { |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | */ |
428 | 428 | public function restore($id) |
429 | 429 | { |
430 | - return DB::transaction(function () use ($id) { |
|
430 | + return DB::transaction(function() use ($id) { |
|
431 | 431 | if (($object = $this->model->withTrashed()->find($id)) != null) { |
432 | 432 | $object->restore(); |
433 | 433 | $this->afterRestore($object); |
@@ -444,14 +444,14 @@ discard block |
||
444 | 444 | */ |
445 | 445 | public function bulkRestore($ids) |
446 | 446 | { |
447 | - return DB::transaction(function () use ($ids) { |
|
447 | + return DB::transaction(function() use ($ids) { |
|
448 | 448 | try { |
449 | 449 | $query = $this->model->withTrashed()->whereIn('id', $ids); |
450 | 450 | $objects = $query->get(); |
451 | 451 | |
452 | 452 | $query->restore(); |
453 | 453 | |
454 | - $objects->each(function ($object) { |
|
454 | + $objects->each(function($object) { |
|
455 | 455 | $this->afterRestore($object); |
456 | 456 | }); |
457 | 457 | } catch (\Exception $e) { |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | { |
727 | 727 | if (isset($scopes[$scopeField])) { |
728 | 728 | $id = $scopes[$scopeField]; |
729 | - $query->whereHas($scopeRelation, function ($query) use ($id, $scopeField) { |
|
729 | + $query->whereHas($scopeRelation, function($query) use ($id, $scopeField) { |
|
730 | 730 | $query->where($scopeField, $id); |
731 | 731 | }); |
732 | 732 | unset($scopes[$scopeField]); |
@@ -757,7 +757,7 @@ discard block |
||
757 | 757 | { |
758 | 758 | |
759 | 759 | if (isset($scopes[$scopeField]) && is_string($scopes[$scopeField])) { |
760 | - $query->where(function ($query) use (&$scopes, $scopeField, $orFields) { |
|
760 | + $query->where(function($query) use (&$scopes, $scopeField, $orFields) { |
|
761 | 761 | foreach ($orFields as $field) { |
762 | 762 | $query->orWhere($field, $this->getLikeOperator(), '%' . $scopes[$scopeField] . '%'); |
763 | 763 | unset($scopes[$field]); |
@@ -833,11 +833,11 @@ discard block |
||
833 | 833 | |
834 | 834 | $uniqueTraits = array_unique(array_map('class_basename', $traits)); |
835 | 835 | |
836 | - $methods = array_map(function (string $trait) use ($method) { |
|
836 | + $methods = array_map(function(string $trait) use ($method) { |
|
837 | 837 | return $method . $trait; |
838 | 838 | }, $uniqueTraits); |
839 | 839 | |
840 | - return array_filter($methods, function (string $method) { |
|
840 | + return array_filter($methods, function(string $method) { |
|
841 | 841 | return method_exists(get_called_class(), $method); |
842 | 842 | }); |
843 | 843 | } |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | $blockRepository = app(BlockRepository::class); |
71 | 71 | |
72 | 72 | $blockRepository->bulkDelete($object->blocks()->pluck('id')->toArray()); |
73 | - $this->getBlocks($object, $fields)->each(function ($block) use ($object, $blockRepository) { |
|
73 | + $this->getBlocks($object, $fields)->each(function($block) use ($object, $blockRepository) { |
|
74 | 74 | $this->createBlock($blockRepository, $block); |
75 | 75 | }); |
76 | 76 | } |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $blockCreated = $blockRepository->create($blockFields); |
89 | 89 | |
90 | 90 | // Handle child blocks |
91 | - $blockFields['blocks']->each(function ($childBlock) use ($blockCreated, $blockRepository) { |
|
91 | + $blockFields['blocks']->each(function($childBlock) use ($blockCreated, $blockRepository) { |
|
92 | 92 | $childBlock['parent_id'] = $blockCreated->id; |
93 | 93 | $this->createBlock($blockRepository, $childBlock); |
94 | 94 | }); |
@@ -200,9 +200,9 @@ discard block |
||
200 | 200 | ]; |
201 | 201 | } |
202 | 202 | |
203 | - $fields['blocksFields'][] = Collection::make($block['content'])->filter(function ($value, $key) { |
|
203 | + $fields['blocksFields'][] = Collection::make($block['content'])->filter(function($value, $key) { |
|
204 | 204 | return $key !== "browsers"; |
205 | - })->map(function ($value, $key) use ($block) { |
|
205 | + })->map(function($value, $key) use ($block) { |
|
206 | 206 | return [ |
207 | 207 | 'name' => "blocks[$block->id][$key]", |
208 | 208 | 'value' => $value, |
@@ -215,15 +215,15 @@ discard block |
||
215 | 215 | |
216 | 216 | if ($medias) { |
217 | 217 | if (config('twill.media_library.translated_form_fields', false)) { |
218 | - $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($mediasByLocale, $locale) use ($block) { |
|
219 | - return Collection::make($mediasByLocale)->mapWithKeys(function ($value, $key) use ($block, $locale) { |
|
218 | + $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($mediasByLocale, $locale) use ($block) { |
|
219 | + return Collection::make($mediasByLocale)->mapWithKeys(function($value, $key) use ($block, $locale) { |
|
220 | 220 | return [ |
221 | 221 | "blocks[$block->id][$key][$locale]" => $value, |
222 | 222 | ]; |
223 | 223 | }); |
224 | 224 | })->filter()->toArray(); |
225 | 225 | } else { |
226 | - $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($value, $key) use ($block) { |
|
226 | + $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($value, $key) use ($block) { |
|
227 | 227 | return [ |
228 | 228 | "blocks[$block->id][$key]" => $value, |
229 | 229 | ]; |
@@ -234,8 +234,8 @@ discard block |
||
234 | 234 | $files = $blockFormFields['files']; |
235 | 235 | |
236 | 236 | if ($files) { |
237 | - Collection::make($files)->each(function ($rolesWithFiles, $locale) use (&$fields, $block) { |
|
238 | - $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $block) { |
|
237 | + Collection::make($files)->each(function($rolesWithFiles, $locale) use (&$fields, $block) { |
|
238 | + $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $block) { |
|
239 | 239 | return [ |
240 | 240 | "blocks[$block->id][$role][$locale]" => $files, |
241 | 241 | ]; |
@@ -274,9 +274,9 @@ discard block |
||
274 | 274 | */ |
275 | 275 | protected function getBlockBrowsers($block) |
276 | 276 | { |
277 | - return Collection::make($block['content']['browsers'])->mapWithKeys(function ($ids, $relation) use ($block) { |
|
277 | + return Collection::make($block['content']['browsers'])->mapWithKeys(function($ids, $relation) use ($block) { |
|
278 | 278 | if (Schema::hasTable(config('twill.related_table', 'twill_related')) && $block->getRelated($relation)->isNotEmpty()) { |
279 | - $items = $this->getFormFieldsForRelatedBrowser($block, $relation);; |
|
279 | + $items = $this->getFormFieldsForRelatedBrowser($block, $relation); ; |
|
280 | 280 | } else { |
281 | 281 | $relationRepository = $this->getModelRepository($relation); |
282 | 282 | $relatedItems = $relationRepository->get([], ['id' => $ids], [], -1); |
@@ -286,9 +286,9 @@ discard block |
||
286 | 286 | $sortedRelatedItems[$item->id] = $item; |
287 | 287 | } |
288 | 288 | |
289 | - $items = Collection::make(array_values($sortedRelatedItems))->filter(function ($value) { |
|
289 | + $items = Collection::make(array_values($sortedRelatedItems))->filter(function($value) { |
|
290 | 290 | return is_object($value); |
291 | - })->map(function ($relatedElement) use ($relation) { |
|
291 | + })->map(function($relatedElement) use ($relation) { |
|
292 | 292 | return [ |
293 | 293 | 'id' => $relatedElement->id, |
294 | 294 | 'name' => $relatedElement->titleInBrowser ?? $relatedElement->title, |