diff --git a/.env.example b/.env.example index a1b3de4..6fb3de6 100644 --- a/.env.example +++ b/.env.example @@ -49,11 +49,11 @@ REDIS_PASSWORD=null REDIS_PORT=6379 MAIL_MAILER=log +MAIL_SCHEME=null MAIL_HOST=127.0.0.1 MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null -MAIL_ENCRYPTION=null MAIL_FROM_ADDRESS="hello@example.com" MAIL_FROM_NAME="${APP_NAME}" diff --git a/.gitignore b/.gitignore index c3ea31b..bec2973 100644 --- a/.gitignore +++ b/.gitignore @@ -18,5 +18,6 @@ npm-debug.log yarn-error.log /.fleet /.idea +/.nova /.vscode /.zed diff --git a/app/Http/Middleware/Idempotency.php b/app/Http/Middleware/Idempotency.php index b8e81ed..da4c57b 100644 --- a/app/Http/Middleware/Idempotency.php +++ b/app/Http/Middleware/Idempotency.php @@ -51,7 +51,7 @@ final class Idempotency /** * Handle an incoming request. * - * @param Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next + * @param Closure(Request): (Response) $next */ public function handle(Request $request, Closure $next): Response { diff --git a/app/Http/Middleware/ResponseWithJson.php b/app/Http/Middleware/ResponseWithJson.php index 24507da..0aa6819 100644 --- a/app/Http/Middleware/ResponseWithJson.php +++ b/app/Http/Middleware/ResponseWithJson.php @@ -13,7 +13,7 @@ final class ResponseWithJson /** * Handle an incoming request. * - * @param Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next + * @param Closure(Request): (Response) $next */ public function handle(Request $request, Closure $next): Response { diff --git a/app/Models/User.php b/app/Models/User.php index 694215b..9f5a8b9 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -8,12 +8,10 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; -use Laravel\Sanctum\HasApiTokens; use Override; final class User extends Authenticatable implements MustVerifyEmail { - use HasApiTokens; use HasFactory; use Notifiable; diff --git a/bootstrap/app.php b/bootstrap/app.php index 7413dd9..fd7823d 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -21,6 +21,6 @@ }) ->withExceptions(function (Exceptions $exceptions): void { $exceptions->shouldRenderJsonWhen( - fn (Request $request) => $request->is('api/*') || $request->wantsJson() + fn (Request $request): bool => $request->is('api/*') || $request->wantsJson() ); })->create(); diff --git a/composer.json b/composer.json index 781445d..b3d04e9 100644 --- a/composer.json +++ b/composer.json @@ -1,24 +1,25 @@ { + "$schema": "https://getcomposer.org/schema.json", "name": "jewei/laravel-skeleton", "type": "project", - "description": "The skeleton application for Laravel.", + "description": "The skeleton application for the Laravel framework.", "keywords": ["laravel", "skeleton"], "license": "MIT", "require": { "php": "^8.3", - "laravel/framework": "^11.29", - "laravel/sanctum": "^4.0", - "laravel/tinker": "^2.10" + "laravel/framework": "^11.31", + "laravel/tinker": "^2.9" }, "require-dev": { - "driftingly/rector-laravel": "^1.2", + "driftingly/rector-laravel": "^2.0", "fakerphp/faker": "^1.23", - "larastan/larastan": "^2.9", + "larastan/larastan": "^3.0", "laravel/pail": "^1.2", - "laravel/pint": "^1.18", + "laravel/pint": "^1.19", + "laravel/sail": "^1.26", "mockery/mockery": "^1.6", "nunomaduro/collision": "^8.5", - "pestphp/pest": "^3.5", + "pestphp/pest": "^3.7", "pestphp/pest-plugin-laravel": "^3.0" }, "autoload": { diff --git a/config/mail.php b/config/mail.php index 1053ffc..73a7841 100644 --- a/config/mail.php +++ b/config/mail.php @@ -41,10 +41,10 @@ 'smtp' => [ 'transport' => 'smtp', + 'scheme' => env('MAIL_SCHEME'), 'url' => env('MAIL_URL'), 'host' => env('MAIL_HOST', '127.0.0.1'), 'port' => env('MAIL_PORT', 2525), - 'encryption' => env('MAIL_ENCRYPTION', 'tls'), 'username' => env('MAIL_USERNAME'), 'password' => env('MAIL_PASSWORD'), 'timeout' => null, diff --git a/package.json b/package.json index 62d9eb2..ad60180 100644 --- a/package.json +++ b/package.json @@ -6,17 +6,16 @@ "dev": "vite" }, "devDependencies": { - "@tailwindcss/forms": "^0.5.9", - "alpinejs": "^3.14.3", + "alpinejs": "^3.14.8", "autoprefixer": "^10.4.20", - "axios": "^1.7.7", - "concurrently": "^9.0.1", - "laravel-vite-plugin": "^1.0.5", - "postcss": "^8.4.47", - "prettier": "^3.3.3", + "axios": "^1.7.9", + "concurrently": "^9.1.2", + "laravel-vite-plugin": "^1.1.1", + "postcss": "^8.5.0", + "prettier": "^3.4.2", "prettier-plugin-blade": "^2.1.19", - "prettier-plugin-tailwindcss": "^0.6.8", - "tailwindcss": "^3.4.14", - "vite": "^5.4.10" + "prettier-plugin-tailwindcss": "^0.6.9", + "tailwindcss": "^3.4.17", + "vite": "^6.0.7" } } diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 50fece8..ea3b700 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -1146,3 +1146,5 @@ class="rounded-sm underline hover:text-black focus:outline-none focus-visible:ri + +