Ensure autoloading supports application and custom layers.

composer.json

@@ -53,7 +53,9 @@
             "App\\": "vendor/orchestra/testbench-core/laravel/app",
             "Database\\Factories\\": "vendor/orchestra/testbench-core/laravel/database/factories",
             "Database\\Seeders\\": "vendor/orchestra/testbench-core/laravel/database/seeders",
-            "Domain\\": "vendor/orchestra/testbench-core/laravel/src/Domain"
+            "Domain\\": "vendor/orchestra/testbench-core/laravel/src/Domain",
+            "Application\\": "vendor/orchestra/testbench-core/laravel/src/Application",
+            "Infrastructure\\": "vendor/orchestra/testbench-core/laravel/src/Infrastructure"
         }
     },
     "scripts": {

src/Support/DomainAutoloader.php

@@ -54,6 +54,22 @@ protected static function normalizePaths($path): array
             ->toArray();
     }
 
+    protected static function getAllLayerPaths(): array
+    {
+        return collect([
+            DomainResolver::domainPath(),
+            DomainResolver::applicationLayerPath(),
+            ...array_values(config('ddd.layers', [])),
+        ])->map(fn ($path) => app()->basePath($path))->toArray();
+    }
+
+    protected static function getCustomLayerPaths(): array
+    {
+        return collect([
+            ...array_values(config('ddd.layers', [])),
+        ])->map(fn ($path) => app()->basePath($path))->toArray();
+    }
+
     protected function handleProviders(): void
     {
         $providers = DomainCache::has('domain-providers')
@@ -155,7 +171,7 @@ protected static function discoverProviders(): array
 
         $paths = static::normalizePaths(
             $configValue === true
-                ? app()->basePath(DomainResolver::domainPath())
+                ? static::getAllLayerPaths()
                 : $configValue
         );
 
@@ -179,7 +195,7 @@ protected static function discoverCommands(): array
 
         $paths = static::normalizePaths(
             $configValue === true ?
-                app()->basePath(DomainResolver::domainPath())
+                static::getAllLayerPaths()
                 : $configValue
         );
 

src/Support/DomainResolver.php

@@ -125,16 +125,6 @@ public static function resolveLayer(string $domain, ?string $type = null): ?Laye
      */
     public static function getDomainObjectNamespace(string $domain, string $type, ?string $name = null): string
     {
-        // $customResolver = app('ddd')->getNamespaceResolver();
-
-        // $resolved = is_callable($customResolver)
-        //     ? $customResolver($domain, $type, $name, app('ddd')->getCommandContext())
-        //     : null;
-
-        // if (! is_null($resolved)) {
-        //     return $resolved;
-        // }
-
         $resolver = function (string $domain, string $type, ?string $name) {
             $layer = static::resolveLayer($domain, $type);
 

tests/.skeleton/composer.json

@@ -14,7 +14,8 @@
         ],
         "psr-4": {
             "App\\": "app/",
-            "Support\\": "src/Support"
+            "Application\\": "src/Application",
+            "Infrastructure\\": "src/Infrastructure"
         }
     },
     "autoload-dev": {

tests/.skeleton/src/Application/Commands/ApplicationSync.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Application\Commands;
+
+use Illuminate\Console\Command;
+use Infrastructure\Models\AppSession;
+
+class ApplicationSync extends Command
+{
+    protected $signature = 'application:sync';
+
+    protected $description = 'Sync application state.';
+
+    public function handle()
+    {
+        $this->info('Application state synced!');
+
+        if ($secret = AppSession::getSecret()) {
+            $this->line($secret);
+
+            return;
+        }
+    }
+}

tests/.skeleton/src/Application/Database/Migrations/2024_10_14_215912_application_setup.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        //
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};

tests/.skeleton/src/Application/Models/Login.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Application\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Lunarstorm\LaravelDDD\Factories\HasDomainFactory;
+
+class Login extends Model
+{
+    use HasDomainFactory;
+
+    protected static $secret = null;
+
+    public static function setSecret($secret): void
+    {
+        self::$secret = $secret;
+    }
+
+    public static function getSecret(): ?string
+    {
+        return self::$secret;
+    }
+}

tests/.skeleton/src/Application/Policies/LoginPolicy.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Application\Policies;
+
+use App\Models\User;
+use Application\Models\Login;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class LoginPolicy
+{
+    use HandlesAuthorization;
+
+    public function viewAny(User $user)
+    {
+        //
+    }
+
+    public function view(User $user, Login $login)
+    {
+        //
+    }
+
+    public function create(User $user)
+    {
+        //
+    }
+
+    public function update(User $user, Login $login)
+    {
+        //
+    }
+
+    public function delete(User $user, Login $login)
+    {
+        //
+    }
+
+    public function restore(User $user, Login $login)
+    {
+        //
+    }
+
+    public function forceDelete(User $user, Login $login)
+    {
+        //
+    }
+}

tests/.skeleton/src/Application/Providers/ApplicationServiceProvider.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Application\Providers;
+
+use Infrastructure\Models\AppSession;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\ServiceProvider;
+
+class ApplicationServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        $this->app->singleton('application-layer', function (Application $app) {
+            return 'application-layer-singleton';
+        });
+    }
+
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        AppSession::setSecret('application-secret');
+    }
+}

