diff --git a/app/Application.php b/app/Application.php index 382d6c36..f310d70d 100644 --- a/app/Application.php +++ b/app/Application.php @@ -6,7 +6,7 @@ class Application extends BaseApplication { - public const string SkeletonVersion = '10.2.5'; + public const string SkeletonVersion = '10.3.3'; - public const string BreezeVersion = '1.21.2'; + public const string BreezeVersion = '1.29.1'; } diff --git a/app/Http/Requests/LoginRequest.php b/app/Http/Requests/LoginRequest.php index a9a4eab5..9dc64da4 100644 --- a/app/Http/Requests/LoginRequest.php +++ b/app/Http/Requests/LoginRequest.php @@ -57,6 +57,6 @@ public function ensureIsNotRateLimited(): void public function throttleKey(): string { - return Str::transliterate(Str::lower($this->input('username')) . '|' . $this->ip()); + return Str::transliterate(Str::lower($this->string('username')) . '|' . $this->ip()); } } diff --git a/config/app.php b/config/app.php index ec5009a0..59863a4e 100644 --- a/config/app.php +++ b/config/app.php @@ -25,7 +25,7 @@ 'maintenance' => [ 'driver' => 'file', - // 'store' => 'redis', + // 'store' => 'redis', ], 'providers' => ServiceProvider::defaultProviders()->merge([ diff --git a/config/hashing.php b/config/hashing.php index cf85c120..8c987692 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -5,13 +5,15 @@ 'driver' => 'bcrypt', 'bcrypt' => [ - 'rounds' => env('BCRYPT_ROUNDS', 10), + 'rounds' => env('BCRYPT_ROUNDS', 12), + 'verify' => true, ], 'argon' => [ 'memory' => 1024, 'threads' => 2, 'time' => 2, + 'verify' => true, ], ]; diff --git a/config/mail.php b/config/mail.php index ea4a7c11..8b66c6c0 100644 --- a/config/mail.php +++ b/config/mail.php @@ -22,15 +22,16 @@ 'transport' => 'ses', ], - 'mailgun' => [ - 'transport' => 'mailgun', + 'postmark' => [ + 'transport' => 'postmark', + // 'message_stream_id' => null, // 'client' => [ // 'timeout' => 5, // ], ], - 'postmark' => [ - 'transport' => 'postmark', + 'mailgun' => [ + 'transport' => 'mailgun', // 'client' => [ // 'timeout' => 5, // ], @@ -50,6 +51,13 @@ 'mailers' => ['smtp', 'log'], ], + 'roundrobin' => [ + 'transport' => 'roundrobin', + 'mailers' => [ + 'ses', + 'postmark', + ], + ], ], 'from' => [ diff --git a/config/session.php b/config/session.php index beff2423..d51f8f9d 100644 --- a/config/session.php +++ b/config/session.php @@ -32,4 +32,6 @@ 'same_site' => 'lax', + 'partitioned' => false, + ]; diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index b020d9bf..b6daa68e 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -4,6 +4,7 @@ use App\Models\User; use Illuminate\Database\Eloquent\Factories\Factory; +use Illuminate\Support\Facades\Hash; use Illuminate\Support\Str; /** @@ -17,7 +18,7 @@ public function definition(): array { return [ 'username' => $this->faker->unique()->userName(), - 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password + 'password' => Hash::make('password'), 'remember_token' => Str::random(10), ]; } diff --git a/phpunit.xml b/phpunit.xml index 05cf14d9..4ab3d432 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -30,6 +30,7 @@ +