Skip to content

Commit a8bfef8

Browse files
jeremykenedyjeremykenedy
authored
Merge pull request jeremykenedy#12 from jeremykenedy/analysis-qgwnj1
Apply fixes from StyleCI
2 parents 486cda0 + 7abb8e8 commit a8bfef8

File tree

6 files changed

+108
-107
lines changed

6 files changed

+108
-107
lines changed

‎src/App/Http/Controllers/UsersManagementController.php‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
namespace jeremykenedy\laravelusers\App\Http\Controllers;
44

55
use App\Http\Controllers\Controller;
6-
use App\Http\Requests;
76
use Auth;
8-
use Illuminate\Foundation\Auth\RegistersUsers;
97
use Illuminate\Http\Request;
108
use Validator;
119

@@ -82,7 +80,7 @@ public function create()
8280
/**
8381
* Store a newly created resource in storage.
8482
*
85-
* @param \Illuminate\Http\Request $request
83+
* @param \Illuminate\Http\Request $request
8684
*
8785
* @return \Illuminate\Http\Response
8886
*/
@@ -133,7 +131,7 @@ public function store(Request $request)
133131
/**
134132
* Display the specified resource.
135133
*
136-
* @param int $id
134+
* @param int $id
137135
*
138136
* @return \Illuminate\Http\Response
139137
*/
@@ -147,14 +145,15 @@ public function show($id)
147145
/**
148146
* Show the form for editing the specified resource.
149147
*
150-
* @param int $id
148+
* @param int $id
149+
*
151150
* @return \Illuminate\Http\Response
152151
*/
153152
public function edit($id)
154153
{
155-
$user = config('laravelusers.defaultUserModel')::findOrFail($id);
156-
$roles = [];
157-
$currentRole = '';
154+
$user = config('laravelusers.defaultUserModel')::findOrFail($id);
155+
$roles = [];
156+
$currentRole = '';
158157

159158
if ($this->_rolesEnabled) {
160159
$roles = config('laravelusers.roleModel')::all();
@@ -170,8 +169,8 @@ public function edit($id)
170169
];
171170

172171
if ($this->_rolesEnabled) {
173-
$data['roles'] = $roles;
174-
$data['currentRole'] = $currentRole;
172+
$data['roles'] = $roles;
173+
$data['currentRole'] = $currentRole;
175174
}
176175

177176
return view('laravelusers::usersmanagement.edit-user')->with($data);
@@ -180,16 +179,16 @@ public function edit($id)
180179
/**
181180
* Update the specified resource in storage.
182181
*
183-
* @param \Illuminate\Http\Request $request
184-
* @param int $id
182+
* @param \Illuminate\Http\Request $request
183+
* @param int $id
185184
*
186185
* @return \Illuminate\Http\Response
187186
*/
188187
public function update(Request $request, $id)
189188
{
190-
$user = config('laravelusers.defaultUserModel')::find($id);
191-
$emailCheck = ($request->input('email') != '') && ($request->input('email') != $user->email);
192-
$passwordCheck = $request->input('password') != null;
189+
$user = config('laravelusers.defaultUserModel')::find($id);
190+
$emailCheck = ($request->input('email') != '') && ($request->input('email') != $user->email);
191+
$passwordCheck = $request->input('password') != null;
193192

194193
$rules = [
195194
'name' => 'required|max:255',
@@ -210,7 +209,6 @@ public function update(Request $request, $id)
210209

211210
$validator = Validator::make($request->all(), $rules);
212211

213-
214212
if ($validator->fails()) {
215213
return back()->withErrors($validator)->withInput();
216214
}
@@ -238,7 +236,7 @@ public function update(Request $request, $id)
238236
/**
239237
* Remove the specified resource from storage.
240238
*
241-
* @param int $id
239+
* @param int $id
242240
*
243241
* @return \Illuminate\Http\Response
244242
*/
@@ -249,6 +247,7 @@ public function destroy($id)
249247

250248
if ($currentUser != $user) {
251249
$user->delete();
250+
252251
return redirect('users')->with('success', trans('laravelusers::laravelusers.messages.delete-success'));
253252
}
254253

‎src/LaravelUsersServiceProvider.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class LaravelUsersServiceProvider extends ServiceProvider
2222
*/
2323
public function boot()
2424
{
25-
$this->loadTranslationsFrom(__DIR__ . '/resources/lang/', $this->_packageTag);
25+
$this->loadTranslationsFrom(__DIR__.'/resources/lang/', $this->_packageTag);
2626
}
2727

2828
/**
@@ -32,9 +32,9 @@ public function boot()
3232
*/
3333
public function register()
3434
{
35-
$this->loadRoutesFrom(__DIR__ . '/routes/web.php');
36-
$this->loadViewsFrom(__DIR__ . '/resources/views/', $this->_packageTag);
37-
$this->mergeConfigFrom(__DIR__.'/config/' . $this->_packageTag . '.php', $this->_packageTag);
35+
$this->loadRoutesFrom(__DIR__.'/routes/web.php');
36+
$this->loadViewsFrom(__DIR__.'/resources/views/', $this->_packageTag);
37+
$this->mergeConfigFrom(__DIR__.'/config/'.$this->_packageTag.'.php', $this->_packageTag);
3838
$this->publishFiles();
3939
$this->app->make('jeremykenedy\laravelusers\App\Http\Controllers\UsersManagementController');
4040
$this->app->singleton(UsersManagementController::class, function () {
@@ -53,15 +53,15 @@ private function publishFiles()
5353
$publishTag = $this->_packageTag;
5454

5555
$this->publishes([
56-
__DIR__ . '/config/' . $this->_packageTag . '.php' => base_path('config/' . $this->_packageTag . '.php'),
56+
__DIR__.'/config/'.$this->_packageTag.'.php' => base_path('config/'.$this->_packageTag.'.php'),
5757
], $publishTag);
5858

5959
$this->publishes([
60-
__DIR__ . '/resources/views' => resource_path('views/vendor/' . $this->_packageTag),
60+
__DIR__.'/resources/views' => resource_path('views/vendor/'.$this->_packageTag),
6161
], $publishTag);
6262

6363
$this->publishes([
64-
__DIR__ . '/resources/lang' => resource_path('lang/vendor/' . $this->_packageTag),
64+
__DIR__.'/resources/lang' => resource_path('lang/vendor/'.$this->_packageTag),
6565
], $publishTag);
6666
}
6767
}

‎src/resources/lang/en/forms.php‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -11,83 +11,83 @@
1111
|
1212
*/
1313

14-
// CREATE NEW USER FORM
15-
'create_user_label_email' => 'User Email',
16-
'create_user_ph_email' => 'User Email',
17-
'create_user_icon_email' => 'fa-envelope',
14+
// CREATE NEW USER FORM
15+
'create_user_label_email' => 'User Email',
16+
'create_user_ph_email' => 'User Email',
17+
'create_user_icon_email' => 'fa-envelope',
1818

19-
'create_user_label_username' => 'Username',
20-
'create_user_ph_username' => 'Username',
21-
'create_user_icon_username' => 'fa-user',
19+
'create_user_label_username' => 'Username',
20+
'create_user_ph_username' => 'Username',
21+
'create_user_icon_username' => 'fa-user',
2222

23-
'create_user_label_firstname' => 'First Name',
24-
'create_user_ph_firstname' => 'First Name',
25-
'create_user_icon_firstname' => 'fa-user',
23+
'create_user_label_firstname' => 'First Name',
24+
'create_user_ph_firstname' => 'First Name',
25+
'create_user_icon_firstname' => 'fa-user',
2626

27-
'create_user_label_lastname' => 'Last Name',
28-
'create_user_ph_lastname' => 'Last Name',
29-
'create_user_icon_lastname' => 'fa-user',
27+
'create_user_label_lastname' => 'Last Name',
28+
'create_user_ph_lastname' => 'Last Name',
29+
'create_user_icon_lastname' => 'fa-user',
3030

31-
'create_user_label_password' => 'Password',
32-
'create_user_ph_password' => 'Password',
33-
'create_user_icon_password' => 'fa-lock',
31+
'create_user_label_password' => 'Password',
32+
'create_user_ph_password' => 'Password',
33+
'create_user_icon_password' => 'fa-lock',
3434

35-
'create_user_label_pw_confirmation' => 'Confirm Password',
36-
'create_user_ph_pw_confirmation' => 'Confirm Password',
37-
'create_user_icon_pw_confirmation' => 'fa-lock',
35+
'create_user_label_pw_confirmation' => 'Confirm Password',
36+
'create_user_ph_pw_confirmation' => 'Confirm Password',
37+
'create_user_icon_pw_confirmation' => 'fa-lock',
3838

39-
'create_user_label_location' => 'User Location',
40-
'create_user_ph_location' => 'User Location',
41-
'create_user_icon_location' => 'fa-map-marker',
39+
'create_user_label_location' => 'User Location',
40+
'create_user_ph_location' => 'User Location',
41+
'create_user_icon_location' => 'fa-map-marker',
4242

43-
'create_user_label_bio' => 'User Bio',
44-
'create_user_ph_bio' => 'User Bio',
45-
'create_user_icon_bio' => 'fa-pencil',
43+
'create_user_label_bio' => 'User Bio',
44+
'create_user_ph_bio' => 'User Bio',
45+
'create_user_icon_bio' => 'fa-pencil',
4646

47-
'create_user_label_twitter_username'=> 'User Twitter Username',
48-
'create_user_ph_twitter_username' => 'User Twitter Username',
49-
'create_user_icon_twitter_username' => 'fa-twitter',
47+
'create_user_label_twitter_username'=> 'User Twitter Username',
48+
'create_user_ph_twitter_username' => 'User Twitter Username',
49+
'create_user_icon_twitter_username' => 'fa-twitter',
5050

51-
'create_user_label_github_username' => 'User GitHub Username',
52-
'create_user_ph_github_username' => 'User GitHub Username',
53-
'create_user_icon_github_username' => 'fa-github',
51+
'create_user_label_github_username' => 'User GitHub Username',
52+
'create_user_ph_github_username' => 'User GitHub Username',
53+
'create_user_icon_github_username' => 'fa-github',
5454

55-
'create_user_label_career_title' => 'User Occupation',
56-
'create_user_ph_career_title' => 'User Occupation',
57-
'create_user_icon_career_title' => 'fa-briefcase',
55+
'create_user_label_career_title' => 'User Occupation',
56+
'create_user_ph_career_title' => 'User Occupation',
57+
'create_user_icon_career_title' => 'fa-briefcase',
5858

59-
'create_user_label_education' => 'User Education',
60-
'create_user_ph_education' => 'User Education',
61-
'create_user_icon_education' => 'fa-graduation-cap',
59+
'create_user_label_education' => 'User Education',
60+
'create_user_ph_education' => 'User Education',
61+
'create_user_icon_education' => 'fa-graduation-cap',
6262

6363
'create_user_label_role' => 'User Role',
6464
'create_user_ph_role' => 'Select User Role',
6565
'create_user_icon_role' => 'fas fa-fw fas fa-shield-alt',
6666

67-
'create_user_button_text' => '<i class="fa fa-user-plus" aria-hidden="true"></i> Create New User',
67+
'create_user_button_text' => '<i class="fa fa-user-plus" aria-hidden="true"></i> Create New User',
6868

69-
// EDIT USER AS ADMINISTRATOR FORM
70-
'edit-user-admin-title' => 'Edit User Information',
69+
// EDIT USER AS ADMINISTRATOR FORM
70+
'edit-user-admin-title' => 'Edit User Information',
7171

72-
'label-username' => 'Username',
73-
'ph-username' => 'Username',
72+
'label-username' => 'Username',
73+
'ph-username' => 'Username',
7474

75-
'label-useremail' => 'User Email',
76-
'ph-useremail' => 'User Email',
75+
'label-useremail' => 'User Email',
76+
'ph-useremail' => 'User Email',
7777

78-
'label-userrole_id' => 'User Access Level',
79-
'option-label' => 'Select a Level',
80-
'option-user' => 'User',
81-
'option-editor' => 'Editor',
82-
'option-admin' => 'Administrator',
83-
'submit-btn-text' => 'Edit the User!',
78+
'label-userrole_id' => 'User Access Level',
79+
'option-label' => 'Select a Level',
80+
'option-user' => 'User',
81+
'option-editor' => 'Editor',
82+
'option-admin' => 'Administrator',
83+
'submit-btn-text' => 'Edit the User!',
8484

85-
'submit-btn-icon' => 'fa-save',
86-
'username-icon' => 'fa-user',
87-
'useremail-icon' => 'fa-envelope-o',
85+
'submit-btn-icon' => 'fa-save',
86+
'username-icon' => 'fa-user',
87+
'useremail-icon' => 'fa-envelope-o',
8888

89-
'change-pw' => 'Change Password',
90-
'cancel' => 'Cancel',
91-
'save-changes' => '<i class="fa fa-fw fa-save" aria-hidden="true"></i> Save Changes',
89+
'change-pw' => 'Change Password',
90+
'cancel' => 'Cancel',
91+
'save-changes' => '<i class="fa fa-fw fa-save" aria-hidden="true"></i> Save Changes',
9292

9393
];

‎src/resources/lang/en/laravelusers.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,21 @@
4949
],
5050

5151
'messages' => [
52-
'userNameTaken' => 'Username is taken',
53-
'userNameRequired' => 'Username is required',
54-
'fNameRequired' => 'First Name is required',
55-
'lNameRequired' => 'Last Name is required',
56-
'emailRequired' => 'Email is required',
57-
'emailInvalid' => 'Email is invalid',
58-
'passwordRequired' => 'Password is required',
59-
'PasswordMin' => 'Password needs to have at least 6 characters',
60-
'PasswordMax' => 'Password maximum length is 20 characters',
61-
'captchaRequire' => 'Captcha is required',
62-
'CaptchaWrong' => 'Wrong captcha, please try again.',
63-
'roleRequired' => 'User role is required.',
64-
'user-creation-success' => 'Successfully created user!',
65-
'update-user-success' => 'Successfully updated user!',
66-
'delete-success' => 'Successfully deleted the user!',
52+
'userNameTaken' => 'Username is taken',
53+
'userNameRequired' => 'Username is required',
54+
'fNameRequired' => 'First Name is required',
55+
'lNameRequired' => 'Last Name is required',
56+
'emailRequired' => 'Email is required',
57+
'emailInvalid' => 'Email is invalid',
58+
'passwordRequired' => 'Password is required',
59+
'PasswordMin' => 'Password needs to have at least 6 characters',
60+
'PasswordMax' => 'Password maximum length is 20 characters',
61+
'captchaRequire' => 'Captcha is required',
62+
'CaptchaWrong' => 'Wrong captcha, please try again.',
63+
'roleRequired' => 'User role is required.',
64+
'user-creation-success' => 'Successfully created user!',
65+
'update-user-success' => 'Successfully updated user!',
66+
'delete-success' => 'Successfully deleted the user!',
6767
'cannot-delete-yourself' => 'You cannot delete yourself!',
6868
],
6969

‎src/routes/web.php‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99

1010
// APP Routes Below
1111
Route::group(['middleware' => 'web', 'namespace' => 'jeremykenedy\laravelusers\app\Http\Controllers'], function () {
12-
13-
Route::resource('users', 'UsersManagementController', [
14-
'names' => [
15-
'index' => 'users',
16-
'destroy' => 'user.destroy'
17-
]
18-
]);
19-
12+
Route::resource('users', 'UsersManagementController', [
13+
'names' => [
14+
'index' => 'users',
15+
'destroy' => 'user.destroy',
16+
],
17+
]);
2018
});

‎tests/TestCase.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
class TestCase extends OrchestraTestCase
1010
{
1111
/**
12-
* Load package service provider
13-
* @param \Illuminate\Foundation\Application $app
12+
* Load package service provider.
13+
*
14+
* @param \Illuminate\Foundation\Application $app
15+
*
1416
* @return jeremykenedy\laravelusers\LaravelUsersServiceProvider
1517
*/
1618
protected function getPackageProviders($app)
@@ -19,8 +21,10 @@ protected function getPackageProviders($app)
1921
}
2022

2123
/**
22-
* Load package alias
23-
* @param \Illuminate\Foundation\Application $app
24+
* Load package alias.
25+
*
26+
* @param \Illuminate\Foundation\Application $app
27+
*
2428
* @return array
2529
*/
2630
protected function getPackageAliases($app)

0 commit comments

Comments
 (0)