Skip to content

Commit 4e6d759

Browse files
jeremykenedyjeremykenedy
authored
Merge pull request #405 from jeremykenedy/analysis-kYn11G
Apply fixes from StyleCI
2 parents 0b654c1 + 25e4f30 commit 4e6d759

File tree

60 files changed

+146
-188
lines changed

Some content is hidden

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

60 files changed

+146
-188
lines changed

‎app/Console/Kernel.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class Kernel extends ConsoleKernel
1919
/**
2020
* Define the application's command schedule.
2121
*
22-
* @param \Illuminate\Console\Scheduling\Schedule $schedule
23-
*
22+
* @param \Illuminate\Console\Scheduling\Schedule $schedule
2423
* @return void
2524
*/
2625
protected function schedule(Schedule $schedule)

‎app/Exceptions/Handler.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ public function register()
5959
/**
6060
* Render an exception into an HTTP response.
6161
*
62-
* @param \Illuminate\Http\Request $request
63-
* @param \Throwable $e
64-
*
62+
* @param \Illuminate\Http\Request $request
63+
* @param \Throwable $e
6564
* @return \Illuminate\Http\Response
6665
*/
6766
public function render($request, Throwable $e)
@@ -87,8 +86,7 @@ public function render($request, Throwable $e)
8786
/**
8887
* Sends an email upon exception.
8988
*
90-
* @param \Throwable $exception
91-
*
89+
* @param \Throwable $exception
9290
* @return void
9391
*/
9492
public function sendEmail(Throwable $exception)

‎app/Exceptions/SocialProviderDeniedException.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ class SocialProviderDeniedException extends Exception
99
/**
1010
* Render the exception as an HTTP response.
1111
*
12-
* @param \Illuminate\Http\Request $request
13-
*
12+
* @param \Illuminate\Http\Request $request
1413
* @return \Illuminate\Http\Response
1514
*/
1615
public function render($request)

‎app/Http/Controllers/Api/CategoryController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ public function index(Request $request)
3535

3636
$orderColumn = request('order_column', 'created_at');
3737

