Update Commands

Tschucki · Mar 30, 2024 · bd2eff2 · bd2eff2
1 parent a5669f2
commit bd2eff2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/app/Commands/GeneratorCommand.php b/app/Commands/GeneratorCommand.php
@@ -5,7 +5,6 @@
 use App\Resources\ShopwarePlugin;
 use App\Services\Plugins\PluginService;
 use LaravelZero\Framework\Commands\Command;
-
 use function Laravel\Prompts\select;
 
 class GeneratorCommand extends Command
@@ -37,8 +36,12 @@ public function handle(): void
 
     private function selectPlugin(): void
     {
-        $pluginService = new PluginService($this->argument('shopwareRootPath') ?? 'shopware');
+        $pluginService = new PluginService($this->argument('shopwareRootPath'));
         $cExistingPlugins = $pluginService->getPlugins();
+        if ($cExistingPlugins->count() === 0) {
+            $this->error('No plugins found in the provided path');
+            exit(1);
+        }
 
         $sSelectedPlugin = select(
             label: 'Select Plugin',
@@ -48,7 +51,7 @@ private function selectPlugin(): void
             hint: 'Select the plugin you want to generate files for',
         );
 
-        $this->selectedPlugin = $cExistingPlugins->first(fn (ShopwarePlugin $plugin) => $plugin->getTitle() === $sSelectedPlugin);
+        $this->selectedPlugin = $cExistingPlugins->first(fn(ShopwarePlugin $plugin) => $plugin->getTitle() === $sSelectedPlugin);
     }
 
     private function selectGenerator(): void
@@ -62,7 +65,7 @@ private function selectGenerator(): void
             hint: 'Select the generator you want to use',
         );
 
-        $this->call('make:'.$sSelectedGenerator, [
+        $this->call('make:' . $sSelectedGenerator, [
             'plugin' => $this->selectedPlugin->getTitle(),
             'shopwareRootPath' => $this->argument('shopwareRootPath'),
         ]);

diff --git a/app/Commands/Generators/MakeCmsBlock.php b/app/Commands/Generators/MakeCmsBlock.php
@@ -245,8 +245,12 @@ private function selectCmsCategory(): void
 
     private function selectPlugin(): void
     {
-        $pluginService = new PluginService($this->argument('shopwareRootPath') ?? 'shopware');
+        $pluginService = new PluginService($this->argument('shopwareRootPath'));
         $cExistingPlugins = $pluginService->getPlugins();
+        if ($cExistingPlugins->count() === 0) {
+            $this->error('No plugins found in the provided path');
+            exit(1);
+        }
         $this->selectedPlugin = $cExistingPlugins->first(fn (ShopwarePlugin $plugin) => $plugin->getTitle() === $this->argument('plugin'));
     }
 }
diff --git a/app/Commands/Generators/MakeCmsElement.php b/app/Commands/Generators/MakeCmsElement.php
@@ -245,7 +245,7 @@ private function setCmsElementName(): void
 
     private function selectPlugin(): void
     {
-        $pluginService = new PluginService($this->argument('shopwareRootPath') ?? 'shopware');
+        $pluginService = new PluginService($this->argument('shopwareRootPath'));
         $cExistingPlugins = $pluginService->getPlugins();
         if ($cExistingPlugins->count() === 0) {
             $this->error('No plugins found in the provided path');

diff --git a/builds/sw-servant b/builds/sw-servant
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "CLI tool to help you create and build Shopware 6 plugins. Creates CMS-Elements & CMS-Blocks",
     "keywords": ["shopware-plugin-servant", "shopware-servant", "shopware", "console", "cli"],
     "type": "project",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "license": "GPL-3.0-or-later",
     "support": {
         "issues": "https://github.com/Tschucki/shopware-servant/issues",