Merge pull request #335 from N1ebieski/Support-for-models-in-subfolders-#24

Support for models in subfolders

Author: TitasGailius

php-templates/auth.php

@@ -6,7 +6,9 @@
  'policies' => (object) [],
  ]);
 } else {
- collect(glob(base_path('**/Models/*.php')))->each(fn($file) => include_once($file));
+ collect(\Illuminate\Support\Facades\File::allFiles(base_path('app/Models')))
+ ->filter(fn(\Symfony\Component\Finder\SplFileInfo $file) => $file->getExtension() === 'php')
+ ->each(fn($file) => include_once($file));
 
  $modelPolicies = collect(get_declared_classes())
  ->filter(fn($class) => is_subclass_of($class, \Illuminate\Database\Eloquent\Model::class))

php-templates/models.php

@@ -54,7 +54,9 @@ public function __construct(protected $factory)
 
  public function all()
  {
- collect(glob(base_path('**/Models/*.php')))->each(fn($file) => include_once($file));
+ collect(\Illuminate\Support\Facades\File::allFiles(base_path('app/Models')))
+ ->filter(fn(\Symfony\Component\Finder\SplFileInfo $file) => $file->getExtension() === 'php')
+ ->each(fn($file) => include_once($file));
 
  return collect(get_declared_classes())
  ->filter(fn($class) => is_subclass_of($class, \Illuminate\Database\Eloquent\Model::class))

src/templates/auth.ts

@@ -6,7 +6,9 @@ if (!\\Illuminate\\Support\\Facades\\App::bound('auth')) {
  'policies' => (object) [],
  ]);
 } else {
- collect(glob(base_path('**/Models/*.php')))->each(fn($file) => include_once($file));
+ collect(\\Illuminate\\Support\\Facades\\File::allFiles(base_path('app/Models')))
+ ->filter(fn(\\Symfony\\Component\\Finder\\SplFileInfo $file) => $file->getExtension() === 'php')
+ ->each(fn($file) => include_once($file));
 
  $modelPolicies = collect(get_declared_classes())
  ->filter(fn($class) => is_subclass_of($class, \\Illuminate\\Database\\Eloquent\\Model::class))

src/templates/models.ts

@@ -54,7 +54,9 @@ $models = new class($factory) {
 
  public function all()
  {
- collect(glob(base_path('**/Models/*.php')))->each(fn($file) => include_once($file));
+ collect(\\Illuminate\\Support\\Facades\\File::allFiles(base_path('app/Models')))
+ ->filter(fn(\\Symfony\\Component\\Finder\\SplFileInfo $file) => $file->getExtension() === 'php')
+ ->each(fn($file) => include_once($file));
 
  return collect(get_declared_classes())
  ->filter(fn($class) => is_subclass_of($class, \\Illuminate\\Database\\Eloquent\\Model::class))