@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | |
148 | 148 | $i = 0; |
149 | 149 | foreach ($words as $w) { |
150 | - $initials .= $w[0]; |
|
150 | + $initials .= $w[ 0 ]; |
|
151 | 151 | $i++; |
152 | 152 | |
153 | 153 | if ($i === 3) { // Maximum: 3 letters |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | $image = 'vendor/uccello/uccello/images/user-no-image.png'; |
169 | 169 | |
170 | 170 | if ($this->avatarType === 'gravatar') { |
171 | - $image = 'https://www.gravatar.com/avatar/' . md5($this->email) . '?d=mm'; |
|
171 | + $image = 'https://www.gravatar.com/avatar/'.md5($this->email).'?d=mm'; |
|
172 | 172 | |
173 | 173 | } elseif ($this->avatarType === 'image' && !empty($this->avatar->path)) { |
174 | 174 | $image = $this->avatar->path; |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | */ |
186 | 186 | public function rolesOnDomain($domain) : Collection |
187 | 187 | { |
188 | - return Cache::remember('domain_'.$domain->slug.'_roles', 600, function () use($domain) { |
|
188 | + return Cache::remember('domain_'.$domain->slug.'_roles', 600, function() use($domain) { |
|
189 | 189 | $roles = collect(); |
190 | 190 | |
191 | 191 | if (config('uccello.roles.display_ancestors_roles')) { |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | |
234 | 234 | $hasRole = false; |
235 | 235 | |
236 | - $descendants = Cache::remember('domain_'.$domain->slug.'_descendants', 600, function () use($domain) { |
|
236 | + $descendants = Cache::remember('domain_'.$domain->slug.'_descendants', 600, function() use($domain) { |
|
237 | 237 | return $domain->findDescendants()->get(); |
238 | 238 | }); |
239 | 239 | |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | { |
260 | 260 | $keyName = 'user_'.$this->id.'_'.$domain->slug.'_'.$module->name.'_capabilities'; |
261 | 261 | |
262 | - return Cache::remember($keyName, 600, function () use($domain, $module) { |
|
262 | + return Cache::remember($keyName, 600, function() use($domain, $module) { |
|
263 | 263 | $capabilities = collect(); |
264 | 264 | |
265 | 265 | // Get the domain and all its parents |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | |
314 | 314 | $keyName = 'user_'.$this->id.'_'.$domain->slug.'_can_access_to_settings_panel'; |
315 | 315 | |
316 | - return Cache::remember($keyName, 600, function () use($domain) { |
|
316 | + return Cache::remember($keyName, 600, function() use($domain) { |
|
317 | 317 | |
318 | 318 | $hasCapability = false; |
319 | 319 | |
@@ -465,8 +465,8 @@ discard block |
||
465 | 465 | { |
466 | 466 | // Use cache |
467 | 467 | $allowedGroups = Cache::rememberForever( |
468 | - 'allowed_groups_for_' . ($this->is_admin ? 'admin' : $this->getKey()), |
|
469 | - function () { |
|
468 | + 'allowed_groups_for_'.($this->is_admin ? 'admin' : $this->getKey()), |
|
469 | + function() { |
|
470 | 470 | return $this->getAllowedGroupUidsProcess(); |
471 | 471 | } |
472 | 472 | ); |
@@ -478,8 +478,8 @@ discard block |
||
478 | 478 | { |
479 | 479 | // Use cache |
480 | 480 | $allowedGroupsAndUsers = Cache::rememberForever( |
481 | - 'allowed_group_users_for_' . ($addUsers ? 'u_' : '') . ($this->is_admin ? 'admin' : $this->getKey()), |
|
482 | - function () use ($addUsers) { |
|
481 | + 'allowed_group_users_for_'.($addUsers ? 'u_' : '').($this->is_admin ? 'admin' : $this->getKey()), |
|
482 | + function() use ($addUsers) { |
|
483 | 483 | return $this->getAllowedGroupsAndUsersProcess($addUsers); |
484 | 484 | } |
485 | 485 | ); |
@@ -489,16 +489,16 @@ discard block |
||
489 | 489 | |
490 | 490 | protected function getAllowedGroupUidsProcess() |
491 | 491 | { |
492 | - $allowedUserUids = collect([$this->uuid]); |
|
492 | + $allowedUserUids = collect([ $this->uuid ]); |
|
493 | 493 | |
494 | 494 | if ($this->is_admin) { |
495 | 495 | $groups = Group::all(); |
496 | 496 | } else { |
497 | - $groups = []; |
|
498 | - $users = []; |
|
497 | + $groups = [ ]; |
|
498 | + $users = [ ]; |
|
499 | 499 | |
500 | 500 | foreach ($this->groups as $group) { |
501 | - $groups[$group->uuid] = $group; |
|
501 | + $groups[ $group->uuid ] = $group; |
|
502 | 502 | }; |
503 | 503 | |
504 | 504 | $this->addRecursiveChildrenGroups($groups, $users, $groups, false); |
@@ -507,7 +507,7 @@ discard block |
||
507 | 507 | } |
508 | 508 | |
509 | 509 | foreach ($groups as $uid => $group) { |
510 | - $allowedUserUids[] = $uid; |
|
510 | + $allowedUserUids[ ] = $uid; |
|
511 | 511 | } |
512 | 512 | |
513 | 513 | return $allowedUserUids; |
@@ -516,19 +516,19 @@ discard block |
||
516 | 516 | protected function addRecursiveChildrenGroups(&$groups, &$users, $searchGroups, $addUsers = false) |
517 | 517 | { |
518 | 518 | foreach ($searchGroups as $uid => $searchGroup) { |
519 | - $searchChildrenGroups = []; |
|
519 | + $searchChildrenGroups = [ ]; |
|
520 | 520 | |
521 | 521 | foreach ($searchGroup->childrenGroups as $childrenGroup) { |
522 | - if (empty($groups[$childrenGroup->uuid])) { |
|
523 | - $groups[$childrenGroup->uuid] = $childrenGroup; |
|
524 | - $searchChildrenGroups[$childrenGroup->uuid] = $childrenGroup; |
|
522 | + if (empty($groups[ $childrenGroup->uuid ])) { |
|
523 | + $groups[ $childrenGroup->uuid ] = $childrenGroup; |
|
524 | + $searchChildrenGroups[ $childrenGroup->uuid ] = $childrenGroup; |
|
525 | 525 | } |
526 | 526 | |
527 | - if($addUsers) |
|
527 | + if ($addUsers) |
|
528 | 528 | { |
529 | 529 | foreach ($childrenGroup->users as $user) { |
530 | - if (empty($users[$user->uuid])) { |
|
531 | - $users[$user->uuid] = $user; |
|
530 | + if (empty($users[ $user->uuid ])) { |
|
531 | + $users[ $user->uuid ] = $user; |
|
532 | 532 | } |
533 | 533 | } |
534 | 534 | } |
@@ -540,26 +540,26 @@ discard block |
||
540 | 540 | |
541 | 541 | protected function getAllowedGroupsAndUsersProcess($addUsers = true) |
542 | 542 | { |
543 | - $allowedUserUids = collect([[ |
|
543 | + $allowedUserUids = collect([ [ |
|
544 | 544 | 'uuid' => $this->uuid, |
545 | 545 | 'recordLabel' => uctrans('me', $this->module) |
546 | - ]]); |
|
546 | + ] ]); |
|
547 | 547 | |
548 | 548 | if ($this->is_admin) { |
549 | 549 | $groups = Group::orderBy('name')->get(); |
550 | 550 | $users = \App\User::orderBy('name')->get(); |
551 | 551 | } else { |
552 | - $groups = []; |
|
553 | - $users = []; |
|
552 | + $groups = [ ]; |
|
553 | + $users = [ ]; |
|
554 | 554 | |
555 | 555 | foreach ($this->groups as $group) { |
556 | - $groups[$group->uuid] = $group; |
|
556 | + $groups[ $group->uuid ] = $group; |
|
557 | 557 | |
558 | - if($addUsers) |
|
558 | + if ($addUsers) |
|
559 | 559 | { |
560 | 560 | foreach ($group->users as $user) { |
561 | - if (empty($users[$user->uuid])) { |
|
562 | - $users[$user->uuid] = $user; |
|
561 | + if (empty($users[ $user->uuid ])) { |
|
562 | + $users[ $user->uuid ] = $user; |
|
563 | 563 | } |
564 | 564 | } |
565 | 565 | } |
@@ -572,15 +572,15 @@ discard block |
||
572 | 572 | } |
573 | 573 | |
574 | 574 | foreach ($groups as $uid => $group) { |
575 | - $allowedUserUids[] = [ |
|
575 | + $allowedUserUids[ ] = [ |
|
576 | 576 | 'uuid' => $group->uuid, |
577 | 577 | 'recordLabel' => $group->recordLabel |
578 | 578 | ]; |
579 | 579 | } |
580 | 580 | |
581 | 581 | foreach ($users as $uid => $user) { |
582 | - if($user->getKey() != $this->getKey()) { |
|
583 | - $allowedUserUids[] = [ |
|
582 | + if ($user->getKey() != $this->getKey()) { |
|
583 | + $allowedUserUids[ ] = [ |
|
584 | 584 | 'uuid' => $user->uuid, |
585 | 585 | 'recordLabel' => $user->recordLabel |
586 | 586 | ]; |
@@ -109,8 +109,8 @@ |
||
109 | 109 | */ |
110 | 110 | public function addConditionToSearchQuery(Builder $query, Field $field, $value) : Builder |
111 | 111 | { |
112 | - $query->where(function ($query) use($field, $value) { |
|
113 | - foreach ((array) $value as $_value) { |
|
112 | + $query->where(function($query) use($field, $value) { |
|
113 | + foreach ((array)$value as $_value) { |
|
114 | 114 | // Replace me by connected user's id |
115 | 115 | if ($_value === 'me') { |
116 | 116 | $_value = Auth::user()->uuid; |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | return $isFilteredByUser; |
44 | 44 | } |
45 | 45 | |
46 | - public function scopeInDomain($query, ?Domain $domain, $withDescendants=false) |
|
46 | + public function scopeInDomain($query, ?Domain $domain, $withDescendants = false) |
|
47 | 47 | { |
48 | 48 | if (!empty($domain) && Schema::hasColumn($this->table, 'domain_id')) { |
49 | 49 | // Activate descendant view if the user is allowed |
@@ -70,15 +70,15 @@ discard block |
||
70 | 70 | |
71 | 71 | protected static function getModuleFromClass($className) |
72 | 72 | { |
73 | - $modules = Cache::rememberForever('modules_by_model_class', function () { |
|
73 | + $modules = Cache::rememberForever('modules_by_model_class', function() { |
|
74 | 74 | $modulesGroupedByModelClass = collect(); |
75 | - Module::all()->map(function ($item) use ($modulesGroupedByModelClass) { |
|
76 | - $modulesGroupedByModelClass[$item->model_class] = $item; |
|
75 | + Module::all()->map(function($item) use ($modulesGroupedByModelClass) { |
|
76 | + $modulesGroupedByModelClass[ $item->model_class ] = $item; |
|
77 | 77 | return $modulesGroupedByModelClass; |
78 | 78 | }); |
79 | 79 | return $modulesGroupedByModelClass; |
80 | 80 | }); |
81 | - return $modules[(string) $className] ?? null; |
|
81 | + return $modules[ (string)$className ] ?? null; |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | public function getUuidAttribute() |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <div class="autoscroll-x"> |
2 | - <?php $filterOrderBy = !empty($selectedFilter) ? (array) $selectedFilter->order_by : []; ?> |
|
2 | + <?php $filterOrderBy = !empty($selectedFilter) ? (array)$selectedFilter->order_by : [ ]; ?> |
|
3 | 3 | <table |
4 | 4 | id="{{ $datatableId }}" |
5 | 5 | class="striped highlight" |
@@ -31,15 +31,15 @@ discard block |
||
31 | 31 | <div class="search hide-on-small-only hide-on-med-only"> |
32 | 32 | <?php |
33 | 33 | $searchValue = null; |
34 | - if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column['name']})) { |
|
35 | - $searchValue = $selectedFilter->conditions->search->{$column['name']}; |
|
34 | + if (!empty($selectedFilter) && !empty($selectedFilter->conditions->search->{$column[ 'name' ]})) { |
|
35 | + $searchValue = $selectedFilter->conditions->search->{$column[ 'name' ]}; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | // If a special template exists, use it. Else use the generic template |
39 | 39 | $uitypeViewName = sprintf('uitypes.search.%s', $column[ 'uitype' ]); |
40 | 40 | $uitypeFallbackView = 'uccello::modules.default.uitypes.search.text'; |
41 | 41 | $uitypeViewToInclude = uccello()->view($column[ 'package' ], $module, $uitypeViewName, $uitypeFallbackView); |
42 | - $field = $module->fields()->where('name', $column['name'])->first(); |
|
42 | + $field = $module->fields()->where('name', $column[ 'name' ])->first(); |
|
43 | 43 | ?> |
44 | 44 | @include($uitypeViewToInclude, [ 'field' => $field ]) |
45 | 45 | </div> |
@@ -234,26 +234,26 @@ discard block |
||
234 | 234 | |
235 | 235 | if (is_numeric($nameOrId)) { |
236 | 236 | // Use cache |
237 | - $modules = Cache::rememberForever('modules_by_id', function () { |
|
237 | + $modules = Cache::rememberForever('modules_by_id', function() { |
|
238 | 238 | $modulesGroupedById = collect(); |
239 | 239 | Module::all()->map(function($item) use($modulesGroupedById) { |
240 | - $modulesGroupedById[$item->id] = $item; |
|
240 | + $modulesGroupedById[ $item->id ] = $item; |
|
241 | 241 | return $modulesGroupedById; |
242 | 242 | }); |
243 | 243 | return $modulesGroupedById; |
244 | 244 | }); |
245 | - return $modules[(string) $nameOrId] ?? null; |
|
245 | + return $modules[ (string)$nameOrId ] ?? null; |
|
246 | 246 | } else { |
247 | 247 | // Use cache |
248 | - $modules = Cache::rememberForever('modules_by_name', function () { |
|
248 | + $modules = Cache::rememberForever('modules_by_name', function() { |
|
249 | 249 | $modulesGroupedByName = collect(); |
250 | 250 | Module::all()->map(function($item) use($modulesGroupedByName) { |
251 | - $modulesGroupedByName[$item->name] = $item; |
|
251 | + $modulesGroupedByName[ $item->name ] = $item; |
|
252 | 252 | return $modulesGroupedByName; |
253 | 253 | }); |
254 | 254 | return $modulesGroupedByName; |
255 | 255 | }); |
256 | - return $modules[(string) $nameOrId] ?? null; |
|
256 | + return $modules[ (string)$nameOrId ] ?? null; |
|
257 | 257 | } |
258 | 258 | } |
259 | 259 | |
@@ -271,26 +271,26 @@ discard block |
||
271 | 271 | |
272 | 272 | if (is_numeric($nameOrId)) { |
273 | 273 | // Use cache |
274 | - $uitypes = Cache::rememberForever('uitypes_by_id', function () { |
|
274 | + $uitypes = Cache::rememberForever('uitypes_by_id', function() { |
|
275 | 275 | $uitypesGroupedById = collect(); |
276 | 276 | Uitype::all()->map(function($item) use($uitypesGroupedById) { |
277 | - $uitypesGroupedById[$item->id] = $item; |
|
277 | + $uitypesGroupedById[ $item->id ] = $item; |
|
278 | 278 | return $uitypesGroupedById; |
279 | 279 | }); |
280 | 280 | return $uitypesGroupedById; |
281 | 281 | }); |
282 | - return $uitypes[(string) $nameOrId] ?? null; |
|
282 | + return $uitypes[ (string)$nameOrId ] ?? null; |
|
283 | 283 | } else { |
284 | 284 | // Use cache |
285 | - $uitypes = Cache::rememberForever('uitypes_by_name', function () { |
|
285 | + $uitypes = Cache::rememberForever('uitypes_by_name', function() { |
|
286 | 286 | $uitypesGroupedByName = collect(); |
287 | 287 | Uitype::all()->map(function($item) use($uitypesGroupedByName) { |
288 | - $uitypesGroupedByName[$item->name] = $item; |
|
288 | + $uitypesGroupedByName[ $item->name ] = $item; |
|
289 | 289 | return $uitypesGroupedByName; |
290 | 290 | }); |
291 | 291 | return $uitypesGroupedByName; |
292 | 292 | }); |
293 | - return $uitypes[(string) $nameOrId] ?? null; |
|
293 | + return $uitypes[ (string)$nameOrId ] ?? null; |
|
294 | 294 | } |
295 | 295 | } |
296 | 296 | |
@@ -308,26 +308,26 @@ discard block |
||
308 | 308 | |
309 | 309 | if (is_numeric($nameOrId)) { |
310 | 310 | // Use cache |
311 | - $displaytypes = Cache::rememberForever('displaytypes_by_id', function () { |
|
311 | + $displaytypes = Cache::rememberForever('displaytypes_by_id', function() { |
|
312 | 312 | $displaytypesGroupedById = collect(); |
313 | 313 | Displaytype::all()->map(function($item) use($displaytypesGroupedById) { |
314 | - $displaytypesGroupedById[$item->id] = $item; |
|
314 | + $displaytypesGroupedById[ $item->id ] = $item; |
|
315 | 315 | return $displaytypesGroupedById; |
316 | 316 | }); |
317 | 317 | return $displaytypesGroupedById; |
318 | 318 | }); |
319 | - return $displaytypes[(string) $nameOrId] ?? null; |
|
319 | + return $displaytypes[ (string)$nameOrId ] ?? null; |
|
320 | 320 | } else { |
321 | 321 | // Use cache |
322 | - $displaytypes = Cache::rememberForever('displaytypes_by_name', function () { |
|
322 | + $displaytypes = Cache::rememberForever('displaytypes_by_name', function() { |
|
323 | 323 | $displaytypesGroupedByName = collect(); |
324 | 324 | Displaytype::all()->map(function($item) use($displaytypesGroupedByName) { |
325 | - $displaytypesGroupedByName[$item->name] = $item; |
|
325 | + $displaytypesGroupedByName[ $item->name ] = $item; |
|
326 | 326 | return $displaytypesGroupedByName; |
327 | 327 | }); |
328 | 328 | return $displaytypesGroupedByName; |
329 | 329 | }); |
330 | - return $displaytypes[(string) $nameOrId] ?? null; |
|
330 | + return $displaytypes[ (string)$nameOrId ] ?? null; |
|
331 | 331 | } |
332 | 332 | } |
333 | 333 | |
@@ -345,26 +345,26 @@ discard block |
||
345 | 345 | |
346 | 346 | if (is_numeric($nameOrId)) { |
347 | 347 | // Use cache |
348 | - $capabilities = Cache::rememberForever('capabilities_by_id', function () { |
|
348 | + $capabilities = Cache::rememberForever('capabilities_by_id', function() { |
|
349 | 349 | $capabilitiesGroupedById = collect(); |
350 | 350 | Capability::all()->map(function($item) use($capabilitiesGroupedById) { |
351 | - $capabilitiesGroupedById[$item->id] = $item; |
|
351 | + $capabilitiesGroupedById[ $item->id ] = $item; |
|
352 | 352 | return $capabilitiesGroupedById; |
353 | 353 | }); |
354 | 354 | return $capabilitiesGroupedById; |
355 | 355 | }); |
356 | - return $capabilities[(string) $nameOrId] ?? null; |
|
356 | + return $capabilities[ (string)$nameOrId ] ?? null; |
|
357 | 357 | } else { |
358 | 358 | // Use cache |
359 | - $capabilities = Cache::rememberForever('capabilities_by_name', function () { |
|
359 | + $capabilities = Cache::rememberForever('capabilities_by_name', function() { |
|
360 | 360 | $capabilitiesGroupedByName = collect(); |
361 | 361 | Capability::all()->map(function($item) use($capabilitiesGroupedByName) { |
362 | - $capabilitiesGroupedByName[$item->name] = $item; |
|
362 | + $capabilitiesGroupedByName[ $item->name ] = $item; |
|
363 | 363 | return $capabilitiesGroupedByName; |
364 | 364 | }); |
365 | 365 | return $capabilitiesGroupedByName; |
366 | 366 | }); |
367 | - return $capabilities[(string) $nameOrId] ?? null; |
|
367 | + return $capabilities[ (string)$nameOrId ] ?? null; |
|
368 | 368 | } |
369 | 369 | } |
370 | 370 | |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | * @param string $type |
407 | 407 | * @return array |
408 | 408 | */ |
409 | - public function getDatatableColumns(Module $module, $filterId=null, $type='list'): array |
|
409 | + public function getDatatableColumns(Module $module, $filterId = null, $type = 'list'): array |
|
410 | 410 | { |
411 | 411 | $columns = [ ]; |
412 | 412 | |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | * @param string $type |
463 | 463 | * @return Filter |
464 | 464 | */ |
465 | - public function getDefaultFilter(Module $module, $type="list") |
|
465 | + public function getDefaultFilter(Module $module, $type = "list") |
|
466 | 466 | { |
467 | 467 | $filter = Filter::where('module_id', $module->id) |
468 | 468 | ->where('type', $type) |