Merge pull request #125 from nova-horizons/singular-model-names

Convert new table names to singular for model names
nova-horizons · Apr 22, 2024 · 73b29bb · 73b29bb
2 parents 6bbd646 + cef41ef
commit 73b29bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/RealoquentHelpers.php b/src/RealoquentHelpers.php
@@ -27,7 +27,7 @@ public static function validateDirectory(string $directory): void
 
     public static function buildModelName(string $modelNamespace, string $tableName): string
     {
-        return $modelNamespace.ucfirst(Str::studly($tableName));
+        return $modelNamespace.ucfirst(Str::studly(Str::singular($tableName)));
     }
 
     public static function newId(): string

diff --git a/src/Writer/ModelWriter.php b/src/Writer/ModelWriter.php
@@ -173,7 +173,7 @@ protected function buildBaseModel(): string
             }
         }
         $class->addProperty('incrementing', $this->table->incrementing ?? false)->setPublic()->addComment('@var bool');
-        $class->addProperty('fillable', $this->table->getFillableColumns())->setProtected()->addComment('@var array<int, string>');
+        $class->addProperty('fillable', $this->table->getFillableColumns())->setProtected()->addComment('@var list<string>');
         $class->addProperty('guarded', $this->table->getGuardedColumns())->setProtected()->addComment('@var array<int, string>');
         $class->addProperty('casts', $this->table->getCastColumns())->setProtected()->addComment('@var array<string, string>');