Passed
Push — task/common-translation-packag... ( 1125af...852212 )
by Grant
08:02
created
app/Services/Validation/Requests/UpdateWorkSampleValidator.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
      */
25 25
     public function __construct()
26 26
     {
27
-        $this->fileTypeIds = FileType::all()->pluck('id')->toArray();
27
+        $this->fileTypeIds = FileType::all ()->pluck ('id')->toArray ();
28 28
     }
29 29
     /**
30 30
      * Get the validation rules that apply to the request.
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
             'name' => 'required|string|max:191',
39 39
             'file_type_id' => [
40 40
                 'required',
41
-                Rule::in($this->fileTypeIds)
41
+                Rule::in ($this->fileTypeIds)
42 42
             ],
43 43
             'url' => 'required|url',
44 44
             'description' => 'required|string',
@@ -57,6 +57,6 @@  discard block
 block discarded – undo
57 57
      */
58 58
     public function validator(array $data) : \Illuminate\Validation\Validator
59 59
     {
60
-        return Validator::make($data, $this->rules());
60
+        return Validator::make ($data, $this->rules ());
61 61
     }
62 62
 }
Please login to merge, or discard this patch.
app/Services/Validation/Requests/UpdateApplicationProfileValidator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
                 'email',
50 50
                 // Email may match existing email for this user,
51 51
                 // but must be unique if changed.
52
-                Rule::unique('users', 'email')->ignore($this->applicant->user->id)
52
+                Rule::unique ('users', 'email')->ignore ($this->applicant->user->id)
53 53
             ],
54 54
 
55 55
             // Password validation.
@@ -99,6 +99,6 @@  discard block
 block discarded – undo
99 99
      */
100 100
     public function validator(array $data) : \Illuminate\Validation\Validator
101 101
     {
102
-        return Validator::make($data, $this->rules());
102
+        return Validator::make ($data, $this->rules ());
103 103
     }
104 104
 }
Please login to merge, or discard this patch.
app/Services/Validation/JobApplicationAnswerValidator.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 
15 15
     public function __construct(JobApplication $application) {
16 16
         $this->application = $application;
17
-        $this->questionIds = $application->job_poster->job_poster_questions->pluck('id')->toArray();
17
+        $this->questionIds = $application->job_poster->job_poster_questions->pluck ('id')->toArray ();
18 18
     }
19 19
 
20 20
     public function rules() {
@@ -22,11 +22,11 @@  discard block
 block discarded – undo
22 22
             'answer' => 'required|string',
23 23
             'job_poster_question_id' => [
24 24
                 'required',
25
-                Rule::in($this->questionIds),
25
+                Rule::in ($this->questionIds),
26 26
             ],
27 27
             'job_application_id' => [
28 28
                 'required',
29
-                Rule::in([$this->application->id]),
29
+                Rule::in ([$this->application->id]),
30 30
             ]
31 31
         ];
32 32
         return $rules;
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
     public function validator(JobApplicationAnswer $answer) {
36 36
 
37 37
 
38
-        return Validator::make($answer->toArray(), $this->rules());
38
+        return Validator::make ($answer->toArray (), $this->rules ());
39 39
     }
40 40
 
41 41
     public function validate(JobApplicationAnswer $answer) {
42
-        return $this->validator($answer)->validate();
42
+        return $this->validator ($answer)->validate ();
43 43
     }
44 44
 
45 45
     public function isComplete(JobApplicationAnswer $answer) {
46
-        return $this->validator($answer)->passes();
46
+        return $this->validator ($answer)->passes ();
47 47
     }
48 48
 }
Please login to merge, or discard this patch.
app/Services/Validation/PasswordValidator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 {
9 9
     public function validate($request)
10 10
     {
11
-        abort(404, 'incomplete');
11
+        abort (404, 'incomplete');
12 12
     }
13 13
 
14 14
     public function rules()
@@ -22,6 +22,6 @@  discard block
 block discarded – undo
22 22
     }
23 23
 
24 24
     public function messages() {
25
-        return Lang::get('validation.custom.password');
25
+        return Lang::get ('validation.custom.password');
26 26
     }
27 27
 }
