v1.5

- Support all DBs that Laravel support (MySQL,PgSQL, MSSQL)
- Added more validation rules
- Default Model name updated to `App\Models`
- Bug fixes

Author: Awais

src/Commands/GeneratorCommand.php

@@ -6,7 +6,6 @@
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
 use Symfony\Component\Console\Input\InputArgument;
@@ -64,7 +63,7 @@ abstract class GeneratorCommand extends Command
      *
      * @var string
      */
-    protected $modelNamespace = 'App';
+    protected $modelNamespace = 'App\Models';
 
     /**
      * Controller Namespace.
@@ -90,7 +89,7 @@ abstract class GeneratorCommand extends Command
     /**
      * Create a new controller creator command instance.
      *
-     * @param \Illuminate\Filesystem\Filesystem $files
+     * @param  \Illuminate\Filesystem\Filesystem  $files
      *
      * @return void
      */
@@ -129,13 +128,13 @@ abstract protected function buildViews();
     /**
      * Build the directory if necessary.
      *
-     * @param string $path
+     * @param  string  $path
      *
      * @return string
      */
     protected function makeDirectory($path)
     {
-        if (!$this->files->isDirectory(dirname($path))) {
+        if (! $this->files->isDirectory(dirname($path))) {
             $this->files->makeDirectory(dirname($path), 0777, true, true);
         }
 
@@ -156,8 +155,8 @@ protected function write($path, $content)
     /**
      * Get the stub file.
      *
-     * @param string $type
-     * @param boolean $content
+     * @param  string  $type
+     * @param  boolean  $content
      *
      * @return string
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
@@ -167,12 +166,12 @@ protected function getStub($type, $content = true)
     {
         $stub_path = config('crud.stub_path', 'default');
         if ($stub_path == 'default') {
-            $stub_path = __DIR__ . '/../stubs/';
+            $stub_path = __DIR__.'/../stubs/';
         }
 
-        $path = Str::finish($stub_path, '/') . "{$type}.stub";
+        $path = Str::finish($stub_path, '/')."{$type}.stub";
 
-        if (!$content) {
+        if (! $content) {
             return $path;
         }
 
@@ -201,7 +200,7 @@ private function _getSpace($no = 1)
      */
     protected function _getControllerPath($name)
     {
-        return app_path($this->_getNamespacePath($this->controllerNamespace) . "{$name}Controller.php");
+        return app_path($this->_getNamespacePath($this->controllerNamespace)."{$name}Controller.php");
     }
 
     /**
@@ -211,7 +210,7 @@ protected function _getControllerPath($name)
      */
     protected function _getModelPath($name)
     {
-        return $this->makeDirectory(app_path($this->_getNamespacePath($this->modelNamespace) . "{$name}.php"));
+        return $this->makeDirectory(app_path($this->_getNamespacePath($this->modelNamespace)."{$name}.php"));
     }
 
     /**
@@ -276,7 +275,7 @@ protected function buildReplacements()
      *
      * @param $title
      * @param $column
-     * @param string $type
+     * @param  string  $type
      *
      * @return mixed
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
@@ -308,7 +307,7 @@ protected function getHead($title)
         return str_replace(
             array_keys($replace),
             array_values($replace),
-            $this->_getSpace(10) . '<th>{{title}}</th>' . "\n"
+            $this->_getSpace(10).'<th>{{title}}</th>'."\n"
         );
     }
 
@@ -326,7 +325,7 @@ protected function getBody($column)
         return str_replace(
             array_keys($replace),
             array_values($replace),
-            $this->_getSpace(11) . '<td>{{ ${{modelNameLowerCase}}->{{column}} }}</td>' . "\n"
+            $this->_getSpace(11).'<td>{{ ${{modelNameLowerCase}}->{{column}} }}</td>'."\n"
         );
     }
 
@@ -337,7 +336,7 @@ protected function getBody($column)
      */
     protected function buildLayout(): void
     {
-        if (!(view()->exists($this->layout))) {
+        if (! (view()->exists($this->layout))) {
 
             $this->info('Creating Layout ...');
 
@@ -357,7 +356,7 @@ protected function buildLayout(): void
     protected function getColumns()
     {
         if (empty($this->tableColumns)) {
-            $this->tableColumns = DB::select('SHOW COLUMNS FROM ' . $this->table);
+            $this->tableColumns = Schema::getColumns($this->table);
         }
 
         return $this->tableColumns;
@@ -372,11 +371,11 @@ protected function getFilteredColumns()
         $columns = [];
 
         foreach ($this->getColumns() as $column) {
-            $columns[] = $column->Field;
+            $columns[] = $column['name'];
         }
 
         return array_filter($columns, function ($value) use ($unwanted) {
-            return !in_array($value, $unwanted);
+            return ! in_array($value, $unwanted);
         });
     }
 
@@ -391,14 +390,26 @@ protected function modelReplacements()
         $rulesArray = [];
         $softDeletesNamespace = $softDeletes = '';
 
-        foreach ($this->getColumns() as $value) {
-            $properties .= "\n * @property $$value->Field";
+        foreach ($this->getColumns() as $column) {
+            $properties .= "\n * @property \${$column['name']}";
+
+            if (! $column['nullable']) {
+                $rulesArray[$column['name']] = ['required'];
+            }
+
+            if ($column['type_name'] == 'bool') {
+                $rulesArray[$column['name']][] = 'boolean';
+            }
+
+            if ($column['type_name'] == 'uuid') {
+                $rulesArray[$column['name']][] = 'uuid';
+            }
 
-            if ($value->Null == 'NO') {
-                $rulesArray[$value->Field] = 'required';
+            if ($column['type_name'] == 'text' || $column['type_name'] == 'varchar') {
+                $rulesArray[$column['name']][] = 'string';
             }
 
-            if ($value->Field == 'deleted_at') {
+            if ($column['name'] == 'deleted_at') {
                 $softDeletesNamespace = "use Illuminate\Database\Eloquent\SoftDeletes;\n";
                 $softDeletes = "use SoftDeletes;\n";
             }
@@ -410,7 +421,7 @@ protected function modelReplacements()
             $rulesArray = Arr::except($rulesArray, $this->unwantedColumns);
             // Make rulesArray
             foreach ($rulesArray as $col => $rule) {
-                $rules .= "\n\t\t'{$col}' => '{$rule}',";
+                $rules .= "\n\t\t'{$col}' => '".implode('|', $rule)."',";
             }
 
             return $rules;
@@ -423,7 +434,7 @@ protected function modelReplacements()
 
             // Add quotes to the unwanted columns for fillable
             array_walk($filterColumns, function (&$value) {
-                $value = "'" . $value . "'";
+                $value = "'".$value."'";
             });
 
             // CSV format
@@ -432,7 +443,7 @@ protected function modelReplacements()
 
         $properties .= "\n *";
 
-        list($relations, $properties) = (new ModelGenerator($this->table, $properties, $this->modelNamespace))->getEloquentRelations();
+        [$relations, $properties] = (new ModelGenerator($this->table, $properties, $this->modelNamespace))->getEloquentRelations();
 
         return [
             '{{fillable}}' => $fillable(),
@@ -463,7 +474,7 @@ protected function buildOptions()
     {
         $route = $this->option('route');
 
-        if (!empty($route)) {
+        if (! empty($route)) {
             $this->options['route'] = $route;
         }