Fix tests.

lunarstorm · Nov 16, 2024 · 482dc12 · 482dc12
1 parent 36af4eb
commit 482dc12
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Commands/DomainModelMakeCommand.php b/src/Commands/DomainModelMakeCommand.php
@@ -92,7 +92,10 @@ protected function createBaseModelIfNeeded()
 
         $domain = DomainResolver::guessDomainFromClass($baseModel);
 
-        $name = Str::after($baseModel, $domain);
+        $name = str($baseModel)
+            ->after($domain)
+            ->replace(['\\', '/'], '/')
+            ->toString();
 
         $this->call(DomainBaseModelMakeCommand::class, [
             '--domain' => $domain,

diff --git a/src/Commands/DomainViewModelMakeCommand.php b/src/Commands/DomainViewModelMakeCommand.php
@@ -2,7 +2,6 @@
 
 namespace Lunarstorm\LaravelDDD\Commands;
 
-use Illuminate\Support\Str;
 use Lunarstorm\LaravelDDD\Commands\Concerns\HasDomainStubs;
 use Lunarstorm\LaravelDDD\Support\DomainResolver;
 
@@ -55,7 +54,10 @@ public function handle()
 
             $domain = DomainResolver::guessDomainFromClass($baseViewModel);
 
-            $name = Str::after($baseViewModel, $domain);
+            $name = str($baseViewModel)
+                ->after($domain)
+                ->replace(['\\', '/'], '/')
+                ->toString();
 
             $this->call(DomainBaseViewModelMakeCommand::class, [
                 '--domain' => $domain,