Formatting (#7)

* wording updates

* formatting

* formatting

* formatting

* formatting

* consistency

* remove util

* formatting

Author: taylorotwell

app/Http/Controllers/Auth/AuthenticatedSessionController.php

@@ -14,7 +14,7 @@
 class AuthenticatedSessionController extends Controller
 {
     /**
-     * Display the login view.
+     * Show the login page.
      */
     public function create(): Response
     {
@@ -44,7 +44,6 @@ public function destroy(Request $request): RedirectResponse
         Auth::guard('web')->logout();
 
         $request->session()->invalidate();
-
         $request->session()->regenerateToken();
 
         return redirect('/');

app/Http/Controllers/Auth/ConfirmablePasswordController.php

@@ -13,7 +13,7 @@
 class ConfirmablePasswordController extends Controller
 {
     /**
-     * Show the confirm password view.
+     * Show the confirm password page.
      */
     public function show(): Response
     {

app/Http/Controllers/Auth/EmailVerificationPromptController.php

@@ -11,9 +11,9 @@
 class EmailVerificationPromptController extends Controller
 {
     /**
-     * Display the email verification prompt.
+     * Show the email verification prompt.
      */
-    public function __invoke(Request $request): RedirectResponse|Response
+    public function __invoke(Request $request): Response|RedirectResponse
     {
         return $request->user()->hasVerifiedEmail()
                     ? redirect()->intended(route('dashboard', absolute: false))

app/Http/Controllers/Auth/NewPasswordController.php

@@ -17,7 +17,7 @@
 class NewPasswordController extends Controller
 {
     /**
-     * Display the password reset view.
+     * Show the password reset page.
      */
     public function create(Request $request): Response
     {
@@ -59,11 +59,11 @@ function ($user) use ($request) {
         // the application's home authenticated view. If there is an error we can
         // redirect them back to where they came from with their error message.
         if ($status == Password::PasswordReset) {
-            return redirect()->route('login')->with('status', __($status));
+            return to_route('login')->with('status', __($status));
         }
 
         throw ValidationException::withMessages([
-            'email' => [trans($status)],
+            'email' => [__($status)],
         ]);
     }
 }

app/Http/Controllers/Auth/PasswordResetLinkController.php

@@ -12,12 +12,12 @@
 class PasswordResetLinkController extends Controller
 {
     /**
-     * Display the password reset link request view.
+     * Show the password reset link request page.
      */
-    public function create(): Response
+    public function create(Request $request): Response
     {
         return Inertia::render('auth/forgot-password', [
-            'status' => session('status'),
+            'status' => $request->session()->get('status'),
         ]);
     }
 
@@ -32,13 +32,10 @@ public function store(Request $request): RedirectResponse
             'email' => 'required|email',
         ]);
 
-        // We will send the password reset link to this user if the email exists
         Password::sendResetLink(
             $request->only('email')
         );
 
-        // We want to always return a 200 response, even if the user is not found. This is a
-        // security measure to prevent email accounts from being discovered
-        return back()->with('status', __('If that email exists in our system, a reset link was sent.'));
+        return back()->with('status', __('If an account exists with that email, you’ll receive a reset link shortly.'));
     }
 }

app/Http/Controllers/Auth/RegisteredUserController.php

@@ -16,7 +16,7 @@
 class RegisteredUserController extends Controller
 {
     /**
-     * Display the registration view.
+     * Show the registration page.
      */
     public function create(): Response
     {
@@ -46,6 +46,6 @@ public function store(Request $request): RedirectResponse
 
         Auth::login($user);
 
-        return redirect(route('dashboard', absolute: false));
+        return to_route('dashboard');
     }
 }

app/Http/Controllers/Settings/PasswordController.php

@@ -14,13 +14,13 @@
 class PasswordController extends Controller
 {
     /**
-     * Display the user's password form.
+     * Display the user's password settings form.
      */
     public function edit(Request $request): Response
     {
         return Inertia::render('settings/password', [
             'mustVerifyEmail' => $request->user() instanceof MustVerifyEmail,
-            'status' => session('status'),
+            'status' => $request->session()->get('status'),
         ]);
     }
 

app/Http/Controllers/Settings/ProfileController.php

@@ -15,18 +15,18 @@
 class ProfileController extends Controller
 {
     /**
-     * Display the user's profile form.
+     * Display the user's profile settings form.
      */
     public function edit(Request $request): Response
     {
         return Inertia::render('settings/profile', [
             'mustVerifyEmail' => $request->user() instanceof MustVerifyEmail,
-            'status' => session('status'),
+            'status' => $request->session()->get('status'),
         ]);
     }
 
     /**
-     * Update the user's profile information.
+     * Update the user's profile settings.
      */
     public function update(ProfileUpdateRequest $request): RedirectResponse
     {
@@ -38,11 +38,11 @@ public function update(ProfileUpdateRequest $request): RedirectResponse
 
         $request->user()->save();
 
-        return Redirect::route('profile.edit');
+        return to_route('profile.edit');
     }
 
     /**
-     * Delete the user's profile.
+     * Delete the user's account.
      */
     public function destroy(Request $request): RedirectResponse
     {
@@ -59,6 +59,6 @@ public function destroy(Request $request): RedirectResponse
         $request->session()->invalidate();
         $request->session()->regenerateToken();
 
-        return Redirect::to('/');
+        return redirect('/');
     }
 }

app/Http/Middleware/HandleInertiaRequests.php

@@ -40,11 +40,11 @@ public function share(Request $request): array
 
         return array_merge(parent::share($request), [
             ...parent::share($request),
+            'name' => config('app.name'),
+            'quote' => ['message' => trim($message), 'author' => trim($author)],
             'auth' => [
                 'user' => $request->user(),
             ],
-            'name' => config('app.name'),
-            'quote' => ['message' => trim($message), 'author' => trim($author)],
         ]);
     }
 }

app/Http/Requests/Auth/LoginRequest.php

@@ -45,7 +45,7 @@ public function authenticate(): void
             RateLimiter::hit($this->throttleKey());
 
             throw ValidationException::withMessages([
-                'email' => trans('auth.failed'),
+                'email' => __('auth.failed'),
             ]);
         }
 
@@ -68,7 +68,7 @@ public function ensureIsNotRateLimited(): void
         $seconds = RateLimiter::availableIn($this->throttleKey());
 
         throw ValidationException::withMessages([
-            'email' => trans('auth.throttle', [
+            'email' => __('auth.throttle', [
                 'seconds' => $seconds,
                 'minutes' => ceil($seconds / 60),
             ]),