Skip to content

Commit a495639

Browse files
viralsolaniviralsolani
authored
Merge pull request #18 from viralsolani/analysis-8KJaDA
Apply fixes from StyleCI
2 parents 0e316be + ade26d1 commit a495639

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+489
-488
lines changed

‎app/Http/Controllers/Backend/Blogs/BlogsController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function createTagsArray($tags)
155155
if (is_numeric($tag)) {
156156
$tags_array[] = $tag;
157157
} else {
158-
$newTag = BlogTag::create(['name'=>$tag, 'status'=>1, 'created_by'=>1]);
158+
$newTag = BlogTag::create(['name' => $tag, 'status' => 1, 'created_by' => 1]);
159159
$tags_array[] = $newTag->id;
160160
}
161161
}

‎app/Http/Controllers/Frontend/Auth/ResetPasswordController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ public function showResetForm($token = null)
6363
protected function rules()
6464
{
6565
return [
66-
'token' => 'required',
67-
'email' => 'required|email',
68-
'password' => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
66+
'token' => 'required',
67+
'email' => 'required|email',
68+
'password' => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
6969
];
7070
}
7171

‎app/Http/Middleware/VerifyJWTToken.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function handle($request, Closure $next)
2626
} elseif ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) {
2727
return response()->json(['token_invalid'], $e->getStatusCode());
2828
} else {
29-
return response()->json(['error'=>'Token is required']);
29+
return response()->json(['error' => 'Token is required']);
3030
}
3131
}
3232

‎app/Http/Requests/Backend/Access/User/StoreUserRequest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ public function authorize()
2828
public function rules()
2929
{
3030
return [
31-
'first_name' => 'required|max:255',
32-
'last_name' => 'required|max:255',
33-
'email' => ['required', 'email', 'max:255', Rule::unique('users')],
34-
'password' => 'required|min:6|confirmed',
35-
'state_id' => 'required',
36-
'city_id' => 'required',
37-
'zip_code' => 'required|regex:/^[0-9]+$/',
38-
'ssn' => 'required|regex:/^[0-9]+$/|max:9|min:9',
31+
'first_name' => 'required|max:255',
32+
'last_name' => 'required|max:255',
33+
'email' => ['required', 'email', 'max:255', Rule::unique('users')],
34+
'password' => 'required|min:6|confirmed',
35+
'state_id' => 'required',
36+
'city_id' => 'required',
37+
'zip_code' => 'required|regex:/^[0-9]+$/',
38+
'ssn' => 'required|regex:/^[0-9]+$/|max:9|min:9',
3939
];
4040
}
4141

‎app/Http/Requests/Backend/Access/User/UpdateUserRequest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public function authorize()
2727
public function rules()
2828
{
2929
return [
30-
'email' => 'required|email',
31-
'first_name' => 'required',
32-
'last_name' => 'required',
33-
'state_id' => 'required',
34-
'city_id' => 'required',
35-
'zip_code' => 'required|regex:/^[0-9]+$/',
36-
'ssn' => 'required|regex:/^[0-9]+$/|max:9|min:9',
30+
'email' => 'required|email',
31+
'first_name' => 'required',
32+
'last_name' => 'required',
33+
'state_id' => 'required',
34+
'city_id' => 'required',
35+
'zip_code' => 'required|regex:/^[0-9]+$/',
36+
'ssn' => 'required|regex:/^[0-9]+$/|max:9|min:9',
3737
];
3838
}
3939

‎app/Http/Requests/Backend/Faqs/StoreFaqsRequest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
'question' => 'required|max:191',
28-
'answer' => 'required',
27+
'question' => 'required|max:191',
28+
'answer' => 'required',
2929
];
3030
}
3131

@@ -37,9 +37,9 @@ public function rules()
3737
public function messages()
3838
{
3939
return [
40-
'question.required' => 'Question field is required.',
41-
'question.max' => 'Question may not be grater than 191 character.',
42-
'answer.required' => 'Answer field is required.',
40+
'question.required' => 'Question field is required.',
41+
'question.max' => 'Question may not be grater than 191 character.',
42+
'answer.required' => 'Answer field is required.',
4343
];
4444
}
4545
}

