Problema
114 file PHP contengono marker di conflitto Git (<<<<<<< HEAD, =======, >>>>>>> origin/dev) committati direttamente nella storia del branch dev, presenti anche su origin/dev remoto (verificato: il fast-forward all'ultimo commit remoto non elimina il problema, è già così a monte).
Coinvolge sia codice applicativo (app/Actions, app/Contracts, app/Models, app/Filament) sia test (tests/) — non è confinato a file di documentazione o traduzione, quindi impedisce la compilazione/esecuzione di parti significative del modulo.
File coinvolti (114 totali)
database/seeders/UserDatabaseSeeder.phpdatabase/factories/OauthRefreshTokenFactory.phpapp/Listeners/LogoutListener.phpapp/Contracts/HasAuthentications.phpapp/Contracts/UserContract.phpapp/Actions/CreateUserAction.phpapp/Models/BaseUser.phpapp/Models/Traits/HasTeams.phpapp/Http/Livewire/Auth/AuthLogout.phpapp/Filament/Widgets/LoginWidget.phpapp/Filament/Widgets/Auth/RegisterWidget.phptests/TestCase.phptests/Pest.phptests/Unit/AuthenticationBusinessLogicTest.phptests/Unit/HasTeamsTraitCurrentTeamTest.phptests/Unit/TenantTest.phptests/Unit/UserTypeTest.phptests/Unit/UserModelsTest.phptests/Unit/UserModulePhpstanFixesTest.phptests/Unit/HasTeamsTraitPestTest.phptests/Unit/PermissionTest.phptests/Unit/ChangeTypeCommandTest.phptests/Unit/HasTeamsTraitTest.phptests/Unit/DebugConfigTest.phptests/Unit/UserTest.phptests/Unit/RoleTest.phptests/Unit/Datas/UserDatasAndEnumsCoverageTest.phptests/Unit/Datas/PasswordDataTest.phptests/Unit/Datas/AdditionalDatasTest.phptests/Unit/Datas/DataClassesTest.phptests/Unit/Actions/AdditionalActionsTest.phptests/Unit/Actions/RegisterOauthUserActionTest.phptests/Unit/Actions/IsUserAllowedActionTest.phptests/Unit/Actions/GetCurrentDeviceActionTest.phptests/Unit/Actions/User/UserMiscActionsTest.phptests/Unit/Actions/User/UpdateUserActionTest.phptests/Unit/Actions/User/GetNewPasswordActionTest.phptests/Unit/Actions/User/CreateUserActionTest.phptests/Unit/Actions/User/DeleteUserActionTest.phptests/Unit/Actions/Socialite/SocialiteUtilityActionsTest.phptests/Unit/Actions/Socialite/Utils/EmailDomainAnalyzerTest.phptests/Unit/Actions/Passport/CreateSpecificClientActionsTest.phptests/Unit/Actions/Activity/LogRegistrationActionTest.phptests/Unit/Actions/Otp/HasherTest.phptests/Unit/Actions/Otp/SendOtpByUserActionTest.phptests/Unit/Database/OauthFactoriesDefinitionTest.phptests/Unit/Mail/MailTest.phptests/Unit/Rules/CheckOtpExpiredRuleTest.phptests/Unit/Rules/RulesTest.phptests/Unit/Models/PassportModelWrappersTest.phptests/Unit/Models/UserBusinessLogicTest.phptests/Unit/Models/ProfileTest.phptests/Unit/Models/TeamTest.phptests/Unit/Models/TenantTest.phptests/Unit/Models/PassportWrapperConventionTest.phptests/Unit/Models/OauthClientTest.phptests/Unit/Models/PermissionTest.phptests/Unit/Models/UserTest.phptests/Unit/Models/DeviceTest.phptests/Unit/Models/AdditionalModelsTest.phptests/Unit/Models/RoleTest.phptests/Unit/Models/Policies/PoliciesTest.phptests/Unit/Models/Traits/HasTeamsTest.phptests/Unit/Models/Traits/Fixtures/MockUserWithTeams.phptests/Unit/QuickWins/UserQuickWinsCoverageTest.phptests/Unit/Enums/UserEnumsTest.phptests/Unit/Enums/EnumClassesTest.phptests/Unit/Traits/PasswordValidationRulesTest.phptests/Unit/Traits/TraitsTest.phptests/Unit/Traits/Fixtures/HasUserTestCaseFixture.phptests/Unit/Console/ConsoleCommandsTest.phptests/Unit/Facades/FacadesTest.phptests/Unit/Passport/PassportModelWrappersTest.phptests/Unit/Filament/Widgets/LoginWidgetTest.phptests/Unit/Events/EventsTest.phptests/Unit/Filament/Widgets/LogoutWidgetTest.phptests/Unit/Filament/Widgets/EditUserWidgetTest.phptests/Traits/HasUserTestCase.phptests/Feature/UserAuthenticationTest.phptests/Feature/TenantScopeConsoleTest.phptests/Feature/UserBusinessLogicTest.phptests/Feature/user-management-business-logic.phptests/Feature/UserManagementBusinessLogicTest.phptests/Feature/UserModelSimpleTest.phptests/Feature/PasswordDataLabelsTest.phptests/Feature/AuthComponentsTest.phptests/Feature/TeamManagementBusinessLogicTest.phptests/Feature/ChangeProfilePasswordTest.phptests/Feature/UserCommandIntegrationTest.phptests/Feature/MigrateDbTest.phptests/Feature/UserModelTest.phptests/Feature/TwoFactorServiceTest.phptests/Feature/UserModelBasicTest.phptests/Feature/TeamManagementTest.phptests/Feature/Actions/RevokeAllUserTokensActionTest.phptests/Feature/Actions/LoginUserActionTest.phptests/Feature/Actions/Socialite/SetDefaultRolesBySocialiteUserActionTest.phptests/Feature/Actions/Socialite/LoginUserActionTest.phptests/Feature/Actions/Socialite/RegisterOauthUserActionTest.phptests/Feature/Actions/Passport/RevokeAllUserTokensActionTest.phptests/Feature/Database/Migrations/UserMigrationSyntaxTest.phptests/Feature/Authentication/UserAuthenticationTest.phptests/Feature/Models/UserModelTest.phptests/Feature/Filament/UserResourceTest.phptests/Feature/Filament/Resources/UserResourceTest.phptests/Feature/Filament/Actions/ChangePasswordActionTest.phptests/Feature/Filament/Widgets/LoginWidgetTest.phptests/Feature/Filament/Widgets/UserOverviewTest.phptests/Feature/Filament/Widgets/Auth/RegisterWidgetTest.phptests/Feature/Filament/Clusters/AppearanceClusterTest.phptests/Feature/Filament/Pages/CreateUserTest.phptests/Feature/Auth/MicrosoftLoginButtonTest.phptests/Feature/Filament/Pages/ListUsersTest.phpresources/views/filament/widgets/auth/login.blade.php
Origine
Riscontrato durante un audit dei moduli il 2026-07-07, verosimilmente causato dallo stesso strumento di sync dei subtree usato su tutto l'ecosistema laraxot (problema analogo già tracciato in laraxot/module_xot_fila5#58, laraxot/module_notify_fila5#32, laraxot/module_activity_fila5#27).
Fix atteso
Risolvere manualmente i conflitti file per file: molti sembrano duplicazioni banali (stesso metodo/contenuto ripetuto in due posizioni), ma almeno i file in app/Actions, app/Contracts, app/Models/BaseUser.php vanno verificati con attenzione perché potrebbero contenere logiche divergenti reali, non solo riordinamenti.
Problema
114 file PHP contengono marker di conflitto Git (
<<<<<<< HEAD,=======,>>>>>>> origin/dev) committati direttamente nella storia del branchdev, presenti anche suorigin/devremoto (verificato: il fast-forward all'ultimo commit remoto non elimina il problema, è già così a monte).Coinvolge sia codice applicativo (
app/Actions,app/Contracts,app/Models,app/Filament) sia test (tests/) — non è confinato a file di documentazione o traduzione, quindi impedisce la compilazione/esecuzione di parti significative del modulo.File coinvolti (114 totali)
database/seeders/UserDatabaseSeeder.phpdatabase/factories/OauthRefreshTokenFactory.phpapp/Listeners/LogoutListener.phpapp/Contracts/HasAuthentications.phpapp/Contracts/UserContract.phpapp/Actions/CreateUserAction.phpapp/Models/BaseUser.phpapp/Models/Traits/HasTeams.phpapp/Http/Livewire/Auth/AuthLogout.phpapp/Filament/Widgets/LoginWidget.phpapp/Filament/Widgets/Auth/RegisterWidget.phptests/TestCase.phptests/Pest.phptests/Unit/AuthenticationBusinessLogicTest.phptests/Unit/HasTeamsTraitCurrentTeamTest.phptests/Unit/TenantTest.phptests/Unit/UserTypeTest.phptests/Unit/UserModelsTest.phptests/Unit/UserModulePhpstanFixesTest.phptests/Unit/HasTeamsTraitPestTest.phptests/Unit/PermissionTest.phptests/Unit/ChangeTypeCommandTest.phptests/Unit/HasTeamsTraitTest.phptests/Unit/DebugConfigTest.phptests/Unit/UserTest.phptests/Unit/RoleTest.phptests/Unit/Datas/UserDatasAndEnumsCoverageTest.phptests/Unit/Datas/PasswordDataTest.phptests/Unit/Datas/AdditionalDatasTest.phptests/Unit/Datas/DataClassesTest.phptests/Unit/Actions/AdditionalActionsTest.phptests/Unit/Actions/RegisterOauthUserActionTest.phptests/Unit/Actions/IsUserAllowedActionTest.phptests/Unit/Actions/GetCurrentDeviceActionTest.phptests/Unit/Actions/User/UserMiscActionsTest.phptests/Unit/Actions/User/UpdateUserActionTest.phptests/Unit/Actions/User/GetNewPasswordActionTest.phptests/Unit/Actions/User/CreateUserActionTest.phptests/Unit/Actions/User/DeleteUserActionTest.phptests/Unit/Actions/Socialite/SocialiteUtilityActionsTest.phptests/Unit/Actions/Socialite/Utils/EmailDomainAnalyzerTest.phptests/Unit/Actions/Passport/CreateSpecificClientActionsTest.phptests/Unit/Actions/Activity/LogRegistrationActionTest.phptests/Unit/Actions/Otp/HasherTest.phptests/Unit/Actions/Otp/SendOtpByUserActionTest.phptests/Unit/Database/OauthFactoriesDefinitionTest.phptests/Unit/Mail/MailTest.phptests/Unit/Rules/CheckOtpExpiredRuleTest.phptests/Unit/Rules/RulesTest.phptests/Unit/Models/PassportModelWrappersTest.phptests/Unit/Models/UserBusinessLogicTest.phptests/Unit/Models/ProfileTest.phptests/Unit/Models/TeamTest.phptests/Unit/Models/TenantTest.phptests/Unit/Models/PassportWrapperConventionTest.phptests/Unit/Models/OauthClientTest.phptests/Unit/Models/PermissionTest.phptests/Unit/Models/UserTest.phptests/Unit/Models/DeviceTest.phptests/Unit/Models/AdditionalModelsTest.phptests/Unit/Models/RoleTest.phptests/Unit/Models/Policies/PoliciesTest.phptests/Unit/Models/Traits/HasTeamsTest.phptests/Unit/Models/Traits/Fixtures/MockUserWithTeams.phptests/Unit/QuickWins/UserQuickWinsCoverageTest.phptests/Unit/Enums/UserEnumsTest.phptests/Unit/Enums/EnumClassesTest.phptests/Unit/Traits/PasswordValidationRulesTest.phptests/Unit/Traits/TraitsTest.phptests/Unit/Traits/Fixtures/HasUserTestCaseFixture.phptests/Unit/Console/ConsoleCommandsTest.phptests/Unit/Facades/FacadesTest.phptests/Unit/Passport/PassportModelWrappersTest.phptests/Unit/Filament/Widgets/LoginWidgetTest.phptests/Unit/Events/EventsTest.phptests/Unit/Filament/Widgets/LogoutWidgetTest.phptests/Unit/Filament/Widgets/EditUserWidgetTest.phptests/Traits/HasUserTestCase.phptests/Feature/UserAuthenticationTest.phptests/Feature/TenantScopeConsoleTest.phptests/Feature/UserBusinessLogicTest.phptests/Feature/user-management-business-logic.phptests/Feature/UserManagementBusinessLogicTest.phptests/Feature/UserModelSimpleTest.phptests/Feature/PasswordDataLabelsTest.phptests/Feature/AuthComponentsTest.phptests/Feature/TeamManagementBusinessLogicTest.phptests/Feature/ChangeProfilePasswordTest.phptests/Feature/UserCommandIntegrationTest.phptests/Feature/MigrateDbTest.phptests/Feature/UserModelTest.phptests/Feature/TwoFactorServiceTest.phptests/Feature/UserModelBasicTest.phptests/Feature/TeamManagementTest.phptests/Feature/Actions/RevokeAllUserTokensActionTest.phptests/Feature/Actions/LoginUserActionTest.phptests/Feature/Actions/Socialite/SetDefaultRolesBySocialiteUserActionTest.phptests/Feature/Actions/Socialite/LoginUserActionTest.phptests/Feature/Actions/Socialite/RegisterOauthUserActionTest.phptests/Feature/Actions/Passport/RevokeAllUserTokensActionTest.phptests/Feature/Database/Migrations/UserMigrationSyntaxTest.phptests/Feature/Authentication/UserAuthenticationTest.phptests/Feature/Models/UserModelTest.phptests/Feature/Filament/UserResourceTest.phptests/Feature/Filament/Resources/UserResourceTest.phptests/Feature/Filament/Actions/ChangePasswordActionTest.phptests/Feature/Filament/Widgets/LoginWidgetTest.phptests/Feature/Filament/Widgets/UserOverviewTest.phptests/Feature/Filament/Widgets/Auth/RegisterWidgetTest.phptests/Feature/Filament/Clusters/AppearanceClusterTest.phptests/Feature/Filament/Pages/CreateUserTest.phptests/Feature/Auth/MicrosoftLoginButtonTest.phptests/Feature/Filament/Pages/ListUsersTest.phpresources/views/filament/widgets/auth/login.blade.phpOrigine
Riscontrato durante un audit dei moduli il 2026-07-07, verosimilmente causato dallo stesso strumento di sync dei subtree usato su tutto l'ecosistema laraxot (problema analogo già tracciato in laraxot/module_xot_fila5#58, laraxot/module_notify_fila5#32, laraxot/module_activity_fila5#27).
Fix atteso
Risolvere manualmente i conflitti file per file: molti sembrano duplicazioni banali (stesso metodo/contenuto ripetuto in due posizioni), ma almeno i file in
app/Actions,app/Contracts,app/Models/BaseUser.phpvanno verificati con attenzione perché potrebbero contenere logiche divergenti reali, non solo riordinamenti.