@@ 108-123 (lines=16) @@ | ||
105 | $listOfPermissionNames = []; |
|
106 | $permissions = []; |
|
107 | ||
108 | foreach ($listOfPermissions as $permission) { |
|
109 | if ($permission instanceof Permission) { |
|
110 | $permissions[$permission->id] = $permission; |
|
111 | } else { |
|
112 | $method = is_numeric($permission) ? 'findById' : 'findByName'; |
|
113 | ||
114 | if (!is_numeric($permission) && !isset($listOfPermissionNames[$permission])) { |
|
115 | $thisPermission = $this->getPermissionClass()->{$method}($permission, $guard); |
|
116 | $permissions[$thisPermission->id] = $thisPermission; |
|
117 | $listOfPermissionNames[$thisPermission->name] = null; |
|
118 | } elseif (is_numeric($permission) && !isset($permissions[$permission])) { |
|
119 | $thisPermission = $this->getPermissionClass()->{$method}($permission, $guard); |
|
120 | $permissions[$thisPermission->id] = $thisPermission; |
|
121 | } |
|
122 | } |
|
123 | } |
|
124 | ||
125 | return $permissions; |
|
126 | } |
@@ 75-90 (lines=16) @@ | ||
72 | $listOfRoleNames = []; |
|
73 | $roles = []; |
|
74 | ||
75 | foreach ($listOfRoles as $role) { |
|
76 | if ($role instanceof Role) { |
|
77 | $roles[$role->id] = $role; |
|
78 | } else { |
|
79 | $method = is_numeric($role) ? 'findById' : 'findByName'; |
|
80 | ||
81 | if (!is_numeric($role) && !isset($listOfRoleNames[$role])) { |
|
82 | $thisRole = $this->getRoleClass()->{$method}($role, $guard); |
|
83 | $roles[$thisRole->id] = $thisRole; |
|
84 | $listOfRoleNames[$thisRole->name] = null; |
|
85 | } elseif (is_numeric($role) && !isset($roles[$role])) { |
|
86 | $thisRole = $this->getRoleClass()->{$method}($role, $guard); |
|
87 | $roles[$thisRole->id] = $thisRole; |
|
88 | } |
|
89 | } |
|
90 | } |
|
91 | ||
92 | return $query->whereHas('roles', function ($query) use ($roles) { |
|
93 | $query->where(function ($query) use ($roles) { |