Fix StatementGenerator (#310)

Author: bingtsingw

src/Generators/StatementGenerator.php

@@ -35,7 +35,7 @@ protected function buildConstructor($statement)
 
         $stub = $this->buildProperties($statement->data()) . PHP_EOL . PHP_EOL;
         $stub .= str_replace('__construct()', '__construct(' . $this->buildParameters($statement->data()) . ')', $constructor);
-        $stub = str_replace('//', $this->buildAssignments($statement->data()), $stub);
+        $stub = trim(str_replace('//', $this->buildAssignments($statement->data()), $stub));
 
         return $stub;
     }

src/Generators/Statements/JobGenerator.php

@@ -3,21 +3,13 @@
 namespace Blueprint\Generators\Statements;
 
 use Blueprint\Blueprint;
-use Blueprint\Contracts\Generator;
+use Blueprint\Generators\StatementGenerator;
 use Blueprint\Models\Statements\DispatchStatement;
 use Blueprint\Tree;
 
-class JobGenerator implements Generator
+class JobGenerator extends StatementGenerator
 {
-    /**
-     * @var \Illuminate\Contracts\Filesystem\Filesystem
-     */
-    private $files;
-
-    public function __construct($files)
-    {
-        $this->files = $files;
-    }
+    protected $new_instance = 'new job instance';
 
     public function output(Tree $tree): array
     {
@@ -71,50 +63,4 @@ protected function populateStub(string $stub, DispatchStatement $dispatchStateme
 
         return $stub;
     }
-
-    protected function buildConstructor(DispatchStatement $dispatchStatement)
-    {
-        static $constructor = null;
-
-        if (is_null($constructor)) {
-            $constructor = str_replace('new instance', 'new job instance', $this->files->stub('partials/constructor.stub'));
-        }
-
-        if (empty($dispatchStatement->data())) {
-            return trim($constructor);
-        }
-
-        $stub = $this->buildProperties($dispatchStatement->data()).PHP_EOL.PHP_EOL;
-        $stub .= str_replace('__construct()', '__construct('.$this->buildParameters($dispatchStatement->data()).')', $constructor);
-        $stub = str_replace('//', $this->buildAssignments($dispatchStatement->data()), $stub);
-
-        return $stub;
-    }
-
-    private function buildProperties(array $data)
-    {
-        return trim(array_reduce($data, function ($output, $property) {
-            $output .= '    public $'.$property.';'.PHP_EOL.PHP_EOL;
-
-            return $output;
-        }, ''));
-    }
-
-    private function buildParameters(array $data)
-    {
-        $parameters = array_map(function ($parameter) {
-            return '$'.$parameter;
-        }, $data);
-
-        return implode(', ', $parameters);
-    }
-
-    private function buildAssignments(array $data)
-    {
-        return trim(array_reduce($data, function ($output, $property) {
-            $output .= '        $this->'.$property.' = $'.$property.';'.PHP_EOL;
-
-            return $output;
-        }, ''));
-    }
 }

stubs/partials/constructor.stub

@@ -6,4 +6,4 @@
     public function __construct()
     {
         //
-    }
+    }