Merge pull request #73 from pemudakoding/main

Fix Data Transfer Object generate wrong namespace app got to App instead of app
KoalaFacade · Feb 25, 2023 · 19c60ea · 19c60ea
2 parents 9299ff4 + f1c78ac
commit 19c60ea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php b/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php
@@ -2,17 +2,29 @@
 
 namespace KoalaFacade\DiamondConsole\Commands\Application\Concerns;
 
+use Illuminate\Support\Str;
 use KoalaFacade\DiamondConsole\Commands\Concerns\InteractsWithConsole;
+use KoalaFacade\DiamondConsole\DataTransferObjects\PlaceholderData;
 use KoalaFacade\DiamondConsole\Support\Source;
 
 trait InteractsWithConsoleInApplication
 {
     use InteractsWithConsole;
 
+    abstract public function getNamespace(): string;
+
     public function getNamespacePath(): string
     {
         return base_path(
             path: Source::transformNamespaceToPath(namespace: $this->getNamespace())
         );
     }
+
+    public function resolvePlaceholders(): PlaceholderData
+    {
+        return new PlaceholderData(
+            namespace: Str::ucfirst(string: $this->getNamespace()),
+            class: $this->getClassName(),
+        );
+    }
 }
diff --git a/src/Commands/Application/DataTransferObjectMakeCommand.php b/src/Commands/Application/DataTransferObjectMakeCommand.php
@@ -8,7 +8,6 @@
 use KoalaFacade\DiamondConsole\Commands\Concerns\HasOptions;
 use KoalaFacade\DiamondConsole\Contracts\Console;
 use KoalaFacade\DiamondConsole\DataTransferObjects\NamespaceData;
-use KoalaFacade\DiamondConsole\DataTransferObjects\PlaceholderData;
 use KoalaFacade\DiamondConsole\Support\Source;
 
 class DataTransferObjectMakeCommand extends Command implements Console
@@ -35,14 +34,6 @@ public function getStubPath(): string
         return Source::resolveStubForPath(name: 'data-transfer-object');
     }
 
-    public function resolvePlaceholders(): PlaceholderData
-    {
-        return new PlaceholderData(
-            namespace: $this->getNamespace(),
-            class: $this->getClassName(),
-        );
-    }
-
     public function beforeCreate(): void
     {
         $this->info(string: 'Generating data transfer object file to your project');

diff --git a/src/Commands/Application/RequestMakeCommand.php b/src/Commands/Application/RequestMakeCommand.php
@@ -3,13 +3,11 @@
 namespace KoalaFacade\DiamondConsole\Commands\Application;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Str;
 use KoalaFacade\DiamondConsole\Commands\Application\Concerns\InteractsWithConsoleInApplication;
 use KoalaFacade\DiamondConsole\Commands\Concerns\HasArguments;
 use KoalaFacade\DiamondConsole\Commands\Concerns\HasOptions;
 use KoalaFacade\DiamondConsole\Contracts\Console;
 use KoalaFacade\DiamondConsole\DataTransferObjects\NamespaceData;
-use KoalaFacade\DiamondConsole\DataTransferObjects\PlaceholderData;
 use KoalaFacade\DiamondConsole\Support\Source;
 
 class RequestMakeCommand extends Command implements Console
@@ -45,12 +43,4 @@ public function getStubPath(): string
     {
         return Source::resolveStubForPath(name: 'request');
     }
-
-    public function resolvePlaceholders(): PlaceholderData
-    {
-        return new PlaceholderData(
-            namespace: Str::ucfirst(string: $this->getNamespace()),
-            class: $this->getClassName(),
-        );
-    }
 }