@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | protected function showEditPermissions() |
37 | 37 | { |
38 | - $permissionsData = Permission::all(['id', 'name'])->map(function($permission){ |
|
38 | + $permissionsData = Permission::all(['id', 'name'])->map(function($permission) { |
|
39 | 39 | $permission['name'] = trans(ucwords($permission['name'])); |
40 | 40 | |
41 | 41 | return $permission; |
@@ -99,19 +99,19 @@ discard block |
||
99 | 99 | |
100 | 100 | protected function columns() |
101 | 101 | { |
102 | - return $this->columns = $this->columns?: Columns::addTo($this); |
|
102 | + return $this->columns = $this->columns ?: Columns::addTo($this); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | protected function permissionId() |
106 | 106 | { |
107 | - return $this->getApp()->stickyGet($this->columns()->name)?: $this->getModuleVariable('permission'); |
|
107 | + return $this->getApp()->stickyGet($this->columns()->name) ?: $this->getModuleVariable('permission'); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | protected function reload($permissionExpression = null) |
111 | 111 | { |
112 | 112 | $columns = $this->columns(); |
113 | 113 | |
114 | - return $this->reload = $this->reload?: new \atk4\ui\JsReload($columns, [$columns->name => $permissionExpression?: '']); |
|
114 | + return $this->reload = $this->reload ?: new \atk4\ui\JsReload($columns, [$columns->name => $permissionExpression ?: '']); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | protected function getModel($array) |
@@ -15,52 +15,52 @@ discard block |
||
15 | 15 | protected $validationRules = []; |
16 | 16 | |
17 | 17 | public function addElements($elements, $parent = null) { |
18 | - $parent = $parent?: $this; |
|
18 | + $parent = $parent ?: $this; |
|
19 | 19 | |
20 | 20 | foreach ($elements as $name => $desc) { |
21 | - $name = $desc['name']?? $name; |
|
21 | + $name = $desc['name'] ?? $name; |
|
22 | 22 | |
23 | - $this->addFieldRules($name, $desc['rules']?? []); |
|
23 | + $this->addFieldRules($name, $desc['rules'] ?? []); |
|
24 | 24 | |
25 | - switch ($desc['type']?? 'field') { |
|
25 | + switch ($desc['type'] ?? 'field') { |
|
26 | 26 | case 'field': |
27 | - $desc = is_string($desc)? [ |
|
27 | + $desc = is_string($desc) ? [ |
|
28 | 28 | 'decorator' => [$desc] |
29 | - ]: $desc; |
|
29 | + ] : $desc; |
|
30 | 30 | |
31 | - $field = $parent->addControl($name, $desc['decorator']?? [], $desc['options']?? []); |
|
31 | + $field = $parent->addControl($name, $desc['decorator'] ?? [], $desc['options'] ?? []); |
|
32 | 32 | |
33 | 33 | if ($default = $desc['default']) { |
34 | 34 | $field->set($default); |
35 | 35 | } |
36 | 36 | |
37 | - if ($desc['display']?? false) { |
|
37 | + if ($desc['display'] ?? false) { |
|
38 | 38 | $this->addFieldsDisplayRules([$name => $desc['display']]); |
39 | 39 | } |
40 | 40 | break; |
41 | 41 | |
42 | 42 | case 'group': |
43 | - $seed = $desc['seed']?? [$name]; |
|
43 | + $seed = $desc['seed'] ?? [$name]; |
|
44 | 44 | |
45 | 45 | $group = $parent->addGroup($seed); |
46 | 46 | |
47 | 47 | $this->addElements($desc['elements'], $group); |
48 | 48 | |
49 | - if ($desc['display']?? false) { |
|
49 | + if ($desc['display'] ?? false) { |
|
50 | 50 | $this->addGroupDisplayRules([$name => $desc['display']]); |
51 | 51 | } |
52 | 52 | break; |
53 | 53 | |
54 | 54 | case 'header': |
55 | - $seed = $desc['seed']?? [$name]; |
|
55 | + $seed = $desc['seed'] ?? [$name]; |
|
56 | 56 | |
57 | 57 | $parent->addHeader($seed); |
58 | 58 | break; |
59 | 59 | |
60 | 60 | case 'view': |
61 | - $seed = $desc['seed']?? ['Label', $name]; |
|
61 | + $seed = $desc['seed'] ?? ['Label', $name]; |
|
62 | 62 | |
63 | - $region = $desc['region']?? null; |
|
63 | + $region = $desc['region'] ?? null; |
|
64 | 64 | |
65 | 65 | $this->add($seed, $region); |
66 | 66 | break; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | public function addFieldsDisplayRules($fieldsDisplayRules) { |
78 | - $this->setControlsDisplayRules(array_merge($this->fieldsDisplayRules?: [], $fieldsDisplayRules)); |
|
78 | + $this->setControlsDisplayRules(array_merge($this->fieldsDisplayRules ?: [], $fieldsDisplayRules)); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | public function addGroupDisplayRules($groupDisplayRules) { |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | public function addFieldRules($field, $rules = []) { |
90 | - if (! $rules) return; |
|
90 | + if (!$rules) return; |
|
91 | 91 | |
92 | - $this->fieldRules[$field] = $rules['rules']?? [ |
|
92 | + $this->fieldRules[$field] = $rules['rules'] ?? [ |
|
93 | 93 | 'identifier' => $field, |
94 | 94 | 'rules' => $rules |
95 | 95 | ]; |
@@ -109,17 +109,17 @@ discard block |
||
109 | 109 | 'fields' => $this->fieldRules |
110 | 110 | ]); |
111 | 111 | |
112 | - $this->onSubmit(function ($form) use ($callback) { |
|
112 | + $this->onSubmit(function($form) use ($callback) { |
|
113 | 113 | $errors = []; |
114 | - foreach ($this->validationRules?: [] as $ruleCallback) { |
|
115 | - if (! is_callable($ruleCallback)) continue; |
|
114 | + foreach ($this->validationRules ?: [] as $ruleCallback) { |
|
115 | + if (!is_callable($ruleCallback)) continue; |
|
116 | 116 | |
117 | 117 | $ruleErrors = $ruleCallback($form); |
118 | 118 | |
119 | - $errors = array_merge($errors, $ruleErrors?: []); |
|
119 | + $errors = array_merge($errors, $ruleErrors ?: []); |
|
120 | 120 | } |
121 | 121 | |
122 | - return $errors?: $callback($this); |
|
122 | + return $errors ?: $callback($this); |
|
123 | 123 | }); |
124 | 124 | |
125 | 125 | return $this; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | |
133 | 133 | public function confirmLeave($confirm = true) |
134 | 134 | { |
135 | - $this->canLeave = ! $confirm; |
|
135 | + $this->canLeave = !$confirm; |
|
136 | 136 | |
137 | 137 | return $this; |
138 | 138 | } |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | $form->addControl('custom_logo', [\atk4\ui\Form\Control\Checkbox::class, 'caption' => __('Use custom logo')]); |
35 | 35 | |
36 | 36 | $form->model->setMulti([ |
37 | - 'title' => Variable::recall('system.title'), |
|
38 | - 'custom_logo' => (bool) Variable::recall('system.logo') |
|
37 | + 'title' => Variable::recall('system.title'), |
|
38 | + 'custom_logo' => (bool) Variable::recall('system.logo') |
|
39 | 39 | ]); |
40 | 40 | |
41 | 41 | $logo = $form->addControl('logo', [ |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $storage->move($from, $to); |
77 | 77 | } |
78 | 78 | |
79 | - Variable::memorize('system.logo', $logo); |
|
79 | + Variable::memorize('system.logo', $logo); |
|
80 | 80 | |
81 | 81 | Variable::memorize('system.title', $form->model['title']); |
82 | 82 |