@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | { |
21 | 21 | $paths = $this->migrations(); |
22 | 22 | |
23 | - foreach (is_array($paths)? $paths: [$paths] as $path) { |
|
23 | + foreach (is_array($paths) ? $paths : [$paths] as $path) { |
|
24 | 24 | \Illuminate\Support\Facades\Artisan::call('migrate', ['--path' => $path, '--force' => true]); |
25 | 25 | } |
26 | 26 | |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | { |
32 | 32 | $paths = $this->migrations(); |
33 | 33 | |
34 | - foreach (is_array($paths)? $paths: [$paths] as $path) { |
|
34 | + foreach (is_array($paths) ? $paths : [$paths] as $path) { |
|
35 | 35 | \Illuminate\Support\Facades\Artisan::call('migrate:rollback', ['--path' => $path]); |
36 | 36 | } |
37 | 37 |
@@ -48,8 +48,8 @@ |
||
48 | 48 | $alias = class_exists($module)? $module::alias(): $module; |
49 | 49 | |
50 | 50 | if (is_array($method) && !$args) { |
51 | - $args = $method; |
|
52 | - $method = 'body'; |
|
51 | + $args = $method; |
|
52 | + $method = 'body'; |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | return url(implode('/', ['view', $alias, $method, self::encodeArgs($args)])); |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | { |
22 | 22 | $defaultView = self::module()::view(); |
23 | 23 | |
24 | - $viewClass = is_a(static::class, ModuleView::class, true)? static::class: $defaultView; |
|
24 | + $viewClass = is_a(static::class, ModuleView::class, true) ? static::class : $defaultView; |
|
25 | 25 | |
26 | 26 | $viewAlias = null; |
27 | 27 | if ($viewClass !== $defaultView) { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | final public static function moduleLink($module, $method = 'body', $args = []) |
47 | 47 | { |
48 | - $alias = class_exists($module)? $module::alias(): $module; |
|
48 | + $alias = class_exists($module) ? $module::alias() : $module; |
|
49 | 49 | |
50 | 50 | if (is_array($method) && !$args) { |
51 | 51 | $args = $method; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * @throws \Illuminate\Http\Exceptions\HttpResponseException |
65 | 65 | */ |
66 | 66 | final public static function decodeArgs($hash) { |
67 | - if (! $hash) return []; |
|
67 | + if (!$hash) return []; |
|
68 | 68 | |
69 | 69 | $args = session($hash); |
70 | 70 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | final public static function encodeArgs($args) { |
83 | 83 | $args = (array) $args; |
84 | 84 | |
85 | - if (! $args) return; |
|
85 | + if (!$args) return; |
|
86 | 86 | |
87 | 87 | $hash = md5(serialize($args)); |
88 | 88 |
@@ -64,11 +64,15 @@ discard block |
||
64 | 64 | * @throws \Illuminate\Http\Exceptions\HttpResponseException |
65 | 65 | */ |
66 | 66 | final public static function decodeArgs($hash) { |
67 | - if (! $hash) return []; |
|
67 | + if (! $hash) { |
|
68 | + return []; |
|
69 | + } |
|
68 | 70 | |
69 | 71 | $args = session($hash); |
70 | 72 | |
71 | - if (is_null($args)) abort(419); |
|
73 | + if (is_null($args)) { |
|
74 | + abort(419); |
|
75 | + } |
|
72 | 76 | |
73 | 77 | return (array) $args; |
74 | 78 | } |
@@ -82,7 +86,9 @@ discard block |
||
82 | 86 | final public static function encodeArgs($args) { |
83 | 87 | $args = (array) $args; |
84 | 88 | |
85 | - if (! $args) return; |
|
89 | + if (! $args) { |
|
90 | + return; |
|
91 | + } |
|
86 | 92 | |
87 | 93 | $hash = md5(serialize($args)); |
88 | 94 |
@@ -12,11 +12,11 @@ |
||
12 | 12 | } |
13 | 13 | |
14 | 14 | final public static function requireJS($file = 'default.js', $isAsync = false, $isDefer = false) { |
15 | - return epesi()->requireJS(self::assetUrl('js/'. $file), $isAsync, $isDefer); |
|
15 | + return epesi()->requireJS(self::assetUrl('js/' . $file), $isAsync, $isDefer); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | final public static function requireCSS($file = 'default.css') { |
19 | - return epesi()->requireCSS(self::assetUrl('css/'. $file)); |
|
19 | + return epesi()->requireCSS(self::assetUrl('css/' . $file)); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | { |
65 | 65 | return self::$installed = self::$installed?? self::getCached('epesi-modules-installed', function() { |
66 | 66 | try { |
67 | - $installedModules = Module::pluck('class', 'alias'); |
|
67 | + $installedModules = Module::pluck('class', 'alias'); |
|
68 | 68 | } catch (\Exception $e) { |
69 | 69 | $installedModules = collect(); |
70 | 70 | } |
@@ -104,27 +104,27 @@ discard block |
||
104 | 104 | */ |
105 | 105 | protected static function discoverModuleClasses($namespace, $basePath) |
106 | 106 | { |
107 | - $ret = collect(); |
|
107 | + $ret = collect(); |
|
108 | 108 | |
109 | - $moduleNamespace = trim($namespace, '\\'); |
|
109 | + $moduleNamespace = trim($namespace, '\\'); |
|
110 | 110 | |
111 | - $names = array_slice(explode('\\', $moduleNamespace), - 1); |
|
111 | + $names = array_slice(explode('\\', $moduleNamespace), - 1); |
|
112 | 112 | |
113 | - if ($name = $names? reset($names): '') { |
|
114 | - $moduleClass = $moduleNamespace . '\\' . $name . 'Core'; |
|
113 | + if ($name = $names? reset($names): '') { |
|
114 | + $moduleClass = $moduleNamespace . '\\' . $name . 'Core'; |
|
115 | 115 | |
116 | - if (is_subclass_of($moduleClass, ModuleCore::class)) { |
|
117 | - $ret->add($moduleClass); |
|
118 | - } |
|
119 | - } |
|
116 | + if (is_subclass_of($moduleClass, ModuleCore::class)) { |
|
117 | + $ret->add($moduleClass); |
|
118 | + } |
|
119 | + } |
|
120 | 120 | |
121 | - foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) { |
|
122 | - $subModuleNamespace = $moduleNamespace . '\\' . basename($path); |
|
121 | + foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) { |
|
122 | + $subModuleNamespace = $moduleNamespace . '\\' . basename($path); |
|
123 | 123 | |
124 | - $ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path)); |
|
125 | - } |
|
124 | + $ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path)); |
|
125 | + } |
|
126 | 126 | |
127 | - return $ret; |
|
127 | + return $ret; |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -356,7 +356,6 @@ discard block |
||
356 | 356 | * |
357 | 357 | * @param string $classOrAlias |
358 | 358 | * @throws \Exception |
359 | - |
|
360 | 359 | * @return boolean |
361 | 360 | */ |
362 | 361 | public static function uninstall($classOrAlias) |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public static function isInstalled($classOrAlias) |
28 | 28 | { |
29 | - return self::getClass($classOrAlias, true)? 1: 0; |
|
29 | + return self::getClass($classOrAlias, true) ? 1 : 0; |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | * @return string; |
49 | 49 | */ |
50 | 50 | public static function getClass($classOrAlias, $installedOnly = false) { |
51 | - $modules = $installedOnly? self::getInstalled(): self::getAll(); |
|
51 | + $modules = $installedOnly ? self::getInstalled() : self::getAll(); |
|
52 | 52 | |
53 | 53 | if (collect($modules)->contains($classOrAlias)) return $classOrAlias; |
54 | 54 | |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | */ |
81 | 81 | public static function getAll() |
82 | 82 | { |
83 | - return self::getCached('epesi-modules-available', function () { |
|
83 | + return self::getCached('epesi-modules-available', function() { |
|
84 | 84 | $modules = collect(); |
85 | - foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules()?: []) as $namespace => $path) { |
|
85 | + foreach (array_merge(config('epesi.modules', []), self::packageManifest()->modules() ?: []) as $namespace => $path) { |
|
86 | 86 | foreach (self::discoverModuleClasses($namespace, $path) as $moduleClass) { |
87 | 87 | $modules->add(['alias' => $moduleClass::alias(), 'class' => $moduleClass]); |
88 | 88 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | |
111 | 111 | $names = array_slice(explode('\\', $moduleNamespace), - 1); |
112 | 112 | |
113 | - if ($name = $names? reset($names): '') { |
|
113 | + if ($name = $names ? reset($names) : '') { |
|
114 | 114 | $moduleClass = $moduleNamespace . '\\' . $name . 'Core'; |
115 | 115 | |
116 | 116 | if (is_subclass_of($moduleClass, ModuleCore::class)) { |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | } |
119 | 119 | } |
120 | 120 | |
121 | - foreach (glob($basePath . '/*', GLOB_ONLYDIR|GLOB_NOSORT) as $path) { |
|
121 | + foreach (glob($basePath . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $path) { |
|
122 | 122 | $subModuleNamespace = $moduleNamespace . '\\' . basename($path); |
123 | 123 | |
124 | 124 | $ret = $ret->merge(self::discoverModuleClasses($subModuleNamespace, $path)); |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | */ |
137 | 137 | protected static function getCached($key, \Closure $default) |
138 | 138 | { |
139 | - if (! Cache::has($key)) { |
|
139 | + if (!Cache::has($key)) { |
|
140 | 140 | Cache::forever($key, $default()); |
141 | 141 | } |
142 | 142 | |
@@ -174,12 +174,12 @@ discard block |
||
174 | 174 | */ |
175 | 175 | public static function collect($method, $args = []) |
176 | 176 | { |
177 | - $args = is_array($args)? $args: [$args]; |
|
177 | + $args = is_array($args) ? $args : [$args]; |
|
178 | 178 | |
179 | 179 | $installedModules = self::getInstalled(); |
180 | 180 | |
181 | 181 | // if epesi is not installed fake having the system module to enable its functionality |
182 | - if (! $installedModules->contains(\Epesi\Core\System\SystemCore::class)) { |
|
182 | + if (!$installedModules->contains(\Epesi\Core\System\SystemCore::class)) { |
|
183 | 183 | $installedModules = collect([ |
184 | 184 | 'system' => \Epesi\Core\System\SystemCore::class |
185 | 185 | ]); |
@@ -187,9 +187,9 @@ discard block |
||
187 | 187 | |
188 | 188 | $ret = []; |
189 | 189 | foreach ($installedModules as $module) { |
190 | - if (! $list = $module::$method(...$args)) continue; |
|
190 | + if (!$list = $module::$method(...$args)) continue; |
|
191 | 191 | |
192 | - $ret = array_merge($ret, is_array($list)? $list: [$list]); |
|
192 | + $ret = array_merge($ret, is_array($list) ? $list : [$list]); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | return $ret; |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | return true; |
209 | 209 | } |
210 | 210 | |
211 | - if (! $moduleClass = self::getClass($classOrAlias)) { |
|
211 | + if (!$moduleClass = self::getClass($classOrAlias)) { |
|
212 | 212 | throw new \Exception('Module "' . $classOrAlias . '" could not be identified'); |
213 | 213 | } |
214 | 214 | |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | ]); |
239 | 239 | |
240 | 240 | if ($installRecommended) { |
241 | - $installRecommended = is_array($installRecommended)? $installRecommended: $module->recommended(); |
|
241 | + $installRecommended = is_array($installRecommended) ? $installRecommended : $module->recommended(); |
|
242 | 242 | |
243 | 243 | foreach ($installRecommended as $recommendedModule) { |
244 | 244 | try { |
@@ -271,10 +271,10 @@ discard block |
||
271 | 271 | $parentModule = array_shift($unsatisfiedDependencies); |
272 | 272 | |
273 | 273 | if (self::$processing[$parentModule]?? false) { |
274 | - throw new \Exception('Cross dependency: '. $parentModule); |
|
274 | + throw new \Exception('Cross dependency: ' . $parentModule); |
|
275 | 275 | } |
276 | 276 | |
277 | - if (! self::isAvailable($parentModule)) { |
|
277 | + if (!self::isAvailable($parentModule)) { |
|
278 | 278 | throw new \Exception('Module not found: "' . $parentModule . '"'); |
279 | 279 | } |
280 | 280 | |
@@ -361,13 +361,13 @@ discard block |
||
361 | 361 | */ |
362 | 362 | public static function uninstall($classOrAlias) |
363 | 363 | { |
364 | - if (! self::isInstalled($classOrAlias)) { |
|
364 | + if (!self::isInstalled($classOrAlias)) { |
|
365 | 365 | print ('Module "' . $classOrAlias . '" is not installed!'); |
366 | 366 | |
367 | 367 | return true; |
368 | 368 | } |
369 | 369 | |
370 | - if (! $moduleClass = self::getClass($classOrAlias)) { |
|
370 | + if (!$moduleClass = self::getClass($classOrAlias)) { |
|
371 | 371 | throw new \Exception('Module "' . $classOrAlias . '" could not be identified'); |
372 | 372 | } |
373 | 373 |
@@ -36,7 +36,9 @@ discard block |
||
36 | 36 | public static function getClass($classOrAlias, $installedOnly = false) { |
37 | 37 | $modules = $installedOnly? self::getInstalled(): self::getAll(); |
38 | 38 | |
39 | - if (collect($modules)->contains($classOrAlias)) return $classOrAlias; |
|
39 | + if (collect($modules)->contains($classOrAlias)) { |
|
40 | + return $classOrAlias; |
|
41 | + } |
|
40 | 42 | |
41 | 43 | return $modules[$classOrAlias]?? null; |
42 | 44 | } |
@@ -138,7 +140,9 @@ discard block |
||
138 | 140 | |
139 | 141 | $ret = []; |
140 | 142 | foreach ($installedModules as $module) { |
141 | - if (! $list = $module::$method(...$args)) continue; |
|
143 | + if (! $list = $module::$method(...$args)) { |
|
144 | + continue; |
|
145 | + } |
|
142 | 146 | |
143 | 147 | $ret = array_merge($ret, is_array($list)? $list: [$list]); |
144 | 148 | } |
@@ -34,10 +34,10 @@ |
||
34 | 34 | */ |
35 | 35 | final public function displayModuleContent($method, $args) { |
36 | 36 | // if method not callbale abort to 'not found' |
37 | - if (! is_callable([$this, $method])) abort(404); |
|
37 | + if (!is_callable([$this, $method])) abort(404); |
|
38 | 38 | |
39 | 39 | // if user has no access abort 'no access' |
40 | - if (! $this->access()) abort(401); |
|
40 | + if (!$this->access()) abort(401); |
|
41 | 41 | |
42 | 42 | $args = $this->decodeArgs($args); |
43 | 43 |
@@ -34,10 +34,14 @@ |
||
34 | 34 | */ |
35 | 35 | final public function displayModuleContent($method, $args) { |
36 | 36 | // if method not callbale abort to 'not found' |
37 | - if (! is_callable([$this, $method])) abort(404); |
|
37 | + if (! is_callable([$this, $method])) { |
|
38 | + abort(404); |
|
39 | + } |
|
38 | 40 | |
39 | 41 | // if user has no access abort 'no access' |
40 | - if (! $this->access()) abort(401); |
|
42 | + if (! $this->access()) { |
|
43 | + abort(401); |
|
44 | + } |
|
41 | 45 | |
42 | 46 | $args = $this->decodeArgs($args); |
43 | 47 |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | class ActionBar extends Menu |
9 | 9 | { |
10 | - public $ui = 'actionbar menu'; |
|
10 | + public $ui = 'actionbar menu'; |
|
11 | 11 | |
12 | 12 | protected static $buttons = []; |
13 | 13 | |
@@ -46,12 +46,12 @@ discard block |
||
46 | 46 | } |
47 | 47 | |
48 | 48 | public function renderView() |
49 | - { |
|
50 | - $this->elements = collect($this->elements)->sortByDesc(function ($element) { |
|
51 | - return $element->weight ?? 10; |
|
52 | - })->toArray(); |
|
49 | + { |
|
50 | + $this->elements = collect($this->elements)->sortByDesc(function ($element) { |
|
51 | + return $element->weight ?? 10; |
|
52 | + })->toArray(); |
|
53 | 53 | |
54 | - return parent::renderView(); |
|
54 | + return parent::renderView(); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | public static function addMenuButton($menu) |
83 | 83 | { |
84 | - return self::instance()->addMenu($menu); |
|
84 | + return self::instance()->addMenu($menu); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | public static function clear() |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | public function renderView() |
49 | 49 | { |
50 | - $this->elements = collect($this->elements)->sortByDesc(function ($element) { |
|
50 | + $this->elements = collect($this->elements)->sortByDesc(function($element) { |
|
51 | 51 | return $element->weight ?? 10; |
52 | 52 | })->toArray(); |
53 | 53 | |
@@ -63,9 +63,9 @@ discard block |
||
63 | 63 | */ |
64 | 64 | public static function addItemButton($button, $defaults = []) |
65 | 65 | { |
66 | - $button = is_string($button)? self::getPredefined($button): $button; |
|
66 | + $button = is_string($button) ? self::getPredefined($button) : $button; |
|
67 | 67 | |
68 | - $button = is_array($button)? new ActionBarItem($button): $button; |
|
68 | + $button = is_array($button) ? new ActionBarItem($button) : $button; |
|
69 | 69 | |
70 | 70 | $actionBar = self::instance(); |
71 | 71 |
@@ -7,40 +7,40 @@ |
||
7 | 7 | |
8 | 8 | class ActionBarItem extends Item |
9 | 9 | { |
10 | - public $weight = 10; |
|
10 | + public $weight = 10; |
|
11 | 11 | |
12 | - public $callback; |
|
12 | + public $callback; |
|
13 | 13 | |
14 | - public $hint; |
|
14 | + public $hint; |
|
15 | 15 | |
16 | - public function renderView() |
|
17 | - { |
|
18 | - $this->addCallback(); |
|
16 | + public function renderView() |
|
17 | + { |
|
18 | + $this->addCallback(); |
|
19 | 19 | |
20 | - if ($this->hint) { |
|
21 | - $this->attr['title'] = $this->hint; |
|
22 | - } |
|
20 | + if ($this->hint) { |
|
21 | + $this->attr['title'] = $this->hint; |
|
22 | + } |
|
23 | 23 | |
24 | - parent::renderView(); |
|
25 | - } |
|
24 | + parent::renderView(); |
|
25 | + } |
|
26 | 26 | |
27 | - public function callback($callable) |
|
28 | - { |
|
29 | - $this->callback = $callable; |
|
27 | + public function callback($callable) |
|
28 | + { |
|
29 | + $this->callback = $callable; |
|
30 | 30 | |
31 | - return $this; |
|
32 | - } |
|
31 | + return $this; |
|
32 | + } |
|
33 | 33 | |
34 | - public function addCallback() |
|
35 | - { |
|
36 | - if (is_callable($callable = $this->callback)) { |
|
37 | - $callable = $this->add('jsCallback')->set($callable); |
|
38 | - } |
|
34 | + public function addCallback() |
|
35 | + { |
|
36 | + if (is_callable($callable = $this->callback)) { |
|
37 | + $callable = $this->add('jsCallback')->set($callable); |
|
38 | + } |
|
39 | 39 | |
40 | - if ($callable instanceof jsCallback) { |
|
41 | - $this->on('click', $callable); |
|
42 | - } |
|
40 | + if ($callable instanceof jsCallback) { |
|
41 | + $this->on('click', $callable); |
|
42 | + } |
|
43 | 43 | |
44 | - return $this; |
|
45 | - } |
|
44 | + return $this; |
|
45 | + } |
|
46 | 46 | } |
@@ -20,10 +20,10 @@ |
||
20 | 20 | | This value is the name of Epesi powered by as displayed. |
21 | 21 | | |
22 | 22 | */ |
23 | - 'credit' => [ |
|
24 | - 'title' => 'EPESI', |
|
25 | - 'link' => 'https://epe.si' |
|
26 | - ], |
|
23 | + 'credit' => [ |
|
24 | + 'title' => 'EPESI', |
|
25 | + 'link' => 'https://epe.si' |
|
26 | + ], |
|
27 | 27 | |
28 | 28 | /* |
29 | 29 | |-------------------------------------------------------------------------- |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | |
9 | 9 | class NavMenu extends BaseMenu |
10 | 10 | { |
11 | - public $ui = 'inverted nav menu'; |
|
11 | + public $ui = 'inverted nav menu'; |
|
12 | 12 | |
13 | 13 | public function init() |
14 | 14 | { |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | self::addItems($submenu, collect($subitems)); |
59 | 59 | } |
60 | 60 | elseif ($subitems = $entry['group'] ?? []) { |
61 | - $subgroup = $menu->addGroup($entry['item']); |
|
61 | + $subgroup = $menu->addGroup($entry['item']); |
|
62 | 62 | |
63 | 63 | self::addItems($subgroup, collect($subitems)); |
64 | 64 | } |
65 | 65 | else { |
66 | - $menu->addItem($entry['item'], $entry['action'] ?? ''); |
|
66 | + $menu->addItem($entry['item'], $entry['action'] ?? ''); |
|
67 | 67 | } |
68 | 68 | }); |
69 | 69 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $this->addHeader($this->app->title); |
18 | 18 | |
19 | 19 | $items = collect(); |
20 | - foreach(NavMenuJoint::collect() as $joint) { |
|
20 | + foreach (NavMenuJoint::collect() as $joint) { |
|
21 | 21 | $items = $items->merge($joint->items()); |
22 | 22 | } |
23 | 23 | |
@@ -34,13 +34,13 @@ discard block |
||
34 | 34 | |
35 | 35 | public static function addItems($menu, Collection $items) |
36 | 36 | { |
37 | - $items->sort(function ($entry1, $entry2) { |
|
37 | + $items->sort(function($entry1, $entry2) { |
|
38 | 38 | $weight1 = $entry1['weight']?? 10; |
39 | 39 | $weight2 = $entry2['weight']?? 10; |
40 | 40 | |
41 | 41 | return $weight1 <=> $weight2; |
42 | 42 | })->map(function($entry, $caption) use ($menu) { |
43 | - if (! ($entry['access'] ?? true)) return; |
|
43 | + if (!($entry['access'] ?? true)) return; |
|
44 | 44 | |
45 | 45 | if (!isset($entry['action']) && !is_array($entry)) { |
46 | 46 | $entry = ['action' => $entry]; |
@@ -40,7 +40,9 @@ discard block |
||
40 | 40 | |
41 | 41 | return $weight1 <=> $weight2; |
42 | 42 | })->map(function($entry, $caption) use ($menu) { |
43 | - if (! ($entry['access'] ?? true)) return; |
|
43 | + if (! ($entry['access'] ?? true)) { |
|
44 | + return; |
|
45 | + } |
|
44 | 46 | |
45 | 47 | if (!isset($entry['action']) && !is_array($entry)) { |
46 | 48 | $entry = ['action' => $entry]; |
@@ -56,13 +58,11 @@ discard block |
||
56 | 58 | $submenu = $menu->addMenu($entry['item']); |
57 | 59 | |
58 | 60 | self::addItems($submenu, collect($subitems)); |
59 | - } |
|
60 | - elseif ($subitems = $entry['group'] ?? []) { |
|
61 | + } elseif ($subitems = $entry['group'] ?? []) { |
|
61 | 62 | $subgroup = $menu->addGroup($entry['item']); |
62 | 63 | |
63 | 64 | self::addItems($subgroup, collect($subitems)); |
64 | - } |
|
65 | - else { |
|
65 | + } else { |
|
66 | 66 | $menu->addItem($entry['item'], $entry['action'] ?? ''); |
67 | 67 | } |
68 | 68 | }); |