Skip to content

Commit 33d3756

Browse files
committed
Merge remote-tracking branch 'origin/main' into pr1
# Conflicts: # resources/js/components/user-menu-content.tsx
2 parents a112a23 + 4742a1e commit 33d3756

File tree

66 files changed

+11166
-599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+11166
-599
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ jobs:
4747
run: php artisan key:generate
4848

4949
- name: Tests
50-
run: ./vendor/bin/phpunit
50+
run: ./vendor/bin/pest

app/Http/Controllers/Auth/AuthenticatedSessionController.php

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

3+
declare(strict_types=1);
4+
35
namespace App\Http\Controllers\Auth;
46

57
use App\Http\Controllers\Controller;
@@ -20,7 +22,7 @@ public function create(Request $request): Response
2022
{
2123
return Inertia::render('auth/login', [
2224
'canResetPassword' => Route::has('password.request'),
23-
'status' => $request->session()->get('status'),
25+
'status' => $request->session()->get('status'),
2426
]);
2527
}
2628

app/Http/Controllers/Auth/ConfirmablePasswordController.php

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

3+
declare(strict_types=1);
4+
35
namespace App\Http\Controllers\Auth;
46

57
use App\Http\Controllers\Controller;
@@ -26,7 +28,7 @@ public function show(): Response
2628
public function store(Request $request): RedirectResponse
2729
{
2830
if (! Auth::guard('web')->validate([
29-
'email' => $request->user()->email,
31+
'email' => $request->user()->email,
3032
'password' => $request->password,
3133
])) {
3234
throw ValidationException::withMessages([

app/Http/Controllers/Auth/EmailVerificationNotificationController.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace App\Http\Controllers\Auth;
46

57
use App\Http\Controllers\Controller;

app/Http/Controllers/Auth/EmailVerificationPromptController.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace App\Http\Controllers\Auth;
46

57
use App\Http\Controllers\Controller;

app/Http/Controllers/Auth/NewPasswordController.php

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

3+
declare(strict_types=1);
4+
35
namespace App\Http\Controllers\Auth;
46

57
use App\Http\Controllers\Controller;
@@ -30,13 +32,13 @@ public function create(Request $request): Response
3032
/**
3133
* Handle an incoming new password request.
3234
*
33-
* @throws \Illuminate\Validation\ValidationException
35+
* @throws ValidationException
3436
*/
3537
public function store(Request $request): RedirectResponse
3638
{
3739
$request->validate([
38-
'token' => 'required',
39-
'email' => 'required|email',
40+
'token' => 'required',
41+
'email' => 'required|email',
4042
'password' => ['required', 'confirmed', Rules\Password::defaults()],
4143
]);
4244

@@ -47,7 +49,7 @@ public function store(Request $request): RedirectResponse
4749
$request->only('email', 'password', 'password_confirmation', 'token'),
4850
function ($user) use ($request) {
4951
$user->forceFill([
50-
'password' => Hash::make($request->password),
52+
'password' => Hash::make($request->password),
5153
'remember_token' => Str::random(60),
5254
])->save();
5355

@@ -58,7 +60,7 @@ function ($user) use ($request) {
5860
// If the password was successfully reset, we will redirect the user back to
5961
// the application's home authenticated view. If there is an error we can
6062
// redirect them back to where they came from with their error message.
61-
if ($status == Password::PasswordReset) {
63+
if ($status === Password::PasswordReset) {
6264
return to_route('login')->with('status', __($status));
6365
}
6466

app/Http/Controllers/Auth/PasswordResetLinkController.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace App\Http\Controllers\Auth;
46

57
use App\Http\Controllers\Controller;

app/Http/Controllers/Auth/RegisteredUserController.php

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

3+
declare(strict_types=1);
4+
35
namespace App\Http\Controllers\Auth;
46

57
use App\Http\Controllers\Controller;
@@ -31,14 +33,14 @@ public function create(): Response
3133
public function store(Request $request): RedirectResponse
3234
{
3335
$request->validate([
34-
'name' => 'required|string|max:255',
35-
'email' => 'required|string|lowercase|email|max:255|unique:'.User::class,
36+
'name' => 'required|string|max:255',
37+
'email' => 'required|string|lowercase|email|max:255|unique:'.User::class,
3638
'password' => ['required', 'confirmed', Rules\Password::defaults()],
3739
]);
3840

3941
$user = User::create([
40-
'name' => $request->name,
41-
'email' => $request->email,
42+
'name' => $request->name,
43+
'email' => $request->email,
4244
'password' => Hash::make($request->password),
4345
]);
4446

app/Http/Controllers/Auth/VerifyEmailController.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace App\Http\Controllers\Auth;
46

57
use App\Http\Controllers\Controller;

app/Http/Controllers/Controller.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace App\Http\Controllers;
46

57
abstract class Controller

0 commit comments

Comments
 (0)