Skip to content

Commit 84dfd35

Browse files
BlazOrazemBlazOrazem
committed
Fix lint, fix actions
1 parent e247cf1 commit 84dfd35

16 files changed

Lines changed: 117 additions & 109 deletions

File tree

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace App\Http\Controllers\Api;
44

5+
use App\Http\Controllers\Controller;
56
use App\Models\User;
67
use Illuminate\Http\Request;
7-
use App\Http\Controllers\Controller;
88
use Illuminate\Support\Facades\Hash;
99
use Illuminate\Validation\ValidationException;
1010

@@ -13,8 +13,8 @@ class AuthController extends Controller
1313
public function register(Request $request)
1414
{
1515
$data = $request->validate([
16-
'name' => ['required', 'string', 'max:255'],
17-
'email' => ['required', 'email', 'max:255', 'unique:users,email'],
16+
'name' => ['required', 'string', 'max:255'],
17+
'email' => ['required', 'email', 'max:255', 'unique:users,email'],
1818
'password' => ['required', 'string', 'min:8'],
1919
]);
2020

@@ -24,9 +24,9 @@ public function register(Request $request)
2424

2525
return response()->json([
2626
'token' => $token,
27-
'user' => [
28-
'id' => $user->id,
29-
'name' => $user->name,
27+
'user' => [
28+
'id' => $user->id,
29+
'name' => $user->name,
3030
'email' => $user->email,
3131
],
3232
], 201);
@@ -35,13 +35,13 @@ public function register(Request $request)
3535
public function login(Request $request)
3636
{
3737
$data = $request->validate([
38-
'email' => ['required', 'email'],
38+
'email' => ['required', 'email'],
3939
'password' => ['required', 'string'],
4040
]);
4141

4242
$user = User::where('email', $data['email'])->first();
4343

44-
if (!$user || !Hash::check($data['password'], $user->password)) {
44+
if (! $user || ! Hash::check($data['password'], $user->password)) {
4545
throw ValidationException::withMessages([
4646
'email' => ['Invalid credentials.'],
4747
]);
@@ -51,9 +51,9 @@ public function login(Request $request)
5151

5252
return response()->json([
5353
'token' => $token,
54-
'user' => [
55-
'id' => $user->id,
56-
'name' => $user->name,
54+
'user' => [
55+
'id' => $user->id,
56+
'name' => $user->name,
5757
'email' => $user->email,
5858
],
5959
]);
@@ -74,8 +74,8 @@ public function me(Request $request)
7474

7575
return response()->json([
7676
'user' => [
77-
'id' => $user->id,
78-
'name' => $user->name,
77+
'id' => $user->id,
78+
'name' => $user->name,
7979
'email' => $user->email,
8080
],
8181
]);

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
namespace App\Http\Controllers\Api;
44

5+
use App\Http\Controllers\Controller;
56
use App\Models\Todo;
67
use Illuminate\Http\Request;
78
use Illuminate\Support\Carbon;
89
use Illuminate\Support\Facades\Log;
9-
use App\Http\Controllers\Controller;
1010

1111
class TodoSyncController extends Controller
1212
{
1313
public function push(Request $request)
1414
{
1515
$data = $request->validate([
16-
'operations' => ['required', 'array'],
17-
'operations.*.uuid' => ['required', 'uuid'],
16+
'operations' => ['required', 'array'],
17+
'operations.*.uuid' => ['required', 'uuid'],
1818
'operations.*.operation' => ['required', 'in:created,updated,deleted'],
19-
'operations.*.payload' => ['nullable', 'array'],
19+
'operations.*.payload' => ['nullable', 'array'],
2020
]);
2121

2222
$user = $request->user();
@@ -30,10 +30,10 @@ public function push(Request $request)
3030
$incomingModifiedAt = $this->parseModifiedAt($payload);
3131

3232
Log::debug('API SYNC PUSH: incoming operation', [
33-
'user_id' => $user->id,
34-
'uuid' => $uuid,
35-
'operation' => $type,
36-
'payload' => $payload,
33+
'user_id' => $user->id,
34+
'uuid' => $uuid,
35+
'operation' => $type,
36+
'payload' => $payload,
3737
'incoming_modified_at' => $incomingModifiedAt->toIso8601String(),
3838
]);
3939

@@ -44,32 +44,32 @@ public function push(Request $request)
4444

4545
if ($type === 'deleted') {
4646
if ($todo) {
47-
if (!$todo->last_modified_at || $incomingModifiedAt->gte($todo->last_modified_at)) {
47+
if (! $todo->last_modified_at || $incomingModifiedAt->gte($todo->last_modified_at)) {
4848
$todo->last_modified_at = $incomingModifiedAt;
4949
$todo->save();
5050
$todo->delete();
5151
}
5252
}
5353

5454
$results[] = [
55-
'uuid' => $uuid,
56-
'status' => 'ok',
55+
'uuid' => $uuid,
56+
'status' => 'ok',
5757
'deleted_at' => $incomingModifiedAt->toIso8601String(),
5858
];
5959

6060
continue;
6161
}
6262

63-
if (!$todo) {
63+
if (! $todo) {
6464
$todo = Todo::create([
65-
'uuid' => $uuid,
66-
'user_id' => $user->id,
67-
'title' => $this->payloadString($payload, 'title', ''),
68-
'is_completed' => $this->payloadBool($payload, 'is_completed', false),
65+
'uuid' => $uuid,
66+
'user_id' => $user->id,
67+
'title' => $this->payloadString($payload, 'title', ''),
68+
'is_completed' => $this->payloadBool($payload, 'is_completed', false),
6969
'last_modified_at' => $incomingModifiedAt,
7070
]);
7171
} else {
72-
if (!$todo->last_modified_at || $incomingModifiedAt->gte($todo->last_modified_at)) {
72+
if (! $todo->last_modified_at || $incomingModifiedAt->gte($todo->last_modified_at)) {
7373
$todo->title = $this->payloadString($payload, 'title', $todo->title);
7474
$todo->is_completed = $this->payloadBool($payload, 'is_completed', (bool) $todo->is_completed);
7575
$todo->last_modified_at = $incomingModifiedAt;
@@ -82,24 +82,24 @@ public function push(Request $request)
8282
}
8383

8484
Log::debug('API SYNC PUSH: saved todo', [
85-
'uuid' => $todo->uuid,
86-
'title' => $todo->title,
87-
'is_completed' => (bool)$todo->is_completed,
85+
'uuid' => $todo->uuid,
86+
'title' => $todo->title,
87+
'is_completed' => (bool) $todo->is_completed,
8888
'last_modified_at' => optional($todo->last_modified_at)?->toIso8601String(),
8989
]);
9090

9191
$results[] = [
92-
'uuid' => $todo->uuid,
93-
'status' => 'ok',
94-
'title' => $todo->title,
95-
'is_completed' => (bool)$todo->is_completed,
92+
'uuid' => $todo->uuid,
93+
'status' => 'ok',
94+
'title' => $todo->title,
95+
'is_completed' => (bool) $todo->is_completed,
9696
'last_modified_at' => optional($todo->last_modified_at)->toIso8601String(),
97-
'deleted_at' => optional($todo->deleted_at)->toIso8601String(),
97+
'deleted_at' => optional($todo->deleted_at)->toIso8601String(),
9898
];
9999
}
100100

101101
return response()->json([
102-
'results' => $results,
102+
'results' => $results,
103103
'server_time' => now()->toIso8601String(),
104104
]);
105105
}
@@ -127,19 +127,19 @@ public function pull(Request $request)
127127

128128
return response()->json([
129129
'todos' => $todos->map(fn (Todo $todo) => [
130-
'uuid' => $todo->uuid,
131-
'title' => $todo->title,
132-
'is_completed' => (bool)$todo->is_completed,
130+
'uuid' => $todo->uuid,
131+
'title' => $todo->title,
132+
'is_completed' => (bool) $todo->is_completed,
133133
'last_modified_at' => optional($todo->last_modified_at)->toIso8601String(),
134-
'deleted_at' => optional($todo->deleted_at)->toIso8601String(),
134+
'deleted_at' => optional($todo->deleted_at)->toIso8601String(),
135135
])->values(),
136136
'server_time' => now()->toIso8601String(),
137137
]);
138138
}
139139

140140
protected function parseModifiedAt(array $payload): Carbon
141141
{
142-
if (array_key_exists('last_modified_at', $payload) && !empty($payload['last_modified_at'])) {
142+
if (array_key_exists('last_modified_at', $payload) && ! empty($payload['last_modified_at'])) {
143143
return Carbon::parse($payload['last_modified_at']);
144144
}
145145

‎app/Models/Todo.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace App\Models;
44

5+
use Illuminate\Database\Eloquent\Factories\HasFactory;
56
use Illuminate\Database\Eloquent\Model;
67
use Illuminate\Database\Eloquent\SoftDeletes;
7-
use Illuminate\Database\Eloquent\Factories\HasFactory;
88

99
class Todo extends Model
1010
{
@@ -19,7 +19,7 @@ class Todo extends Model
1919
];
2020

2121
protected $casts = [
22-
'is_completed' => 'boolean',
22+
'is_completed' => 'boolean',
2323
'last_modified_at' => 'datetime',
2424
];
2525

‎app/Models/User.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace App\Models;
44

5-
use Laravel\Sanctum\HasApiTokens;
6-
use Illuminate\Notifications\Notifiable;
75
use Illuminate\Database\Eloquent\Factories\HasFactory;
86
use Illuminate\Foundation\Auth\User as Authenticatable;
7+
use Illuminate\Notifications\Notifiable;
8+
use Laravel\Sanctum\HasApiTokens;
99

1010
class User extends Authenticatable
1111
{
@@ -26,7 +26,7 @@ protected function casts(): array
2626
{
2727
return [
2828
'email_verified_at' => 'datetime',
29-
'password' => 'hashed',
29+
'password' => 'hashed',
3030
];
3131
}
3232

‎app/Providers/AppServiceProvider.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace App\Providers;
44

5-
use Illuminate\Support\Str;
6-
use Illuminate\Http\Request;
7-
use Illuminate\Support\ServiceProvider;
85
use Illuminate\Cache\RateLimiting\Limit;
6+
use Illuminate\Http\Request;
97
use Illuminate\Support\Facades\RateLimiter;
8+
use Illuminate\Support\ServiceProvider;
9+
use Illuminate\Support\Str;
1010

1111
class AppServiceProvider extends ServiceProvider
1212
{

‎bootstrap/app.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
return Application::configure(basePath: dirname(__DIR__))
88
->withRouting(
9-
// web: __DIR__.'/../routes/web.php',
9+
// web: __DIR__.'/../routes/web.php',
1010
api: __DIR__.'/../routes/api.php',
1111
commands: __DIR__.'/../routes/console.php',
1212
health: '/up',

‎config/sanctum.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?php
22

3+
use Illuminate\Cookie\Middleware\EncryptCookies;
4+
use Illuminate\Foundation\Http\Middleware\ValidateCsrfToken;
5+
use Laravel\Sanctum\Http\Middleware\AuthenticateSession;
36
use Laravel\Sanctum\Sanctum;
47

58
return [
@@ -76,9 +79,9 @@
7679
*/
7780

7881
'middleware' => [
79-
'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class,
80-
'encrypt_cookies' => Illuminate\Cookie\Middleware\EncryptCookies::class,
81-
'validate_csrf_token' => Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class,
82+
'authenticate_session' => AuthenticateSession::class,
83+
'encrypt_cookies' => EncryptCookies::class,
84+
'validate_csrf_token' => ValidateCsrfToken::class,
8285
],
8386

8487
];

‎database/factories/TodoFactory.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Database\Factories;
44

55
use App\Models\Todo;
6+
use App\Models\User;
67
use Illuminate\Database\Eloquent\Factories\Factory;
78

89
/**
@@ -18,10 +19,10 @@ class TodoFactory extends Factory
1819
public function definition(): array
1920
{
2021
return [
21-
'uuid' => $this->faker->uuid(),
22-
'user_id' => \App\Models\User::factory(),
23-
'title' => $this->faker->sentence(),
24-
'is_completed' => $this->faker->boolean(),
22+
'uuid' => $this->faker->uuid(),
23+
'user_id' => User::factory(),
24+
'title' => $this->faker->sentence(),
25+
'is_completed' => $this->faker->boolean(),
2526
'last_modified_at' => now(),
2627
];
2728
}

‎database/factories/UserFactory.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace Database\Factories;
44

55
use App\Models\User;
6-
use Illuminate\Support\Str;
7-
use Illuminate\Support\Facades\Hash;
86
use Illuminate\Database\Eloquent\Factories\Factory;
7+
use Illuminate\Support\Facades\Hash;
8+
use Illuminate\Support\Str;
99

1010
/**
1111
* @extends Factory<User>
@@ -25,11 +25,11 @@ class UserFactory extends Factory
2525
public function definition(): array
2626
{
2727
return [
28-
'name' => fake()->name(),
29-
'email' => fake()->unique()->safeEmail(),
28+
'name' => fake()->name(),
29+
'email' => fake()->unique()->safeEmail(),
3030
'email_verified_at' => now(),
31-
'password' => static::$password ??= Hash::make('password'),
32-
'remember_token' => Str::random(10),
31+
'password' => static::$password ??= Hash::make('password'),
32+
'remember_token' => Str::random(10),
3333
];
3434
}
3535

‎routes/api.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
use Illuminate\Support\Facades\Route;
43
use App\Http\Controllers\Api\AuthController;
54
use App\Http\Controllers\Api\TodoSyncController;
5+
use Illuminate\Support\Facades\Route;
66

77
Route::middleware('throttle:auth')->group(function () {
88
Route::post('/register', [AuthController::class, 'register']);

0 commit comments

Comments
 (0)