wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

src/Commands/GeneratorCommand.php

@@ -4,15 +4,31 @@
 
 use Illuminate\Filesystem\Filesystem;
 use Orchestra\Canvas\Core\Concerns;
+use Orchestra\Canvas\Core\Contracts\GeneratesCode;
 
 /**
  * @property string|null  $name
  * @property string|null  $description
  */
-abstract class GeneratorCommand extends \Illuminate\Console\GeneratorCommand
+abstract class GeneratorCommand extends \Illuminate\Console\GeneratorCommandd implements GeneratesCode
 {
+    use Concerns\CodeGenerator;
+    use Concerns\TestGenerator;
+    use Concerns\ResolvesPresetStubsOverrides;
     use Concerns\UsesGeneratorOverrides;
 
+   /**
+     * Execute the console command.
+     *
+     * @return bool|null
+     *
+     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
+     */
+    public function handle()
+    {
+        return $this->generateCode() ? self::SUCCESS : self::FAILURE;
+    }
+
     /**
      * Get the destination class path.
      *
@@ -83,4 +99,15 @@ protected function possibleEvents()
     {
         return $this->possibleEventsUsingCanvas();
     }
+
+    /**
+     * Resolve the fully-qualified path to the stub.
+     *
+     * @param  string  $stub
+     * @return string
+     */
+    protected function resolveStubPath(string $stub)
+    {
+        return $this->resolveStubPathUsingCanvas($stub);
+    }
 }

src/Concerns/CodeGenerator.php

@@ -3,6 +3,7 @@
 namespace Orchestra\Canvas\Core\Concerns;
 
 use Illuminate\Console\Concerns\CreatesMatchingTest;
+use Illuminate\Console\Concerns\CreatesUsingGeneratorPreset;
 use Illuminate\Support\Str;
 
 trait CodeGenerator

src/Concerns/MigrationGenerator.php

@@ -2,6 +2,8 @@
 
 namespace Orchestra\Canvas\Core\Concerns;
 
+use Illuminate\Console\Concerns\CreatesUsingGeneratorPreset;
+
 trait MigrationGenerator
 {
     use CreatesUsingGeneratorPreset;

src/Concerns/ResolvesPresetStubs.php → src/Concerns/ResolvesPresetStubsOverrides.php

@@ -2,15 +2,15 @@
 
 namespace Orchestra\Canvas\Core\Concerns;
 
-trait ResolvesPresetStubs
+trait ResolvesPresetStubsOverrides
 {
     /**
      * Resolve the fully-qualified path to the stub.
      *
      * @param  string  $stub
      * @return string
      */
-    protected function resolveStubPath($stub)
+    protected function resolveStubPathUsingCanvas(string $stub): string
     {
         $preset = $this->generatorPreset();
 
@@ -25,8 +25,5 @@ protected function resolveStubPath($stub)
      * @param  string  $stub
      * @return string
      */
-    protected function resolveDefaultStubPath($stub)
-    {
-        return $stub;
-    }
+    abstract protected function resolveDefaultStubPath($stub);
 }