@@ -16,52 +16,52 @@ discard block |
||
16 | 16 | protected $validationRules = []; |
17 | 17 | |
18 | 18 | public function addElements($elements, $parent = null) { |
19 | - $parent = $parent?: $this; |
|
19 | + $parent = $parent ?: $this; |
|
20 | 20 | |
21 | 21 | foreach ($elements as $name => $desc) { |
22 | - $name = $desc['name']?? $name; |
|
22 | + $name = $desc['name'] ?? $name; |
|
23 | 23 | |
24 | - $this->addControlRules($name, $desc['rules']?? []); |
|
24 | + $this->addControlRules($name, $desc['rules'] ?? []); |
|
25 | 25 | |
26 | - switch ($desc['type']?? 'field') { |
|
26 | + switch ($desc['type'] ?? 'field') { |
|
27 | 27 | case 'field': |
28 | - $desc = is_string($desc)? [ |
|
28 | + $desc = is_string($desc) ? [ |
|
29 | 29 | 'decorator' => [$desc] |
30 | - ]: $desc; |
|
30 | + ] : $desc; |
|
31 | 31 | |
32 | - $field = $parent->addControl($name, $desc['decorator']?? [], $desc['options']?? []); |
|
32 | + $field = $parent->addControl($name, $desc['decorator'] ?? [], $desc['options'] ?? []); |
|
33 | 33 | |
34 | 34 | if ($default = $desc['default']) { |
35 | 35 | $field->set($default); |
36 | 36 | } |
37 | 37 | |
38 | - if ($desc['display']?? false) { |
|
38 | + if ($desc['display'] ?? false) { |
|
39 | 39 | $this->addControlDisplayRules([$name => $desc['display']]); |
40 | 40 | } |
41 | 41 | break; |
42 | 42 | |
43 | 43 | case 'group': |
44 | - $seed = $desc['seed']?? [$name]; |
|
44 | + $seed = $desc['seed'] ?? [$name]; |
|
45 | 45 | |
46 | 46 | $group = $parent->addGroup($seed); |
47 | 47 | |
48 | 48 | $this->addElements($desc['elements'], $group); |
49 | 49 | |
50 | - if ($desc['display']?? false) { |
|
50 | + if ($desc['display'] ?? false) { |
|
51 | 51 | $this->addGroupDisplayRules([$name => $desc['display']]); |
52 | 52 | } |
53 | 53 | break; |
54 | 54 | |
55 | 55 | case 'header': |
56 | - $seed = $desc['seed']?? [$name]; |
|
56 | + $seed = $desc['seed'] ?? [$name]; |
|
57 | 57 | |
58 | 58 | $parent->addHeader($seed); |
59 | 59 | break; |
60 | 60 | |
61 | 61 | case 'view': |
62 | - $seed = $desc['seed']?? [Label::class, $name]; |
|
62 | + $seed = $desc['seed'] ?? [Label::class, $name]; |
|
63 | 63 | |
64 | - $region = $desc['region']?? null; |
|
64 | + $region = $desc['region'] ?? null; |
|
65 | 65 | |
66 | 66 | $this->add($seed, $region); |
67 | 67 | break; |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | } |
77 | 77 | |
78 | 78 | public function addControlDisplayRules($controlDisplayRules) { |
79 | - $this->setControlsDisplayRules(array_merge($this->controlDisplayRules?: [], $controlDisplayRules)); |
|
79 | + $this->setControlsDisplayRules(array_merge($this->controlDisplayRules ?: [], $controlDisplayRules)); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | public function addGroupDisplayRules($groupDisplayRules) { |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | } |
89 | 89 | |
90 | 90 | public function addControlRules($field, $rules = []) { |
91 | - if (! $rules) return; |
|
91 | + if (!$rules) return; |
|
92 | 92 | |
93 | - $this->controlRules[$field] = $rules['rules']?? [ |
|
93 | + $this->controlRules[$field] = $rules['rules'] ?? [ |
|
94 | 94 | 'identifier' => $field, |
95 | 95 | 'rules' => $rules |
96 | 96 | ]; |
@@ -110,17 +110,17 @@ discard block |
||
110 | 110 | 'fields' => $this->controlRules |
111 | 111 | ]); |
112 | 112 | |
113 | - $this->onSubmit(function ($form) use ($callback) { |
|
113 | + $this->onSubmit(function($form) use ($callback) { |
|
114 | 114 | $errors = []; |
115 | - foreach ($this->validationRules?: [] as $ruleCallback) { |
|
116 | - if (! is_callable($ruleCallback)) continue; |
|
115 | + foreach ($this->validationRules ?: [] as $ruleCallback) { |
|
116 | + if (!is_callable($ruleCallback)) continue; |
|
117 | 117 | |
118 | 118 | $ruleErrors = $ruleCallback($form); |
119 | 119 | |
120 | - $errors = array_merge($errors, $ruleErrors?: []); |
|
120 | + $errors = array_merge($errors, $ruleErrors ?: []); |
|
121 | 121 | } |
122 | 122 | |
123 | - return $errors?: $callback($this); |
|
123 | + return $errors ?: $callback($this); |
|
124 | 124 | }); |
125 | 125 | |
126 | 126 | return $this; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | |
134 | 134 | public function confirmLeave($confirm = true) |
135 | 135 | { |
136 | - $this->canLeave = ! $confirm; |
|
136 | + $this->canLeave = !$confirm; |
|
137 | 137 | |
138 | 138 | return $this; |
139 | 139 | } |
@@ -88,7 +88,9 @@ discard block |
||
88 | 88 | } |
89 | 89 | |
90 | 90 | public function addControlRules($field, $rules = []) { |
91 | - if (! $rules) return; |
|
91 | + if (! $rules) { |
|
92 | + return; |
|
93 | + } |
|
92 | 94 | |
93 | 95 | $this->controlRules[$field] = $rules['rules']?? [ |
94 | 96 | 'identifier' => $field, |
@@ -113,7 +115,9 @@ discard block |
||
113 | 115 | $this->onSubmit(function ($form) use ($callback) { |
114 | 116 | $errors = []; |
115 | 117 | foreach ($this->validationRules?: [] as $ruleCallback) { |
116 | - if (! is_callable($ruleCallback)) continue; |
|
118 | + if (! is_callable($ruleCallback)) { |
|
119 | + continue; |
|
120 | + } |
|
117 | 121 | |
118 | 122 | $ruleErrors = $ruleCallback($form); |
119 | 123 |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | { |
31 | 31 | $modules = collect(ModuleManager::getAll()); |
32 | 32 | |
33 | - return $modules->filter(function ($subModuleClass) use ($modules) { |
|
34 | - return ! $modules->map(function($moduleClass){ |
|
33 | + return $modules->filter(function($subModuleClass) use ($modules) { |
|
34 | + return !$modules->map(function($moduleClass) { |
|
35 | 35 | return $moduleClass::namespace(); |
36 | 36 | })->contains($subModuleClass::parentNamespace()); |
37 | 37 | })->sort(); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | |
66 | 66 | $section->add($label, 'title')->setStyle('float', 'right'); |
67 | 67 | |
68 | - $submodules = collect(ModuleManager::getAll())->filter(function ($subModuleClass) use ($moduleClass) { |
|
68 | + $submodules = collect(ModuleManager::getAll())->filter(function($subModuleClass) use ($moduleClass) { |
|
69 | 69 | return $subModuleClass::isSubModuleOf($moduleClass); |
70 | 70 | }); |
71 | 71 | |
@@ -79,11 +79,11 @@ discard block |
||
79 | 79 | |
80 | 80 | public function formatModuleInfo($moduleClass) |
81 | 81 | { |
82 | - $moduleInfo = (array) ($moduleClass::info()?: __(' No details provided by author')); |
|
82 | + $moduleInfo = (array) ($moduleClass::info() ?: __(' No details provided by author')); |
|
83 | 83 | |
84 | 84 | $ret = []; |
85 | 85 | foreach ($moduleInfo as $label => $text) { |
86 | - $ret[] = (is_string($label)? "<strong>$label</strong>: ": '') . $text; |
|
86 | + $ret[] = (is_string($label) ? "<strong>$label</strong>: " : '') . $text; |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | return implode('<br>', $ret); |
@@ -123,12 +123,12 @@ discard block |
||
123 | 123 | |
124 | 124 | $form = Form::addTo($view); |
125 | 125 | foreach ($recommended as $childModule) { |
126 | - if (! ModuleManager::isAvailable($childModule)) continue; |
|
126 | + if (!ModuleManager::isAvailable($childModule)) continue; |
|
127 | 127 | |
128 | 128 | $form->addControl($childModule::alias(), [\atk4\ui\Form\Control\Checkbox::class, 'caption' => $childModule::label()]); |
129 | 129 | } |
130 | 130 | |
131 | - $form->onSubmit(function ($form) use ($moduleClass) { |
|
131 | + $form->onSubmit(function($form) use ($moduleClass) { |
|
132 | 132 | ob_start(); |
133 | 133 | ModuleManager::install($moduleClass, array_keys($form->getValues(), true)); |
134 | 134 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | } |
138 | 138 | |
139 | 139 | \atk4\ui\Button::addTo($view, [__('Install'), 'primary'])->on('click', [ |
140 | - isset($form)? $form->submit(): $installCallback |
|
140 | + isset($form) ? $form->submit() : $installCallback |
|
141 | 141 | ]); |
142 | 142 | }); |
143 | 143 | |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | ]; |
164 | 164 | }); |
165 | 165 | |
166 | - if ($dependents = ModuleManager::listDependents()[$moduleClass]?? []) { |
|
166 | + if ($dependents = ModuleManager::listDependents()[$moduleClass] ?? []) { |
|
167 | 167 | $modal = \atk4\ui\Modal::addTo($this, ['title' => __(':module Module Installation', ['module' => $moduleClass::label()])])->set(function($view) use ($moduleClass, $dependents, $uninstallCallback) { |
168 | 168 | $message = \atk4\ui\Message::addTo($view, [__('Module is required by following modules')]); |
169 | 169 |
@@ -56,8 +56,7 @@ discard block |
||
56 | 56 | $this->addUninstallButton($section, $moduleClass); |
57 | 57 | |
58 | 58 | // $this->addReinstallButton($section, $moduleClass); |
59 | - } |
|
60 | - else { |
|
59 | + } else { |
|
61 | 60 | $label = [\atk4\ui\Label::class, __('Available'), 'yellow']; |
62 | 61 | |
63 | 62 | $this->addInstallButton($section, $moduleClass); |
@@ -69,7 +68,9 @@ discard block |
||
69 | 68 | return $subModuleClass::isSubModuleOf($moduleClass); |
70 | 69 | }); |
71 | 70 | |
72 | - if ($submodules->isEmpty()) continue; |
|
71 | + if ($submodules->isEmpty()) { |
|
72 | + continue; |
|
73 | + } |
|
73 | 74 | |
74 | 75 | $this->addAccordion($section, $submodules); |
75 | 76 | } |
@@ -123,7 +124,9 @@ discard block |
||
123 | 124 | |
124 | 125 | $form = Form::addTo($view); |
125 | 126 | foreach ($recommended as $childModule) { |
126 | - if (! ModuleManager::isAvailable($childModule)) continue; |
|
127 | + if (! ModuleManager::isAvailable($childModule)) { |
|
128 | + continue; |
|
129 | + } |
|
127 | 130 | |
128 | 131 | $form->addControl($childModule::alias(), [\atk4\ui\Form\Control\Checkbox::class, 'caption' => $childModule::label()]); |
129 | 132 | } |