[7.x] Ensure generated testbench.yaml is configured with App\\ and Database\\ instead of Workbench\App\\ and Workbench\Database\\ based on configured namespaces

src/Console/DevToolCommand.php

@@ -25,6 +25,11 @@ class DevToolCommand extends Command
 {
     use Concerns\InteractsWithFiles;
 
+    /**
+     * Namespace prefix for Workbench environment.
+     */
+    protected string $workbenchNamespacePrefix = 'Workbench\\';
+
     /**
      * Execute the console command.
      *
@@ -235,16 +240,14 @@ protected function appendAutoloadDevToComposer(array $content, Filesystem $files
             $content['autoload-dev']['psr-4'] = [];
         }
 
-        $namespacePrefix = '';
-
-        if ($this->components->confirm('Prefix with `Workbench` namespace?', default: true)) {
-            $namespacePrefix = 'Workbench\\';
+        if ($this->components->confirm('Prefix with `Workbench` namespace?', default: false) === false) {
+            $this->workbenchNamespacePrefix = '';
         }
 
         $namespaces = [
-            'workbench/app/' => $namespacePrefix.'App\\',
-            'workbench/database/factories/' => $namespacePrefix.'Database\\Factories\\',
-            'workbench/database/seeders/' => $namespacePrefix.'Database\\Seeders\\',
+            'workbench/app/' => $this->workbenchNamespacePrefix.'App\\',
+            'workbench/database/factories/' => $this->workbenchNamespacePrefix.'Database\\Factories\\',
+            'workbench/database/seeders/' => $this->workbenchNamespacePrefix.'Database\\Seeders\\',
         ];
 
         $autoloads = array_flip($content['autoload-dev']['psr-4']);

src/Console/InstallCommand.php

@@ -90,6 +90,19 @@ protected function copyTestbenchConfigurationFile(Filesystem $filesystem, string
             components: $this->components,
             force: (bool) $this->option('force'),
         ))->handle($from, $to);
+
+        $this->replaceInFile(
+            $filesystem,
+            [
+                'Workbench\App\Providers\WorkbenchServiceProvider',
+                'Workbench\Database\Seeders\DatabaseSeeder',
+            ],
+            [
+                \sprintf('%sProviders\WorkbenchServiceProvider', Workbench::detectNamespace('app') ?? 'Workbench\App\\'),
+                \sprintf('%sDatabaseSeeder', Workbench::detectNamespace('database/seeders') ?? 'Workbench\Database\Seeders\\'),
+            ],
+            $to
+        );
     }
 
     /**

src/Console/stubs/testbench.yaml

@@ -6,6 +6,9 @@ providers:
 migrations:
   - workbench/database/migrations
 
+seeders:
+  - Workbench\Database\Seeders\DatabaseSeeder
+
 workbench:
   start: '/'
   install: true
@@ -21,7 +24,6 @@ workbench:
     - db-wipe
     - migrate-fresh:
         --seed: true
-        --seeder: Workbench\Database\Seeders\DatabaseSeeder
   assets:
     - laravel-assets
   sync: []

tests/Console/CommandTestCase.php

@@ -82,14 +82,13 @@ protected function assertCommandExecutedWithInstall(): void
         $config = Config::loadFromYaml($workingPath);
 
         $this->assertSame(default_skeleton_path(), $config['laravel']);
-        $this->assertFalse($config->seeders);
+        $this->assertSame([DatabaseSeeder::class], $config->seeders);
         $this->assertSame([
             'asset-publish',
             'create-sqlite-db',
             'db-wipe',
             ['migrate-fresh' => [
                 '--seed' => true,
-                '--seeder' => DatabaseSeeder::class,
             ]],
         ], $config->getWorkbenchAttributes()['build']);
         $this->assertSame([

tests/Console/DevToolCommandTest.php

@@ -12,7 +12,7 @@ class DevToolCommandTest extends CommandTestCase
     public function it_can_run_devtool_command_with_installation(?string $answer, bool $createEnvironmentFile)
     {
         $this->artisan('workbench:devtool', ['--install' => true])
-            ->expectsConfirmation('Prefix with `Workbench` namespace?', true)
+            ->expectsConfirmation('Prefix with `Workbench` namespace?', 'yes')
             ->expectsChoice("Export '.env' file as?", $answer, [
                 'Skip exporting .env',
                 '.env',
@@ -33,7 +33,7 @@ public function it_can_run_devtool_command_with_installation(?string $answer, bo
     public function it_can_run_devtool_command_with_basic_installation(?string $answer, bool $createEnvironmentFile)
     {
         $this->artisan('workbench:devtool', ['--install' => true, '--basic' => true])
-            ->expectsConfirmation('Prefix with `Workbench` namespace?', true)
+            ->expectsConfirmation('Prefix with `Workbench` namespace?', 'yes')
             ->expectsChoice("Export '.env' file as?", $answer, [
                 'Skip exporting .env',
                 '.env',
@@ -50,7 +50,7 @@ public function it_can_run_devtool_command_with_basic_installation(?string $answ
     public function it_can_run_devtool_command_without_installation()
     {
         $this->artisan('workbench:devtool', ['--no-install' => true])
-            ->expectsConfirmation('Prefix with `Workbench` namespace?', true)
+            ->expectsConfirmation('Prefix with `Workbench` namespace?', 'yes')
             ->assertSuccessful();
 
         $this->assertCommandExecutedWithDevTool();
@@ -61,7 +61,7 @@ public function it_can_run_devtool_command_without_installation()
     public function it_can_be_installed_with_no_interaction_options()
     {
         $this->artisan('workbench:devtool', ['--no-install' => true, '--no-interaction' => true])
-            ->expectsConfirmation('Prefix with `Workbench` namespace?', true)
+            ->expectsConfirmation('Prefix with `Workbench` namespace?', 'yes')
             ->assertSuccessful();
 
         $this->assertCommandExecutedWithDevTool();

tests/Console/InstallCommandTest.php

@@ -17,7 +17,7 @@ class InstallCommandTest extends CommandTestCase
     public function it_can_run_installation_command_with_devtool(?string $answer, bool $createEnvironmentFile)
     {
         $this->artisan('workbench:install', ['--devtool' => true])
-            ->expectsConfirmation('Prefix with `Workbench` namespace?', true)
+            ->expectsConfirmation('Prefix with `Workbench` namespace?', 'yes')
             ->expectsChoice("Export '.env' file as?", $answer, [
                 'Skip exporting .env',
                 '.env',