Skip to content

Commit d1be29f

Browse files
authored
Code formatting (#76)
* Remove backslashes from functions in classes * Use `auth()->guard()` instead of `auth()` for better autocompletion * Use Laravel password defaults
1 parent 979f814 commit d1be29f

16 files changed

+46
-67
lines changed

app/Enums/Permission.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ enum Permission: string
1717

1818
public static function values(): array
1919
{
20-
return \collect(self::cases())->map(fn ($case): string => $case->value)->toArray();
20+
return collect(self::cases())->map(fn ($case): string => $case->value)->toArray();
2121
}
2222
}

app/Enums/Role.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ enum Role: string
1010

1111
public static function values(): array
1212
{
13-
return \collect(self::cases())->map(fn ($case): string => $case->value)->toArray();
13+
return collect(self::cases())->map(fn ($case): string => $case->value)->toArray();
1414
}
1515
}

app/Filament/Resources/OrganisationResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static function formSchema()
6565
->label('Owner')
6666
->required()
6767
->options(User::all()->pluck('full_name', 'id')->toArray())
68-
->default(fn (): int => \auth()->id() ?: null),
68+
->default(fn (): int => auth()->guard()->id() ?: null),
6969
];
7070
}
7171

app/Http/Controllers/AccountController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class AccountController extends Controller
1010
{
1111
public function edit(Request $request)
1212
{
13-
return \inertia('Account/Edit', [
13+
return inertia('Account/Edit', [
1414
'user' => UserResource::make($request->user()),
1515
]);
1616
}
@@ -20,8 +20,8 @@ public function update(AccountUpdateRequest $request)
2020
$request->user()->update($request->only('first_name', 'last_name', 'email'));
2121
$request->user()->updatePassword($request->validated('password'));
2222

23-
\session()->flash('success', \__('account.updated'));
23+
session()->flash('success', __('account.updated'));
2424

25-
return \redirect()->back();
25+
return redirect()->back();
2626
}
2727
}

app/Http/Controllers/DashboardController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ class DashboardController extends Controller
66
{
77
public function index()
88
{
9-
return \inertia('Dashboard/Index');
9+
return inertia('Dashboard/Index');
1010
}
1111
}

app/Http/Controllers/EmailVerificationController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ class EmailVerificationController extends Controller
99
{
1010
public function show()
1111
{
12-
return \inertia('EmailVerification/Show');
12+
return inertia('EmailVerification/Show');
1313
}
1414

1515
public function store(EmailVerificationRequest $request)
1616
{
1717
$request->fulfill();
1818

19-
return \redirect()->route('home');
19+
return redirect()->route('home');
2020
}
2121

2222
public function update(Request $request)
2323
{
2424
$request->user()->sendEmailVerificationNotification();
2525

26-
\session()->flash('success', \__('account.verification-resent'));
26+
session()->flash('success', __('account.verification-resent'));
2727

28-
return \back();
28+
return back();
2929
}
3030
}

app/Http/Controllers/LoginController.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ class LoginController extends Controller
1010
{
1111
public function show(Request $request)
1212
{
13-
$isProd = \app()->environment('production');
13+
$isProd = app()->environment('production');
1414

15-
return \inertia('Login/Show', [
16-
'email' => ! $isProd ? \config('app.seed.emails.super', '') : '',
15+
return inertia('Login/Show', [
16+
'email' => ! $isProd ? config('app.seed.emails.super', '') : '',
1717
'password' => ! $isProd ? '12345' : '',
1818
'remember' => ! $isProd ? true : false,
1919
'redirect' => $request->query('redirect', ''),
@@ -22,19 +22,19 @@ public function show(Request $request)
2222

2323
public function store(LoginStoreRequest $request)
2424
{
25-
\throw_if(
26-
! \auth()->attempt($request->only('email', 'password'), $request->only('remember')),
25+
throw_if(
26+
! auth()->guard()->attempt($request->only('email', 'password'), $request->only('remember')),
2727
ValidationException::withMessages([
28-
'email' => \__('auth.failed'),
28+
'email' => __('auth.failed'),
2929
])
3030
);
3131

3232
$request->session()->regenerate();
3333

3434
if ($request->validated('redirect')) {
35-
return \redirect()->to($request->validated('redirect'));
35+
return redirect()->to($request->validated('redirect'));
3636
}
3737

38-
return \redirect()->route('home');
38+
return redirect()->route('home');
3939
}
4040
}

app/Http/Controllers/LogoutController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ class LogoutController extends Controller
88
{
99
public function __invoke(Request $request)
1010
{
11-
\auth()->logout();
11+
auth()->guard()->logout();
1212

1313
$request->session()->invalidate();
1414
$request->session()->regenerateToken();
1515

16-
return \redirect()->route('login');
16+
return redirect()->route('login');
1717
}
1818
}

app/Http/Controllers/OrganisationController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class OrganisationController extends Controller
1010
{
1111
public function edit(OrganisationEditRequest $request)
1212
{
13-
return \inertia('Organisation/Edit', [
13+
return inertia('Organisation/Edit', [
1414
'organisation' => OrganisationResource::make($request->user()->organisation),
1515
]);
1616
}
@@ -19,8 +19,8 @@ public function update(OrganisationUpdateRequest $request)
1919
{
2020
$request->user()->organisation->update($request->only('name'));
2121

22-
\session()->flash('success', \__('organisation.updated'));
22+
session()->flash('success', __('organisation.updated'));
2323

24-
return \back();
24+
return back();
2525
}
2626
}

app/Http/Controllers/RegisterController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class RegisterController extends Controller
1111
{
1212
public function show()
1313
{
14-
return \inertia('Register/Show', \app()->environment('local') ? [
14+
return inertia('Register/Show', app()->environment('local') ? [
1515
'first_name' => 'Jim',
1616
'last_name' => 'Gordon',
1717
'email' => 'test@test.com',
@@ -35,10 +35,10 @@ public function store(RegisterStoreRequest $request)
3535

3636
$user->assignRole(Role::USER->value);
3737

38-
\auth()->loginUsingId($user->id);
38+
auth()->guard()->loginUsingId($user->id);
3939

40-
\event(new Registered($user));
40+
event(new Registered($user));
4141

42-
return \redirect()->route('home');
42+
return redirect()->route('home');
4343
}
4444
}

0 commit comments

Comments
 (0)