Please login to merge, or discard this patch.
app/Services/Validation/SkillDeclarationValidator.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -23,33 +23,33 @@  discard block
 block discarded – undo
23 23
     public function __construct(Applicant $applicant)
24 24
     {
25 25
         $this->applicant = $applicant;
26
-        $this->skill_ids = Skill::all()->pluck('id');
27
-        $this->skill_status_ids = SkillStatus::all()->pluck('id');
28
-        $this->skill_level_ids = SkillLevel::all()->pluck('id');
26
+        $this->skill_ids = Skill::all ()->pluck ('id');
27
+        $this->skill_status_ids = SkillStatus::all ()->pluck ('id');
28
+        $this->skill_level_ids = SkillLevel::all ()->pluck ('id');
29 29
 
30 30
     }
31 31
 
32 32
     public function validator(SkillDeclaration $skillDeclaration) {
33
-        $uniqueSkillRule = new UniqueApplicantSkillRule($this->applicant, $skillDeclaration->id);
33
+        $uniqueSkillRule = new UniqueApplicantSkillRule ($this->applicant, $skillDeclaration->id);
34 34
 
35 35
         //Validate basic data is filled in
36
-        $validator = Validator::make($skillDeclaration->getAttributes(), [
36
+        $validator = Validator::make ($skillDeclaration->getAttributes (), [
37 37
             'skill_id' => [
38 38
                 'required',
39
-                Rule::in($this->skill_ids->toArray()),
39
+                Rule::in ($this->skill_ids->toArray ()),
40 40
                 $uniqueSkillRule,
41 41
             ],
42 42
             'applicant_id' => [
43 43
                 'required',
44
-                Rule::in([$this->applicant->id]),
44
+                Rule::in ([$this->applicant->id]),
45 45
             ],
46 46
             'skill_status_id' => [
47 47
                 'required',
48
-                Rule::in($this->skill_status_ids->toArray()),
48
+                Rule::in ($this->skill_status_ids->toArray ()),
49 49
             ],
50 50
             'skill_level_id' => [
51 51
                 'required',
52
-                Rule::in($this->skill_level_ids->toArray()),
52
+                Rule::in ($this->skill_level_ids->toArray ()),
53 53
             ],
54 54
             'description' => 'required|string',
55 55
         ]);
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
     public function validate(SkillDeclaration $skillDeclaration)
60 60
     {
61
-        return $this->validator($skillDeclaration)->validate();
61
+        return $this->validator ($skillDeclaration)->validate ();
62 62
     }
63 63
 
64 64
 
Please login to merge, or discard this patch.
app/Services/Validation/ApplicationValidator.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@  discard block
 block discarded – undo
20 20
     protected $preferred_language_ids;
21 21
 
22 22
     public function __construct() {
23
-        $this->citizenship_ids = CitizenshipDeclaration::all()->pluck('id')->toArray();
24
-        $this->veteran_status_ids = VeteranStatus::all()->pluck('id')->toArray();
25
-        $this->preferred_language_ids = PreferredLanguage::all()->pluck('id')->toArray();
23
+        $this->citizenship_ids = CitizenshipDeclaration::all ()->pluck ('id')->toArray ();
24
+        $this->veteran_status_ids = VeteranStatus::all ()->pluck ('id')->toArray ();
25
+        $this->preferred_language_ids = PreferredLanguage::all ()->pluck ('id')->toArray ();
26 26
     }
27 27
 
28 28
     public function validate(JobApplication $application) {
@@ -33,30 +33,30 @@  discard block
 block discarded – undo
33 33
             'applicant_id' => 'required'
34 34
         ];
35 35
 
36
-        $rules = array_merge(
36
+        $rules = array_merge (
37 37
             $backendRules,
38 38
             //$this->basicsValidator($application)->getRules(),
39
-            $this->experienceValidator($application)->getRules(),
39
+            $this->experienceValidator ($application)->getRules (),
40 40
             //$this->essentialSkillsValidator($application)->getRules(),
41
-            $this->affirmationValidator($application)->getRules()
41
+            $this->affirmationValidator ($application)->getRules ()
42 42
         );
43 43
 
44
-        $data = $application->toArray();
44
+        $data = $application->toArray ();
45 45
 
46 46
         // Combining and simplifiying error messages
47
-        $rules = array_merge(
47
+        $rules = array_merge (
48 48
             $rules,
49 49
             ['application_step_1' => 'required|boolean|accepted'],
50 50
             ['application_step_3' => 'required|boolean|accepted']
51 51
         );
52
-        $data = array_merge(
52
+        $data = array_merge (
53 53
             $data,
54
-            ['application_step_1' => $this->basicsComplete($application)],
55
-            ['application_step_3' => $this->essentialSkillsComplete($application)]
54
+            ['application_step_1' => $this->basicsComplete ($application)],
55
+            ['application_step_3' => $this->essentialSkillsComplete ($application)]
56 56
         );
57 57
 
58 58
         //Validate basic data is filled in
59
-        Validator::make($data, $rules)->validate();
59
+        Validator::make ($data, $rules)->validate ();
60 60
     }
61 61
 
62 62
     /**
@@ -70,19 +70,19 @@  discard block
 block discarded – undo
70 70
     {
71 71
         $newArray = [];
72 72
         foreach ($array as $key => $value) {
73
-            $newArray[$fn($key)] = $value;
73
+            $newArray[$fn ($key)] = $value;
74 74
         }
75 75
         return $newArray;
76 76
     }
77 77
 
78 78
     protected function addNestedValidatorRules($nestedAttribute, $validatorRules, $rules = []) {
79 79
         // prepend the attribute name of each validator rule with the nested attribute name
80
-        $newRules = $this->arrayMapKeys(function($key) use ($nestedAttribute) {
81
-                return implode('.', [$nestedAttribute, $key]);
80
+        $newRules = $this->arrayMapKeys (function ($key) use ($nestedAttribute) {
81
+                return implode ('.', [$nestedAttribute, $key]);
82 82
             },
83 83
             $validatorRules);
84 84
         //Merge new rules with old rules
85
-        $rules = array_merge($rules, $newRules);
85
+        $rules = array_merge ($rules, $newRules);
86 86
         return $rules;
87 87
     }
88 88
 
@@ -90,87 +90,87 @@  discard block
 block discarded – undo
90 90
         // Validate the fields common to every application
91 91
         $rules = [
92 92
             'language_requirement_confirmed' => ['required', 'boolean'],
93
-            'citizenship_declaration_id' => ['required', Rule::in($this->citizenship_ids)],
94
-            'veteran_status_id' => ['required', Rule::in($this->veteran_status_ids)],
95
-            'preferred_language_id' => ['required', Rule::in($this->preferred_language_ids)],
93
+            'citizenship_declaration_id' => ['required', Rule::in ($this->citizenship_ids)],
94
+            'veteran_status_id' => ['required', Rule::in ($this->veteran_status_ids)],
95
+            'preferred_language_id' => ['required', Rule::in ($this->preferred_language_ids)],
96 96
         ];
97 97
 
98 98
         //Load application answers so they are included in application->toArray()
99
-        $application->load('job_application_answers');
99
+        $application->load ('job_application_answers');
100 100
 
101 101
         // Validate that each question has been answered
102 102
         $jobPosterQuestionRules = [];
103
-        foreach($application->job_poster->job_poster_questions as $question) {
104
-            $jobPosterQuestionRules[] = new ContainsObjectWithAttributeRule('job_poster_question_id', $question->id);
103
+        foreach ($application->job_poster->job_poster_questions as $question) {
104
+            $jobPosterQuestionRules[] = new ContainsObjectWithAttributeRule ('job_poster_question_id', $question->id);
105 105
         }
106 106
         $rules['job_application_answers'] = $jobPosterQuestionRules;
107
-        $answerValidatorFactory = new JobApplicationAnswerValidator($application);
107
+        $answerValidatorFactory = new JobApplicationAnswerValidator ($application);
108 108
 
109 109
         //Validate that each answer is complete
110
-        foreach($application->job_application_answers as $key=>$answer) {
111
-            $attribute = implode('.', ['job_application_answers', $key]);
112
-            $rules = $this->addNestedValidatorRules($attribute, $answerValidatorFactory->rules(), $rules);
110
+        foreach ($application->job_application_answers as $key=>$answer) {
111
+            $attribute = implode ('.', ['job_application_answers', $key]);
112
+            $rules = $this->addNestedValidatorRules ($attribute, $answerValidatorFactory->rules (), $rules);
113 113
         }
114 114
 
115
-        $validator = Validator::make($application->toArray(), $rules);
115
+        $validator = Validator::make ($application->toArray (), $rules);
116 116
         return $validator;
117 117
     }
118 118
 
119 119
     public function basicsComplete(JobApplication $application) {
120
-        $validator = $this->basicsValidator($application);
121
-        return $validator->passes();
120
+        $validator = $this->basicsValidator ($application);
121
+        return $validator->passes ();
122 122
     }
123 123
 
124 124
     public function experienceValidator(JobApplication $application) {
125 125
         $rules = ['experience_saved' => 'required|boolean|accepted'];
126
-        return Validator::make($application->toArray(), $rules);
126
+        return Validator::make ($application->toArray (), $rules);
127 127
     }
128 128
 
129 129
     public function experienceComplete(JobApplication $application) {
130
-        return $this->experienceValidator($application)->passes();
130
+        return $this->experienceValidator ($application)->passes ();
131 131
     }
132 132
 
133 133
     protected function skillsValidator(JobApplication $application, $criteria_type) {
134 134
         $rules = [];
135 135
 
136 136
         $skillDeclarationRules = [];
137
-        $criteriaTypeId = CriteriaType::where('name', $criteria_type)->firstOrFail()->id;
138
-        foreach($application->job_poster->criteria->where('criteria_type_id', $criteriaTypeId) as $criteria) {
137
+        $criteriaTypeId = CriteriaType::where ('name', $criteria_type)->firstOrFail ()->id;
138
+        foreach ($application->job_poster->criteria->where ('criteria_type_id', $criteriaTypeId) as $criteria) {
139 139
             //Validate that every essential skill has a corresponding declaration
140
-            $skillDeclarationRules[] = new ContainsObjectWithAttributeRule('skill_id', $criteria->skill_id);
140
+            $skillDeclarationRules[] = new ContainsObjectWithAttributeRule ('skill_id', $criteria->skill_id);
141 141
         }
142 142
         $rules['skill_declarations'] = $skillDeclarationRules;
143
-        $application->applicant->load('skill_declarations');
143
+        $application->applicant->load ('skill_declarations');
144 144
 
145 145
         //Validate that those declarations are complete
146
-        $skilDeclarationValidatorFactory = new SkillDeclarationValidator($application->applicant);
147
-        $relevantSkillIds = $application->job_poster->criteria->where('criteria_type_id', $criteriaTypeId)->pluck('skill_id');
148
-        foreach( $application->skill_declarations as $key=>$declaration) {
149
-            if ($relevantSkillIds->contains($declaration->skill_id)) {
150
-                $attribute = implode('.', ['skill_declarations', $key]);
151
-                $skillDeclarationValidator = $skilDeclarationValidatorFactory->validator($declaration);
152
-                $rules = $this->addNestedValidatorRules($attribute, $skillDeclarationValidator->getRules(), $rules);
146
+        $skilDeclarationValidatorFactory = new SkillDeclarationValidator ($application->applicant);
147
+        $relevantSkillIds = $application->job_poster->criteria->where ('criteria_type_id', $criteriaTypeId)->pluck ('skill_id');
148
+        foreach ($application->skill_declarations as $key=>$declaration) {
149
+            if ($relevantSkillIds->contains ($declaration->skill_id)) {
150
+                $attribute = implode ('.', ['skill_declarations', $key]);
151
+                $skillDeclarationValidator = $skilDeclarationValidatorFactory->validator ($declaration);
152
+                $rules = $this->addNestedValidatorRules ($attribute, $skillDeclarationValidator->getRules (), $rules);
153 153
             }
154 154
         }
155 155
 
156
-        $validator = Validator::make($application->toArray(), $rules);
156
+        $validator = Validator::make ($application->toArray (), $rules);
157 157
         return $validator;
158 158
     }
159 159
 
160 160
     public function essentialSkillsValidator(JobApplication $application) {
161
-        return $this->skillsValidator($application, 'essential');
161
+        return $this->skillsValidator ($application, 'essential');
162 162
     }
163 163
 
164 164
     public function essentialSkillsComplete(JobApplication $application) {
165
-        return $this->essentialSkillsValidator($application)->passes();
165
+        return $this->essentialSkillsValidator ($application)->passes ();
166 166
     }
167 167
 
168 168
     public function assetSkillsValidator(JobApplication $application) {
169
-        return $this->skillsValidator($application, 'asset');
169
+        return $this->skillsValidator ($application, 'asset');
170 170
     }
171 171
 
172 172
     public function assetSkillsComplete(JobApplication $application) {
173
-        return $this->assetSkillsValidator($application)->passes();
173
+        return $this->assetSkillsValidator ($application)->passes ();
174 174
     }
175 175
 
176 176
     public function affirmationValidator(JobApplication $application) {
@@ -186,10 +186,10 @@  discard block
 block discarded – undo
186 186
                 'max:191',
187 187
             ]
188 188
         ];
189
-        return Validator::make($application->toArray(), $rules);
189
+        return Validator::make ($application->toArray (), $rules);
190 190
     }
191 191
 
192 192
     public function affirmationComplete(JobApplication $application) {
193
-        return $this->affirmationValidator($application)->passes();
193
+        return $this->affirmationValidator ($application)->passes ();
194 194
     }
195 195
 }
Please login to merge, or discard this patch.
app/Services/Validation/BaseDataValidator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
      */
15 15
     public function validate(array $data): void
16 16
     {
17
-        $this->validator($data)->validate();
17
+        $this->validator ($data)->validate ();
18 18
     }
19 19
 
20 20
     /**
@@ -25,6 +25,6 @@  discard block
 block discarded – undo
25 25
      */
26 26
     public function isValid(array $data) : bool
27 27
     {
28
-        return $this->validator($data)->passes();
28
+        return $this->validator ($data)->passes ();
29 29
     }
30 30
 }
Please login to merge, or discard this patch.
app/Models/SkillDeclaration.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -50,31 +50,31 @@
 block discarded – undo
50 50
 
51 51
     public function skill()// phpcs:ignore
52 52
     {
53
-        return $this->belongsTo(\App\Models\Skill::class);
53
+        return $this->belongsTo (\App\Models\Skill::class);
54 54
     }
55 55
 
56 56
     public function skill_status()// phpcs:ignore
57 57
     {
58
-        return $this->belongsTo(\App\Models\Lookup\SkillStatus::class);
58
+        return $this->belongsTo (\App\Models\Lookup\SkillStatus::class);
59 59
     }
60 60
 
61 61
     public function skill_level()// phpcs:ignore
62 62
     {
63
-        return $this->belongsTo(\App\Models\Lookup\SkillLevel::class);
63
+        return $this->belongsTo (\App\Models\Lookup\SkillLevel::class);
64 64
     }
65 65
 
66 66
     public function applicant()// phpcs:ignore
67 67
     {
68
-        return $this->belongsTo(\App\Models\Applicant::class);
68
+        return $this->belongsTo (\App\Models\Applicant::class);
69 69
     }
70 70
 
71 71
     public function references()// phpcs:ignore
72 72
     {
73
-        return $this->belongsToMany(\App\Models\Reference::class);
73
+        return $this->belongsToMany (\App\Models\Reference::class);
74 74
     }
75 75
 
76 76
     public function work_samples()// phpcs:ignore
77 77
     {
78
-        return $this->belongsToMany(\App\Models\WorkSample::class);
78
+        return $this->belongsToMany (\App\Models\WorkSample::class);
79 79
     }
80 80
 }
Please login to merge, or discard this patch.
app/Models/WorkplacePhoto.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
     ];
31 31
 
32 32
     public function workplace_photo_caption() {
33
-        return $this->hasOne(\App\Models\WorkplacePhotoCaption::class);
33
+        return $this->hasOne (\App\Models\WorkplacePhotoCaption::class);
34 34
     }
35 35
 
36 36
 }
Please login to merge, or discard this patch.