Merge branch '7.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

bin/sync

@@ -87,6 +87,11 @@ transform([
     line("return redirect()->intended(route('dashboard', absolute: false));", 2) => line('return redirect()->intended($this->redirectToAfterLoggedIn());', 2),
 ], static fn ($changes) => $files->replaceInFile(array_keys($changes), array_values($changes), "{$workingPath}/src/Http/Controllers/Auth/AuthenticatedSessionController.php"));
 
+transform([
+    line('function (User $user) use ($request) {', 3) => line('function ($user) use ($request) {', 3),
+    line('use Workbench\App\Models\User;') => '',
+], static fn ($changes) => $files->replaceInFile(array_keys($changes), array_values($changes), "{$workingPath}/src/Http/Controllers/Auth/NewPasswordController.php"));
+
 transform([
     line("return redirect(route('dashboard', absolute: false));", 2) => line('return redirect($this->redirectToAfterLoggedIn());', 2),
 ], static fn ($changes) => $files->replaceInFile(array_keys($changes), array_values($changes), "{$workingPath}/src/Http/Controllers/Auth/RegisteredUserController.php"));

package.json

@@ -13,6 +13,6 @@
         "laravel-vite-plugin": "^1.0",
         "postcss": "^8.4.31",
         "tailwindcss": "^3.1.0",
-        "vite": "^5.0"
+        "vite": "^5.4"
     }
 }

public/build/manifest.json

@@ -5,7 +5,7 @@
     "isEntry": true
   },
   "resources/js/app.js": {
-    "file": "assets/app-MratX3S_.js",
+    "file": "assets/app-O62UIZbF.js",
     "name": "app",
     "src": "resources/js/app.js",
     "isEntry": true

src/AuthServiceProvider.php

@@ -14,7 +14,9 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        $this->loadRoutesFrom((string) realpath(join_paths(__DIR__, '..', 'routes', 'workbench-auth.php')));
+        $this->booted(function () {
+            $this->loadRoutesFrom((string) realpath(join_paths(__DIR__, '..', 'routes', 'workbench-auth.php')));
+        });
 
         $this->loadViewsFrom((string) realpath(join_paths(__DIR__, '..', 'resources', 'views')), '');
 

src/Workbench.php

@@ -23,19 +23,24 @@ class Workbench extends \Orchestra\Testbench\Workbench\Workbench
      * Get the path to the application (Laravel) folder.
      *
      * @no-named-arguments
+     *
+     * @param  array<int, mixed>|string  ...$path
      */
     public static function applicationPath(array|string $path = ''): string
     {
-        return base_path(
-            join_paths(...Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path))
-        );
+        /** @var array<int, mixed> $path */
+        $path = Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path);
+
+        return base_path(join_paths(...$path));
     }
 
     /**
      * Get the path to the Laravel application skeleton.
      *
      * @no-named-arguments
      *
+     * @param  array<int, mixed>|string  ...$path
+     *
      * @see \Orchestra\Workbench\Workbench::applicationPath()
      */
     public static function laravelPath(array|string $path = ''): string
@@ -47,12 +52,15 @@ public static function laravelPath(array|string $path = ''): string
      * Get the path to the package folder.
      *
      * @no-named-arguments
+     *
+     * @param  array<int, mixed>|string  ...$path
      */
     public static function packagePath(array|string $path = ''): string
     {
-        return package_path(
-            ...Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path)
-        );
+        /** @var array<int, mixed> $path */
+        $path = Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path);
+
+        return package_path(...$path);
     }
 
     /**
@@ -62,9 +70,10 @@ public static function packagePath(array|string $path = ''): string
      */
     public static function path(array|string $path = ''): string
     {
-        return workbench_path(
-            ...Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path)
-        );
+        /** @var array<int, mixed> $path */
+        $path = Arr::wrap(\func_num_args() > 1 ? \func_get_args() : $path);
+
+        return workbench_path(...$path);
     }
 
     /**

src/WorkbenchServiceProvider.php

@@ -42,7 +42,9 @@ public function register(): void
      */
     public function boot(): void
     {
-        $this->loadRoutesFrom((string) realpath(join_paths(__DIR__, '..', 'routes', 'workbench.php')));
+        $this->booted(function () {
+            $this->loadRoutesFrom((string) realpath(join_paths(__DIR__, '..', 'routes', 'workbench.php')));
+        });
 
         $this->app->make(HttpKernel::class)->pushMiddleware(Http\Middleware\CatchDefaultRoute::class);