update v1.1

Author: getsolaris

composer.json

@@ -14,6 +14,9 @@
         "illuminate/support": "~5.6.34|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
         "illuminate/console": "~5.6.34|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5"
+    },
     "license": "MIT",
     "authors": [
         {

src/MakeService.php

@@ -21,7 +21,7 @@ class MakeService extends GeneratorCommand
      *
      * @var string
      */
-    protected $signature = 'make:service {name : Create a service class} {--c : Create a service contract}';
+    protected $signature = 'make:service {name : Create a service class} {--i : Create a service interface}';
 
     /**
      * The console command description.
@@ -42,21 +42,24 @@ protected function getStub()
     }
 
     /**
-     * @param bool $isContract
      * @return string
      */
-    protected function getServiceStub(bool $isContract): string
+    protected function getServiceStub(): string
     {
-        return self::STUB_PATH .
-            ($isContract ? 'service.stub' : 'service.origin.stub');
+        return self::STUB_PATH . 'service.stub';
+    }
+
+    protected function getInterfaceStub(): string
+    {
+        return self::STUB_PATH . 'interface.stub';
     }
 
     /**
      * @return string
      */
-    protected function getServiceContractStub(): string
+    protected function getServiceInterfaceStub(): string
     {
-        return self::STUB_PATH . 'service.contract.stub';
+        return self::STUB_PATH . 'service.interface.stub';
     }
 
     /**
@@ -89,31 +92,31 @@ public function handle()
         }
 
         $this->makeDirectory($path);
-        $isContract = $this->option('c');
+        $isInterface = $this->option('i');
 
         $this->files->put(
             $path,
             $this->sortImports(
-                $this->buildServiceClass($name, $isContract)
+                $this->buildServiceClass($name, $isInterface)
             )
         );
         $message = $this->type;
 
         // Whether to create contract
-        if ($isContract) {
-            $contractName = $this->getNameInput() . 'Contract.php';
-            $contractPath = str_replace($this->getNameInput() . '.php', 'Contracts/', $path);
+        if ($isInterface) {
+            $interfaceName = $this->getNameInput() . 'Interface.php';
+            $interfacePath = str_replace($this->getNameInput() . '.php', 'Interfaces/', $path);
 
-            $this->makeDirectory($contractPath . $contractName);
+            $this->makeDirectory($interfacePath . $interfaceName);
 
             $this->files->put(
-                $contractPath . $contractName,
+                $interfacePath . $interfaceName,
                 $this->sortImports(
-                    $this->buildServiceContractInterface($this->getNameInput())
+                    $this->buildServiceInterface($this->getNameInput())
                 )
             );
 
-            $message .= ' and Contract';
+            $message .= ' and Interface';
         }
 
         $this->info($message . ' created successfully.');
@@ -123,14 +126,16 @@ public function handle()
      * Build the class with the given name.
      *
      * @param string $name
-     * @param $isContract
+     * @param $isInterface
      * @return string
      *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    protected function buildServiceClass($name, $isContract): string
+    protected function buildServiceClass(string $name, $isInterface): string
     {
-        $stub = $this->files->get($this->getServiceStub($isContract));
+        $stub = $this->files->get(
+            $isInterface ? $this->getServiceInterfaceStub() : $this->getServiceStub()
+        );
 
         return $this->replaceNamespace($stub, $name)->replaceClass($stub, $name);
     }
@@ -143,9 +148,9 @@ protected function buildServiceClass($name, $isContract): string
      *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
-    protected function buildServiceContractInterface($name): string
+    protected function buildServiceInterface(string $name): string
     {
-        $stub = $this->files->get($this->getServiceContractStub());
+        $stub = $this->files->get($this->getInterfaceStub());
 
         return $this->replaceNamespace($stub, $name)->replaceClass($stub, $name);
     }

src/Stubs/interface.stub

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Services\Contracts;
+namespace App\Services\Interfaces;
 
 /**
- * Interface {{ class }}Contract
- * @package App\Services\Contracts
+ * Interface {{ class }}Interface
+ * @package App\Services\Interfaces
  */
-interface {{ class }}Contract
+interface {{ class }}Interface
 {
 
 }

src/Stubs/service.interface.stub

@@ -2,13 +2,13 @@
 
 namespace {{ namespace }};
 
-use {{ namespace }}\Contracts\{{ class }}Contract;
+use {{ namespace }}\Interfaces\{{ class }}Interface;
 
 /**
  * Class {{ class }}
  * @package App\Services
  */
-class {{ class }} implements {{ class }}Contract
+class {{ class }} implements {{ class }}Interface
 {
 
 }

tests/GenerateTest.php

@@ -1,11 +1,37 @@
 <?php
 
 use PHPUnit\Framework\TestCase;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithConsole;
+use Tests\CreatesApplication;
 
-class MakeFileExistTest extends TestCase
+/**
+ * @property \Illuminate\Contracts\Container\Container $app
+ */
+class GenerateTest extends TestCase
 {
-    public function test_console_command(): void
+    use CreatesApplication, InteractsWithConsole;
+
+    protected $app;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->app = require __DIR__ . '/../../bootstrap/app.php';
+    }
+
+    /**
+     * @return void
+     */
+    public function test_make_service_command(): void
+    {
+        $this->artisan('make:service TestService')->assertSuccessful();
+    }
+
+    /**
+     * @return void
+     */
+    public function test_make_service_to_interface_command(): void
     {
-        $this->artisan('make:service');
+        $this->artisan('make:service TestService --i')->assertSuccessful();
     }
 }

tests/StubExistTest.php

@@ -2,13 +2,29 @@
 
 use PHPUnit\Framework\TestCase;
 
-class MakeTest extends TestCase
+class StubExistTest extends TestCase
 {
+    /**
+     * @return void
+     */
     public function test_exist_service_stub(): void
     {
-        $this->assertFileExists(
-            'service.stub',
-            "given filename doesn't exists"
-        );
+        $this->assertFileExists(__DIR__ . '/../src/Stubs/service.stub');
+    }
+
+    /**
+     * @return void
+     */
+    public function test_exist_interface_stub(): void
+    {
+        $this->assertFileExists(__DIR__ . '/../src/Stubs/interface.stub');
+    }
+
+    /**
+     * @return void
+     */
+    public function test_exist_service_interface_stub(): void
+    {
+        $this->assertFileExists(__DIR__ . '/../src/Stubs/service.interface.stub');
     }
 }