Merge branch '8.x' into 9.x

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Jan 22, 2025 · 6911fcb · 6911fcb
2 parents a7de828 + ccf8571
commit 6911fcb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/bin/sync b/bin/sync
@@ -85,6 +85,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"));

diff --git a/src/AuthServiceProvider.php b/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')), '');
 

diff --git a/src/Http/Controllers/Auth/NewPasswordController.php b/src/Http/Controllers/Auth/NewPasswordController.php
@@ -11,7 +11,6 @@
 use Illuminate\Validation\Rules;
 use Illuminate\View\View;
 use Orchestra\Workbench\Http\Controllers\Controller;
-use Workbench\App\Models\User;
 
 class NewPasswordController extends Controller
 {
@@ -41,7 +40,7 @@ public function store(Request $request): RedirectResponse
         // database. Otherwise we will parse the error and return the response.
         $status = Password::reset(
             $request->only('email', 'password', 'password_confirmation', 'token'),
-            function (User $user) use ($request) {
+            function ($user) use ($request) {
                 $user->forceFill([
                     'password' => Hash::make($request->password),
                     'remember_token' => Str::random(60),

diff --git a/src/Workbench.php b/src/Workbench.php
@@ -39,6 +39,8 @@ public static function applicationPath(array|string $path = ''): string
      *
      * @no-named-arguments
      *
+     * @param  array<int, mixed>|string  ...$path
+     *
      * @see \Orchestra\Workbench\Workbench::applicationPath()
      */
     public static function laravelPath(array|string $path = ''): string

diff --git a/src/WorkbenchServiceProvider.php b/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);