| @@ -98,7 +98,7 @@ | ||
| 98 | 98 | |
| 99 | 99 | public function baseDirectory() | 
| 100 | 100 |      { | 
| 101 | - return __DIR__ . '/..'; | |
| 101 | + return __DIR__.'/..'; | |
| 102 | 102 | } | 
| 103 | 103 | |
| 104 | 104 | public function boot() | 
| @@ -47,7 +47,7 @@ | ||
| 47 | 47 |          } catch (\Exception $e) { | 
| 48 | 48 | return false; | 
| 49 | 49 | } | 
| 50 | -        if(in_array($value, $settings['only_one_user'])) { | |
| 50 | +        if (in_array($value, $settings['only_one_user'])) { | |
| 51 | 51 | return $this->roleRepository->getById($value)->users()->count() === 0; | 
| 52 | 52 | } | 
| 53 | 53 | return true; | 
| @@ -17,7 +17,7 @@ | ||
| 17 | 17 | public function authorize($ability, $arguments = []) | 
| 18 | 18 |      { | 
| 19 | 19 | return $this->baseAuthorize( | 
| 20 | - 'assign-roles.' . $ability, | |
| 20 | + 'assign-roles.'.$ability, | |
| 21 | 21 | $arguments | 
| 22 | 22 | ); | 
| 23 | 23 | } | 
| @@ -12,7 +12,7 @@ | ||
| 12 | 12 | public function rules() | 
| 13 | 13 |      { | 
| 14 | 14 | return [ | 
| 15 | - 'position_id' => ['required', app(PositionIsAllowed::class), app(PositionCanBeUsed::class)], | |
| 15 | + 'position_id' => ['required', app(PositionIsAllowed::class), app(PositionCanBeUsed::class)], | |
| 16 | 16 | 'role_name' => ['required', 'string', 'max:255', 'min:3'], | 
| 17 | 17 | 'email' => ['nullable', 'sometimes', 'email'] | 
| 18 | 18 | ]; | 
| @@ -91,7 +91,7 @@ discard block | ||
| 91 | 91 | private function logicGroupId() | 
| 92 | 92 |      { | 
| 93 | 93 |          $id = settings('logic_group', null); | 
| 94 | -        if($id === null) { | |
| 94 | +        if ($id === null) { | |
| 95 | 95 | return null; | 
| 96 | 96 | } | 
| 97 | 97 | return (int) $id; | 
| @@ -111,7 +111,7 @@ discard block | ||
| 111 | 111 | |
| 112 | 112 | private function filter(Collection $roles) | 
| 113 | 113 |      { | 
| 114 | -        if($this->hasLogicGroup()) { | |
| 114 | +        if ($this->hasLogicGroup()) { | |
| 115 | 115 |              return $roles->filter(function(\BristolSU\ControlDB\Contracts\Models\Role $role) { | 
| 116 | 116 | return $this->isInLogicGroup($role); | 
| 117 | 117 | })->values(); | 
| @@ -42,7 +42,7 @@ | ||
| 42 | 42 |          } catch (\Exception $e) { | 
| 43 | 43 | return false; | 
| 44 | 44 | } | 
| 45 | -        if(in_array($value, $settings['only_one_role'])) { | |
| 45 | +        if (in_array($value, $settings['only_one_role'])) { | |
| 46 | 46 | $roles = $this->roleRepository->allThroughGroup($this->group()); | 
| 47 | 47 | |
| 48 | 48 |              return $roles->filter(function(\BristolSU\ControlDB\Contracts\Models\Role $role) use ($value) { | 
| @@ -63,7 +63,7 @@ | ||
| 63 | 63 | |
| 64 | 64 | protected function getCacheKey(Group $group) | 
| 65 | 65 |      { | 
| 66 | - return PositionSettingRetrieval::class . '.' . $group->id(); | |
| 66 | + return PositionSettingRetrieval::class.'.'.$group->id(); | |
| 67 | 67 | } | 
| 68 | 68 | |
| 69 | 69 | public function parse($setting) | 
| @@ -45,7 +45,7 @@ | ||
| 45 | 45 | return false; | 
| 46 | 46 | } | 
| 47 | 47 | |
| 48 | - return count($remainingPositions) === 0; | |
| 48 | + return count($remainingPositions) === 0; | |
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | 51 | public function percentage($settings, ActivityInstance $activityInstance, ModuleInstance $moduleInstance): int | 
| @@ -59,15 +59,15 @@ discard block | ||
| 59 | 59 | return false; | 
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | -        if(count($requiredPositions) === 0) { | |
| 62 | +        if (count($requiredPositions) === 0) { | |
| 63 | 63 | return 100; | 
| 64 | 64 | } | 
| 65 | 65 | |
| 66 | 66 | $filled = count($requiredPositions) - count($remainingPositions); | 
| 67 | 67 | |
| 68 | - $percentage = (int) round(($filled/count($requiredPositions)) * 100, 0); | |
| 68 | + $percentage = (int) round(($filled / count($requiredPositions)) * 100, 0); | |
| 69 | 69 | |
| 70 | -        if($percentage > 100) { | |
| 70 | +        if ($percentage > 100) { | |
| 71 | 71 | return 100; | 
| 72 | 72 | } | 
| 73 | 73 | return $percentage; | 
| @@ -152,7 +152,7 @@ discard block | ||
| 152 | 152 | */ | 
| 153 | 153 | private function getGroup(ActivityInstance $activityInstance) | 
| 154 | 154 |      { | 
| 155 | -        if($activityInstance->resource_type === 'group') { | |
| 155 | +        if ($activityInstance->resource_type === 'group') { | |
| 156 | 156 | return $activityInstance->participant(); | 
| 157 | 157 | } | 
| 158 | 158 | return $activityInstance->participant()->group(); | 
| @@ -166,7 +166,7 @@ discard block | ||
| 166 | 166 | private function rolesThroughGroup(Group $group, ModuleInstance $moduleInstance) | 
| 167 | 167 |      { | 
| 168 | 168 | $roles = $group->roles(); | 
| 169 | -        if($this->logicGroupId($moduleInstance) !== null) { | |
| 169 | +        if ($this->logicGroupId($moduleInstance) !== null) { | |
| 170 | 170 | $logicGroup = app(LogicRepository::class)->getById($this->logicGroupId($moduleInstance)); | 
| 171 | 171 |              return $roles->filter(function(\BristolSU\ControlDB\Contracts\Models\Role $role) use ($moduleInstance, $logicGroup) { | 
| 172 | 172 | return LogicTester::evaluate($logicGroup, null, $role->group(), $role); | 
| @@ -178,7 +178,7 @@ discard block | ||
| 178 | 178 | private function logicGroupId(ModuleInstance $moduleInstance) | 
| 179 | 179 |      { | 
| 180 | 180 |          $id = $moduleInstance->setting('logic_group', null); | 
| 181 | -        if($id === null) { | |
| 181 | +        if ($id === null) { | |
| 182 | 182 | return null; | 
| 183 | 183 | } | 
| 184 | 184 | return (int) $id; | 
| @@ -34,10 +34,10 @@ discard block | ||
| 34 | 34 | |
| 35 | 35 | public function getSettings(Group $group, array $settings) | 
| 36 | 36 |      { | 
| 37 | -        if(Cache::has($this->getCacheKey($group))) { | |
| 37 | +        if (Cache::has($this->getCacheKey($group))) { | |
| 38 | 38 | return Cache::get($this->getCacheKey($group)); | 
| 39 | 39 | } | 
| 40 | -        foreach ((array_key_exists('required', $settings)?$settings['required']:[]) as $setting) { | |
| 40 | +        foreach ((array_key_exists('required', $settings) ? $settings['required'] : []) as $setting) { | |
| 41 | 41 |              if ($this->groupIsForSetting($group, $setting)) { | 
| 42 | 42 | Cache::put($this->getCacheKey($group), $setting['required'], 7200); | 
| 43 | 43 | return $setting['required']; | 
| @@ -48,7 +48,7 @@ discard block | ||
| 48 | 48 | |
| 49 | 49 | protected function getCacheKey(Group $group) | 
| 50 | 50 |      { | 
| 51 | - return RequiredSettingRetrieval::class . '.' . $group->id(); | |
| 51 | + return RequiredSettingRetrieval::class.'.'.$group->id(); | |
| 52 | 52 | } | 
| 53 | 53 | |
| 54 | 54 | protected function groupIsForSetting(Group $group, array $setting): bool |