Detect App\Model\User from skeleton if available (#288)

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Dec 29, 2024 · 11635f9 · 11635f9
1 parent 7fdabdc
commit 11635f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/Bootstrap/LoadConfigurationWithWorkbench.php b/src/Bootstrap/LoadConfigurationWithWorkbench.php
@@ -9,7 +9,6 @@
 use Orchestra\Testbench\Workbench\Workbench;
 use Symfony\Component\Finder\Finder;
 
-use function Orchestra\Testbench\join_paths;
 use function Orchestra\Testbench\workbench_path;
 
 /**
@@ -41,10 +40,6 @@ public function bootstrap(Application $app): void
 
         $userModel = Workbench::applicationUserModel();
 
-        if (\is_null($userModel) && is_file($app->basePath(join_paths('Models', 'User.php')))) {
-            $userModel = 'App\Models\User';
-        }
-
         if (! \is_null($userModel) && is_a($userModel, Authenticatable::class, true)) {
             $app->make('config')->set('auth.providers.users.model', $userModel);
         }

diff --git a/src/Workbench/Workbench.php b/src/Workbench/Workbench.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Finder\Finder;
 
 use function Orchestra\Testbench\after_resolving;
+use function Orchestra\Testbench\join_paths;
 use function Orchestra\Testbench\package_path;
 use function Orchestra\Testbench\workbench_path;
 
@@ -310,6 +311,7 @@ public static function applicationUserModel(): ?string
             static::$cachedUserModel = match (true) {
                 Env::has('AUTH_MODEL') => Env::get('AUTH_MODEL'),
                 is_file(workbench_path('app', 'Models', 'User.php')) => \sprintf('%sModels\User', static::detectNamespace('app')),
+                is_file(base_path(join_paths('Models', 'User.php'))) => 'App\Models\User',
                 default => false,
             };
         }