38-
if (!in_array($orderColumn, ['id', 'name', 'created_at'])) {
38+
if (! in_array($orderColumn, ['id', 'name', 'created_at'])) {
3939
$orderColumn = 'created_at';
4040
}
4141

4242
$orderDirection = request('order_direction', 'desc');
4343

44-
if (!in_array($orderDirection, ['asc', 'desc'])) {
44+
if (! in_array($orderDirection, ['asc', 'desc'])) {
4545
$orderDirection = 'desc';
4646
}
4747

‎app/Http/Controllers/Api/PostController.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ public function index(Request $request)
3535

3636
$orderColumn = request('order_column', 'created_at');
3737

38-
if (!in_array($orderColumn, ['id', 'title', 'created_at'])) {
38+
if (! in_array($orderColumn, ['id', 'title', 'created_at'])) {
3939
$orderColumn = 'created_at';
4040
}
4141

4242
$orderDirection = request('order_direction', 'desc');
4343

44-
if (!in_array($orderDirection, ['asc', 'desc'])) {
44+
if (! in_array($orderDirection, ['asc', 'desc'])) {
4545
$orderDirection = 'desc';
4646
}
4747

@@ -72,7 +72,7 @@ public function index(Request $request)
7272
->orWhere('content', 'like', '%'.request('search_global').'%');
7373
});
7474
})
75-
->when(!auth()->user()->hasPermission('Can Edit Articles'), function ($query) {
75+
->when(! auth()->user()->hasPermission('Can Edit Articles'), function ($query) {
7676
return $query->where('user_id', auth()->id());
7777
})
7878

@@ -101,7 +101,7 @@ public function store(StorePostRequest $request)
101101

102102
public function show(ShowPostRequest $request, Post $post)
103103
{
104-
if ($post->user_id !== auth()->user()->id && !auth()->user()->hasPermission('Can View Articles')) {
104+
if ($post->user_id !== auth()->user()->id && ! auth()->user()->hasPermission('Can View Articles')) {
105105
return response()->json(['status' => 405, 'success' => false, 'message' => 'You can only edit your own posts']);
106106
} else {
107107
return new PostResource($post);
@@ -110,7 +110,7 @@ public function show(ShowPostRequest $request, Post $post)
110110

111111
public function update(StorePostRequest $request, Post $post)
112112
{
113-
if ($post->user_id !== auth()->id() && !auth()->user()->hasPermission('Can Edit Articles')) {
113+
if ($post->user_id !== auth()->id() && ! auth()->user()->hasPermission('Can Edit Articles')) {
114114
return response()->json(['status' => 405, 'success' => false, 'message' => 'You can only edit your own posts']);
115115
} else {
116116
$post->update($request->validated());
@@ -124,7 +124,7 @@ public function update(StorePostRequest $request, Post $post)
124124

125125
public function destroy(DeletePostRequest $request, Post $post)
126126
{
127-
if ($post->user_id !== auth()->id() && !auth()->user()->hasPermission('delete.articles')) {
127+
if ($post->user_id !== auth()->id() && ! auth()->user()->hasPermission('delete.articles')) {
128128
return response()->json([
129129
'status' => 405,
130130
'success' => false,

‎app/Http/Controllers/Api/ProfileController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function user(Request $request)
3636
public function darkModeToggle(Request $request)
3737
{
3838
$user = Auth::user();
39-
$user->theme_dark = !$user->theme_dark;
39+
$user->theme_dark = ! $user->theme_dark;
4040

4141
if ($user->save()) {
4242
return $this->successResponse($user->theme_dark, 'Mode Switched');

‎app/Http/Controllers/Api/UserController.php‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ public function __construct()
2323
/**
2424
* Tap the guard we need.
2525
*
26-
* @param string $guard
27-
*
26+
* @param string $guard
2827
* @return middleware guard
2928
*/
3029
protected function guard($guard = 'web')
@@ -35,8 +34,7 @@ protected function guard($guard = 'web')
3534
/**
3635
* Retreive the user by sanctum middleware.
3736
*
38-
* @param \Illuminate\Http\Request $request
39-
*
37+
* @param \Illuminate\Http\Request $request
4038
* @return \Illuminate\Http\Response
4139
*/
4240
public function user(Request $request)
@@ -49,8 +47,7 @@ public function user(Request $request)
4947
/**
5048
* Retreive the user by sanctum authtoken.
5149
*
52-
* @param \Illuminate\Http\Request $request
53-
*
50+
* @param \Illuminate\Http\Request $request
5451
* @return \Illuminate\Http\Response
5552
*/
5653
public function userByToken(Request $request)
@@ -70,14 +67,13 @@ public function userByToken(Request $request)
7067
/**
7168
* Process request to download user data.
7269
*
73-
* @param \App\Models\User $user
74-
* @param \Illuminate\Http\Request $request
75-
*
70+
* @param \App\Models\User $user
71+
* @param \Illuminate\Http\Request $request
7672
* @return \Illuminate\Http\Response
7773
*/
7874
public function exportUserPersonalData(User $user, Request $request)
7975
{
80-
if (!auth('sanctum')->check()) {
76+
if (! auth('sanctum')->check()) {
8177
abort(403);
8278
}
8379

@@ -98,14 +94,13 @@ public function exportUserPersonalData(User $user, Request $request)
9894
/**
9995
* Delete the users account.
10096
*
101-
* @param \App\Models\User $user
102-
* @param \Illuminate\Http\Request $request
103-
*
97+
* @param \App\Models\User $user
98+
* @param \Illuminate\Http\Request $request
10499
* @return \Illuminate\Http\Response
105100
*/
106101
public function deleteUserAccount(User $user, Request $request)
107102
{
108-
if (!auth('sanctum')->check()) {
103+
if (! auth('sanctum')->check()) {
109104
abort(403);
110105
}
111106

‎app/Http/Controllers/Api/UsersController.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ public function __construct()
3131
/**
3232
* Tap the guard we need.
3333
*
34-
* @param string $guard
35-
*
34+
* @param string $guard
3635
* @return middleware guard
3736
*/
3837
protected function guard($guard = 'web')

‎app/Http/Controllers/Auth/AuthenticatedSessionController.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ public function create()
2727
/**
2828
* Handle an incoming authentication request.
2929
*
30-
* @param \App\Http\Requests\Auth\LoginRequest $request
31-
*
30+
* @param \App\Http\Requests\Auth\LoginRequest $request
3231
* @return \Illuminate\Http\RedirectResponse
3332
*/
3433
public function login(LoginRequest $request)
@@ -58,8 +57,7 @@ public function login(LoginRequest $request)
5857
/**
5958
* Destroy an authenticated session.
6059
*
61-
* @param \Illuminate\Http\Request $request
62-
*
60+
* @param \Illuminate\Http\Request $request
6361
* @return \Illuminate\Http\RedirectResponse
6462
*/
6563
public function logout(Request $request)
@@ -91,8 +89,7 @@ public function logout(Request $request)
9189
/**
9290
* Create User.
9391
*
94-
* @param RegisterRequest $request
95-
*
92+
* @param RegisterRequest $request
9693
* @return JsonResponse
9794
*/
9895
public function register(RegisterRequest $request)

‎app/Http/Controllers/Auth/ImpersonateController.php‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ public function __construct()
2828
/**
2929
* Impersonate a user, store the token for returning.
3030
*
31-
* @param \App\Http\Requests\Users\ImpersonateUserRequest $request
32-
* @param \App\Models\User $user
33-
*
31+
* @param \App\Http\Requests\Users\ImpersonateUserRequest $request
32+
* @param \App\Models\User $user
3433
* @return \Illuminate\Http\Response
3534
*/
3635
public function impersonate(ImpersonateUserRequest $request, User $user)
@@ -42,7 +41,7 @@ public function impersonate(ImpersonateUserRequest $request, User $user)
4241
abort(418);
4342
}
4443

45-
if (!$impersonatee || !$impersonatee->canBeImpersonated() || !$impersonator->canImpersonate()) {
44+
if (! $impersonatee || ! $impersonatee->canBeImpersonated() || ! $impersonator->canImpersonate()) {
4645
abort(403);
4746
}
4847

@@ -71,8 +70,7 @@ public function impersonate(ImpersonateUserRequest $request, User $user)
7170
/**
7271
* Leave impersonating a user.
7372
*
74-
* @param \App\Http\Requests\Users\ImpersonateUserRequest $request
75-
*
73+
* @param \App\Http\Requests\Users\ImpersonateUserRequest $request
7674
* @return \Illuminate\Http\Response
7775
*/
7876
public function leaveImpersonate(LeaveImpersonateUserRequest $request)
@@ -106,8 +104,7 @@ public function leaveImpersonate(LeaveImpersonateUserRequest $request)
106104
/**
107105
* Logout a user herlper function.
108106
*
109-
* @param \App\Models\User $user
110-
*
107+
* @param \App\Models\User $user
111108
* @return void
112109
*/
113110
public function logoutUser($user)
@@ -120,8 +117,7 @@ public function logoutUser($user)
120117
/**
121118
* Access the web guard middleware.
122119
*
123-
* @param string $guard
124-
*
120+
* @param string $guard
125121
* @return App\Http\Kernel::middlewareGroups['web']
126122
*/
127123
public function guard($guard = 'web')

0 commit comments

Comments
 (0)