Merge branch '7.x' into 8.x

composer.json

@@ -20,7 +20,10 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Orchestra\\Canvas\\Core\\Tests\\": "tests/"
+            "Orchestra\\Canvas\\Core\\Tests\\": "tests/",
+            "Workbench\\App\\": "workbench/app/",
+            "Workbench\\Database\\Factories\\": "workbench/database/factories/",
+            "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
         }
     },
     "require": {
@@ -57,8 +60,13 @@
         }
     },
     "scripts": {
-        "post-autoload-dump": "@prepare",
+        "post-autoload-dump": [
+            "@clear",
+            "@prepare"
+        ],
         "prepare": "@php vendor/bin/testbench package:discover --ansi",
+        "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
+        "build": "@php vendor/bin/testbench workbench:build --ansi",
         "lint": [
             "@php vendor/bin/phpstan analyse",
             "@php vendor/bin/pint"

src/CodeGenerator.php

@@ -64,7 +64,7 @@ public function getDefaultNamespace(string $rootNamespace): string
     /**
      * Generator options.
      *
-     * @return array{name: string}
+     * @return array<string, mixed>
      */
     public function generatorOptions(): array
     {

testbench.yaml

@@ -0,0 +1,2 @@
+providers:
+  - Orchestra\Canvas\Core\LaravelServiceProvider

tests/Unit/Presets/LaravelTest.php

@@ -3,11 +3,22 @@
 namespace Orchestra\Canvas\Core\Tests\Unit\Presets;
 
 use Illuminate\Filesystem\Filesystem;
+use Mockery as m;
+use Orchestra\Canvas\Commands;
 use Orchestra\Canvas\Core\Presets\Laravel;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
 
 class LaravelTest extends TestCase
 {
+    /**
+     * Teardown the test environment.
+     */
+    protected function tearDown(): void
+    {
+        m::close();
+    }
+
     /** @test */
     public function it_has_proper_signatures()
     {
@@ -23,6 +34,7 @@ public function it_has_proper_signatures()
         $this->assertSame($preset->basePath(), $preset->laravelPath());
 
         $this->assertSame('App', $preset->rootNamespace());
+        $this->assertSame('Tests', $preset->testingNamespace());
         $this->assertSame('App\Models', $preset->modelNamespace());
         $this->assertSame('App\Providers', $preset->providerNamespace());
         $this->assertSame('Database\Factories', $preset->factoryNamespace());
@@ -62,4 +74,23 @@ public function it_can_configure_provider_namespace()
         $this->assertSame('App\Models', $preset->modelNamespace());
         $this->assertSame('App', $preset->providerNamespace());
     }
+
+    /** @test */
+    public function it_can_add_additional_commands()
+    {
+        Laravel::commands([
+            Commands\Code::class,
+        ]);
+
+        $app = m::mock(Application::class);
+        $app->shouldReceive('add')
+            ->once()
+            ->with(m::type(Commands\Code::class))
+            ->andReturnUsing(fn ($generator) => $this->assertInstanceOf(Commands\Code::class, $generator));
+
+        $directory = __DIR__;
+        $preset = new Laravel(['namespace' => 'App', 'provider' => ['namespace' => 'App']], $directory, new Filesystem());
+
+        $preset->addAdditionalCommands($app);
+    }
 }

tests/Unit/Presets/PackageTest.php

@@ -3,8 +3,11 @@
 namespace Orchestra\Canvas\Core\Tests\Unit\Presets;
 
 use Illuminate\Filesystem\Filesystem;
+use Mockery as m;
+use Orchestra\Canvas\Commands;
 use Orchestra\Canvas\Core\Presets\Package;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
 
 class PackageTest extends TestCase
 {
@@ -23,6 +26,7 @@ public function it_has_proper_signatures()
         $this->assertSame("{$directory}/vendor/orchestra/testbench-core/laravel", $preset->laravelPath());
 
         $this->assertSame('FooBar', $preset->rootNamespace());
+        $this->assertSame('FooBar\Tests', $preset->testingNamespace());
         $this->assertSame('FooBar', $preset->modelNamespace());
         $this->assertSame('FooBar', $preset->providerNamespace());
         $this->assertSame('Database\Factories', $preset->factoryNamespace());
@@ -73,4 +77,23 @@ public function it_requires_root_namespace_to_be_configured()
 
         $preset->rootNamespace();
     }
+
+    /** @test */
+    public function it_can_add_additional_commands()
+    {
+        Package::commands([
+            Commands\Code::class,
+        ]);
+
+        $app = m::mock(Application::class);
+        $app->shouldReceive('add')
+            ->once()
+            ->with(m::type(Commands\Code::class))
+            ->andReturnUsing(fn ($generator) => $this->assertInstanceOf(Commands\Code::class, $generator));
+
+        $directory = __DIR__;
+        $preset = new Package(['namespace' => 'App', 'provider' => ['namespace' => 'App']], $directory, new Filesystem());
+
+        $preset->addAdditionalCommands($app);
+    }
 }