@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $items = $this->getIndexItems($scopes); |
100 | 100 | |
101 | 101 | return [ |
102 | - 'items' => $items->map(function ($item) { |
|
102 | + 'items' => $items->map(function($item) { |
|
103 | 103 | return $item->toCmsArray(); |
104 | 104 | })->toArray(), |
105 | 105 | 'maxPage' => $items->lastPage(), |
@@ -220,11 +220,11 @@ discard block |
||
220 | 220 | { |
221 | 221 | $ids = explode(',', $this->request->input('ids')); |
222 | 222 | |
223 | - $metadatasFromRequest = $this->getExtraMetadatas()->reject(function ($meta) { |
|
223 | + $metadatasFromRequest = $this->getExtraMetadatas()->reject(function($meta) { |
|
224 | 224 | return is_null($meta); |
225 | 225 | })->toArray(); |
226 | 226 | |
227 | - $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array)$this->request->get('fieldsRemovedFromBulkEditing', []))); |
|
227 | + $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array) $this->request->get('fieldsRemovedFromBulkEditing', []))); |
|
228 | 228 | |
229 | 229 | if (in_array('tags', $this->request->get('fieldsRemovedFromBulkEditing', []))) { |
230 | 230 | $this->repository->addIgnoreFieldsBeforeSave('bulk_tags'); |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | $items = $this->getIndexItems($scopes); |
245 | 245 | |
246 | 246 | return $this->responseFactory->json([ |
247 | - 'items' => $items->map(function ($item) { |
|
247 | + 'items' => $items->map(function($item) { |
|
248 | 248 | return $item->toCmsArray(); |
249 | 249 | })->toArray(), |
250 | 250 | 'tags' => $this->repository->getTagsList(), |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | */ |
297 | 297 | private function getExtraMetadatas() |
298 | 298 | { |
299 | - return Collection::make($this->customFields)->mapWithKeys(function ($field) { |
|
299 | + return Collection::make($this->customFields)->mapWithKeys(function($field) { |
|
300 | 300 | $fieldInRequest = $this->request->get($field['name']); |
301 | 301 | |
302 | 302 | if (isset($field['type']) && $field['type'] === 'checkbox') { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $items = $this->getIndexItems($scopes); |
93 | 93 | |
94 | 94 | return [ |
95 | - 'items' => $items->map(function ($item) { |
|
95 | + 'items' => $items->map(function($item) { |
|
96 | 96 | return $this->buildFile($item); |
97 | 97 | })->toArray(), |
98 | 98 | 'maxPage' => $items->lastPage(), |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | private function buildFile($item) |
109 | 109 | { |
110 | 110 | return $item->toCmsArray() + [ |
111 | - 'tags' => $item->tags->map(function ($tag) { |
|
111 | + 'tags' => $item->tags->map(function($tag) { |
|
112 | 112 | return $tag->name; |
113 | 113 | }), |
114 | 114 | 'deleteUrl' => $item->canDeleteSafely() ? moduleRoute($this->moduleName, $this->routePrefix, 'destroy', $item->id) : null, |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | $items = $this->getIndexItems($scopes); |
231 | 231 | |
232 | 232 | return $this->responseFactory->json([ |
233 | - 'items' => $items->map(function ($item) { |
|
233 | + 'items' => $items->map(function($item) { |
|
234 | 234 | return $this->buildFile($item); |
235 | 235 | })->toArray(), |
236 | 236 | 'tags' => $this->repository->getTagsList(), |
@@ -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 | ]; |
@@ -71,11 +71,11 @@ discard block |
||
71 | 71 | |
72 | 72 | $blockRepository->bulkDelete($object->blocks()->pluck('id')->toArray()); |
73 | 73 | |
74 | - $this->getBlocks($object, $fields)->each(function ($block) use ($object, $blockRepository) { |
|
74 | + $this->getBlocks($object, $fields)->each(function($block) use ($object, $blockRepository) { |
|
75 | 75 | |
76 | 76 | $blockCreated = $blockRepository->create($block); |
77 | 77 | |
78 | - $block['blocks']->each(function ($childBlock) use ($blockCreated, $blockRepository) { |
|
78 | + $block['blocks']->each(function($childBlock) use ($blockCreated, $blockRepository) { |
|
79 | 79 | $childBlock['parent_id'] = $blockCreated->id; |
80 | 80 | $blockRepository->create($childBlock); |
81 | 81 | }); |
@@ -174,9 +174,9 @@ discard block |
||
174 | 174 | ]; |
175 | 175 | } |
176 | 176 | |
177 | - $fields['blocksFields'][] = Collection::make($block['content'])->filter(function ($value, $key) { |
|
177 | + $fields['blocksFields'][] = Collection::make($block['content'])->filter(function($value, $key) { |
|
178 | 178 | return $key !== "browsers"; |
179 | - })->map(function ($value, $key) use ($block) { |
|
179 | + })->map(function($value, $key) use ($block) { |
|
180 | 180 | return [ |
181 | 181 | 'name' => "blocks[$block->id][$key]", |
182 | 182 | 'value' => $value, |
@@ -189,15 +189,15 @@ discard block |
||
189 | 189 | |
190 | 190 | if ($medias) { |
191 | 191 | if (config('twill.media_library.translated_form_fields', false)) { |
192 | - $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($mediasByLocale, $locale) use ($block) { |
|
193 | - return Collection::make($mediasByLocale)->mapWithKeys(function ($value, $key) use ($block, $locale) { |
|
192 | + $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($mediasByLocale, $locale) use ($block) { |
|
193 | + return Collection::make($mediasByLocale)->mapWithKeys(function($value, $key) use ($block, $locale) { |
|
194 | 194 | return [ |
195 | 195 | "blocks[$block->id][$key][$locale]" => $value, |
196 | 196 | ]; |
197 | 197 | }); |
198 | 198 | })->filter()->toArray(); |
199 | 199 | } else { |
200 | - $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($value, $key) use ($block) { |
|
200 | + $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($value, $key) use ($block) { |
|
201 | 201 | return [ |
202 | 202 | "blocks[$block->id][$key]" => $value, |
203 | 203 | ]; |
@@ -208,8 +208,8 @@ discard block |
||
208 | 208 | $files = $blockFormFields['files']; |
209 | 209 | |
210 | 210 | if ($files) { |
211 | - Collection::make($files)->each(function ($rolesWithFiles, $locale) use (&$fields, $block) { |
|
212 | - $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $block) { |
|
211 | + Collection::make($files)->each(function($rolesWithFiles, $locale) use (&$fields, $block) { |
|
212 | + $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $block) { |
|
213 | 213 | return [ |
214 | 214 | "blocks[$block->id][$role][$locale]" => $files, |
215 | 215 | ]; |
@@ -248,9 +248,9 @@ discard block |
||
248 | 248 | */ |
249 | 249 | protected function getBlockBrowsers($block) |
250 | 250 | { |
251 | - return Collection::make($block['content']['browsers'])->mapWithKeys(function ($ids, $relation) use ($block) { |
|
251 | + return Collection::make($block['content']['browsers'])->mapWithKeys(function($ids, $relation) use ($block) { |
|
252 | 252 | if (Schema::hasTable(config('twill.related_table', 'related')) && $block->getRelated($relation)->isNotEmpty()) { |
253 | - $items = $this->getFormFieldsForRelatedBrowser($block, $relation);; |
|
253 | + $items = $this->getFormFieldsForRelatedBrowser($block, $relation); ; |
|
254 | 254 | } else { |
255 | 255 | $relationRepository = $this->getModelRepository($relation); |
256 | 256 | $relatedItems = $relationRepository->get([], ['id' => $ids], [], -1); |
@@ -260,9 +260,9 @@ discard block |
||
260 | 260 | $sortedRelatedItems[$item->id] = $item; |
261 | 261 | } |
262 | 262 | |
263 | - $items = Collection::make(array_values($sortedRelatedItems))->filter(function ($value) { |
|
263 | + $items = Collection::make(array_values($sortedRelatedItems))->filter(function($value) { |
|
264 | 264 | return is_object($value); |
265 | - })->map(function ($relatedElement) use ($relation) { |
|
265 | + })->map(function($relatedElement) use ($relation) { |
|
266 | 266 | return [ |
267 | 267 | 'id' => $relatedElement->id, |
268 | 268 | 'name' => $relatedElement->titleInBrowser ?? $relatedElement->title, |
@@ -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 |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function getFormFieldsForBrowser($object, $relation, $routePrefix = null, $titleKey = 'title', $moduleName = null) |
105 | 105 | { |
106 | - return $object->$relation->map(function ($relatedElement) use ($titleKey, $routePrefix, $relation, $moduleName) { |
|
106 | + return $object->$relation->map(function($relatedElement) use ($titleKey, $routePrefix, $relation, $moduleName) { |
|
107 | 107 | return [ |
108 | 108 | 'id' => $relatedElement->id, |
109 | 109 | 'name' => $relatedElement->titleInBrowser ?? $relatedElement->$titleKey, |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | */ |
123 | 123 | public function getFormFieldsForRelatedBrowser($object, $relation) |
124 | 124 | { |
125 | - return $object->getRelated($relation)->map(function ($relatedElement) { |
|
125 | + return $object->getRelated($relation)->map(function($relatedElement) { |
|
126 | 126 | return ($relatedElement != null) ? [ |
127 | 127 | 'id' => $relatedElement->id, |
128 | 128 | 'name' => $relatedElement->titleInBrowser ?? $relatedElement->title, |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | ]) + (classHasTrait($relatedElement, HasMedias::class) ? [ |
133 | 133 | 'thumbnail' => $relatedElement->defaultCmsImage(['w' => 100, 'h' => 100]), |
134 | 134 | ] : []) : []; |
135 | - })->reject(function ($item) { |
|
135 | + })->reject(function($item) { |
|
136 | 136 | return empty($item); |
137 | 137 | })->values()->toArray(); |
138 | 138 | } |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | if (Schema::hasTable(config('twill.related_table', 'related'))) { |
46 | 46 | $relatedItems = Collection::make(); |
47 | 47 | |
48 | - Collection::make($fields['browsers'])->each(function ($items, $browserName) use ($object, &$relatedItems) { |
|
49 | - Collection::make($items)->each(function ($item) use ($browserName, &$relatedItems) { |
|
48 | + Collection::make($fields['browsers'])->each(function($items, $browserName) use ($object, &$relatedItems) { |
|
49 | + Collection::make($items)->each(function($item) use ($browserName, &$relatedItems) { |
|
50 | 50 | try { |
51 | 51 | $repository = $this->getModelRepository($item['endpointType'] ?? $browserName); |
52 | 52 | $relatedItems->push((object) [ |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | { |
75 | 75 | if (Schema::hasTable(config('twill.related_table', 'related'))) { |
76 | 76 | if (isset($fields['browsers'])) { |
77 | - Collection::make($fields['browsers'])->each(function ($items, $browserName) use ($object) { |
|
77 | + Collection::make($fields['browsers'])->each(function($items, $browserName) use ($object) { |
|
78 | 78 | $object->saveRelated($items, $browserName); |
79 | 79 | }); |
80 | 80 | } |
@@ -102,14 +102,14 @@ discard block |
||
102 | 102 | { |
103 | 103 | $blocksFromConfig = $this->config->get('twill.block_editor.' . ($repeater ? 'repeaters' : 'blocks')); |
104 | 104 | |
105 | - $block['type'] = Collection::make($blocksFromConfig)->search(function ($blockConfig) use ($block) { |
|
105 | + $block['type'] = Collection::make($blocksFromConfig)->search(function($blockConfig) use ($block) { |
|
106 | 106 | return $blockConfig['component'] === $block['type']; |
107 | 107 | }); |
108 | 108 | |
109 | 109 | $block['content'] = empty($block['content']) ? new \stdClass : (object) $block['content']; |
110 | 110 | |
111 | 111 | if ($block['browsers']) { |
112 | - $browsers = Collection::make($block['browsers'])->map(function ($items) { |
|
112 | + $browsers = Collection::make($block['browsers'])->map(function($items) { |
|
113 | 113 | return Collection::make($items)->pluck('id'); |
114 | 114 | })->toArray(); |
115 | 115 |