diff --git a/app/Facade/Filters/Filter.php b/app/Facade/Filters/Filter.php index 067c784..e98d0f3 100644 --- a/app/Facade/Filters/Filter.php +++ b/app/Facade/Filters/Filter.php @@ -7,4 +7,4 @@ class Filter public FilterTypeEnum $type; public string $column; public mixed $filter; -} \ No newline at end of file +} diff --git a/app/Facade/Filters/FilterTypeEnum.php b/app/Facade/Filters/FilterTypeEnum.php index a1fa6ec..bf4337b 100644 --- a/app/Facade/Filters/FilterTypeEnum.php +++ b/app/Facade/Filters/FilterTypeEnum.php @@ -7,4 +7,4 @@ enum FilterTypeEnum: string case Is = 'is'; case Not = 'not'; case Like = 'like'; -} \ No newline at end of file +} diff --git a/app/Facade/Filters/Filters.php b/app/Facade/Filters/Filters.php index af03239..323dc0f 100644 --- a/app/Facade/Filters/Filters.php +++ b/app/Facade/Filters/Filters.php @@ -11,7 +11,6 @@ use JsonMapper; class Filters { - /** * @var Filter[] */ @@ -30,7 +29,7 @@ class Filters if (is_array($data)) { $data = json_decode(json_encode($data), false); } - + $data->filters ??= []; $data->orders ??= []; $data->pagination ??= null; @@ -63,7 +62,7 @@ class Filters } if (!is_null($this->pagination)) { - $builder->paginate($this->pagination->size , ['*'], 'page', $this->pagination->page); + $builder->paginate($this->pagination->size, ['*'], 'page', $this->pagination->page); } } -} \ No newline at end of file +} diff --git a/app/Facade/Filters/OrderTypeEnum.php b/app/Facade/Filters/OrderTypeEnum.php index 2f295d9..cadb188 100644 --- a/app/Facade/Filters/OrderTypeEnum.php +++ b/app/Facade/Filters/OrderTypeEnum.php @@ -6,4 +6,4 @@ enum OrderTypeEnum: string { case Asc = 'asc'; case Desc = 'desc'; -} \ No newline at end of file +} diff --git a/app/Facade/Filters/Pagination.php b/app/Facade/Filters/Pagination.php index 14412f8..6f249c2 100644 --- a/app/Facade/Filters/Pagination.php +++ b/app/Facade/Filters/Pagination.php @@ -6,4 +6,4 @@ class Pagination { public int $size; public int $page; -} \ No newline at end of file +} diff --git a/app/HistoryObserver.php b/app/HistoryObserver.php index 6137b88..b3ec6a5 100644 --- a/app/HistoryObserver.php +++ b/app/HistoryObserver.php @@ -1,6 +1,7 @@ userService->listAll(); diff --git a/app/Http/Controllers/PublicUserController.php b/app/Http/Controllers/PublicUserController.php index 6a08dd2..cd8ed1b 100755 --- a/app/Http/Controllers/PublicUserController.php +++ b/app/Http/Controllers/PublicUserController.php @@ -10,7 +10,8 @@ class PublicUserController extends Controller { public function __construct( private UserService $userService - ) { } + ) { + } public function register(RegisterRequest $request) { diff --git a/app/Http/Requests/LoginRequest.php b/app/Http/Requests/LoginRequest.php index 43c5e84..78224cb 100644 --- a/app/Http/Requests/LoginRequest.php +++ b/app/Http/Requests/LoginRequest.php @@ -25,7 +25,7 @@ class LoginRequest extends RestRequest { return [ 'email' => ['required', 'email'], - 'password' => ['required', Password::min(1)->rules([ new ZxcvbnRule ])], + 'password' => ['required', Password::min(1)->rules([ new ZxcvbnRule() ])], ]; } } diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php index c40376a..daf5e6b 100644 --- a/app/Http/Requests/RegisterRequest.php +++ b/app/Http/Requests/RegisterRequest.php @@ -30,7 +30,7 @@ class RegisterRequest extends RestRequest 'middle_name' => ['required', 'string'], 'email' => ['required', 'email'], 'phone' => ['required', 'regex:' . User::PHONE_REGEX ], - 'password' => ['required', Password::min(1)->rules([ new ZxcvbnRule ])], + 'password' => ['required', Password::min(1)->rules([ new ZxcvbnRule() ])], ]; } } diff --git a/app/Http/Requests/UserEditRequest.php b/app/Http/Requests/UserEditRequest.php index c0947a7..77f9d00 100644 --- a/app/Http/Requests/UserEditRequest.php +++ b/app/Http/Requests/UserEditRequest.php @@ -9,7 +9,6 @@ use Illuminate\Validation\Rules\Password; class UserEditRequest extends AuthorizedRequest { - /** * Get the validation rules that apply to the request. * @@ -24,7 +23,7 @@ class UserEditRequest extends AuthorizedRequest 'user.email' => [ 'email' ], 'user.phone' => [ 'string', 'regex:' . User::PHONE_REGEX ], 'user' => 'required', - 'password' => [ Password::min(1)->rules([ new ZxcvbnRule ]) ], + 'password' => [ Password::min(1)->rules([ new ZxcvbnRule() ]) ], 'user.email_verified_at' => 'prohibited', 'user.created_at' => 'prohibited', diff --git a/app/Models/History.php b/app/Models/History.php index d7039d0..8785e2f 100644 --- a/app/Models/History.php +++ b/app/Models/History.php @@ -9,7 +9,8 @@ use Illuminate\Database\Eloquent\Model; class History extends Model { - use HasFactory, UuidId; + use HasFactory; + use UuidId; protected $fillable = [ 'model_id', diff --git a/app/Models/User.php b/app/Models/User.php index d244982..ca0e15e 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -11,7 +11,10 @@ use Illuminate\Notifications\Notifiable; class User extends Authenticatable { - use HasFactory, Notifiable, UuidId, HasHistory; + use HasFactory; + use Notifiable; + use UuidId; + use HasHistory; public const PHONE_REGEX = '/^\+\d+$/'; diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 30b55a3..596f57f 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -94,7 +94,7 @@ class UserService $users = User::whereIn('id', $ids)->get(); if ($users->count() != count($ids)) { $existingIds = $users->map( - function($model) { + function ($model) { return $model->id; } )->toArray(); @@ -102,4 +102,4 @@ class UserService } return null; } -} \ No newline at end of file +} diff --git a/app/Services/UserTrashService.php b/app/Services/UserTrashService.php index e292723..0d0c06f 100644 --- a/app/Services/UserTrashService.php +++ b/app/Services/UserTrashService.php @@ -1,6 +1,7 @@ userService->getUnexistingIds($ids); diff --git a/app/UuidId.php b/app/UuidId.php index 281db7c..8c5b4e1 100644 --- a/app/UuidId.php +++ b/app/UuidId.php @@ -1,20 +1,24 @@ id = Uuid::uuid6()->toString(); }); } - public function getIncrementing(): bool { + public function getIncrementing(): bool + { return false; } - public function getKeyType(): string { + public function getKeyType(): string + { return 'string'; } } diff --git a/database/migrations/0001_01_01_000000_create_users_table.php b/database/migrations/0001_01_01_000000_create_users_table.php index 8d0f353..b352529 100644 --- a/database/migrations/0001_01_01_000000_create_users_table.php +++ b/database/migrations/0001_01_01_000000_create_users_table.php @@ -5,8 +5,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Builder; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class () extends Migration { /** * Run the migrations. */ diff --git a/database/migrations/0001_01_01_000001_create_cache_table.php b/database/migrations/0001_01_01_000001_create_cache_table.php index b9c106b..66cdb48 100644 --- a/database/migrations/0001_01_01_000001_create_cache_table.php +++ b/database/migrations/0001_01_01_000001_create_cache_table.php @@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class () extends Migration { /** * Run the migrations. */ diff --git a/database/migrations/0001_01_01_000002_create_jobs_table.php b/database/migrations/0001_01_01_000002_create_jobs_table.php index 425e705..ccf3ec1 100644 --- a/database/migrations/0001_01_01_000002_create_jobs_table.php +++ b/database/migrations/0001_01_01_000002_create_jobs_table.php @@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class () extends Migration { /** * Run the migrations. */ diff --git a/database/migrations/2024_08_29_211556_create_histories_table.php b/database/migrations/2024_08_29_211556_create_histories_table.php index 3d31871..4840791 100644 --- a/database/migrations/2024_08_29_211556_create_histories_table.php +++ b/database/migrations/2024_08_29_211556_create_histories_table.php @@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class () extends Migration { /** * Run the migrations. */ diff --git a/database/migrations/2024_08_30_013415_add_deleted_at_to_users.php b/database/migrations/2024_08_30_013415_add_deleted_at_to_users.php index 53fe5ef..c18da86 100644 --- a/database/migrations/2024_08_30_013415_add_deleted_at_to_users.php +++ b/database/migrations/2024_08_30_013415_add_deleted_at_to_users.php @@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class () extends Migration { /** * Run the migrations. */ diff --git a/routes/web.php b/routes/web.php index 5e07be3..4d392fa 100644 --- a/routes/web.php +++ b/routes/web.php @@ -5,12 +5,12 @@ use App\Http\Controllers\PublicUserController; use App\Http\Controllers\TrashUserController; use Illuminate\Support\Facades\Route; -Route::get('/', function() { +Route::get('/', function () { return view('welcome'); }); -Route::prefix('/api')->group(function() { - Route::controller(PublicUserController::class)->prefix('/users')->group(function() { +Route::prefix('/api')->group(function () { + Route::controller(PublicUserController::class)->prefix('/users')->group(function () { Route::put('/register', 'register'); Route::post('/login', 'login'); Route::post('/reset', 'reset'); @@ -28,6 +28,6 @@ Route::prefix('/api')->group(function() { }); }); -Route::get('/session', function() { +Route::get('/session', function () { exit(print_r(session()->all(), true)); });