From a721224a473083cd48085f7e7865cba5ef241599 Mon Sep 17 00:00:00 2001 From: Stiven Katuuk Date: Sat, 25 Feb 2023 17:33:56 +0800 Subject: [PATCH 1/2] fix(Application): dto namespace app lowercase in app/ --- .../Concerns/InteractsWithConsoleInApplication.php | 10 ++++++++++ .../Application/DataTransferObjectMakeCommand.php | 9 --------- src/Commands/Application/RequestMakeCommand.php | 10 ---------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php b/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php index afeadaf..72cdaac 100644 --- a/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php +++ b/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php @@ -2,7 +2,9 @@ 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 @@ -15,4 +17,12 @@ public function getNamespacePath(): string 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 index dd833d5..2159c25 100644 --- 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 index 73dbc55..adb7d21 100644 --- 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(), - ); - } } From cb080c68f6053daffa66606f30351d98f5c83fa3 Mon Sep 17 00:00:00 2001 From: Stiven Katuuk Date: Sat, 25 Feb 2023 17:40:26 +0800 Subject: [PATCH 2/2] fix(application): console trait miss abstract method --- .../Application/Concerns/InteractsWithConsoleInApplication.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php b/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php index 72cdaac..a061747 100644 --- a/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php +++ b/src/Commands/Application/Concerns/InteractsWithConsoleInApplication.php @@ -11,6 +11,8 @@ trait InteractsWithConsoleInApplication { use InteractsWithConsole; + abstract public function getNamespace(): string; + public function getNamespacePath(): string { return base_path(