Merge branch 'develop' into usePHPUNIT

Author: tnylea

.gitattributes

@@ -6,6 +6,5 @@
 *.md diff=markdown
 *.php diff=php
 
-/.github export-ignore
 CHANGELOG.md export-ignore
-.styleci.yml export-ignore
+README.md export-ignore

.github/workflows/lint.yml

@@ -10,6 +10,9 @@ on:
       - develop
       - main
 
+permissions:
+  contents: write
+
 jobs:
   quality:
     runs-on: ubuntu-latest
@@ -19,7 +22,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.4'
 
       - name: Install Dependencies
         run: |
@@ -35,12 +38,12 @@ jobs:
       - name: Frontend Lint
         run: npm run lint
 
-      - name: Commit changes
+      - name: Commit Changes
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: fix code style
           commit_options: '--no-verify'
 
-      # We need to run PHPStan after commiting changes as it does not auto-fix errors.
+      # We need to run PHPStan after commiting changes as it does not auto-fix errors...
       - name: PHPStan
         run: ./vendor/bin/phpstan

.github/workflows/tests.yml

@@ -21,20 +21,20 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.4
           tools: composer:v2
           coverage: xdebug
 
-      - name: Setup Node.js
+      - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '22'
           cache: 'npm'
 
-      - name: Install Node dependencies
+      - name: Install Node Dependencies
         run: npm ci
 
-      - name: Build assets
+      - name: Build Assets
         run: npm run build
 
       - name: Create SQLite Database

.gitignore

@@ -1,4 +1,15 @@
+.DS_Store
+.env
+.env.backup
+.env.production
+.phpactor.json
+.phpunit.result.cache
+/.fleet
+/.idea
+/.nova
 /.phpunit.cache
+/.vscode
+/.zed
 /bootstrap/ssr
 /node_modules
 /public/build
@@ -7,19 +18,8 @@
 /storage/*.key
 /storage/pail
 /vendor
-.DS_Store
-.env
-.env.backup
-.env.production
-.phpactor.json
-.phpunit.result.cache
+auth.json
 Homestead.json
 Homestead.yaml
-auth.json
 npm-debug.log
 yarn-error.log
-/.fleet
-/.idea
-/.nova
-/.vscode
-/.zed

app/Http/Controllers/Auth/AuthenticatedSessionController.php

@@ -14,13 +14,13 @@
 class AuthenticatedSessionController extends Controller
 {
     /**
-     * Display the login view.
+     * Show the login page.
      */
-    public function create(): Response
+    public function create(Request $request): Response
     {
         return Inertia::render('auth/login', [
             'canResetPassword' => Route::has('password.request'),
-            'status' => session('status'),
+            'status' => $request->session()->get('status'),
         ]);
     }
 
@@ -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,12 +11,12 @@
 class EmailVerificationPromptController extends Controller
 {
     /**
-     * Display the email verification prompt.
+     * Show the email verification prompt page.
      */
-    public function __invoke(Request $request): RedirectResponse|Response
+    public function __invoke(Request $request): Response|RedirectResponse
     {
         return $request->user()->hasVerifiedEmail()
                     ? redirect()->intended(route('dashboard', absolute: false))
-                    : Inertia::render('auth/verify-email', ['status' => session('status')]);
+                    : Inertia::render('auth/verify-email', ['status' => $request->session()->get('status')]);
     }
 }

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');
     }
 }