@@ -11,14 +11,14 @@ |
||
| 11 | 11 | |
| 12 | 12 | public function scopeMine($query) |
| 13 | 13 | { |
| 14 | - return $query->whereHas('revisions', function ($query) { |
|
| 14 | + return $query->whereHas('revisions', function($query) { |
|
| 15 | 15 | $query->where('user_id', auth('twill_users')->user()->id); |
| 16 | 16 | }); |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function revisionsArray() |
| 20 | 20 | { |
| 21 | - return $this->revisions->map(function ($revision) { |
|
| 21 | + return $this->revisions->map(function($revision) { |
|
| 22 | 22 | return [ |
| 23 | 23 | 'id' => $revision->id, |
| 24 | 24 | 'author' => $revision->user->name ?? 'Unknown', |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | private function findMedia($role, $crop = "default") |
| 35 | 35 | { |
| 36 | - $media = $this->medias->first(function ($media) use ($role, $crop) { |
|
| 36 | + $media = $this->medias->first(function($media) use ($role, $crop) { |
|
| 37 | 37 | if (config('twill.media_library.translated_form_fields', false)) { |
| 38 | 38 | $localeScope = $media->pivot->locale === app()->getLocale(); |
| 39 | 39 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | }); |
| 43 | 43 | |
| 44 | 44 | if (!$media && config('twill.media_library.translated_form_fields', false)) { |
| 45 | - $media = $this->medias->first(function ($media) use ($role, $crop) { |
|
| 45 | + $media = $this->medias->first(function($media) use ($role, $crop) { |
|
| 46 | 46 | return $media->pivot->role === $role && $media->pivot->crop === $crop; |
| 47 | 47 | }); |
| 48 | 48 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | public function images($role, $crop = "default", $params = []) |
| 87 | 87 | { |
| 88 | - $medias = $this->medias->filter(function ($media) use ($role, $crop) { |
|
| 88 | + $medias = $this->medias->filter(function($media) use ($role, $crop) { |
|
| 89 | 89 | return $media->pivot->role === $role && $media->pivot->crop === $crop; |
| 90 | 90 | }); |
| 91 | 91 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | public function imagesAsArrays($role, $crop = "default", $params = []) |
| 122 | 122 | { |
| 123 | - $medias = $this->medias->filter(function ($media) use ($role, $crop) { |
|
| 123 | + $medias = $this->medias->filter(function($media) use ($role, $crop) { |
|
| 124 | 124 | return $media->pivot->role === $role && $media->pivot->crop === $crop; |
| 125 | 125 | }); |
| 126 | 126 | |
@@ -136,12 +136,12 @@ discard block |
||
| 136 | 136 | public function imageAltText($role, $media = null) |
| 137 | 137 | { |
| 138 | 138 | if (!$media) { |
| 139 | - $media = $this->medias->first(function ($media) use ($role) { |
|
| 139 | + $media = $this->medias->first(function($media) use ($role) { |
|
| 140 | 140 | if (config('twill.media_library.translated_form_fields', false)) { |
| 141 | 141 | $localeScope = $media->pivot->locale === app()->getLocale(); |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - return $media->pivot->role === $role && ($localeScope ?? true);; |
|
| 144 | + return $media->pivot->role === $role && ($localeScope ?? true); ; |
|
| 145 | 145 | }); |
| 146 | 146 | } |
| 147 | 147 | |
@@ -155,12 +155,12 @@ discard block |
||
| 155 | 155 | public function imageCaption($role, $media = null) |
| 156 | 156 | { |
| 157 | 157 | if (!$media) { |
| 158 | - $media = $this->medias->first(function ($media) use ($role) { |
|
| 158 | + $media = $this->medias->first(function($media) use ($role) { |
|
| 159 | 159 | if (config('twill.media_library.translated_form_fields', false)) { |
| 160 | 160 | $localeScope = $media->pivot->locale === app()->getLocale(); |
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - return $media->pivot->role === $role && ($localeScope ?? true);; |
|
| 163 | + return $media->pivot->role === $role && ($localeScope ?? true); ; |
|
| 164 | 164 | }); |
| 165 | 165 | } |
| 166 | 166 | |
@@ -174,12 +174,12 @@ discard block |
||
| 174 | 174 | public function imageVideo($role, $media = null) |
| 175 | 175 | { |
| 176 | 176 | if (!$media) { |
| 177 | - $media = $this->medias->first(function ($media) use ($role) { |
|
| 177 | + $media = $this->medias->first(function($media) use ($role) { |
|
| 178 | 178 | if (config('twill.media_library.translated_form_fields', false)) { |
| 179 | 179 | $localeScope = $media->pivot->locale === app()->getLocale(); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - return $media->pivot->role === $role && ($localeScope ?? true);; |
|
| 182 | + return $media->pivot->role === $role && ($localeScope ?? true); ; |
|
| 183 | 183 | }); |
| 184 | 184 | } |
| 185 | 185 | |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | |
| 249 | 249 | public function imageObjects($role, $crop = "default") |
| 250 | 250 | { |
| 251 | - return $this->medias->filter(function ($media) use ($role, $crop) { |
|
| 251 | + return $this->medias->filter(function($media) use ($role, $crop) { |
|
| 252 | 252 | return $media->pivot->role === $role && $media->pivot->crop === $crop; |
| 253 | 253 | }); |
| 254 | 254 | } |
@@ -16,12 +16,12 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | $locale = $locale ?? app()->getLocale(); |
| 18 | 18 | |
| 19 | - $file = $this->files->first(function ($file) use ($role, $locale) { |
|
| 19 | + $file = $this->files->first(function($file) use ($role, $locale) { |
|
| 20 | 20 | return $file->pivot->role === $role && $file->pivot->locale === $locale; |
| 21 | 21 | }); |
| 22 | 22 | |
| 23 | 23 | if (!$file && config('translatable.use_property_fallback', false)) { |
| 24 | - $file = $this->files->first(function ($file) use ($role) { |
|
| 24 | + $file = $this->files->first(function($file) use ($role) { |
|
| 25 | 25 | return $file->pivot->role === $role && $file->pivot->locale === config('translatable.fallback_locale'); |
| 26 | 26 | }); |
| 27 | 27 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | { |
| 48 | 48 | $locale = $locale ?? app()->getLocale(); |
| 49 | 49 | |
| 50 | - $files = $this->files->filter(function ($file) use ($role, $locale) { |
|
| 50 | + $files = $this->files->filter(function($file) use ($role, $locale) { |
|
| 51 | 51 | return $file->pivot->role === $role && $file->pivot->locale === $locale; |
| 52 | 52 | }); |
| 53 | 53 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | return $this->relatedCache[$browser_name] = $this->relatedItems |
| 33 | 33 | ->where('browser_name', $browser_name) |
| 34 | - ->map(function ($item) { |
|
| 34 | + ->map(function($item) { |
|
| 35 | 35 | return $item->related; |
| 36 | 36 | }); |
| 37 | 37 | } |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | $position = 1; |
| 48 | 48 | |
| 49 | - Collection::make($items)->map(function ($item) { |
|
| 49 | + Collection::make($items)->map(function($item) { |
|
| 50 | 50 | return Arr::only($item, ['endpointType', 'id']); |
| 51 | - })->each(function ($values) use ($browser_name, &$position) { |
|
| 51 | + })->each(function($values) use ($browser_name, &$position) { |
|
| 52 | 52 | RelatedItem::create([ |
| 53 | 53 | 'subject_id' => $this->getKey(), |
| 54 | 54 | 'subject_type' => $this->getMorphClass(), |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | |
| 22 | 22 | public function scopeForBucket($query, $bucketKey) |
| 23 | 23 | { |
| 24 | - return $query->where('bucket_key', $bucketKey)->get()->map(function ($feature) { |
|
| 24 | + return $query->where('bucket_key', $bucketKey)->get()->map(function($feature) { |
|
| 25 | 25 | return $feature->featured; |
| 26 | 26 | })->filter(); |
| 27 | 27 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $items = $this->getIndexItems($scopes); |
| 95 | 95 | |
| 96 | 96 | return [ |
| 97 | - 'items' => $items->map(function ($item) { |
|
| 97 | + 'items' => $items->map(function($item) { |
|
| 98 | 98 | return $item->toCmsArray(); |
| 99 | 99 | })->toArray(), |
| 100 | 100 | 'maxPage' => $items->lastPage(), |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | { |
| 217 | 217 | $ids = explode(',', $this->request->input('ids')); |
| 218 | 218 | |
| 219 | - $metadatasFromRequest = $this->getExtraMetadatas()->reject(function ($meta) { |
|
| 219 | + $metadatasFromRequest = $this->getExtraMetadatas()->reject(function($meta) { |
|
| 220 | 220 | return is_null($meta); |
| 221 | 221 | })->toArray(); |
| 222 | 222 | |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $items = $this->getIndexItems($scopes); |
| 241 | 241 | |
| 242 | 242 | return $this->responseFactory->json([ |
| 243 | - 'items' => $items->map(function ($item) { |
|
| 243 | + 'items' => $items->map(function($item) { |
|
| 244 | 244 | return $item->toCmsArray(); |
| 245 | 245 | })->toArray(), |
| 246 | 246 | 'tags' => $this->repository->getTagsList(), |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | private function getExtraMetadatas() |
| 281 | 281 | { |
| 282 | - return Collection::make($this->customFields)->mapWithKeys(function ($field) { |
|
| 282 | + return Collection::make($this->customFields)->mapWithKeys(function($field) { |
|
| 283 | 283 | $fieldInRequest = $this->request->get($field['name']); |
| 284 | 284 | |
| 285 | 285 | if (isset($field['type']) && $field['type'] === 'checkbox') { |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $items = $this->getIndexItems($scopes); |
| 89 | 89 | |
| 90 | 90 | return [ |
| 91 | - 'items' => $items->map(function ($item) { |
|
| 91 | + 'items' => $items->map(function($item) { |
|
| 92 | 92 | return $this->buildFile($item); |
| 93 | 93 | })->toArray(), |
| 94 | 94 | 'maxPage' => $items->lastPage(), |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | private function buildFile($item) |
| 105 | 105 | { |
| 106 | 106 | return $item->toCmsArray() + [ |
| 107 | - 'tags' => $item->tags->map(function ($tag) { |
|
| 107 | + 'tags' => $item->tags->map(function($tag) { |
|
| 108 | 108 | return $tag->name; |
| 109 | 109 | }), |
| 110 | 110 | 'deleteUrl' => $item->canDeleteSafely() ? moduleRoute($this->moduleName, $this->routePrefix, 'destroy', $item->id) : null, |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | $items = $this->getIndexItems($scopes); |
| 226 | 226 | |
| 227 | 227 | return $this->responseFactory->json([ |
| 228 | - 'items' => $items->map(function ($item) { |
|
| 228 | + 'items' => $items->map(function($item) { |
|
| 229 | 229 | return $this->buildFile($item); |
| 230 | 230 | })->toArray(), |
| 231 | 231 | 'tags' => $this->repository->getTagsList(), |
@@ -56,16 +56,16 @@ |
||
| 56 | 56 | |
| 57 | 57 | $blocksCollection->push($newBlock); |
| 58 | 58 | |
| 59 | - $block['blocks']->each(function ($childBlock) use ($newBlock, $blocksCollection, $blockRepository) { |
|
| 59 | + $block['blocks']->each(function($childBlock) use ($newBlock, $blocksCollection, $blockRepository) { |
|
| 60 | 60 | $childBlock['parent_id'] = $newBlock->id; |
| 61 | 61 | $newChildBlock = $blockRepository->createForPreview($childBlock); |
| 62 | 62 | $blocksCollection->push($newChildBlock); |
| 63 | 63 | }); |
| 64 | 64 | |
| 65 | - $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function ($block) use ($blocksCollection, $viewFactory, $config) { |
|
| 65 | + $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function($block) use ($blocksCollection, $viewFactory, $config) { |
|
| 66 | 66 | if ($config->get('twill.block_editor.block_preview_render_childs') ?? true) { |
| 67 | 67 | $childBlocks = $blocksCollection->where('parent_id', $block->id); |
| 68 | - $renderedChildViews = $childBlocks->map(function ($childBlock) use ($viewFactory, $config) { |
|
| 68 | + $renderedChildViews = $childBlocks->map(function($childBlock) use ($viewFactory, $config) { |
|
| 69 | 69 | $view = $this->getBlockView($childBlock->type, $config); |
| 70 | 70 | |
| 71 | 71 | return $viewFactory->exists($view) ? $viewFactory->make($view, [ |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | 'name' => 'required', |
| 41 | 41 | 'role' => 'not_in:SUPERADMIN', |
| 42 | 42 | 'email' => 'required|email|unique:' . config('twill.users_table', 'twill_users') . ',email,' . $this->route('user'), |
| 43 | - 'verify-code' => function ($attribute, $value, $fail) { |
|
| 43 | + 'verify-code' => function($attribute, $value, $fail) { |
|
| 44 | 44 | $user = Auth::guard('twill_users')->user(); |
| 45 | 45 | $with2faSettings = config('twill.enabled.users-2fa') && $user->id == $this->route('user'); |
| 46 | 46 | |