@@ -69,7 +69,7 @@ |
||
69 | 69 | private function readManifest() |
70 | 70 | { |
71 | 71 | try { |
72 | - return Cache::rememberForever('twill-manifest', function () { |
|
72 | + return Cache::rememberForever('twill-manifest', function() { |
|
73 | 73 | return $this->readJson($this->getManifestFilename()); |
74 | 74 | }); |
75 | 75 | } catch (\Exception $e) { |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $routesFile |
18 | 18 | ) { |
19 | 19 | if (file_exists($routesFile)) { |
20 | - $hostRoutes = function ($router) use ( |
|
20 | + $hostRoutes = function($router) use ( |
|
21 | 21 | $middlewares, |
22 | 22 | $namespace, |
23 | 23 | $routesFile |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | 'namespace' => $namespace, |
28 | 28 | 'middleware' => $middlewares, |
29 | 29 | ], |
30 | - function ($router) use ($routesFile) { |
|
30 | + function($router) use ($routesFile) { |
|
31 | 31 | require $routesFile; |
32 | 32 | } |
33 | 33 | ); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | $manager = (new Manager()); |
127 | 127 | |
128 | 128 | $manager->getCapsuleList() |
129 | - ->each(function ($capsule) use ($router, $manager) { |
|
129 | + ->each(function($capsule) use ($router, $manager) { |
|
130 | 130 | $this->registerCapsuleRoutes($router, $capsule, $manager); |
131 | 131 | }); |
132 | 132 | } |
@@ -46,7 +46,7 @@ |
||
46 | 46 | |
47 | 47 | public function registerCapsules() |
48 | 48 | { |
49 | - $this->manager->getCapsuleList()->map(function ($capsule) { |
|
49 | + $this->manager->getCapsuleList()->map(function($capsule) { |
|
50 | 50 | $this->registerCapsule($capsule); |
51 | 51 | }); |
52 | 52 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | return $list |
27 | 27 | ->where('enabled', true) |
28 | - ->map(function ($capsule) use ($path) { |
|
28 | + ->map(function($capsule) use ($path) { |
|
29 | 29 | return $this->makeCapsule($capsule, $path); |
30 | 30 | }); |
31 | 31 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | public function getCapsuleByModule($module) |
41 | 41 | { |
42 | 42 | return $this->getCapsuleList() |
43 | - ->filter(function ($capsule) use ($module) { |
|
43 | + ->filter(function($capsule) use ($module) { |
|
44 | 44 | return Str::lower($capsule['plural']) == Str::lower($module); |
45 | 45 | }) |
46 | 46 | ->first(); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | "{$capsuleNamespace}\\" . |
107 | 107 | config('twill.capsules.namespaces.requests'); |
108 | 108 | |
109 | - $capsule['psr4_path'] = "$basePath/{$name}" . (filled($this->getCapsulesSubdir()) ? $this->getCapsulesSubdir().'/' : ''); |
|
109 | + $capsule['psr4_path'] = "$basePath/{$name}" . (filled($this->getCapsulesSubdir()) ? $this->getCapsulesSubdir() . '/' : ''); |
|
110 | 110 | |
111 | 111 | $capsule['base_path'] = $basePath; |
112 | 112 | |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | { |
247 | 247 | $twillSeeder = app(CapsuleSeeder::class); |
248 | 248 | |
249 | - $this->getCapsuleList()->each(function ($capsule) use ($twillSeeder, $illuminateSeeder) { |
|
249 | + $this->getCapsuleList()->each(function($capsule) use ($twillSeeder, $illuminateSeeder) { |
|
250 | 250 | if (filled($capsuleSeeder = $this->makeCapsuleSeeder($capsule))) { |
251 | 251 | $twillSeeder->setCommand($illuminateSeeder->command); |
252 | 252 |
@@ -235,14 +235,14 @@ |
||
235 | 235 | return $value; |
236 | 236 | } |
237 | 237 | |
238 | - if ($configBlock = collect(config("twill.block_editor.blocks"))->filter(function ($block) use ($blockName) { |
|
238 | + if ($configBlock = collect(config("twill.block_editor.blocks"))->filter(function($block) use ($blockName) { |
|
239 | 239 | return Str::contains($block['component'], $blockName); |
240 | 240 | })->first()) { |
241 | 241 | if ($value = ($configBlock[$property] ?? null)) { |
242 | 242 | return $value; |
243 | 243 | } |
244 | 244 | } |
245 | - if ($configRepeater = collect(config("twill.block_editor.repeaters"))->filter(function ($repeater) use ($blockName) { |
|
245 | + if ($configRepeater = collect(config("twill.block_editor.repeaters"))->filter(function($repeater) use ($blockName) { |
|
246 | 246 | return Str::contains($repeater['component'], $blockName); |
247 | 247 | })->first()) { |
248 | 248 | if ($value = ($configRepeater[$property] ?? null)) { |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | public function findByName($search, $sources = []) |
53 | 53 | { |
54 | 54 | return $this->collect() |
55 | - ->filter(function ($block) use ($search, $sources) { |
|
55 | + ->filter(function($block) use ($search, $sources) { |
|
56 | 56 | return $block->name == $search && |
57 | 57 | (blank($sources) || |
58 | 58 | collect($sources)->contains($block->source)); |
59 | 59 | }) |
60 | - ->sortBy(function ($block) { |
|
60 | + ->sortBy(function($block) { |
|
61 | 61 | return $block->source === 'app' ? 0 : 1; |
62 | 62 | }) |
63 | 63 | ->first(); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | public function getBlocks() |
70 | 70 | { |
71 | 71 | return $this->collect() |
72 | - ->filter(function ($block) { |
|
72 | + ->filter(function($block) { |
|
73 | 73 | return $block->type === Block::TYPE_BLOCK; |
74 | 74 | }) |
75 | 75 | ->values(); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | */ |
81 | 81 | public function getBlockList() |
82 | 82 | { |
83 | - return $this->getBlocks()->map(function (Block $block) { |
|
83 | + return $this->getBlocks()->map(function(Block $block) { |
|
84 | 84 | return $block->toList(); |
85 | 85 | }); |
86 | 86 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | } |
109 | 109 | |
110 | 110 | return collect($this->fileSystem->files($directory)) |
111 | - ->map(function ($file) use ($source, $type) { |
|
111 | + ->map(function($file) use ($source, $type) { |
|
112 | 112 | return new Block($file, $type, $source); |
113 | 113 | }); |
114 | 114 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $this->paths = collect( |
122 | 122 | config('twill.block_editor.directories.source.blocks') |
123 | 123 | ) |
124 | - ->map(function ($path) { |
|
124 | + ->map(function($path) { |
|
125 | 125 | $path['type'] = Block::TYPE_BLOCK; |
126 | 126 | |
127 | 127 | return $path; |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | ->merge( |
130 | 130 | collect( |
131 | 131 | config('twill.block_editor.directories.source.repeaters') |
132 | - )->map(function ($path) { |
|
132 | + )->map(function($path) { |
|
133 | 133 | $path['type'] = Block::TYPE_REPEATER; |
134 | 134 | |
135 | 135 | return $path; |
@@ -167,12 +167,12 @@ discard block |
||
167 | 167 | $this->generatePaths(); |
168 | 168 | |
169 | 169 | $this->items = collect($this->paths) |
170 | - ->reduce(function (Collection $keep, $path) { |
|
170 | + ->reduce(function(Collection $keep, $path) { |
|
171 | 171 | $this->readBlocks( |
172 | 172 | $path['path'], |
173 | 173 | $path['source'], |
174 | 174 | $path['type'] |
175 | - )->each(function ($block) use ($keep) { |
|
175 | + )->each(function($block) use ($keep) { |
|
176 | 176 | $keep->push($block); |
177 | 177 | |
178 | 178 | return $keep; |
@@ -183,15 +183,15 @@ discard block |
||
183 | 183 | ->toArray(); |
184 | 184 | |
185 | 185 | $this->items = $this->collect() |
186 | - ->each(function (Block $block) { |
|
186 | + ->each(function(Block $block) { |
|
187 | 187 | $block->setSource($this->detectCustomSources($block)); |
188 | 188 | }) |
189 | 189 | ->toArray(); |
190 | 190 | |
191 | 191 | // remove duplicate Twill blocks |
192 | 192 | $appBlocks = $this->collect()->whereIn('source', [Block::SOURCE_APP, Block::SOURCE_CUSTOM]); |
193 | - $this->items = $this->collect()->filter(function ($item) use ($appBlocks) { |
|
194 | - return !$appBlocks->contains(function ($block) use ($item) { |
|
193 | + $this->items = $this->collect()->filter(function($item) use ($appBlocks) { |
|
194 | + return !$appBlocks->contains(function($block) use ($item) { |
|
195 | 195 | return $item->source === Block::SOURCE_TWILL && $item->name === $block->name; |
196 | 196 | }); |
197 | 197 | })->values()->toArray(); |
@@ -214,12 +214,12 @@ discard block |
||
214 | 214 | */ |
215 | 215 | public function addBlocksFromConfig(Collection $items, $type) |
216 | 216 | { |
217 | - $items->reject(function ($value, $blockName) use ($type) { |
|
218 | - return $this->contains(function ($block) use ($blockName, $type) { |
|
217 | + $items->reject(function($value, $blockName) use ($type) { |
|
218 | + return $this->contains(function($block) use ($blockName, $type) { |
|
219 | 219 | return $block->name === $blockName && $block->type === $type; |
220 | 220 | }) ? [$blockName, $value] : false; |
221 | 221 | }) |
222 | - ->each(function ($block, $blockName) use ($type) { |
|
222 | + ->each(function($block, $blockName) use ($type) { |
|
223 | 223 | if ($block['compiled'] ?? false) { |
224 | 224 | $file = null; |
225 | 225 | } else { |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | */ |
261 | 261 | public function logDeprecatedBlockConfig($blockName, $type) |
262 | 262 | { |
263 | - $path = $this->paths->filter(function ($path) use ($type) { |
|
263 | + $path = $this->paths->filter(function($path) use ($type) { |
|
264 | 264 | return $path['source'] === Block::SOURCE_APP && $path['type'] === $type; |
265 | 265 | })->pluck('path')->join(', ', ' or '); |
266 | 266 | |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | public function findFileByComponentName($componentName) |
283 | 283 | { |
284 | 284 | $filename = str_replace('a17-block-', '', $componentName) . '.blade.php'; |
285 | - $paths = $this->paths->pluck('path')->filter(function ($path) { |
|
285 | + $paths = $this->paths->pluck('path')->filter(function($path) { |
|
286 | 286 | return $this->fileSystem->exists($path); |
287 | 287 | })->toArray(); |
288 | 288 | |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | */ |
309 | 309 | public function list() |
310 | 310 | { |
311 | - return $this->collect()->map(function (Block $block) { |
|
311 | + return $this->collect()->map(function(Block $block) { |
|
312 | 312 | return $block->toList(); |
313 | 313 | }); |
314 | 314 | } |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | public function getRepeaters() |
328 | 328 | { |
329 | 329 | return $this->collect() |
330 | - ->filter(function ($block) { |
|
330 | + ->filter(function($block) { |
|
331 | 331 | return $block->type === Block::TYPE_REPEATER; |
332 | 332 | }) |
333 | 333 | ->values(); |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | */ |
339 | 339 | public function getRepeaterList() |
340 | 340 | { |
341 | - return $this->getRepeaters()->map(function (Block $block) { |
|
341 | + return $this->getRepeaters()->map(function(Block $block) { |
|
342 | 342 | return $block->toList(); |
343 | 343 | }); |
344 | 344 | } |
@@ -82,11 +82,11 @@ discard block |
||
82 | 82 | $middlewares, |
83 | 83 | $supportSubdomainRouting |
84 | 84 | ) { |
85 | - $internalRoutes = function ($router) use ( |
|
85 | + $internalRoutes = function($router) use ( |
|
86 | 86 | $middlewares, |
87 | 87 | $supportSubdomainRouting |
88 | 88 | ) { |
89 | - $router->group(['middleware' => $middlewares], function ($router) { |
|
89 | + $router->group(['middleware' => $middlewares], function($router) { |
|
90 | 90 | require __DIR__ . '/../routes/admin.php'; |
91 | 91 | }); |
92 | 92 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | ? ['supportSubdomainRouting'] |
97 | 97 | : [], |
98 | 98 | ], |
99 | - function ($router) { |
|
99 | + function($router) { |
|
100 | 100 | require __DIR__ . '/../routes/auth.php'; |
101 | 101 | } |
102 | 102 | ); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | ? ['twill_auth:twill_users'] |
108 | 108 | : [], |
109 | 109 | ], |
110 | - function ($router) { |
|
110 | + function($router) { |
|
111 | 111 | require __DIR__ . '/../routes/templates.php'; |
112 | 112 | } |
113 | 113 | ); |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $groupOptions + [ |
118 | 118 | 'namespace' => $this->namespace . '\Admin', |
119 | 119 | ], |
120 | - function ($router) use ($internalRoutes, $supportSubdomainRouting) { |
|
120 | + function($router) use ($internalRoutes, $supportSubdomainRouting) { |
|
121 | 121 | $router->group( |
122 | 122 | [ |
123 | 123 | 'domain' => config('twill.admin_app_url'), |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | config('twill.admin_middleware_group', 'web'), |
149 | 149 | ], |
150 | 150 | ], |
151 | - function ($router) { |
|
151 | + function($router) { |
|
152 | 152 | $router->group( |
153 | 153 | [ |
154 | 154 | 'middleware' => $this->app->environment( |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | ? ['twill_auth:twill_users'] |
158 | 158 | : [], |
159 | 159 | ], |
160 | - function ($router) { |
|
160 | + function($router) { |
|
161 | 161 | require __DIR__ . '/../routes/templates.php'; |
162 | 162 | } |
163 | 163 | ); |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | */ |
211 | 211 | protected function registerMacros() |
212 | 212 | { |
213 | - Route::macro('moduleShowWithPreview', function ( |
|
213 | + Route::macro('moduleShowWithPreview', function( |
|
214 | 214 | $moduleName, |
215 | 215 | $routePrefix = null, |
216 | 216 | $controllerName = null |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | ->middleware(['web', 'twill_auth:twill_users', 'can:list']); |
245 | 245 | }); |
246 | 246 | |
247 | - Route::macro('module', function ( |
|
247 | + Route::macro('module', function( |
|
248 | 248 | $slug, |
249 | 249 | $options = [], |
250 | 250 | $resource_options = [], |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | $_slug = Arr::last($slugs); |
256 | 256 | $className = implode( |
257 | 257 | '', |
258 | - array_map(function ($s) { |
|
258 | + array_map(function($s) { |
|
259 | 259 | return ucfirst(Str::singular($s)); |
260 | 260 | }, $slugs) |
261 | 261 | ); |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | if ($resource) { |
381 | 381 | Route::group( |
382 | 382 | ['as' => $resourceCustomGroupPrefix], |
383 | - function () use ($slug, $className, $resource_options) { |
|
383 | + function() use ($slug, $className, $resource_options) { |
|
384 | 384 | Route::resource( |
385 | 385 | $slug, |
386 | 386 | "{$className}Controller", |