@@ -70,7 +70,7 @@ |
||
70 | 70 | return ''; |
71 | 71 | } |
72 | 72 | |
73 | - return $this->elements[$part]->map(function ($element) { |
|
73 | + return $this->elements[$part]->map(function($element) { |
|
74 | 74 | if ($element instanceof Htmlable) { |
75 | 75 | return $element->toHtml(); |
76 | 76 | } |
@@ -38,7 +38,7 @@ |
||
38 | 38 | * |
39 | 39 | * @param array|callable|string $options |
40 | 40 | * |
41 | - * @return $this|mixed |
|
41 | + * @return Select |
|
42 | 42 | */ |
43 | 43 | public function options($options = []) |
44 | 44 | { |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | { |
204 | 204 | $fieldsStr = implode('.', $fields); |
205 | 205 | $urlsStr = implode('^', $sourceUrls); |
206 | - $script = <<<EOT |
|
206 | + $script = <<<EOT |
|
207 | 207 | var fields = '$fieldsStr'.split('.'); |
208 | 208 | var urls = '$urlsStr'.split('^'); |
209 | 209 | |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | * |
252 | 252 | * @return $this |
253 | 253 | */ |
254 | - public function model($model, $idField = 'id', $textField = 'name') |
|
254 | + public function model($model, $idField = 'id', $textField = 'name') |
|
255 | 255 | { |
256 | 256 | if ( |
257 | 257 | !class_exists($model) |
@@ -341,11 +341,11 @@ discard block |
||
341 | 341 | * |
342 | 342 | * @re tu rn $this |
343 | 343 | */ |
344 | - public function ajax($url, $idField = 'id', $textField = 'text') |
|
345 | - { |
|
344 | + public function ajax($url, $idField = 'id', $textField = 'text') |
|
345 | + { |
|
346 | 346 | $configs = $this->configs([ |
347 | - 'allowClear' => true, |
|
348 | - 'placeholder' => $this->label, |
|
347 | + 'allowClear' => true, |
|
348 | + 'placeholder' => $this->label, |
|
349 | 349 | 'minimumInputLength' => 1, |
350 | 350 | ]); |
351 | 351 | |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | |
409 | 409 | /** |
410 | 410 | * {@inheritdoc} |
411 | - */ |
|
411 | + */ |
|
412 | 412 | public function render() |
413 | 413 | { |
414 | 414 | Admin::js('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.5/js/i18n/' . app()->getLocale() . '.js'); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | if (is_callable($options)) { |
62 | 62 | $this->options = $options; |
63 | 63 | } else { |
64 | - $this->options = (array)$options; |
|
64 | + $this->options = (array) $options; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | return $this; |
@@ -118,22 +118,22 @@ discard block |
||
118 | 118 | return $this; |
119 | 119 | } |
120 | 120 | |
121 | - private function buildJsJson(array $options,array $functions = ['escapeMarkup','templateResult','templateSelection']) |
|
121 | + private function buildJsJson(array $options, array $functions = ['escapeMarkup', 'templateResult', 'templateSelection']) |
|
122 | 122 | { |
123 | 123 | return implode( |
124 | 124 | ",\n", |
125 | - array_map(function ($u, $v) use ($functions) { |
|
125 | + array_map(function($u, $v) use ($functions) { |
|
126 | 126 | if (is_string($v)) { |
127 | 127 | return in_array($u, $functions) ? "{$u}: {$v}" : "{$u}: '{$v}'"; |
128 | 128 | } |
129 | - return "{$u}: " . json_encode($v); |
|
129 | + return "{$u}: ".json_encode($v); |
|
130 | 130 | }, array_keys($options), $options) |
131 | 131 | ); |
132 | 132 | } |
133 | 133 | |
134 | 134 | private function configs($default = [], $quoted = false) |
135 | 135 | { |
136 | - $configs = array_merge( |
|
136 | + $configs = array_merge( |
|
137 | 137 | [ |
138 | 138 | 'allowClear' => true, |
139 | 139 | 'language' => app()->getLocale(), |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | 'escapeMarkup' => 'function (markup) {return markup;}', |
145 | 145 | ], $default, $this->config); |
146 | 146 | $configs = $this->buildJsJson($configs); |
147 | - return $quoted ? '{' . $configs . '}' : $configs; |
|
147 | + return $quoted ? '{'.$configs.'}' : $configs; |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | throw new \InvalidArgumentException("[$model] must be a valid model class"); |
261 | 261 | } |
262 | 262 | |
263 | - $this->options = function ($value) use ($model, $idField, $textField) { |
|
263 | + $this->options = function($value) use ($model, $idField, $textField) { |
|
264 | 264 | if (empty($value)) { |
265 | 265 | return []; |
266 | 266 | } |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | protected function loadRemoteOptions($url, $parameters = [], $options = []) |
296 | 296 | { |
297 | 297 | $ajaxOptions = [ |
298 | - 'url' => $url . '?' . http_build_query($parameters), |
|
298 | + 'url' => $url.'?'.http_build_query($parameters), |
|
299 | 299 | ]; |
300 | 300 | |
301 | 301 | $configs = $this->configs([ |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | */ |
412 | 412 | public function render() |
413 | 413 | { |
414 | - Admin::js('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.5/js/i18n/' . app()->getLocale() . '.js'); |
|
414 | + Admin::js('https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.5/js/i18n/'.app()->getLocale().'.js'); |
|
415 | 415 | $configs = $this->configs([ |
416 | 416 | 'allowClear' => true, |
417 | 417 | 'placeholder' => [ |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | 'groups' => $this->groups, |
442 | 442 | ]); |
443 | 443 | |
444 | -$this->attribute('data-value', implode(',', (array)$this->value())); |
|
444 | +$this->attribute('data-value', implode(',', (array) $this->value())); |
|
445 | 445 | |
446 | 446 | return parent::render(); |
447 | 447 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | return $next($request); |
34 | 34 | } |
35 | 35 | |
36 | - if (!Admin::user()->allPermissions()->first(function ($permission) use ($request) { |
|
36 | + if (!Admin::user()->allPermissions()->first(function($permission) use ($request) { |
|
37 | 37 | return $permission->shouldPassThrough($request); |
38 | 38 | })) { |
39 | 39 | Checker::error(); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function checkRoutePermission(Request $request) |
54 | 54 | { |
55 | - if (!$middleware = collect($request->route()->middleware())->first(function ($middleware) { |
|
55 | + if (!$middleware = collect($request->route()->middleware())->first(function($middleware) { |
|
56 | 56 | return Str::startsWith($middleware, $this->middlewarePrefix); |
57 | 57 | })) { |
58 | 58 | return false; |
@@ -86,7 +86,7 @@ |
||
86 | 86 | { |
87 | 87 | parent::boot(); |
88 | 88 | |
89 | - static::deleting(function ($model) { |
|
89 | + static::deleting(function($model) { |
|
90 | 90 | $model->administrators()->detach(); |
91 | 91 | |
92 | 92 | $model->permissions()->detach(); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | $method = $this->http_method; |
68 | 68 | |
69 | - $matches = array_map(function ($path) use ($method) { |
|
69 | + $matches = array_map(function($path) use ($method) { |
|
70 | 70 | $path = trim(config('admin.route.prefix'), '/').$path; |
71 | 71 | |
72 | 72 | if (Str::contains($path, ':')) { |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | return false; |
101 | 101 | } |
102 | 102 | |
103 | - $method = collect($match['method'])->filter()->map(function ($method) { |
|
103 | + $method = collect($match['method'])->filter()->map(function($method) { |
|
104 | 104 | return strtoupper($method); |
105 | 105 | }); |
106 | 106 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | { |
141 | 141 | parent::boot(); |
142 | 142 | |
143 | - static::deleting(function ($model) { |
|
143 | + static::deleting(function($model) { |
|
144 | 144 | $model->roles()->detach(); |
145 | 145 | }); |
146 | 146 | } |
@@ -155,7 +155,7 @@ |
||
155 | 155 | { |
156 | 156 | parent::boot(); |
157 | 157 | |
158 | - static::deleting(function ($model) { |
|
158 | + static::deleting(function($model) { |
|
159 | 159 | $model->roles()->detach(); |
160 | 160 | |
161 | 161 | $model->permissions()->detach(); |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | /** |
10 | 10 | * Get all permissions of user. |
11 | 11 | * |
12 | - * @return mixed |
|
12 | + * @return Collection |
|
13 | 13 | */ |
14 | 14 | public function allPermissions() : Collection |
15 | 15 | { |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | /** |
20 | 20 | * Check if user has permission. |
21 | 21 | * |
22 | - * @param $ability |
|
22 | + * @param string $ability |
|
23 | 23 | * @param array $arguments |
24 | 24 | * |
25 | 25 | * @return bool |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | /** |
53 | 53 | * Check if user is administrator. |
54 | 54 | * |
55 | - * @return mixed |
|
55 | + * @return boolean |
|
56 | 56 | */ |
57 | 57 | public function isAdministrator() : bool |
58 | 58 | { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * |
65 | 65 | * @param string $role |
66 | 66 | * |
67 | - * @return mixed |
|
67 | + * @return boolean |
|
68 | 68 | */ |
69 | 69 | public function isRole(string $role) : bool |
70 | 70 | { |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * |
77 | 77 | * @param array $roles |
78 | 78 | * |
79 | - * @return mixed |
|
79 | + * @return boolean |
|
80 | 80 | */ |
81 | 81 | public function inRoles(array $roles = []) : bool |
82 | 82 | { |
@@ -78,7 +78,7 @@ |
||
78 | 78 | { |
79 | 79 | static::treeBoot(); |
80 | 80 | |
81 | - static::deleting(function ($model) { |
|
81 | + static::deleting(function($model) { |
|
82 | 82 | $model->roles()->detach(); |
83 | 83 | }); |
84 | 84 | } |
@@ -107,6 +107,7 @@ |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
110 | + * @param string $name |
|
110 | 111 | * @return string |
111 | 112 | */ |
112 | 113 | protected function elementNameWithPrefix($name) |
@@ -317,7 +317,7 @@ |
||
317 | 317 | * @param string $method |
318 | 318 | * @param array $arguments |
319 | 319 | * |
320 | - * @return bool|mixed |
|
320 | + * @return Field |
|
321 | 321 | */ |
322 | 322 | public function __call($method, $arguments = []) |
323 | 323 | { |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | |
184 | 184 | $this->overwriteExistingField($name); |
185 | 185 | |
186 | - return tap($field, function ($field) { |
|
186 | + return tap($field, function($field) { |
|
187 | 187 | $this->fields->push($field); |
188 | 188 | }); |
189 | 189 | } |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | |
206 | 206 | $this->overwriteExistingRelation($name); |
207 | 207 | |
208 | - return tap($relation, function ($relation) { |
|
208 | + return tap($relation, function($relation) { |
|
209 | 209 | $this->relations->push($relation); |
210 | 210 | }); |
211 | 211 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | } |
223 | 223 | |
224 | 224 | $this->fields = $this->fields->filter( |
225 | - function (Field $field) use ($name) { |
|
225 | + function(Field $field) use ($name) { |
|
226 | 226 | return $field->getName() != $name; |
227 | 227 | } |
228 | 228 | ); |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | } |
241 | 241 | |
242 | 242 | $this->relations = $this->relations->filter( |
243 | - function (Relation $relation) use ($name) { |
|
243 | + function(Relation $relation) use ($name) { |
|
244 | 244 | return $relation->getName() != $name; |
245 | 245 | } |
246 | 246 | ); |