Fix Native Type Declarations in Jetstream and Fortify

Author: cbaconnier

src/Installers/FortifyInstaller.php

@@ -40,22 +40,26 @@ protected function configureFiles()
         (new Filesystem)->move(base_path('app/Actions/Fortify/ResetUserPassword.php'), base_path('src/Domain/User/Actions/ResetUserPasswordAction.php'));
         $this->replaceAllInFile([
             'namespace App\Actions\Fortify'                      => 'namespace Domain\User\Actions',
+            'App\Models\User'                                    => 'Domain\User\Models\User',
             'class ResetUserPassword'                            => 'class ResetUserPasswordAction',
             'use Laravel\Fortify\Contracts\ResetsUserPasswords;' => 'use Laravel\Fortify\Contracts\ResetsUserPasswords;
 use Domain\User\Rules\PasswordValidationRules;',
         ], base_path('src/Domain/User/Actions/ResetUserPasswordAction.php'));
 
         (new Filesystem)->move(base_path('app/Actions/Fortify/UpdateUserPassword.php'), base_path('src/Domain/User/Actions/UpdateUserPasswordAction.php'));
         $this->replaceAllInFile([
-            'namespace App\Actions\Fortify'        => 'namespace Domain\User\Actions',
-            'class UpdateUserPassword'             => 'class UpdateUserPasswordAction',
+            'namespace App\Actions\Fortify' => 'namespace Domain\User\Actions',
+            'class UpdateUserPassword'      => 'class UpdateUserPasswordAction',
+            'App\Models\User'               => 'Domain\User\Models\User',
+
             'use Illuminate\Support\Facades\Hash;' => 'use Domain\User\Rules\PasswordValidationRules;
 use Illuminate\Support\Facades\Hash;',
         ], base_path('src/Domain/User/Actions/UpdateUserPasswordAction.php'));
 
         (new Filesystem)->move(base_path('app/Actions/Fortify/UpdateUserProfileInformation.php'), base_path('src/Domain/User/Actions/UpdateUserProfileInformationAction.php'));
         $this->replaceAllInFile([
             'namespace App\Actions\Fortify'      => 'namespace Domain\User\Actions',
+            'App\Models\User'                    => 'Domain\User\Models\User',
             'class UpdateUserProfileInformation' => 'class UpdateUserProfileInformationAction',
         ], base_path('src/Domain/User/Actions/UpdateUserProfileInformationAction.php'));
 

src/Installers/JetstreamInstaller.php

@@ -56,6 +56,8 @@ protected function configureBaseFiles()
         (new Filesystem)->move(base_path('app/Actions/Jetstream/DeleteUser.php'), base_path('src/Domain/User/Actions/DeleteUserAction.php'));
         $this->replaceAllInFile([
             'namespace App\Actions\Jetstream;' => 'namespace Domain\User\Actions;',
+            'App\Models\Team'                  => 'Domain\Team\Models\Team',
+            'App\Models\User'                  => 'Domain\User\Models\User',
             'class DeleteUser'                 => 'class DeleteUserAction',
         ], base_path('src/Domain/User/Actions/DeleteUserAction.php'));
 
@@ -111,37 +113,48 @@ protected function configureTeamFiles()
         (new Filesystem)->move(base_path('app/Actions/Jetstream/AddTeamMember.php'), base_path('src/Domain/Team/Actions/AddTeamMemberAction.php'));
         $this->replaceAllInFile([
             'namespace App\Actions\Jetstream;' => 'namespace Domain\Team\Actions;',
+            'App\Models\Team'                  => 'Domain\Team\Models\Team',
+            'App\Models\User'                  => 'Domain\User\Models\User',
             'class AddTeamMember'              => 'class AddTeamMemberAction',
         ], base_path('src/Domain/Team/Actions/AddTeamMemberAction.php'));
 
         (new Filesystem)->move(base_path('app/Actions/Jetstream/CreateTeam.php'), base_path('src/Domain/Team/Actions/CreateTeamAction.php'));
         $this->replaceAllInFile([
             'namespace App\Actions\Jetstream;' => 'namespace Domain\Team\Actions;',
+            'App\Models\Team'                  => 'Domain\Team\Models\Team',
+            'App\Models\User'                  => 'Domain\User\Models\User',
             'class CreateTeam'                 => 'class CreateTeamAction',
         ], base_path('src/Domain/Team/Actions/CreateTeamAction.php'));
 
         (new Filesystem)->move(base_path('app/Actions/Jetstream/DeleteTeam.php'), base_path('src/Domain/Team/Actions/DeleteTeamAction.php'));
         $this->replaceAllInFile([
             'namespace App\Actions\Jetstream;' => 'namespace Domain\Team\Actions;',
+            'App\Models\Team'                  => 'Domain\Team\Models\Team',
             'class DeleteTeam'                 => 'class DeleteTeamAction',
         ], base_path('src/Domain/Team/Actions/DeleteTeamAction.php'));
 
         (new Filesystem)->move(base_path('app/Actions/Jetstream/InviteTeamMember.php'), base_path('src/Domain/Team/Actions/InviteTeamMemberAction.php'));
         $this->replaceAllInFile([
             'namespace App\Actions\Jetstream;' => 'namespace Domain\Team\Actions;',
+            'App\Models\Team'                  => 'Domain\Team\Models\Team',
+            'App\Models\User'                  => 'Domain\User\Models\User',
             'class InviteTeamMember'           => 'class InviteTeamMemberAction',
         ], base_path('src/Domain/Team/Actions/InviteTeamMemberAction.php'));
 
         (new Filesystem)->move(base_path('app/Actions/Jetstream/RemoveTeamMember.php'), base_path('src/Domain/Team/Actions/RemoveTeamMemberAction.php'));
         $this->replaceAllInFile([
             'namespace App\Actions\Jetstream;' => 'namespace Domain\Team\Actions;',
+            'App\Models\Team'                  => 'Domain\Team\Models\Team',
+            'App\Models\User'                  => 'Domain\User\Models\User',
             'class RemoveTeamMember'           => 'class RemoveTeamMemberAction',
         ], base_path('src/Domain/Team/Actions/RemoveTeamMemberAction.php'));
 
         (new Filesystem)->move(base_path('app/Actions/Jetstream/UpdateTeamName.php'), base_path('src/Domain/Team/Actions/UpdateTeamNameAction.php'));
         $this->replaceAllInFile([
             'namespace App\Actions\Jetstream;' => 'namespace Domain\Team\Actions;',
             'class UpdateTeamName'             => 'class UpdateTeamNameAction',
+            'App\Models\Team'                  => 'Domain\Team\Models\Team',
+            'App\Models\User'                  => 'Domain\User\Models\User',
         ], base_path('src/Domain/Team/Actions/UpdateTeamNameAction.php'));
 
         /* Models */