refactor: remove app folder by moving User model and AppServiceProvider to modules

Chemaclass · Chemaclass · commit 2a8de8994cdf · 2026-01-25T16:28:00.000+01:00
diff --git a/.claude/rules/git-workflow.md b/.claude/rules/git-workflow.md
@@ -16,7 +16,7 @@ Follow conventional commits:
 |------|---------|
 | `feat` | New features |
 | `fix` | Bug fixes |
-| `refactor` | Code restructuring (no behavior change) |
+| `ref` | Code restructuring (no behavior change) |
 | `test` | Adding/updating tests |
 | `docs` | Documentation changes |
 | `chore` | Maintenance tasks |
@@ -28,7 +28,7 @@ Follow conventional commits:
 ```
 feat: add user registration endpoint
 fix: prevent duplicate email registration
-refactor: extract email validation to value object
+ref: extract email validation to value object
 test: add integration tests for user repository
 ```
 
@@ -68,7 +68,7 @@ test: add integration tests for user repository
 ```
 feat/user-registration
 fix/duplicate-email-bug
-refactor/extract-email-vo
+ref/extract-email-vo
 test/user-repository
 ```
 
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
diff --git a/app/Models/User.php b/app/Models/User.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
@@ -1,6 +1,6 @@
 <?php
 
 return [
-    App\Providers\AppServiceProvider::class,
+    Modules\Shared\Infrastructure\Provider\SharedServiceProvider::class,
     Modules\User\Infrastructure\Provider\UserServiceProvider::class,
 ];
diff --git a/composer.json b/composer.json
@@ -23,7 +23,6 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "app/",
             "Modules\\": "modules/",
             "Database\\Factories\\": "database/factories/",
             "Database\\Seeders\\": "database/seeders/"
@@ -59,7 +58,7 @@
             "@lint",
             "@phpstan",
             "@php artisan config:clear --ansi",
-            "@php artisan test"
+            "./vendor/bin/phpunit"
         ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
diff --git a/config/auth.php b/config/auth.php
@@ -62,7 +62,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => env('AUTH_MODEL', App\Models\User::class),
+            'model' => env('AUTH_MODEL', Modules\User\Infrastructure\Persistence\Eloquent\Model\UserModel::class),
         ],
 
         // 'users' => [
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -7,10 +7,12 @@
 use Illuminate\Support\Str;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\Modules\User\Infrastructure\Persistence\Eloquent\Model\UserModel>
  */
 class UserFactory extends Factory
 {
+    protected $model = \Modules\User\Infrastructure\Persistence\Eloquent\Model\UserModel::class;
+
     /**
      * The current password being used by the factory.
      */
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -2,9 +2,9 @@
 
 namespace Database\Seeders;
 
-use App\Models\User;
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
+use Modules\User\Infrastructure\Persistence\Eloquent\Model\UserModel as User;
 
 class DatabaseSeeder extends Seeder
 {
diff --git a/modules/Shared/Infrastructure/Provider/SharedServiceProvider.php b/modules/Shared/Infrastructure/Provider/SharedServiceProvider.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\Shared\Infrastructure\Provider;
+
+use Illuminate\Support\ServiceProvider;
+
+final class SharedServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        //
+    }
+
+    public function boot(): void
+    {
+        //
+    }
+}
diff --git a/modules/User/Infrastructure/Persistence/Eloquent/Model/UserModel.php b/modules/User/Infrastructure/Persistence/Eloquent/Model/UserModel.php
@@ -4,22 +4,46 @@
 
 namespace Modules\User\Infrastructure\Persistence\Eloquent\Model;
 
+use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
-use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
 
-final class UserModel extends Model
+final class UserModel extends Authenticatable
 {
+    /** @use HasFactory<UserFactory> */
+    use HasFactory;
+
     use HasUuids;
+    use Notifiable;
 
     protected $table = 'users';
 
     protected $keyType = 'string';
 
     public $incrementing = false;
 
+    /** @var list<string> */
     protected $fillable = [
         'id',
         'name',
         'email',
+        'password',
+    ];
+
+    /** @var list<string> */
+    protected $hidden = [
+        'password',
+        'remember_token',
     ];
+
+    /** @return array<string, string> */
+    protected function casts(): array
+    {
+        return [
+            'email_verified_at' => 'datetime',
+            'password' => 'hashed',
+        ];
+    }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,7 +3,6 @@ includes:
 
 parameters:
     paths:
-        - app/
         - modules/
 
     level: max

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Database\Seeders;`
`4`	`4`
`5`		`-use App\Models\User;`
`6`	`5`	`use Illuminate\Database\Console\Seeds\WithoutModelEvents;`
`7`	`6`	`use Illuminate\Database\Seeder;`
	`7`	`+use Modules\User\Infrastructure\Persistence\Eloquent\Model\UserModel as User;`
`8`	`8`
`9`	`9`	`class DatabaseSeeder extends Seeder`
`10`	`10`	`{`