@@ -73,7 +73,9 @@ discard block |
||
| 73 | 73 | { |
| 74 | 74 | $entry = collect(array_merge(['item' => $entry, 'group' => '00500:general', 'weight' => 10], $entry)); |
| 75 | 75 | |
| 76 | - if (! $entry->get('item')) return; |
|
| 76 | + if (! $entry->get('item')) { |
|
| 77 | + return; |
|
| 78 | + } |
|
| 77 | 79 | |
| 78 | 80 | $this->entries->add($entry); |
| 79 | 81 | } |
@@ -94,14 +96,18 @@ discard block |
||
| 94 | 96 | { |
| 95 | 97 | $empty = true; |
| 96 | 98 | foreach ($this->entries->groupBy('group')->sortKeys() as $group) { |
| 97 | - if (!$empty) $this->userMenu->addDivider(); |
|
| 99 | + if (!$empty) { |
|
| 100 | + $this->userMenu->addDivider(); |
|
| 101 | + } |
|
| 98 | 102 | |
| 99 | 103 | foreach ($group->sortBy('weight') as $entry) { |
| 100 | 104 | $empty = false; |
| 101 | 105 | |
| 102 | 106 | $item = $this->userMenu->addItem($entry['item'], $entry->get('action')); |
| 103 | 107 | |
| 104 | - if (! $callback = $entry->get('callback')) continue; |
|
| 108 | + if (! $callback = $entry->get('callback')) { |
|
| 109 | + continue; |
|
| 110 | + } |
|
| 105 | 111 | |
| 106 | 112 | $callback($item); |
| 107 | 113 | } |
@@ -40,7 +40,9 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | return $weight1 <=> $weight2; |
| 42 | 42 | })->map(function($item, $caption) use ($menu) { |
| 43 | - if (! ($item['access']?? true)) return; |
|
| 43 | + if (! ($item['access']?? true)) { |
|
| 44 | + return; |
|
| 45 | + } |
|
| 44 | 46 | |
| 45 | 47 | if (!isset($item['link']) && !is_array($item)) { |
| 46 | 48 | $item = [ |
@@ -58,8 +60,7 @@ discard block |
||
| 58 | 60 | $submenu = $menu->addMenu($item['caption']); |
| 59 | 61 | |
| 60 | 62 | self::addItems($submenu, collect($subitems)); |
| 61 | - } |
|
| 62 | - elseif ($subitems = $item['group']?? []) { |
|
| 63 | + } elseif ($subitems = $item['group']?? []) { |
|
| 63 | 64 | $subgroup = $menu->addGroup($item['caption']); |
| 64 | 65 | |
| 65 | 66 | if (($item['toggle']?? false) && !$menu->in_dropdown) { |
@@ -68,8 +69,7 @@ discard block |
||
| 68 | 69 | } |
| 69 | 70 | |
| 70 | 71 | self::addItems($subgroup, collect($subitems)); |
| 71 | - } |
|
| 72 | - elseif ($subitems = $item['accordion']?? []) { |
|
| 72 | + } elseif ($subitems = $item['accordion']?? []) { |
|
| 73 | 73 | $accordion = $menu->add(['Accordion']); |
| 74 | 74 | |
| 75 | 75 | $section = $accordion->addSection($item['caption']); |
@@ -92,12 +92,10 @@ discard block |
||
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | // self::addItems($accordion, collect($subitems)); |
| 95 | - } |
|
| 96 | - else { |
|
| 95 | + } else { |
|
| 97 | 96 | if (is_a($menu, Accordion::class)) { |
| 98 | 97 | $menu->add(['View', 'Test']); |
| 99 | - } |
|
| 100 | - else { |
|
| 98 | + } else { |
|
| 101 | 99 | $menu->addItem($item['caption'], $item['link']?? ''); |
| 102 | 100 | } |
| 103 | 101 | |
@@ -71,7 +71,9 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | public function setMenu() |
| 73 | 73 | { |
| 74 | - if ($this->menu) return; |
|
| 74 | + if ($this->menu) { |
|
| 75 | + return; |
|
| 76 | + } |
|
| 75 | 77 | |
| 76 | 78 | //.ui.sidebar, |
| 77 | 79 | $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu'); |
@@ -119,7 +121,9 @@ discard block |
||
| 119 | 121 | |
| 120 | 122 | public function setMenuRight() |
| 121 | 123 | { |
| 122 | - if ($this->menuRight) return; |
|
| 124 | + if ($this->menuRight) { |
|
| 125 | + return; |
|
| 126 | + } |
|
| 123 | 127 | |
| 124 | 128 | $this->menuRight = $this->menu->add(new Seeds\RightMenu([ |
| 125 | 129 | 'ui' => false |
@@ -128,11 +132,15 @@ discard block |
||
| 128 | 132 | |
| 129 | 133 | public function setMenuLeft() |
| 130 | 134 | { |
| 131 | - if ($this->menuLeft) return; |
|
| 135 | + if ($this->menuLeft) { |
|
| 136 | + return; |
|
| 137 | + } |
|
| 132 | 138 | |
| 133 | 139 | $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu'); |
| 134 | 140 | |
| 135 | - if (! $this->burger) return; |
|
| 141 | + if (! $this->burger) { |
|
| 142 | + return; |
|
| 143 | + } |
|
| 136 | 144 | |
| 137 | 145 | if (! session()->get('menu', 1)) { |
| 138 | 146 | $this->isMenuLeftVisible = false; |
@@ -151,7 +159,9 @@ discard block |
||
| 151 | 159 | |
| 152 | 160 | public function setActionBar() |
| 153 | 161 | { |
| 154 | - if ($this->actionBar) return; |
|
| 162 | + if ($this->actionBar) { |
|
| 163 | + return; |
|
| 164 | + } |
|
| 155 | 165 | |
| 156 | 166 | $this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar'); |
| 157 | 167 | } |
@@ -89,7 +89,9 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | public function addFieldRules($field, $rules = []) { |
| 92 | - if (! $rules) return; |
|
| 92 | + if (! $rules) { |
|
| 93 | + return; |
|
| 94 | + } |
|
| 93 | 95 | |
| 94 | 96 | $this->fieldRules[$field] = $rules['rules']?? [ |
| 95 | 97 | 'identifier' => $field, |
@@ -102,7 +104,9 @@ discard block |
||
| 102 | 104 | public function setValues($values) |
| 103 | 105 | { |
| 104 | 106 | foreach ($values?: [] as $name => $value) { |
| 105 | - if (! $field = $this->fields[$name]?? null) continue; |
|
| 107 | + if (! $field = $this->fields[$name]?? null) { |
|
| 108 | + continue; |
|
| 109 | + } |
|
| 106 | 110 | |
| 107 | 111 | $field->set($value); |
| 108 | 112 | } |
@@ -128,7 +132,9 @@ discard block |
||
| 128 | 132 | $this->onSubmit(function ($form) use ($callback) { |
| 129 | 133 | $errors = []; |
| 130 | 134 | foreach ($this->validationRules?: [] as $ruleCallback) { |
| 131 | - if (! is_callable($ruleCallback)) continue; |
|
| 135 | + if (! is_callable($ruleCallback)) { |
|
| 136 | + continue; |
|
| 137 | + } |
|
| 132 | 138 | |
| 133 | 139 | $ruleErrors = $ruleCallback($form); |
| 134 | 140 | |