Merge pull request #1828 from nWidart/handle-case-where-config-servic…

…e-does-not-exist added invokable and force options into make-service command
nWidart · Apr 25, 2024 · addf050 · addf050
2 parents d74e3aa + d40e10f
commit addf050
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/src/Commands/Make/ServiceMakeCommand.php b/src/Commands/Make/ServiceMakeCommand.php
@@ -7,6 +7,7 @@
 use Nwidart\Modules\Support\Stub;
 use Nwidart\Modules\Traits\ModuleCommandTrait;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
 
 class ServiceMakeCommand extends GeneratorCommand
 {
@@ -20,9 +21,9 @@ public function getDestinationFilePath(): string
     {
         $path = $this->laravel['modules']->getModulePath($this->getModuleName());
 
-        $servicePath = GenerateConfigReader::read('service');
+        $servicePath = GenerateConfigReader::read('service')->getPath() ?? config('modules.paths.app_folder').'Services';
 
-        return $path . $servicePath->getPath() . '/' . $this->getServiceName() . '.php';
+        return $path . $servicePath . '/' . $this->getServiceName() . '.php';
     }
 
     protected function getTemplateContents(): string
@@ -43,6 +44,17 @@ protected function getArguments(): array
         ];
     }
 
+    /**
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return [
+            ['invokable', 'i', InputOption::VALUE_NONE, 'Generate an invokable class', null],
+            ['force', 'f', InputOption::VALUE_NONE, 'su.'],
+        ];
+    }
+
     protected function getServiceName(): array|string
     {
         return Str::studly($this->argument('name'));
@@ -55,12 +67,11 @@ private function getClassNameWithoutNamespace(): array|string
 
     public function getDefaultNamespace(): string
     {
-        return config('modules.paths.generator.service.namespace')
-            ?? ltrim(config('modules.paths.generator.service.path', 'Services'), config('modules.paths.app_folder'));
+        return config('modules.paths.generator.service.namespace', 'Services');
     }
 
     protected function getStubName(): string
     {
-        return '/service.stub';
+        return $this->option('invokable') === true ? '/service-invoke.stub' : '/service.stub';
     }
 }
diff --git a/src/Commands/stubs/service-invoke.stub b/src/Commands/stubs/service-invoke.stub
@@ -0,0 +1,11 @@
+<?php
+
+namespace $CLASS_NAMESPACE$;
+
+class $CLASS$
+{
+    public function __invokable()
+    {
+        //
+    }
+}
diff --git a/tests/Commands/ServiceMakeCommandTest.php b/tests/Commands/ServiceMakeCommandTest.php
@@ -42,6 +42,23 @@ public function test_it_generates_a_new_service_class()
         $this->assertSame(0, $code);
     }
 
+    public function test_it_generates_a_new_service_class_can_override_with_force_option()
+    {
+        $this->artisan('module:make-service', ['name' => 'MyService', 'module' => 'Blog']);
+        $code = $this->artisan('module:make-service', ['name' => 'MyService', 'module' => 'Blog', '--force' => true]);
+
+        $this->assertTrue(is_file($this->modulePath . '/Services/MyService.php'));
+        $this->assertSame(0, $code);
+    }
+
+    public function test_it_generates_a_new_service_class_can_use_invoke_option()
+    {
+        $code = $this->artisan('module:make-service', ['name' => 'MyService', 'module' => 'Blog', '--invokable' => true]);
+
+        $this->assertTrue(is_file($this->modulePath . '/Services/MyService.php'));
+        $this->assertSame(0, $code);
+    }
+
     public function test_it_generated_correct_file_with_content()
     {
         $code = $this->artisan('module:make-service', ['name' => 'MyService', 'module' => 'Blog']);