@@ -11,10 +11,10 @@ discard block |
||
11 | 11 | * |
12 | 12 | * @return boolean |
13 | 13 | */ |
14 | - public function authorize() : bool |
|
14 | + public function authorize () : bool |
|
15 | 15 | { |
16 | 16 | // Only allow updates if the user is a logged in Admin. |
17 | - return backpack_auth()->check(); |
|
17 | + return backpack_auth ()->check (); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | /** |
@@ -22,10 +22,10 @@ discard block |
||
22 | 22 | * |
23 | 23 | * @return string[] |
24 | 24 | */ |
25 | - public function rules() : array |
|
25 | + public function rules () : array |
|
26 | 26 | { |
27 | 27 | return [ |
28 | - 'name' => 'required|unique_translation:skills,name' . (isset($this->id) ? ",{$this->id}" : ''), |
|
28 | + 'name' => 'required|unique_translation:skills,name'.(isset($this->id) ? ",{$this->id}" : ''), |
|
29 | 29 | 'description' => 'required', |
30 | 30 | 'skill_type_id' => 'exists:skill_types,id' |
31 | 31 | ]; |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * |
37 | 37 | * @return string[] |
38 | 38 | */ |
39 | - public function messages() : array |
|
39 | + public function messages () : array |
|
40 | 40 | { |
41 | 41 | return [ |
42 | 42 | 'name.required' => 'Please enter a Skill name.', |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | * |
23 | 23 | * @return boolean |
24 | 24 | */ |
25 | - public function authorize(): bool |
|
25 | + public function authorize (): bool |
|
26 | 26 | { |
27 | - $job = $this->route('job'); |
|
27 | + $job = $this->route ('job'); |
|
28 | 28 | // Published jobs cannot be updated. |
29 | 29 | return $job && $job->published_at === null; |
30 | 30 | } |
@@ -34,25 +34,25 @@ discard block |
||
34 | 34 | * |
35 | 35 | * @return string[] |
36 | 36 | */ |
37 | - public function rules(): array |
|
37 | + public function rules (): array |
|
38 | 38 | { |
39 | - $dateFormat = Config::get('app.api_datetime_format'); |
|
39 | + $dateFormat = Config::get ('app.api_datetime_format'); |
|
40 | 40 | $dateFormatRule = "date_format:$dateFormat"; |
41 | 41 | $sliderRule = 'between:1,4'; |
42 | 42 | return [ |
43 | - 'chosen_lang' => ['nullable', Rule::in(['en', 'fr'])], |
|
43 | + 'chosen_lang' => ['nullable', Rule::in (['en', 'fr'])], |
|
44 | 44 | 'term_qty' => 'nullable|numeric', |
45 | 45 | 'open_date_time' =>['nullable', $dateFormatRule], |
46 | 46 | 'close_date_time' => ['nullable', $dateFormatRule], |
47 | 47 | 'start_date_time' =>['nullable', $dateFormatRule], |
48 | - 'department_id' => ['nullable', new ValidIdRule(Department::class)], |
|
49 | - 'province_id' => ['nullable', new ValidIdRule(Province::class)], |
|
50 | - 'security_clearance_id' => ['nullable', new ValidIdRule(SecurityClearance::class)], |
|
51 | - 'language_requirement_id' => ['nullable', new ValidIdRule(LanguageRequirement::class)], |
|
48 | + 'department_id' => ['nullable', new ValidIdRule (Department::class)], |
|
49 | + 'province_id' => ['nullable', new ValidIdRule (Province::class)], |
|
50 | + 'security_clearance_id' => ['nullable', new ValidIdRule (SecurityClearance::class)], |
|
51 | + 'language_requirement_id' => ['nullable', new ValidIdRule (LanguageRequirement::class)], |
|
52 | 52 | 'salary_min' => 'nullable|numeric', |
53 | 53 | 'salary_max' => 'nullable|numeric', |
54 | 54 | 'noc' => 'nullable|numeric', |
55 | - 'classification_id' => ['nullable', new ValidIdRule(Classification::class)], |
|
55 | + 'classification_id' => ['nullable', new ValidIdRule (Classification::class)], |
|
56 | 56 | 'classification_level' => 'nullable|numeric', |
57 | 57 | 'remote_work_allowed' => 'nullable|boolean', |
58 | 58 | 'team_size' => 'nullable|numeric', |
@@ -63,10 +63,10 @@ discard block |
||
63 | 63 | 'experimental_vs_ongoing' => ['nullable', $sliderRule], |
64 | 64 | 'citizen_facing_vs_back_office' => ['nullable', $sliderRule], |
65 | 65 | 'collaborative_vs_independent' => ['nullable', $sliderRule], |
66 | - 'telework_allowed_frequency_id' => ['nullable', new ValidIdRule(Frequency::class)], |
|
67 | - 'flexible_hours_frequency_id' => ['nullable', new ValidIdRule(Frequency::class)], |
|
68 | - 'travel_requirement_id' => ['nullable', new ValidIdRule(TravelRequirement::class)], |
|
69 | - 'overtime_requirement_id' => ['nullable', new ValidIdRule(OvertimeRequirement::class)], |
|
66 | + 'telework_allowed_frequency_id' => ['nullable', new ValidIdRule (Frequency::class)], |
|
67 | + 'flexible_hours_frequency_id' => ['nullable', new ValidIdRule (Frequency::class)], |
|
68 | + 'travel_requirement_id' => ['nullable', new ValidIdRule (TravelRequirement::class)], |
|
69 | + 'overtime_requirement_id' => ['nullable', new ValidIdRule (OvertimeRequirement::class)], |
|
70 | 70 | 'en.city' => 'nullable|string', |
71 | 71 | 'en.title' => 'nullable|string', |
72 | 72 | 'en.dept_impact' => 'nullable|string', |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * |
27 | 27 | * @return boolean |
28 | 28 | */ |
29 | - public function authorize() |
|
29 | + public function authorize () |
|
30 | 30 | { |
31 | 31 | return $this->manager !== null; |
32 | 32 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * |
37 | 37 | * @return void |
38 | 38 | */ |
39 | - protected function failedValidation(\Illuminate\Contracts\Validation\Validator $validator) |
|
39 | + protected function failedValidation (\Illuminate\Contracts\Validation\Validator $validator) |
|
40 | 40 | { |
41 | 41 | $this->validator = $validator; |
42 | 42 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | * |
47 | 47 | * @return array |
48 | 48 | */ |
49 | - public function rules() |
|
49 | + public function rules () |
|
50 | 50 | { |
51 | 51 | return [ |
52 | 52 | 'first_name' => 'required|string|max:191', |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | 'email', |
59 | 59 | // Email may match existing email for this user, |
60 | 60 | // but must be unique if changed. |
61 | - Rule::unique('users', 'email')->ignore($this->manager->user->id) |
|
61 | + Rule::unique ('users', 'email')->ignore ($this->manager->user->id) |
|
62 | 62 | ], |
63 | 63 | 'gov_email' => [ |
64 | 64 | 'nullable', |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | 'confirmed' |
80 | 80 | ], |
81 | 81 | |
82 | - 'department_id' => ['required', new ValidIdRule(Department::class)], |
|
82 | + 'department_id' => ['required', new ValidIdRule (Department::class)], |
|
83 | 83 | |
84 | 84 | 'years_experience' => 'nullable|numeric|min:0', |
85 | 85 | 'gc_directory_url' => 'nullable|url', |
@@ -14,10 +14,10 @@ |
||
14 | 14 | * @param \Closure $next |
15 | 15 | * @return mixed |
16 | 16 | */ |
17 | - public function handle($request, Closure $next) |
|
17 | + public function handle ($request, Closure $next) |
|
18 | 18 | { |
19 | - Date::setLocale(app()->getLocale()); |
|
19 | + Date::setLocale (app ()->getLocale ()); |
|
20 | 20 | |
21 | - return $next($request); |
|
21 | + return $next ($request); |
|
22 | 22 | } |
23 | 23 | } |
@@ -32,15 +32,15 @@ |
||
32 | 32 | * @param \Symfony\Component\HttpFoundation\Response $response Outgoing response. |
33 | 33 | * @return \Symfony\Component\HttpFoundation\Response |
34 | 34 | */ |
35 | - protected function addCookieToResponse($request, $response) |
|
35 | + protected function addCookieToResponse ($request, $response) |
|
36 | 36 | { |
37 | 37 | if ($this->addHttpCookie) { |
38 | - $config = config('session'); |
|
39 | - $response->headers->setCookie( |
|
40 | - new Cookie( |
|
38 | + $config = config ('session'); |
|
39 | + $response->headers->setCookie ( |
|
40 | + new Cookie ( |
|
41 | 41 | 'XSRF-TOKEN', |
42 | - $request->session()->token(), |
|
43 | - $this->availableAt(60 * $config['lifetime']), |
|
42 | + $request->session ()->token (), |
|
43 | + $this->availableAt (60 * $config['lifetime']), |
|
44 | 44 | $config['path'], |
45 | 45 | $config['domain'], |
46 | 46 | $config['secure'], |
@@ -12,15 +12,15 @@ |
||
12 | 12 | * @param \Closure $next |
13 | 13 | * @return mixed |
14 | 14 | */ |
15 | - public function handle($request, Closure $next) |
|
15 | + public function handle ($request, Closure $next) |
|
16 | 16 | { |
17 | - $user = $request->user(); |
|
17 | + $user = $request->user (); |
|
18 | 18 | |
19 | - if ($user !== null && $user->isManager() && !$user->isGovIdentityConfirmed()) { |
|
20 | - $request->session()->put('url.expected', $request->url()); |
|
21 | - return redirect(route('manager.first_visit')); |
|
19 | + if ($user !== null && $user->isManager () && !$user->isGovIdentityConfirmed ()) { |
|
20 | + $request->session ()->put ('url.expected', $request->url ()); |
|
21 | + return redirect (route ('manager.first_visit')); |
|
22 | 22 | } |
23 | 23 | |
24 | - return $next($request); |
|
24 | + return $next ($request); |
|
25 | 25 | } |
26 | 26 | } |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | * |
21 | 21 | * @return bool [description] |
22 | 22 | */ |
23 | - private function checkIfUserIsAdmin($user) |
|
23 | + private function checkIfUserIsAdmin ($user) |
|
24 | 24 | { |
25 | - return ($user->isAdmin()); |
|
25 | + return ($user->isAdmin ()); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -32,12 +32,12 @@ discard block |
||
32 | 32 | * |
33 | 33 | * @return [type] [description] |
34 | 34 | */ |
35 | - private function respondToUnauthorizedRequest($request) |
|
35 | + private function respondToUnauthorizedRequest ($request) |
|
36 | 36 | { |
37 | - if ($request->ajax() || $request->wantsJson()) { |
|
38 | - return response(trans('backpack::base.unauthorized'), 401); |
|
37 | + if ($request->ajax () || $request->wantsJson ()) { |
|
38 | + return response (trans ('backpack::base.unauthorized'), 401); |
|
39 | 39 | } else { |
40 | - return redirect()->guest(backpack_url('login')); |
|
40 | + return redirect ()->guest (backpack_url ('login')); |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | |
@@ -49,16 +49,16 @@ discard block |
||
49 | 49 | * |
50 | 50 | * @return mixed |
51 | 51 | */ |
52 | - public function handle($request, Closure $next) |
|
52 | + public function handle ($request, Closure $next) |
|
53 | 53 | { |
54 | - if (backpack_auth()->guest()) { |
|
55 | - return $this->respondToUnauthorizedRequest($request); |
|
54 | + if (backpack_auth ()->guest ()) { |
|
55 | + return $this->respondToUnauthorizedRequest ($request); |
|
56 | 56 | } |
57 | 57 | |
58 | - if (!$this->checkIfUserIsAdmin(backpack_user())) { |
|
59 | - return $this->respondToUnauthorizedRequest($request); |
|
58 | + if (!$this->checkIfUserIsAdmin (backpack_user ())) { |
|
59 | + return $this->respondToUnauthorizedRequest ($request); |
|
60 | 60 | } |
61 | 61 | |
62 | - return $next($request); |
|
62 | + return $next ($request); |
|
63 | 63 | } |
64 | 64 | } |
@@ -18,24 +18,24 @@ |
||
18 | 18 | * @param string $role |
19 | 19 | * @return mixed |
20 | 20 | */ |
21 | - public function handle($request, Closure $next, $role) |
|
21 | + public function handle ($request, Closure $next, $role) |
|
22 | 22 | { |
23 | 23 | // If user logged in as admin, always pass, regardless of $role |
24 | - if (Auth::check() && Auth::user()->isAdmin()) { |
|
25 | - Log::info('CheckRole Bypassed as Admin'); |
|
26 | - return $next($request); |
|
24 | + if (Auth::check () && Auth::user ()->isAdmin ()) { |
|
25 | + Log::info ('CheckRole Bypassed as Admin'); |
|
26 | + return $next ($request); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | // Redirect if not logged in, or if not the correct role |
30 | - if (Auth::guest() || !Auth::user()->hasRole($role)) { |
|
31 | - Log::info('CheckRole Failed'); |
|
30 | + if (Auth::guest () || !Auth::user ()->hasRole ($role)) { |
|
31 | + Log::info ('CheckRole Failed'); |
|
32 | 32 | // TODO: redirect to some sort of error messag |
33 | - if (WhichPortal::isManagerPortal()) { |
|
34 | - return redirect(route('manager.home')); |
|
33 | + if (WhichPortal::isManagerPortal ()) { |
|
34 | + return redirect (route ('manager.home')); |
|
35 | 35 | } else { |
36 | - return redirect(route('home')); |
|
36 | + return redirect (route ('home')); |
|
37 | 37 | } |
38 | 38 | } |
39 | - return $next($request); |
|
39 | + return $next ($request); |
|
40 | 40 | } |
41 | 41 | } |
@@ -13,11 +13,11 @@ |
||
13 | 13 | * @param \Closure $next |
14 | 14 | * @return mixed |
15 | 15 | */ |
16 | - public function handle($request, Closure $next) |
|
16 | + public function handle ($request, Closure $next) |
|
17 | 17 | { |
18 | - if (\App::environment('local')) { |
|
19 | - return $next($request); |
|
18 | + if (\App::environment ('local')) { |
|
19 | + return $next ($request); |
|
20 | 20 | } |
21 | - abort(404); |
|
21 | + abort (404); |
|
22 | 22 | } |
23 | 23 | } |