@@ -65,14 +65,14 @@ discard block |
||
65 | 65 | { |
66 | 66 | return collect( |
67 | 67 | config('twill.block_editor.directories.source.icons') |
68 | - )->reduce(function (Collection $keep, $path) { |
|
68 | + )->reduce(function(Collection $keep, $path) { |
|
69 | 69 | if (!$this->files->exists($path)) { |
70 | 70 | $this->displayError("Directory not found: {$path}"); |
71 | 71 | |
72 | 72 | return $keep; |
73 | 73 | } |
74 | 74 | |
75 | - $files = collect($this->files->files($path))->map(function ( |
|
75 | + $files = collect($this->files->files($path))->map(function( |
|
76 | 76 | SplFileInfo $file |
77 | 77 | ) { |
78 | 78 | return [ |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function handle() |
94 | 94 | { |
95 | - $icons = $this->getIconList()->filter(function ($icon) { |
|
95 | + $icons = $this->getIconList()->filter(function($icon) { |
|
96 | 96 | return $this->isAllowed($icon); |
97 | 97 | }); |
98 | 98 |
@@ -51,10 +51,10 @@ discard block |
||
51 | 51 | |
52 | 52 | $this->getChildrenPreview($block['blocks'], $blocksCollection, $newBlock->id, $blockId, $blockRepository); |
53 | 53 | |
54 | - $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function ($block) use ($blocksCollection, $viewFactory, $config) { |
|
54 | + $renderedBlocks = $blocksCollection->where('parent_id', null)->map(function($block) use ($blocksCollection, $viewFactory, $config) { |
|
55 | 55 | if ($config->get('twill.block_editor.block_preview_render_childs') ?? true) { |
56 | 56 | $childBlocks = $blocksCollection->where('parent_id', $block->id); |
57 | - $renderedChildViews = $childBlocks->map(function ($childBlock) use ($viewFactory, $config) { |
|
57 | + $renderedChildViews = $childBlocks->map(function($childBlock) use ($viewFactory, $config) { |
|
58 | 58 | $view = $this->getBlockView($childBlock->type, $config); |
59 | 59 | |
60 | 60 | return $viewFactory->exists($view) ? $viewFactory->make($view, [ |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | protected function getChildrenPreview($blocks, $blocksCollection, $parentId, &$blockId, $blockRepository) |
110 | 110 | { |
111 | - $blocks->each(function ($childBlock) use (&$blockId, $parentId, $blocksCollection, $blockRepository) { |
|
111 | + $blocks->each(function($childBlock) use (&$blockId, $parentId, $blocksCollection, $blockRepository) { |
|
112 | 112 | $childBlock['parent_id'] = $parentId; |
113 | 113 | $blockId++; |
114 | 114 | $newChildBlock = $blockRepository->createForPreview($childBlock); |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | public function findByName($search, $sources = []) |
51 | 51 | { |
52 | 52 | return $this->collect() |
53 | - ->filter(function ($block) use ($search, $sources) { |
|
53 | + ->filter(function($block) use ($search, $sources) { |
|
54 | 54 | return $block->name == $search && |
55 | 55 | (blank($sources) || |
56 | 56 | collect($sources)->contains($block->source)); |
57 | 57 | }) |
58 | - ->sortBy(function ($block) { |
|
58 | + ->sortBy(function($block) { |
|
59 | 59 | return $block->source === 'app' ? 0 : 1; |
60 | 60 | }) |
61 | 61 | ->first(); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | public function getBlocks() |
68 | 68 | { |
69 | 69 | return $this->collect() |
70 | - ->filter(function ($block) { |
|
70 | + ->filter(function($block) { |
|
71 | 71 | return $block->type === Block::TYPE_BLOCK; |
72 | 72 | }) |
73 | 73 | ->values(); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | */ |
79 | 79 | public function getBlockList() |
80 | 80 | { |
81 | - return $this->getBlocks()->map(function (Block $block) { |
|
81 | + return $this->getBlocks()->map(function(Block $block) { |
|
82 | 82 | return $block->toList(); |
83 | 83 | }); |
84 | 84 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | return collect(); |
106 | 106 | } |
107 | 107 | |
108 | - return collect($this->fileSystem->files($directory))->map(function ( |
|
108 | + return collect($this->fileSystem->files($directory))->map(function( |
|
109 | 109 | $file |
110 | 110 | ) use ($source, $type) { |
111 | 111 | return new Block($file, $type, $source); |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $this->paths = collect( |
121 | 121 | config('twill.block_editor.directories.source.blocks') |
122 | 122 | ) |
123 | - ->map(function ($path) { |
|
123 | + ->map(function($path) { |
|
124 | 124 | $path['type'] = Block::TYPE_BLOCK; |
125 | 125 | |
126 | 126 | return $path; |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | ->merge( |
129 | 129 | collect( |
130 | 130 | config('twill.block_editor.directories.source.repeaters') |
131 | - )->map(function ($path) { |
|
131 | + )->map(function($path) { |
|
132 | 132 | $path['type'] = Block::TYPE_REPEATER; |
133 | 133 | |
134 | 134 | return $path; |
@@ -166,12 +166,12 @@ discard block |
||
166 | 166 | $this->generatePaths(); |
167 | 167 | |
168 | 168 | $this->items = collect($this->paths) |
169 | - ->reduce(function (Collection $keep, $path) { |
|
169 | + ->reduce(function(Collection $keep, $path) { |
|
170 | 170 | $this->readBlocks( |
171 | 171 | $path['path'], |
172 | 172 | $path['source'], |
173 | 173 | $path['type'] |
174 | - )->each(function ($block) use ($keep) { |
|
174 | + )->each(function($block) use ($keep) { |
|
175 | 175 | $keep->push($block); |
176 | 176 | |
177 | 177 | return $keep; |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | ->toArray(); |
183 | 183 | |
184 | 184 | $this->items = $this->collect() |
185 | - ->each(function (Block $block) { |
|
185 | + ->each(function(Block $block) { |
|
186 | 186 | $block->setSource($this->detectCustomSources($block)); |
187 | 187 | }) |
188 | 188 | ->toArray(); |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | */ |
204 | 204 | public function list() |
205 | 205 | { |
206 | - return $this->collect()->map(function (Block $block) { |
|
206 | + return $this->collect()->map(function(Block $block) { |
|
207 | 207 | return $block->toList(); |
208 | 208 | }); |
209 | 209 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | public function getRepeaters() |
223 | 223 | { |
224 | 224 | return $this->collect() |
225 | - ->filter(function ($block) { |
|
225 | + ->filter(function($block) { |
|
226 | 226 | return $block->type === Block::TYPE_REPEATER; |
227 | 227 | }) |
228 | 228 | ->values(); |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | */ |
234 | 234 | public function getRepeaterList() |
235 | 235 | { |
236 | - return $this->getRepeaters()->map(function (Block $block) { |
|
236 | + return $this->getRepeaters()->map(function(Block $block) { |
|
237 | 237 | return $block->toList(); |
238 | 238 | }); |
239 | 239 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | { |
38 | 38 | $this->call('twill:make:module', [ |
39 | 39 | 'moduleName' => $this->argument('moduleName'), |
40 | - ] + collect($this->options())->mapWithKeys(function ($value, $key) { |
|
40 | + ] + collect($this->options())->mapWithKeys(function($value, $key) { |
|
41 | 41 | return ["--{$key}" => $value]; |
42 | 42 | })->toArray()); |
43 | 43 | } |
@@ -22,18 +22,18 @@ discard block |
||
22 | 22 | |
23 | 23 | public function __construct(array $attributes = []) |
24 | 24 | { |
25 | - $this->fillable(array_merge($this->fillable, Collection::make(config('twill.media_library.extra_metadatas_fields'))->map(function ($field) { |
|
25 | + $this->fillable(array_merge($this->fillable, Collection::make(config('twill.media_library.extra_metadatas_fields'))->map(function($field) { |
|
26 | 26 | return $field['name']; |
27 | 27 | })->toArray())); |
28 | 28 | |
29 | - Collection::make(config('twill.media_library.translatable_metadatas_fields'))->each(function ($field) { |
|
29 | + Collection::make(config('twill.media_library.translatable_metadatas_fields'))->each(function($field) { |
|
30 | 30 | $this->casts[$field] = 'json'; |
31 | 31 | }); |
32 | 32 | |
33 | 33 | parent::__construct($attributes); |
34 | 34 | } |
35 | 35 | |
36 | - public function scopeUnused ($query) |
|
36 | + public function scopeUnused($query) |
|
37 | 37 | { |
38 | 38 | $usedIds = DB::table(config('twill.mediables_table'))->get()->pluck('media_id'); |
39 | 39 | return $query->whereNotIn('id', $usedIds->toArray())->get(); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | 'medium' => ImageService::getUrl($this->uuid, ["h" => "430"]), |
70 | 70 | 'width' => $this->width, |
71 | 71 | 'height' => $this->height, |
72 | - 'tags' => $this->tags->map(function ($tag) { |
|
72 | + 'tags' => $this->tags->map(function($tag) { |
|
73 | 73 | return $tag->name; |
74 | 74 | }), |
75 | 75 | 'deleteUrl' => $this->canDeleteSafely() ? moduleRoute('medias', 'media-library', 'destroy', $this->id) : null, |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | 'caption' => $this->caption, |
82 | 82 | 'altText' => $this->alt_text, |
83 | 83 | 'video' => null, |
84 | - ] + Collection::make(config('twill.media_library.extra_metadatas_fields'))->mapWithKeys(function ($field) { |
|
84 | + ] + Collection::make(config('twill.media_library.extra_metadatas_fields'))->mapWithKeys(function($field) { |
|
85 | 85 | return [ |
86 | 86 | $field['name'] => $this->{$field['name']}, |
87 | 87 | ]; |
@@ -25,7 +25,7 @@ |
||
25 | 25 | return DB::table(config('twill.fileables_table', 'twill_fileables'))->where('file_id', $this->id)->count() === 0; |
26 | 26 | } |
27 | 27 | |
28 | - public function scopeUnused ($query) |
|
28 | + public function scopeUnused($query) |
|
29 | 29 | { |
30 | 30 | $usedIds = DB::table(config('twill.fileables_table'))->get()->pluck('file_id'); |
31 | 31 | return $query->whereNotIn('id', $usedIds->toArray())->get(); |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | if (!function_exists('dumpUsableSqlQuery')) { |
10 | 10 | function dumpUsableSqlQuery($query) |
11 | 11 | { |
12 | - dd(vsprintf(str_replace('?', '%s', $query->toSql()), array_map(function ($binding) { |
|
12 | + dd(vsprintf(str_replace('?', '%s', $query->toSql()), array_map(function($binding) { |
|
13 | 13 | return is_numeric($binding) ? $binding : "'{$binding}'"; |
14 | 14 | }, $query->getBindings()))); |
15 | 15 | } |
@@ -201,12 +201,12 @@ discard block |
||
201 | 201 | { |
202 | 202 | $blockList = app(BlockCollection::class)->getBlockList(); |
203 | 203 | |
204 | - $appBlocksList = $blockList->filter(function ($block) { |
|
204 | + $appBlocksList = $blockList->filter(function($block) { |
|
205 | 205 | return $block['source'] !== A17\Twill\Services\Blocks\Block::SOURCE_TWILL; |
206 | 206 | }); |
207 | 207 | |
208 | 208 | return $blockList->filter( |
209 | - function ($block) use ($blocks, $groups, $appBlocksList) { |
|
209 | + function($block) use ($blocks, $groups, $appBlocksList) { |
|
210 | 210 | if ($block['group'] === A17\Twill\Services\Blocks\Block::SOURCE_TWILL) { |
211 | 211 | if (!collect( |
212 | 212 | config('twill.block_editor.use_twill_blocks') |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | } |
216 | 216 | |
217 | 217 | if (count($appBlocksList) > 0 && $appBlocksList->contains( |
218 | - function ($appBlock) use ($block) { |
|
218 | + function($appBlock) use ($block) { |
|
219 | 219 | return $appBlock['name'] === $block['name']; |
220 | 220 | }) |
221 | 221 | ) { |
@@ -20,12 +20,12 @@ discard block |
||
20 | 20 | { |
21 | 21 | $icons = collect( |
22 | 22 | config('twill.block_editor.directories.source.icons') |
23 | - )->reduce(function (Collection $keep, $path) { |
|
23 | + )->reduce(function(Collection $keep, $path) { |
|
24 | 24 | if (!$this->files->exists($path)) { |
25 | 25 | return $keep; |
26 | 26 | } |
27 | 27 | |
28 | - $files = collect($this->files->files($path))->map(function ( |
|
28 | + $files = collect($this->files->files($path))->map(function( |
|
29 | 29 | SplFileInfo $file |
30 | 30 | ) { |
31 | 31 | if (in_array($file->getFilename(), config('twill.internal_icons'))) { |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | abort(404); |
55 | 55 | } |
56 | 56 | |
57 | - return response()->stream(function () use ($file) { |
|
57 | + return response()->stream(function() use ($file) { |
|
58 | 58 | echo $this->files->get($file); |
59 | 59 | }, 200, ["Content-Type" => "image/svg+xml"]); |
60 | 60 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | { |
48 | 48 | $this->blockCollection |
49 | 49 | ->getMissingDirectories() |
50 | - ->each(function ($directory) { |
|
50 | + ->each(function($directory) { |
|
51 | 51 | $this->error("Directory not found: {$directory}"); |
52 | 52 | }); |
53 | 53 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | return $blockCollection |
62 | 62 | ->first() |
63 | 63 | ->keys() |
64 | - ->map(function ($key) { |
|
64 | + ->map(function($key) { |
|
65 | 65 | return Str::studly($key); |
66 | 66 | }) |
67 | 67 | ->toArray(); |
@@ -81,20 +81,20 @@ discard block |
||
81 | 81 | |
82 | 82 | return $this->blockCollection |
83 | 83 | ->collect() |
84 | - ->reject(function (Block $block) use ($sourceFiltered) { |
|
84 | + ->reject(function(Block $block) use ($sourceFiltered) { |
|
85 | 85 | return $sourceFiltered && !$this->option($block->source); |
86 | 86 | }) |
87 | - ->reject(function (Block $block) use ($typeFiltered) { |
|
87 | + ->reject(function(Block $block) use ($typeFiltered) { |
|
88 | 88 | return $this->dontPassTextFilter($block) || |
89 | 89 | ($typeFiltered && |
90 | 90 | !$this->option(Str::plural($block->type))); |
91 | 91 | }) |
92 | - ->map(function (Block $block) { |
|
92 | + ->map(function(Block $block) { |
|
93 | 93 | return $this->colorize( |
94 | 94 | $this->option('short') ? $block->toShortList() : $block->toList() |
95 | 95 | ); |
96 | 96 | }) |
97 | - ->sortBy(function ($block) { |
|
97 | + ->sortBy(function($block) { |
|
98 | 98 | return [$block['group'], $block['title']]; |
99 | 99 | }); |
100 | 100 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | if (filled($filter = $this->argument('filter'))) { |
153 | 153 | return !$block |
154 | 154 | ->toList() |
155 | - ->reduce(function ($keep, $element) use ($filter) { |
|
155 | + ->reduce(function($keep, $element) use ($filter) { |
|
156 | 156 | return $keep || |
157 | 157 | Str::contains( |
158 | 158 | Str::lower($element), |