Skip to content

Commit 6eaaaa0

Browse files
authored
Use laravel/pint (#17)
* Install laravel/pint via Composer * Remove squizlabs/php_codesniffer * Remove laravel/sail * Remove phpunit/phpunit as direct dependency * Update composer.json * Update php.yml * Fix code style issues
1 parent 6ab9f81 commit 6eaaaa0

28 files changed

+74
-272
lines changed

.github/workflows/php.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: steps.cache-vendor.outputs.cache-hit != 'true'
2222
run: composer install --no-interaction
2323

24-
validate:
24+
lint:
2525
name: Lint
2626
needs: [dependencies]
2727
runs-on: ubuntu-latest
@@ -40,12 +40,12 @@ jobs:
4040
if: steps.cache-vendor.outputs.cache-hit != 'true'
4141
run: composer install --no-interaction
4242

43-
- name: Lint against PSR-12
43+
- name: Lint against Laravel code style
4444
run: composer lint
4545

4646
test:
4747
name: Test
48-
needs: [validate, dependencies]
48+
needs: [lint, dependencies]
4949
runs-on: ubuntu-latest
5050
env:
5151
APP_ENV: testing

app/Console/Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function schedule(Schedule $schedule)
2525
*/
2626
protected function commands()
2727
{
28-
$this->load(__DIR__ . '/Commands');
28+
$this->load(__DIR__.'/Commands');
2929

3030
require base_path('routes/console.php');
3131
}

app/Http/Controllers/AccountController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class AccountController extends Controller
1111
public function edit(Request $request)
1212
{
1313
return \inertia()->render('Account/Edit', [
14-
'user' => UserResource::make($request->user())
14+
'user' => UserResource::make($request->user()),
1515
]);
1616
}
1717

@@ -21,7 +21,7 @@ public function update(AccountUpdate $request)
2121
$request->user()->updatePassword($request->validated('password'));
2222

2323
return \redirect()->back()->with('notice', [
24-
'type' => 'success',
24+
'type' => 'success',
2525
'message' => 'Your account has been updated.',
2626
]);
2727
}

app/Http/Controllers/LoginController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ public function show(Request $request)
1313
$isProd = \app()->environment('production');
1414

1515
return \inertia()->render('Login/Show', [
16-
'email' => !$isProd ? \env('SEED_ADMIN_EMAIL') : '',
17-
'password' => !$isProd ? '12345' : '',
18-
'remember' => !$isProd ? true : false,
16+
'email' => ! $isProd ? \env('SEED_ADMIN_EMAIL') : '',
17+
'password' => ! $isProd ? '12345' : '',
18+
'remember' => ! $isProd ? true : false,
1919
'redirect' => $request->query('redirect', ''),
2020
]);
2121
}
2222

2323
public function store(LoginStore $request)
2424
{
2525
\throw_if(
26-
!\auth()->attempt($request->only('email', 'password'), $request->validated('remember')),
26+
! \auth()->attempt($request->only('email', 'password'), $request->validated('remember')),
2727
ValidationException::withMessages([
2828
'email' => \__('auth.failed'),
2929
])

app/Http/Controllers/RegisterController.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace App\Http\Controllers;
44

5-
use App\Http\Controllers\Controller;
65
use App\Http\Requests\Register\RegisterStore;
76
use App\Models\User;
87

@@ -13,10 +12,10 @@ public function show()
1312
$isProd = \app()->environment('production');
1413

1514
return \inertia()->render('Register/Show', [
16-
'first_name' => !$isProd ? 'Jim' : '',
17-
'last_name' => !$isProd ? 'Gordon' : '',
18-
'email' => !$isProd ? 'test@test.com' : '',
19-
'password' => !$isProd ? '123456Ab#' : '',
15+
'first_name' => ! $isProd ? 'Jim' : '',
16+
'last_name' => ! $isProd ? 'Gordon' : '',
17+
'email' => ! $isProd ? 'test@test.com' : '',
18+
'password' => ! $isProd ? '123456Ab#' : '',
2019
]);
2120
}
2221

app/Http/Middleware/HandleInertiaRequests.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function share(Request $request): array
1515
'user' => $request->user() ? UserResource::make($request->user()) : [],
1616
],
1717
'notice' => $request->session()->get('notice') ?: [
18-
'type' => '',
18+
'type' => '',
1919
'message' => '',
2020
],
2121
]);

app/Http/Requests/Account/AccountUpdate.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ public function rules()
1111
{
1212
return [
1313
'first_name' => ['required', 'sometimes', 'string', 'max:255'],
14-
'last_name' => ['required', 'sometimes', 'string', 'max:255'],
15-
'email' => ['required', 'sometimes', 'email', 'unique:users,email,' . \auth()->id()],
16-
'password' => [
14+
'last_name' => ['required', 'sometimes', 'string', 'max:255'],
15+
'email' => ['required', 'sometimes', 'email', 'unique:users,email,'.\auth()->id()],
16+
'password' => [
1717
'nullable',
1818
Password::min(6)
1919
->mixedCase()

app/Http/Requests/Login/LoginStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class LoginStore extends FormRequest
99
public function rules()
1010
{
1111
return [
12-
'email' => ['required', 'email', 'exists:users'],
12+
'email' => ['required', 'email', 'exists:users'],
1313
'password' => ['required'],
1414
'remember' => ['boolean'],
1515
'redirect' => ['nullable', 'string'],

app/Http/Requests/Register/RegisterStore.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ public function rules()
1111
{
1212
return [
1313
'first_name' => ['required', 'string'],
14-
'last_name' => ['required', 'string'],
15-
'email' => ['required', 'email', 'unique:users'],
16-
'password' => [
14+
'last_name' => ['required', 'string'],
15+
'email' => ['required', 'email', 'unique:users'],
16+
'password' => [
1717
'required',
1818
Password::min(6)
1919
->mixedCase()
@@ -28,7 +28,7 @@ public function attributes()
2828
{
2929
return [
3030
'first_name' => 'first name',
31-
'last_name' => 'last name',
31+
'last_name' => 'last name',
3232
];
3333
}
3434
}

app/Http/Resources/UserResource.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ class UserResource extends JsonResource
99
public function toArray($request)
1010
{
1111
return [
12-
'id' => $this->id,
13-
'email' => $this->whenHas('email'),
12+
'id' => $this->id,
13+
'email' => $this->whenHas('email'),
1414
'first_name' => $this->whenHas('first_name'),
15-
'last_name' => $this->whenHas('last_name'),
16-
'can' => $this->all_permissions,
15+
'last_name' => $this->whenHas('last_name'),
16+
'can' => $this->all_permissions,
1717
];
1818
}
1919
}

0 commit comments

Comments
 (0)