‎app/Http/Requests/Backend/Faqs/UpdateFaqsRequest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public function authorize()
2424
public function rules()
2525
{
2626
return [
27-
'question' => 'required|max:191',
28-
'answer' => 'required',
27+
'question' => 'required|max:191',
28+
'answer' => 'required',
2929
];
3030
}
3131

@@ -37,9 +37,9 @@ public function rules()
3737
public function messages()
3838
{
3939
return [
40-
'question.required' => 'Question field is required.',
41-
'question.max' => 'Question may not be grater than 191 character.',
42-
'answer.required' => 'Answer field is required.',
40+
'question.required' => 'Question field is required.',
41+
'question.max' => 'Question may not be grater than 191 character.',
42+
'answer.required' => 'Answer field is required.',
4343
];
4444
}
4545
}

‎app/Http/Requests/Backend/Modules/StoreModuleRequest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ public function rules()
4242
public function messages()
4343
{
4444
return [
45-
'name.required' => 'Module Name field is required to be filled',
46-
'name.max' => 'Module Name should not exceed 191 characters',
47-
'name.unique' => 'Module Name is already taken',
48-
'directory_name.required' => 'Directory Name field is required to be filled',
49-
'model_name.required' => 'Model Name field is required to be filled',
45+
'name.required' => 'Module Name field is required to be filled',
46+
'name.max' => 'Module Name should not exceed 191 characters',
47+
'name.unique' => 'Module Name is already taken',
48+
'directory_name.required' => 'Directory Name field is required to be filled',
49+
'model_name.required' => 'Model Name field is required to be filled',
5050
];
5151
}
5252
}

‎app/Http/Requests/Backend/Settings/UpdateSettingsRequest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ public function rules()
5757
public function messages()
5858
{
5959
return [
60-
'logo.dimensions' => 'Invalid logo - should be minimum 226*48',
61-
'favicon.dimensions' => 'Invalid icon - should be 16*16',
62-
'logo.required' => 'The logo field is required in seo settings.',
63-
'favicon.required' => 'The favicon field is required in seo settings.',
64-
'from_name.required' => 'The from name field is required in mail settings.',
65-
'from_email.required' => 'The from email field is required in mail settings.',
60+
'logo.dimensions' => 'Invalid logo - should be minimum 226*48',
61+
'favicon.dimensions' => 'Invalid icon - should be 16*16',
62+
'logo.required' => 'The logo field is required in seo settings.',
63+
'favicon.required' => 'The favicon field is required in seo settings.',
64+
'from_name.required' => 'The from name field is required in mail settings.',
65+
'from_email.required' => 'The from email field is required in mail settings.',
6666
];
6767
}
6868
}

‎app/Http/Requests/Frontend/Auth/RegisterRequest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ public function authorize()
2828
public function rules()
2929
{
3030
return [
31-
'first_name' => 'required|max:255',
32-
'last_name' => 'required|max:255',
33-
'email' => ['required', 'email', 'max:255', Rule::unique('users')],
34-
'password' => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
35-
'state_id' => 'required',
36-
'city_id' => 'required',
37-
'zip_code' => 'required',
38-
'ssn' => 'required',
39-
'is_term_accept' => 'required',
40-
'g-recaptcha-response' => 'required_if:captcha_status,true|captcha',
31+
'first_name' => 'required|max:255',
32+
'last_name' => 'required|max:255',
33+
'email' => ['required', 'email', 'max:255', Rule::unique('users')],
34+
'password' => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
35+
'state_id' => 'required',
36+
'city_id' => 'required',
37+
'zip_code' => 'required',
38+
'ssn' => 'required',
39+
'is_term_accept' => 'required',
40+
'g-recaptcha-response' => 'required_if:captcha_status,true|captcha',
4141
];
4242
}
4343

0 commit comments

Comments
 (0)