tests/.skeleton/src/Infrastructure/Commands/LogPrune.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Infrastructure\Commands;
+
+use Illuminate\Console\Command;
+use Infrastructure\Models\AppSession;
+use Infrastructure\Support\Clipboard;
+
+class LogPrune extends Command
+{
+    protected $signature = 'log:prune';
+
+    protected $description = 'Prune system logs.';
+
+    public function handle()
+    {
+        $this->info('System logs pruned!');
+
+        if ($secret = Clipboard::get('secret')) {
+            $this->line($secret);
+
+            return;
+        }
+    }
+}

tests/.skeleton/src/Infrastructure/Models/AppSession.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Infrastructure\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Lunarstorm\LaravelDDD\Factories\HasDomainFactory;
+
+class AppSession extends Model
+{
+    use HasDomainFactory;
+
+    protected static $secret = null;
+
+    public static function setSecret($secret): void
+    {
+        self::$secret = $secret;
+    }
+
+    public static function getSecret(): ?string
+    {
+        return self::$secret;
+    }
+}

tests/.skeleton/src/Infrastructure/Policies/AppSessionPolicy.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Infrastructure\Policies;
+
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+use Infrastructure\Models\AppSession;
+
+class AppSessionPolicy
+{
+    use HandlesAuthorization;
+
+    public function viewAny(User $user)
+    {
+        //
+    }
+
+    public function view(User $user, AppSession $appSession)
+    {
+        //
+    }
+
+    public function create(User $user)
+    {
+        //
+    }
+
+    public function update(User $user, AppSession $appSession)
+    {
+        //
+    }
+
+    public function delete(User $user, AppSession $appSession)
+    {
+        //
+    }
+
+    public function restore(User $user, AppSession $appSession)
+    {
+        //
+    }
+
+    public function forceDelete(User $user, AppSession $appSession)
+    {
+        //
+    }
+}

tests/.skeleton/src/Infrastructure/Providers/InfrastructureServiceProvider.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Infrastructure\Providers;
+
+use Illuminate\Foundation\Application;
+use Illuminate\Support\ServiceProvider;
+use Infrastructure\Support\Clipboard;
+
+class InfrastructureServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        $this->app->singleton('infrastructure-layer', function (Application $app) {
+            return 'infrastructure-layer-singleton';
+        });
+    }
+
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        Clipboard::set('secret', 'infrastructure-secret');
+    }
+}

tests/.skeleton/src/Infrastructure/Support/Clipboard.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Infrastructure\Support;
+
+class Clipboard
+{
+    protected static $clips = [];
+
+    public static function set(string $key, $value): void
+    {
+        data_set(static::$clips, $key, $value);
+    }
+
+    public static function get(string $key)
+    {
+        return data_get(static::$clips, $key);
+    }
+}