From 2203fcb62bf4d6805d7163e49249fd9cdb2f2a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Skowro=C5=84ski?= Date: Sat, 9 Mar 2024 01:34:50 +0100 Subject: [PATCH] Split code by modules --- assets/{ => mods}/mod/modForm.js | 0 .../modListPublic/modListCustomize.js | 0 assets/{ => shared}/_bootstrap.scss | 0 assets/{ => shared}/app.js | 0 assets/{ => shared}/app.scss | 0 assets/{ => shared}/font/Good Brush.woff | Bin assets/{ => shared}/form.js | 0 assets/{ => shared/index}/landing.js | 0 assets/{ => shared/index}/landing.scss | 0 assets/{ => shared/joinUs}/joinUs.js | 0 assets/{ => shared/joinUs}/joinUs.scss | 0 assets/{ => shared}/multiRowSelect.js | 0 .../{ => attendances}/filters/Attendance.yaml | 0 .../attendances/resources/Attendance.yaml | 19 ++++++ .../{ => mods}/filters/ModList.yaml | 0 .../api_platform/mods/resources/ModList.yaml | 25 +++++++ config/api_platform/resources/Attendance.yaml | 19 ------ config/api_platform/resources/ModList.yaml | 25 ------- .../Attendance.Attendance.orm.xml} | 2 +- .../{Dlc/Dlc.orm.xml => Mods/Dlc.Dlc.orm.xml} | 2 +- .../Mod.AbstractMod.orm.xml} | 8 +-- .../Mod.DirectoryMod.orm.xml} | 2 +- .../Mod.SteamWorkshopMod.orm.xml} | 4 +- .../ModGroup.ModGroup.orm.xml} | 4 +- .../ModList.ModList.orm.xml} | 10 +-- .../Common.AbstractBlamableEntity.orm.xml} | 6 +- .../Common.AbstractEntity.orm.xml} | 2 +- .../Permissions.AbstractPermissions.orm.xml} | 8 +-- .../Permissions.UserGroupPermissions.orm.xml} | 2 +- .../Permissions.UserPermissions.orm.xml} | 2 +- .../User.orm.xml => Users/User.User.orm.xml} | 6 +- .../UserGroup.UserGroup.orm.xml} | 6 +- config/packages/api_platform.yaml | 7 +- config/packages/doctrine.yaml | 64 +++++------------- config/packages/http_client.yaml | 2 +- config/packages/security.yaml | 6 +- config/packages/twig.yaml | 2 +- config/routes.yaml | 4 +- config/routes/annotations.yaml | 2 +- config/services.yaml | 40 +++++------ .../AttendanceInputDataTransformer.php | 8 +-- .../AttendanceOutputDataTransformer.php | 6 +- .../Api/Input/Attendance/AttendanceInput.php | 6 +- .../Output/Attendance/AttendanceOutput.php | 2 +- .../Attendance/AttendanceProcessor.php | 8 +-- .../Attendance/AttendanceDataProvider.php | 6 +- .../Attendance/AttendanceFixtures.php | 6 +- .../Entity/Attendance/Attendance.php | 4 +- .../Attendance/AttendanceRepository.php | 4 +- .../Validator/Attendance/UniqueAttendance.php | 2 +- .../Attendance/UniqueAttendanceValidator.php | 8 +-- src/Controller/.gitignore | 0 src/Entity/.gitignore | 0 .../ModList/GetModListByNameOperation.php | 8 +-- .../Dlc/DlcOutputDataTransformer.php | 6 +- .../Mod/ModOutputDataTransformer.php | 14 ++-- .../ModListDetailsOutputDataTransformer.php | 18 ++--- .../ModList/ModListOutputDataTransformer.php | 6 +- src/{ => Mods}/Api/Output/Dlc/DlcOutput.php | 2 +- src/{ => Mods}/Api/Output/Mod/ModOutput.php | 2 +- .../Output/ModList/ModListDetailsOutput.php | 6 +- .../Api/Output/ModList/ModListOutput.php | 2 +- .../Provider/ModList/ModListDataProvider.php | 6 +- .../ModList/ModListDetailsDataProvider.php | 6 +- .../Controller/Dlc/CreateAction.php | 12 ++-- .../Controller/Dlc/DeleteAction.php | 6 +- src/{ => Mods}/Controller/Dlc/ListAction.php | 8 +-- .../Controller/Dlc/UpdateAction.php | 14 ++-- .../Controller/Mod/CreateAction.php | 12 ++-- .../Controller/Mod/DeleteAction.php | 6 +- src/{ => Mods}/Controller/Mod/ListAction.php | 8 +-- .../Controller/Mod/UpdateAction.php | 14 ++-- .../Controller/ModGroup/CreateAction.php | 12 ++-- .../Controller/ModGroup/DeleteAction.php | 6 +- .../Controller/ModGroup/ListAction.php | 8 +-- .../Controller/ModGroup/UpdateAction.php | 14 ++-- .../Controller/ModList/CopyAction.php | 14 ++-- .../Controller/ModList/CreateAction.php | 12 ++-- .../Controller/ModList/DeleteAction.php | 6 +- .../Controller/ModList/ListAction.php | 8 +-- .../Controller/ModList/UpdateAction.php | 14 ++-- .../ModListPublic/CustomizeAction.php | 10 +-- .../ModListPublic/DownloadAction.php | 10 +-- .../Controller/ModListPublic/SelectAction.php | 8 +-- .../Dlc/CslaIronCurtainDlcFixture.php | 6 +- .../Dlc/GlobalMobilizationDlcFixture.php | 6 +- .../Dlc/SogPrairieFireDlcFixture.php | 6 +- .../Dlc/Spearhead1944DlcFixture.php | 6 +- .../ArmaScriptProfilerModFixture.php | 6 +- .../Mod/Directory/Deprecated/R3ModFixture.php | 8 +-- .../AceInteractionMenuExpansionModFixture.php | 8 +-- .../Required/ArmaForcesMedicalModFixture.php | 8 +-- .../Broken/ArmaForcesAceMedicalModFixture.php | 10 +-- .../Required/CupTerrainsCoreModFixture.php | 8 +-- .../Required/CupTerrainsMapsModFixture.php | 8 +-- .../Required/CupUnitsModFixture.php | 8 +-- .../Required/CupVehiclesModFixture.php | 8 +-- .../Required/CupWeaponsModFixture.php | 8 +-- .../LegacyArmaForcesModsModFixture.php | 10 +-- .../ArmaForcesJbadBuildingFixModFixture.php | 10 +-- .../Required/RhsAfrfModFixture.php | 8 +-- .../Required/RhsGrefModFixture.php | 8 +-- .../Required/RhsUsafModFixture.php | 8 +-- .../ModGroup/CupModGroupFixture.php | 18 ++--- .../ModGroup/RhsModGroupFixture.php | 12 ++-- .../ModList/CupModListFixture.php | 28 ++++---- .../ModList/DefaultModListFixture.php | 50 +++++++------- .../ModList/RhsModListFixture.php | 28 ++++---- src/{ => Mods}/Entity/Dlc/Dlc.php | 4 +- src/{ => Mods}/Entity/Mod/AbstractMod.php | 6 +- src/{ => Mods}/Entity/Mod/DirectoryMod.php | 4 +- .../Entity/Mod/Enum/ModSourceEnum.php | 2 +- .../Entity/Mod/Enum/ModStatusEnum.php | 2 +- .../Entity/Mod/Enum/ModTypeEnum.php | 2 +- .../Entity/Mod/SteamWorkshopMod.php | 6 +- src/{ => Mods}/Entity/ModGroup/ModGroup.php | 6 +- src/{ => Mods}/Entity/ModList/ModList.php | 12 ++-- .../Doctrine/ModGroupUpdatedSubscriber.php | 8 ++- .../DlcFormDtoDataTransformer.php | 12 ++-- src/{ => Mods}/Form/Dlc/DlcFormType.php | 4 +- src/{ => Mods}/Form/Dlc/Dto/DlcFormDto.php | 10 +-- .../ModFormDtoDataTransformer.php | 24 +++---- src/{ => Mods}/Form/Mod/Dto/ModFormDto.php | 12 ++-- src/{ => Mods}/Form/Mod/ModFormType.php | 14 ++-- .../ModGroupFormDtoDataTransformer.php | 8 +-- .../Form/ModGroup/Dto/ModGroupFormDto.php | 6 +- .../Form/ModGroup/ModGroupFormType.php | 6 +- .../ModListFormDtoDataTransformer.php | 12 ++-- .../Form/ModList/Dto/ModListFormDto.php | 12 ++-- .../Form/ModList/ModListFormType.php | 16 ++--- .../Repository/Dlc/DlcRepository.php | 4 +- .../Repository/Mod/DirectoryModRepository.php | 4 +- .../Repository/Mod/ModRepository.php | 12 ++-- .../Mod/SteamWorkshopModRepository.php | 4 +- .../ModGroup/ModGroupRepository.php | 4 +- .../Repository/ModList/ModListRepository.php | 4 +- .../Security/Voter/Dlc/CreateDlcVoter.php | 8 +-- .../Security/Voter/Dlc/DeleteDlcVoter.php | 10 +-- .../Security/Voter/Dlc/ListDlcsVoter.php | 8 +-- .../Security/Voter/Dlc/UpdateDlcVoter.php | 10 +-- .../Security/Voter/Mod/CreateModVoter.php | 8 +-- .../Security/Voter/Mod/DeleteModVoter.php | 10 +-- .../Security/Voter/Mod/ListModsVoter.php | 8 +-- .../Security/Voter/Mod/UpdateModVoter.php | 10 +-- .../Voter/ModGroup/CreateModGroupVoter.php | 8 +-- .../Voter/ModGroup/DeleteModGroupVoter.php | 10 +-- .../Voter/ModGroup/ListModGroupsVoter.php | 8 +-- .../Voter/ModGroup/UpdateModGroupVoter.php | 10 +-- .../Voter/ModList/ApproveModListVoter.php | 8 +-- .../Voter/ModList/CopyModListVoter.php | 10 +-- .../Voter/ModList/CreateModListVoter.php | 8 +-- .../Voter/ModList/DeleteModListVoter.php | 10 +-- .../Voter/ModList/DownloadModListVoter.php | 10 +-- .../Voter/ModList/ListModListsVoter.php | 8 +-- .../Voter/ModList/UpdateModListVoter.php | 10 +-- .../ModListUpdateService.php | 8 +-- .../ModListUpdateServiceInterface.php | 4 +- .../Validator/Dlc/SteamStoreArma3DlcUrl.php | 2 +- .../Dlc/SteamStoreArma3DlcUrlValidator.php | 14 ++-- .../Validator/Dlc/UniqueDirectoryDlc.php | 2 +- .../Dlc/UniqueDirectoryDlcValidator.php | 8 +-- .../Validator/Dlc/UniqueSteamStoreDlc.php | 2 +- .../Dlc/UniqueSteamStoreDlcValidator.php | 12 ++-- .../Mod/SteamWorkshopArma3ModUrl.php | 2 +- .../Mod/SteamWorkshopArma3ModUrlValidator.php | 14 ++-- .../Validator/Mod/UniqueDirectoryMod.php | 2 +- .../Mod/UniqueDirectoryModValidator.php | 8 +-- .../Validator/Mod/UniqueSteamWorkshopMod.php | 2 +- .../Mod/UniqueSteamWorkshopModValidator.php | 12 ++-- .../Validator/ModGroup/UniqueModGroupName.php | 2 +- .../ModGroup/UniqueModGroupNameValidator.php | 8 +-- .../Validator/ModList/UniqueModListName.php | 2 +- .../ModList/UniqueModListNameValidator.php | 8 +-- src/Repository/.gitignore | 0 .../Provider/Common/AbstractDataProvider.php | 2 +- .../Normalizer/PaginatorNormalizer.php | 2 +- .../Controller/Home/IndexAction.php | 6 +- .../Controller/Home/JoinUsAction.php | 4 +- .../Controller/Home/MissionsAction.php | 6 +- .../Controller/Security/ConnectAction.php | 4 +- .../Security/ConnectCheckAction.php | 2 +- .../Controller/Security/LogoutAction.php | 2 +- .../Doctrine/Dbal/Types/BigIntType.php | 2 +- .../Entity/Common}/AbstractBlamableEntity.php | 4 +- .../Entity/Common}/AbstractEntity.php | 2 +- .../Doctrine/EntityBlamableSubscriber.php | 8 ++- .../UserLocaleRequestSubscriber.php | 2 +- .../Authenticator/ApiKeyAuthenticator.php | 4 +- .../Authenticator/DiscordAuthenticator.php | 24 +++---- .../Security/Enum/ConnectionsEnum.php | 2 +- .../Security/Enum/PermissionsEnum.php | 2 +- src/{ => Shared}/Security/Enum/RoleEnum.php | 2 +- src/{ => Shared}/Security/Enum/ScopeEnum.php | 2 +- .../Security/Exception/MultipleRolesFound.php | 2 +- .../RequiredRolesNotAssignedException.php | 2 +- .../Exception/RoleNotFoundException.php | 2 +- .../UserNotADiscordMemberException.php | 2 +- .../Security/Model/ApiTokenUser.php | 4 +- .../Security/Traits/UserInterfaceTrait.php | 4 +- .../Service/Discord/DiscordClientFactory.php | 2 +- .../IdentifierFactory/IdentifierFactory.php | 2 +- .../IdentifierFactoryInterface.php | 2 +- .../IdentifierFactoryStub.php | 2 +- .../Service/Mission/Dto/MissionDto.php | 2 +- .../Service/Mission/Enum/MissionStateEnum.php | 2 +- .../Service/Mission/MissionClient.php | 6 +- .../Mission/MissionClientInterface.php | 4 +- .../Service/Mission/MissionStore.php | 2 +- .../Service/SteamApiClient/Dto/AppInfoDto.php | 2 +- .../Dto/WorkshopItemInfoDto.php | 2 +- .../Exception/AppNotFoundException.php | 2 +- .../Exception/ClientException.php | 2 +- .../WorkshopItemNotFoundException.php | 2 +- .../InvalidAppUrlFormatException.php | 2 +- .../InvalidWorkshopItemUrlFormatException.php | 2 +- .../SteamApiClient/Helper/SteamHelper.php | 6 +- .../Service/SteamApiClient/SteamApiClient.php | 10 +-- .../SteamApiClientInterface.php | 6 +- .../SteamApiClientMockResponseFactory.php | 2 +- .../GetPublishedFileDetails/1934142795.json | 0 .../GetPublishedFileDetails/1981535406.json | 0 .../GetPublishedFileDetails/455312245.json | 0 .../Test/data/appdetails/1227700.json | 0 .../Test/data/appdetails/1681170.json | 0 .../Test/data/appdetails/2138330.json | 0 .../Service/Version/VersionProvider.php | 2 +- .../Version/VersionProviderInterface.php | 2 +- src/{ => Shared}/Test/Traits/TimeTrait.php | 2 +- .../Twig/BackgroundImageExtension.php | 2 +- src/{ => Shared}/Twig/CalendarExtension.php | 4 +- src/{ => Shared}/Twig/ImgproxyExtension.php | 2 +- src/{ => Shared}/Twig/SteamExtension.php | 4 +- src/{ => Shared}/Twig/UserExtension.php | 4 +- src/{ => Shared}/Twig/UtilsExtension.php | 2 +- src/{ => Shared}/Twig/VersionExtension.php | 4 +- .../Validator/Common}/AbstractValidator.php | 2 +- .../Validator/Common}/SteamProfileId.php | 2 +- .../Common}/SteamProfileIdValidator.php | 2 +- .../Common}/WindowsDirectoryName.php | 2 +- .../Common}/WindowsDirectoryNameValidator.php | 2 +- .../Command/PermissionsMakeAdminCommand.php | 6 +- .../Controller/User/DeleteAction.php | 6 +- .../Controller/User/ListAction.php | 8 +-- .../Controller/User/UpdateAction.php | 14 ++-- .../Controller/UserGroup/CreateAction.php | 12 ++-- .../Controller/UserGroup/DeleteAction.php | 6 +- .../Controller/UserGroup/ListAction.php | 8 +-- .../Controller/UserGroup/UpdateAction.php | 14 ++-- .../DataFixtures/User/AdminFixture.php | 8 +-- .../DataFixtures/User/User1Fixture.php | 8 +-- .../DataFixtures/User/User2Fixture.php | 8 +-- .../DataFixtures/User/User3Fixture.php | 8 +-- .../UserGroup/AdminsGroupFixture.php | 10 +-- .../UserGroup/UsersGroupFixture.php | 16 ++--- .../Permissions/AbstractPermissions.php | 4 +- .../Permissions/UserGroupPermissions.php | 2 +- .../Entity/Permissions/UserPermissions.php | 2 +- src/{ => Users}/Entity/User/User.php | 10 +-- .../Entity/UserGroup/UserGroup.php | 8 +-- .../Form/Permissions/PermissionsType.php | 6 +- .../UserFormDtoDataTransformer.php | 6 +- src/{ => Users}/Form/User/Dto/UserFormDto.php | 8 +-- src/{ => Users}/Form/User/UserFormType.php | 8 +-- .../UserGroupFormDtoDataTransformer.php | 10 +-- .../Form/UserGroup/Dto/UserGroupFormDto.php | 8 +-- .../Form/UserGroup/UserGroupFormType.php | 10 +-- .../Permissions/PermissionsRepository.php | 4 +- .../UserGroupPermissionsRepository.php | 6 +- .../Permissions/UserPermissionsRepository.php | 6 +- .../Repository/User/UserRepository.php | 4 +- .../UserGroup/UserGroupRepository.php | 4 +- .../Security/Voter/User/DeleteUserVoter.php | 8 +-- .../Security/Voter/User/ListUsersVoter.php | 8 +-- .../Security/Voter/User/UpdateUserVoter.php | 8 +-- .../Voter/UserGroup/CreateUserGroupVoter.php | 8 +-- .../Voter/UserGroup/DeleteUserGroupVoter.php | 10 +-- .../Voter/UserGroup/ListUserGroupsVoter.php | 8 +-- .../Voter/UserGroup/UpdateUserGroupVoter.php | 10 +-- .../Validator/User/UniqueUserSteamId.php | 2 +- .../User/UniqueUserSteamIdValidator.php | 10 +-- .../UserGroup/UniqueUserGroupName.php | 2 +- .../UniqueUserGroupNameValidator.php | 8 +-- .../mod_tabs/_mod_tabs_content.html.twig | 16 ----- .../dlc_tabs/_dlc_tabs_content.html.twig | 4 +- .../_partial/dlc_tabs/_dlc_tabs_nav.html.twig | 2 +- .../dlc_tabs/_dlc_tabs_table.html.twig | 6 +- .../_mod_group_tabs_content.html.twig | 4 +- .../_mod_group_tabs_nav.html.twig | 2 +- .../_mod_group_tabs_table.html.twig | 6 +- .../_partial/mod_tabs/_mod_tabs.html.twig | 4 +- .../mod_tabs/_mod_tabs_content.html.twig | 16 +++++ .../_partial/mod_tabs/_mod_tabs_nav.html.twig | 2 +- .../mod_tabs/_mod_tabs_table.html.twig | 16 ++--- templates/{ => mods}/dlc/form.html.twig | 6 +- templates/{ => mods}/dlc/list.html.twig | 16 ++--- templates/{ => mods}/mod/form.html.twig | 6 +- templates/{ => mods}/mod/list.html.twig | 16 ++--- templates/{ => mods}/mod_group/form.html.twig | 8 +-- templates/{ => mods}/mod_group/list.html.twig | 16 ++--- templates/{ => mods}/mod_list/form.html.twig | 18 ++--- templates/{ => mods}/mod_list/list.html.twig | 22 +++--- .../_partial/_description.html.twig | 0 .../_partial/_optional_mods_tab.html.twig | 8 +-- .../_partial/_required_mods_tab.html.twig | 8 +-- .../mod_list_public/customize.html.twig | 12 ++-- .../launcher_preset_template.html.twig | 12 ++-- .../mod_list_public/select.html.twig | 16 ++--- .../_macro/common_macro.html.twig | 0 .../{ => shared}/_macro/tab_macro.html.twig | 0 .../{ => shared}/_macro/table_macro.html.twig | 30 ++++---- .../{ => shared}/_partial/_footer.html.twig | 0 .../_partial/_mission_widget.html.twig | 2 +- .../{ => shared}/_partial/_modal.html.twig | 0 .../_partial/_page_header.html.twig | 0 .../{ => shared}/_partial/_table.html.twig | 0 .../_partial/navbar/_navbar.html.twig | 4 +- .../_partial/navbar/_navbar_icons.html.twig | 0 .../_partial/navbar/_navbar_links.html.twig | 24 +++---- templates/{ => shared}/app_theme.html.twig | 0 templates/{ => shared}/base.html.twig | 4 +- .../TwigBundle/Exception/error.html.twig | 0 .../TwigBundle/Exception/error403.html.twig | 0 .../TwigBundle/Exception/error404.html.twig | 0 templates/{ => shared}/card.html.twig | 2 +- templates/{ => shared}/container.html.twig | 2 +- .../{ => shared}/container_fluid.html.twig | 2 +- templates/{ => shared}/default.html.twig | 8 +-- .../home/index/_partial/_about.html.twig | 16 ++--- .../home/index/_partial/_missions.html.twig | 10 +-- .../index/_partial/pl/_about_us.html.twig | 0 .../index/_partial/pl/_community.html.twig | 0 .../home/index/_partial/pl/_fun.html.twig | 0 .../home/index/_partial/pl/_games.html.twig | 0 .../home/index/_partial/pl/_gaming.html.twig | 0 .../{ => shared}/home/index/index.html.twig | 12 ++-- .../join_us/_partial/pl/join_steps.html.twig | 0 .../home/join_us/join_us.html.twig | 8 +-- .../home/missions/missions.html.twig | 10 +-- .../_partial/permissions/form.html.twig | 0 templates/{ => users}/user/form.html.twig | 8 +-- templates/{ => users}/user/list.html.twig | 14 ++-- .../_partial/_users_table.html.twig | 6 +- .../_partial/combo_tabs/_combo_tabs.html.twig | 4 +- .../combo_tabs/_combo_tabs_content.html.twig | 4 +- .../combo_tabs/_combo_tabs_nav.html.twig | 2 +- .../{ => users}/user_group/form.html.twig | 10 +-- .../{ => users}/user_group/list.html.twig | 16 ++--- tests/_support/FunctionalTester.php | 2 +- tests/_support/Traits/ResponseAssertTrait.php | 4 +- .../_support/Traits/SecurityAssertsTrait.php | 2 +- .../Api/Attendance/CreateAttendanceCest.php | 6 +- .../Api/Attendance/ListAttendancesCest.php | 2 +- .../Api/ModList/GetModListsByIdCest.php | 4 +- .../Api/ModList/GetModListsByNameCest.php | 4 +- .../Api/ModList/ListModListsCest.php | 2 +- .../{ => Mods}/Web/Dlc/CreateDlcCest.php | 12 ++-- .../{ => Mods}/Web/Dlc/DeleteDlcCest.php | 10 +-- .../{ => Mods}/Web/Dlc/ListDlcsCest.php | 6 +- .../{ => Mods}/Web/Dlc/UpdateDlcCest.php | 16 ++--- .../Web/Mod/CreateDirectoryModCest.php | 16 ++--- .../Web/Mod/CreateSteamWorkshopModCest.php | 20 +++--- .../{ => Mods}/Web/Mod/DeleteModCest.php | 10 +-- .../{ => Mods}/Web/Mod/ListModsCest.php | 6 +- .../Web/Mod/UpdateDirectoryModCest.php | 16 ++--- .../Web/Mod/UpdateSteamWorkshopModCest.php | 20 +++--- .../Web/ModGroup/CreateModGroupCest.php | 18 ++--- .../Web/ModGroup/DeleteModGroupCest.php | 10 +-- .../Web/ModGroup/ListModGroupsCest.php | 6 +- .../Web/ModGroup/UpdateModGroupCest.php | 24 +++---- .../Web/ModList/CopyModListCest.php | 46 ++++++------- .../Web/ModList/CreateModListCest.php | 28 ++++---- .../Web/ModList/DeleteModListCest.php | 12 ++-- .../Web/ModList/ListModListsCest.php | 8 +-- .../Web/ModList/UpdateModListCest.php | 46 ++++++------- .../ModListPublic/CustomizeModListCest.php | 8 +-- .../Web/ModListPublic/DownloadModListCest.php | 44 ++++++------ .../Web/ModListPublic/SelectModListCest.php | 10 +-- .../{Web => Shared}/Api/IndexCest.php | 6 +- .../{ => Shared}/Web/Home/IndexCest.php | 6 +- .../{ => Shared}/Web/Home/JoinUsCest.php | 6 +- .../{ => Shared}/Web/Home/MissionsCest.php | 6 +- .../{ => Shared}/Web/Security/ConnectCest.php | 4 +- .../{ => Shared}/Web/Security/LogoutCest.php | 4 +- .../{ => Users}/Web/User/DeleteUserCest.php | 8 +-- .../{ => Users}/Web/User/ListUsersCest.php | 6 +- .../{ => Users}/Web/User/UpdateUserCest.php | 10 +-- .../Web/UserGroup/CreateUserGroupCest.php | 21 +++--- .../Web/UserGroup/DeleteUserGroupCest.php | 10 +-- .../Web/UserGroup/ListUserGroupsCest.php | 6 +- .../Web/UserGroup/UpdateUserGroupCest.php | 20 +++--- .../SteamApiClient/SteamApiClientCest.php | 8 +-- .../Service/Version/VersionProviderCest.php | 4 +- .../Doctrine/EntityBlamableSubscriberTest.php | 8 +-- .../Discord/DiscordClientFactoryTest.php | 4 +- .../Service/Mission/MissionClientTest.php | 8 +-- .../SteamApiClient/Helper/SteamHelperTest.php | 6 +- webpack.config.js | 12 ++-- 397 files changed, 1456 insertions(+), 1488 deletions(-) rename assets/{ => mods}/mod/modForm.js (100%) rename assets/{ => mods}/modListPublic/modListCustomize.js (100%) rename assets/{ => shared}/_bootstrap.scss (100%) rename assets/{ => shared}/app.js (100%) rename assets/{ => shared}/app.scss (100%) rename assets/{ => shared}/font/Good Brush.woff (100%) rename assets/{ => shared}/form.js (100%) rename assets/{ => shared/index}/landing.js (100%) rename assets/{ => shared/index}/landing.scss (100%) rename assets/{ => shared/joinUs}/joinUs.js (100%) rename assets/{ => shared/joinUs}/joinUs.scss (100%) rename assets/{ => shared}/multiRowSelect.js (100%) rename config/api_platform/{ => attendances}/filters/Attendance.yaml (100%) create mode 100644 config/api_platform/attendances/resources/Attendance.yaml rename config/api_platform/{ => mods}/filters/ModList.yaml (100%) create mode 100644 config/api_platform/mods/resources/ModList.yaml delete mode 100644 config/api_platform/resources/Attendance.yaml delete mode 100644 config/api_platform/resources/ModList.yaml rename config/doctrine/{Attendance/Attendance.orm.xml => Attendances/Attendance.Attendance.orm.xml} (83%) rename config/doctrine/{Dlc/Dlc.orm.xml => Mods/Dlc.Dlc.orm.xml} (87%) rename config/doctrine/{Mod/AbstractMod.orm.xml => Mods/Mod.AbstractMod.orm.xml} (71%) rename config/doctrine/{Mod/DirectoryMod.orm.xml => Mods/Mod.DirectoryMod.orm.xml} (80%) rename config/doctrine/{Mod/SteamWorkshopMod.orm.xml => Mods/Mod.SteamWorkshopMod.orm.xml} (69%) rename config/doctrine/{ModGroup/ModGroup.orm.xml => Mods/ModGroup.ModGroup.orm.xml} (84%) rename config/doctrine/{ModList/ModList.orm.xml => Mods/ModList.ModList.orm.xml} (85%) rename config/doctrine/{AbstractBlamableEntity.orm.xml => Shared/Common.AbstractBlamableEntity.orm.xml} (82%) rename config/doctrine/{AbstractEntity.orm.xml => Shared/Common.AbstractEntity.orm.xml} (89%) rename config/doctrine/{Permissions/AbstractPermissions.orm.xml => Users/Permissions.AbstractPermissions.orm.xml} (85%) rename config/doctrine/{Permissions/UserPermissions.orm.xml => Users/Permissions.UserGroupPermissions.orm.xml} (72%) rename config/doctrine/{Permissions/UserGroupPermissions.orm.xml => Users/Permissions.UserPermissions.orm.xml} (73%) rename config/doctrine/{User/User.orm.xml => Users/User.User.orm.xml} (81%) rename config/doctrine/{UserGroup/UserGroup.orm.xml => Users/UserGroup.UserGroup.orm.xml} (79%) rename src/{ => Attendances}/Api/DataTransformer/Attendance/AttendanceInputDataTransformer.php (71%) rename src/{ => Attendances}/Api/DataTransformer/Attendance/AttendanceOutputDataTransformer.php (69%) rename src/{ => Attendances}/Api/Input/Attendance/AttendanceInput.php (65%) rename src/{ => Attendances}/Api/Output/Attendance/AttendanceOutput.php (83%) rename src/{ => Attendances}/Api/Processor/Attendance/AttendanceProcessor.php (79%) rename src/{ => Attendances}/Api/Provider/Attendance/AttendanceDataProvider.php (79%) rename src/{ => Attendances}/DataFixtures/Attendance/AttendanceFixtures.php (92%) rename src/{ => Attendances}/Entity/Attendance/Attendance.php (86%) rename src/{ => Attendances}/Repository/Attendance/AttendanceRepository.php (86%) rename src/{ => Attendances}/Validator/Attendance/UniqueAttendance.php (94%) rename src/{ => Attendances}/Validator/Attendance/UniqueAttendanceValidator.php (84%) delete mode 100644 src/Controller/.gitignore delete mode 100644 src/Entity/.gitignore rename src/{ => Mods}/Api/Controller/ModList/GetModListByNameOperation.php (76%) rename src/{ => Mods}/Api/DataTransformer/Dlc/DlcOutputDataTransformer.php (77%) rename src/{ => Mods}/Api/DataTransformer/Mod/ModOutputDataTransformer.php (71%) rename src/{ => Mods}/Api/DataTransformer/ModList/ModListDetailsOutputDataTransformer.php (70%) rename src/{ => Mods}/Api/DataTransformer/ModList/ModListOutputDataTransformer.php (76%) rename src/{ => Mods}/Api/Output/Dlc/DlcOutput.php (90%) rename src/{ => Mods}/Api/Output/Mod/ModOutput.php (92%) rename src/{ => Mods}/Api/Output/ModList/ModListDetailsOutput.php (83%) rename src/{ => Mods}/Api/Output/ModList/ModListOutput.php (89%) rename src/{ => Mods}/Api/Provider/ModList/ModListDataProvider.php (81%) rename src/{ => Mods}/Api/Provider/ModList/ModListDetailsDataProvider.php (81%) rename src/{ => Mods}/Controller/Dlc/CreateAction.php (82%) rename src/{ => Mods}/Controller/Dlc/DeleteAction.php (87%) rename src/{ => Mods}/Controller/Dlc/ListAction.php (78%) rename src/{ => Mods}/Controller/Dlc/UpdateAction.php (80%) rename src/{ => Mods}/Controller/Mod/CreateAction.php (82%) rename src/{ => Mods}/Controller/Mod/DeleteAction.php (86%) rename src/{ => Mods}/Controller/Mod/ListAction.php (78%) rename src/{ => Mods}/Controller/Mod/UpdateAction.php (80%) rename src/{ => Mods}/Controller/ModGroup/CreateAction.php (81%) rename src/{ => Mods}/Controller/ModGroup/DeleteAction.php (86%) rename src/{ => Mods}/Controller/ModGroup/ListAction.php (77%) rename src/{ => Mods}/Controller/ModGroup/UpdateAction.php (79%) rename src/{ => Mods}/Controller/ModList/CopyAction.php (80%) rename src/{ => Mods}/Controller/ModList/CreateAction.php (81%) rename src/{ => Mods}/Controller/ModList/DeleteAction.php (86%) rename src/{ => Mods}/Controller/ModList/ListAction.php (79%) rename src/{ => Mods}/Controller/ModList/UpdateAction.php (79%) rename src/{ => Mods}/Controller/ModListPublic/CustomizeAction.php (79%) rename src/{ => Mods}/Controller/ModListPublic/DownloadAction.php (84%) rename src/{ => Mods}/Controller/ModListPublic/SelectAction.php (85%) rename src/{ => Mods}/DataFixtures/Dlc/CslaIronCurtainDlcFixture.php (88%) rename src/{ => Mods}/DataFixtures/Dlc/GlobalMobilizationDlcFixture.php (89%) rename src/{ => Mods}/DataFixtures/Dlc/SogPrairieFireDlcFixture.php (88%) rename src/{ => Mods}/DataFixtures/Dlc/Spearhead1944DlcFixture.php (88%) rename src/{ => Mods}/DataFixtures/Mod/Directory/ArmaScriptProfilerModFixture.php (87%) rename src/{ => Mods}/DataFixtures/Mod/Directory/Deprecated/R3ModFixture.php (81%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Optional/AceInteractionMenuExpansionModFixture.php (82%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/ArmaForcesMedicalModFixture.php (82%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/Broken/ArmaForcesAceMedicalModFixture.php (79%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsCoreModFixture.php (82%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsMapsModFixture.php (82%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/CupUnitsModFixture.php (82%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/CupVehiclesModFixture.php (82%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/CupWeaponsModFixture.php (82%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/Deprecated/LegacyArmaForcesModsModFixture.php (79%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/Disabled/ArmaForcesJbadBuildingFixModFixture.php (79%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/RhsAfrfModFixture.php (82%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/RhsGrefModFixture.php (82%) rename src/{ => Mods}/DataFixtures/Mod/SteamWorkshop/Required/RhsUsafModFixture.php (82%) rename src/{ => Mods}/DataFixtures/ModGroup/CupModGroupFixture.php (75%) rename src/{ => Mods}/DataFixtures/ModGroup/RhsModGroupFixture.php (79%) rename src/{ => Mods}/DataFixtures/ModList/CupModListFixture.php (73%) rename src/{ => Mods}/DataFixtures/ModList/DefaultModListFixture.php (67%) rename src/{ => Mods}/DataFixtures/ModList/RhsModListFixture.php (73%) rename src/{ => Mods}/Entity/Dlc/Dlc.php (93%) rename src/{ => Mods}/Entity/Mod/AbstractMod.php (86%) rename src/{ => Mods}/Entity/Mod/DirectoryMod.php (91%) rename src/{ => Mods}/Entity/Mod/Enum/ModSourceEnum.php (80%) rename src/{ => Mods}/Entity/Mod/Enum/ModStatusEnum.php (92%) rename src/{ => Mods}/Entity/Mod/Enum/ModTypeEnum.php (91%) rename src/{ => Mods}/Entity/Mod/SteamWorkshopMod.php (89%) rename src/{ => Mods}/Entity/ModGroup/ModGroup.php (92%) rename src/{ => Mods}/Entity/ModList/ModList.php (94%) rename src/{ => Mods}/EventSubscriber/Doctrine/ModGroupUpdatedSubscriber.php (78%) rename src/{ => Mods}/Form/Dlc/DataTransformer/DlcFormDtoDataTransformer.php (83%) rename src/{ => Mods}/Form/Dlc/DlcFormType.php (94%) rename src/{ => Mods}/Form/Dlc/Dto/DlcFormDto.php (86%) rename src/{ => Mods}/Form/Mod/DataTransformer/ModFormDtoDataTransformer.php (85%) rename src/{ => Mods}/Form/Mod/Dto/ModFormDto.php (90%) rename src/{ => Mods}/Form/Mod/ModFormType.php (93%) rename src/{ => Mods}/Form/ModGroup/DataTransformer/ModGroupFormDtoDataTransformer.php (86%) rename src/{ => Mods}/Form/ModGroup/Dto/ModGroupFormDto.php (93%) rename src/{ => Mods}/Form/ModGroup/ModGroupFormType.php (92%) rename src/{ => Mods}/Form/ModList/DataTransformer/ModListFormDtoDataTransformer.php (90%) rename src/{ => Mods}/Form/ModList/Dto/ModListFormDto.php (95%) rename src/{ => Mods}/Form/ModList/ModListFormType.php (94%) rename src/{ => Mods}/Repository/Dlc/DlcRepository.php (90%) rename src/{ => Mods}/Repository/Mod/DirectoryModRepository.php (91%) rename src/{ => Mods}/Repository/Mod/ModRepository.php (94%) rename src/{ => Mods}/Repository/Mod/SteamWorkshopModRepository.php (91%) rename src/{ => Mods}/Repository/ModGroup/ModGroupRepository.php (88%) rename src/{ => Mods}/Repository/ModList/ModListRepository.php (90%) rename src/{ => Mods}/Security/Voter/Dlc/CreateDlcVoter.php (80%) rename src/{ => Mods}/Security/Voter/Dlc/DeleteDlcVoter.php (78%) rename src/{ => Mods}/Security/Voter/Dlc/ListDlcsVoter.php (80%) rename src/{ => Mods}/Security/Voter/Dlc/UpdateDlcVoter.php (78%) rename src/{ => Mods}/Security/Voter/Mod/CreateModVoter.php (80%) rename src/{ => Mods}/Security/Voter/Mod/DeleteModVoter.php (78%) rename src/{ => Mods}/Security/Voter/Mod/ListModsVoter.php (80%) rename src/{ => Mods}/Security/Voter/Mod/UpdateModVoter.php (78%) rename src/{ => Mods}/Security/Voter/ModGroup/CreateModGroupVoter.php (80%) rename src/{ => Mods}/Security/Voter/ModGroup/DeleteModGroupVoter.php (77%) rename src/{ => Mods}/Security/Voter/ModGroup/ListModGroupsVoter.php (80%) rename src/{ => Mods}/Security/Voter/ModGroup/UpdateModGroupVoter.php (77%) rename src/{ => Mods}/Security/Voter/ModList/ApproveModListVoter.php (80%) rename src/{ => Mods}/Security/Voter/ModList/CopyModListVoter.php (77%) rename src/{ => Mods}/Security/Voter/ModList/CreateModListVoter.php (80%) rename src/{ => Mods}/Security/Voter/ModList/DeleteModListVoter.php (80%) rename src/{ => Mods}/Security/Voter/ModList/DownloadModListVoter.php (82%) rename src/{ => Mods}/Security/Voter/ModList/ListModListsVoter.php (80%) rename src/{ => Mods}/Security/Voter/ModList/UpdateModListVoter.php (80%) rename src/{ => Mods}/Service/ModListUpdateService/ModListUpdateService.php (87%) rename src/{ => Mods}/Service/ModListUpdateService/ModListUpdateServiceInterface.php (64%) rename src/{ => Mods}/Validator/Dlc/SteamStoreArma3DlcUrl.php (97%) rename src/{ => Mods}/Validator/Dlc/SteamStoreArma3DlcUrlValidator.php (81%) rename src/{ => Mods}/Validator/Dlc/UniqueDirectoryDlc.php (95%) rename src/{ => Mods}/Validator/Dlc/UniqueDirectoryDlcValidator.php (87%) rename src/{ => Mods}/Validator/Dlc/UniqueSteamStoreDlc.php (95%) rename src/{ => Mods}/Validator/Dlc/UniqueSteamStoreDlcValidator.php (79%) rename src/{ => Mods}/Validator/Mod/SteamWorkshopArma3ModUrl.php (97%) rename src/{ => Mods}/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php (82%) rename src/{ => Mods}/Validator/Mod/UniqueDirectoryMod.php (95%) rename src/{ => Mods}/Validator/Mod/UniqueDirectoryModValidator.php (86%) rename src/{ => Mods}/Validator/Mod/UniqueSteamWorkshopMod.php (95%) rename src/{ => Mods}/Validator/Mod/UniqueSteamWorkshopModValidator.php (78%) rename src/{ => Mods}/Validator/ModGroup/UniqueModGroupName.php (95%) rename src/{ => Mods}/Validator/ModGroup/UniqueModGroupNameValidator.php (85%) rename src/{ => Mods}/Validator/ModList/UniqueModListName.php (95%) rename src/{ => Mods}/Validator/ModList/UniqueModListNameValidator.php (85%) delete mode 100644 src/Repository/.gitignore rename src/{ => Shared}/Api/Provider/Common/AbstractDataProvider.php (97%) rename src/{ => Shared}/Api/Serializer/Normalizer/PaginatorNormalizer.php (96%) rename src/{ => Shared}/Controller/Home/IndexAction.php (83%) rename src/{ => Shared}/Controller/Home/JoinUsAction.php (76%) rename src/{ => Shared}/Controller/Home/MissionsAction.php (85%) rename src/{ => Shared}/Controller/Security/ConnectAction.php (91%) rename src/{ => Shared}/Controller/Security/ConnectCheckAction.php (92%) rename src/{ => Shared}/Controller/Security/LogoutAction.php (91%) rename src/{ => Shared}/Doctrine/Dbal/Types/BigIntType.php (88%) rename src/{Entity => Shared/Entity/Common}/AbstractBlamableEntity.php (92%) rename src/{Entity => Shared/Entity/Common}/AbstractEntity.php (93%) rename src/{ => Shared}/EventSubscriber/Doctrine/EntityBlamableSubscriber.php (81%) rename src/{ => Shared}/EventSubscriber/UserLocaleRequestSubscriber.php (98%) rename src/{ => Shared}/Security/Authenticator/ApiKeyAuthenticator.php (95%) rename src/{ => Shared}/Security/Authenticator/DiscordAuthenticator.php (92%) rename src/{ => Shared}/Security/Enum/ConnectionsEnum.php (72%) rename src/{ => Shared}/Security/Enum/PermissionsEnum.php (97%) rename src/{ => Shared}/Security/Enum/RoleEnum.php (72%) rename src/{ => Shared}/Security/Enum/ScopeEnum.php (83%) rename src/{ => Shared}/Security/Exception/MultipleRolesFound.php (68%) rename src/{ => Shared}/Security/Exception/RequiredRolesNotAssignedException.php (81%) rename src/{ => Shared}/Security/Exception/RoleNotFoundException.php (69%) rename src/{ => Shared}/Security/Exception/UserNotADiscordMemberException.php (81%) rename src/{ => Shared}/Security/Model/ApiTokenUser.php (79%) rename src/{ => Shared}/Security/Traits/UserInterfaceTrait.php (82%) rename src/{ => Shared}/Service/Discord/DiscordClientFactory.php (95%) rename src/{ => Shared}/Service/IdentifierFactory/IdentifierFactory.php (83%) rename src/{ => Shared}/Service/IdentifierFactory/IdentifierFactoryInterface.php (76%) rename src/{ => Shared}/Service/IdentifierFactory/IdentifierFactoryStub.php (95%) rename src/{ => Shared}/Service/Mission/Dto/MissionDto.php (98%) rename src/{ => Shared}/Service/Mission/Enum/MissionStateEnum.php (77%) rename src/{ => Shared}/Service/Mission/MissionClient.php (94%) rename src/{ => Shared}/Service/Mission/MissionClientInterface.php (81%) rename src/{ => Shared}/Service/Mission/MissionStore.php (97%) rename src/{ => Shared}/Service/SteamApiClient/Dto/AppInfoDto.php (91%) rename src/{ => Shared}/Service/SteamApiClient/Dto/WorkshopItemInfoDto.php (89%) rename src/{ => Shared}/Service/SteamApiClient/Exception/AppNotFoundException.php (81%) rename src/{ => Shared}/Service/SteamApiClient/Exception/ClientException.php (58%) rename src/{ => Shared}/Service/SteamApiClient/Exception/WorkshopItemNotFoundException.php (81%) rename src/{ => Shared}/Service/SteamApiClient/Helper/Exception/InvalidAppUrlFormatException.php (59%) rename src/{ => Shared}/Service/SteamApiClient/Helper/Exception/InvalidWorkshopItemUrlFormatException.php (61%) rename src/{ => Shared}/Service/SteamApiClient/Helper/SteamHelper.php (86%) rename src/{ => Shared}/Service/SteamApiClient/SteamApiClient.php (86%) rename src/{ => Shared}/Service/SteamApiClient/SteamApiClientInterface.php (55%) rename src/{ => Shared}/Service/SteamApiClient/Test/SteamApiClientMockResponseFactory.php (98%) rename src/{ => Shared}/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1934142795.json (100%) rename src/{ => Shared}/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1981535406.json (100%) rename src/{ => Shared}/Service/SteamApiClient/Test/data/GetPublishedFileDetails/455312245.json (100%) rename src/{ => Shared}/Service/SteamApiClient/Test/data/appdetails/1227700.json (100%) rename src/{ => Shared}/Service/SteamApiClient/Test/data/appdetails/1681170.json (100%) rename src/{ => Shared}/Service/SteamApiClient/Test/data/appdetails/2138330.json (100%) rename src/{ => Shared}/Service/Version/VersionProvider.php (92%) rename src/{ => Shared}/Service/Version/VersionProviderInterface.php (75%) rename src/{ => Shared}/Test/Traits/TimeTrait.php (94%) rename src/{ => Shared}/Twig/BackgroundImageExtension.php (97%) rename src/{ => Shared}/Twig/CalendarExtension.php (93%) rename src/{ => Shared}/Twig/ImgproxyExtension.php (98%) rename src/{ => Shared}/Twig/SteamExtension.php (91%) rename src/{ => Shared}/Twig/UserExtension.php (96%) rename src/{ => Shared}/Twig/UtilsExtension.php (97%) rename src/{ => Shared}/Twig/VersionExtension.php (89%) rename src/{Validator => Shared/Validator/Common}/AbstractValidator.php (97%) rename src/{Validator => Shared/Validator/Common}/SteamProfileId.php (96%) rename src/{Validator => Shared/Validator/Common}/SteamProfileIdValidator.php (79%) rename src/{Validator => Shared/Validator/Common}/WindowsDirectoryName.php (96%) rename src/{Validator => Shared/Validator/Common}/WindowsDirectoryNameValidator.php (80%) rename src/{ => Users}/Command/PermissionsMakeAdminCommand.php (96%) rename src/{ => Users}/Controller/User/DeleteAction.php (87%) rename src/{ => Users}/Controller/User/ListAction.php (77%) rename src/{ => Users}/Controller/User/UpdateAction.php (80%) rename src/{ => Users}/Controller/UserGroup/CreateAction.php (80%) rename src/{ => Users}/Controller/UserGroup/DeleteAction.php (86%) rename src/{ => Users}/Controller/UserGroup/ListAction.php (77%) rename src/{ => Users}/Controller/UserGroup/UpdateAction.php (78%) rename src/{ => Users}/DataFixtures/User/AdminFixture.php (87%) rename src/{ => Users}/DataFixtures/User/User1Fixture.php (88%) rename src/{ => Users}/DataFixtures/User/User2Fixture.php (88%) rename src/{ => Users}/DataFixtures/User/User3Fixture.php (88%) rename src/{ => Users}/DataFixtures/UserGroup/AdminsGroupFixture.php (84%) rename src/{ => Users}/DataFixtures/UserGroup/UsersGroupFixture.php (81%) rename src/{ => Users}/Entity/Permissions/AbstractPermissions.php (96%) rename src/{ => Users}/Entity/Permissions/UserGroupPermissions.php (69%) rename src/{ => Users}/Entity/Permissions/UserPermissions.php (68%) rename src/{ => Users}/Entity/User/User.php (93%) rename src/{ => Users}/Entity/UserGroup/UserGroup.php (91%) rename src/{ => Users}/Form/Permissions/PermissionsType.php (98%) rename src/{ => Users}/Form/User/DataTransformer/UserFormDtoDataTransformer.php (86%) rename src/{ => Users}/Form/User/Dto/UserFormDto.php (82%) rename src/{ => Users}/Form/User/UserFormType.php (85%) rename src/{ => Users}/Form/UserGroup/DataTransformer/UserGroupFormDtoDataTransformer.php (86%) rename src/{ => Users}/Form/UserGroup/Dto/UserGroupFormDto.php (92%) rename src/{ => Users}/Form/UserGroup/UserGroupFormType.php (88%) rename src/{ => Users}/Repository/Permissions/PermissionsRepository.php (87%) rename src/{ => Users}/Repository/Permissions/UserGroupPermissionsRepository.php (82%) rename src/{ => Users}/Repository/Permissions/UserPermissionsRepository.php (82%) rename src/{ => Users}/Repository/User/UserRepository.php (91%) rename src/{ => Users}/Repository/UserGroup/UserGroupRepository.php (88%) rename src/{ => Users}/Security/Voter/User/DeleteUserVoter.php (82%) rename src/{ => Users}/Security/Voter/User/ListUsersVoter.php (80%) rename src/{ => Users}/Security/Voter/User/UpdateUserVoter.php (81%) rename src/{ => Users}/Security/Voter/UserGroup/CreateUserGroupVoter.php (80%) rename src/{ => Users}/Security/Voter/UserGroup/DeleteUserGroupVoter.php (77%) rename src/{ => Users}/Security/Voter/UserGroup/ListUserGroupsVoter.php (80%) rename src/{ => Users}/Security/Voter/UserGroup/UpdateUserGroupVoter.php (77%) rename src/{ => Users}/Validator/User/UniqueUserSteamId.php (95%) rename src/{ => Users}/Validator/User/UniqueUserSteamIdValidator.php (83%) rename src/{ => Users}/Validator/UserGroup/UniqueUserGroupName.php (95%) rename src/{ => Users}/Validator/UserGroup/UniqueUserGroupNameValidator.php (84%) delete mode 100644 templates/_partial/mod_tabs/_mod_tabs_content.html.twig rename templates/{ => mods}/_partial/dlc_tabs/_dlc_tabs_content.html.twig (51%) rename templates/{ => mods}/_partial/dlc_tabs/_dlc_tabs_nav.html.twig (77%) rename templates/{ => mods}/_partial/dlc_tabs/_dlc_tabs_table.html.twig (85%) rename templates/{ => mods}/_partial/mod_group_tabs/_mod_group_tabs_content.html.twig (51%) rename templates/{ => mods}/_partial/mod_group_tabs/_mod_group_tabs_nav.html.twig (79%) rename templates/{ => mods}/_partial/mod_group_tabs/_mod_group_tabs_table.html.twig (84%) rename templates/{ => mods}/_partial/mod_tabs/_mod_tabs.html.twig (65%) create mode 100644 templates/mods/_partial/mod_tabs/_mod_tabs_content.html.twig rename templates/{ => mods}/_partial/mod_tabs/_mod_tabs_nav.html.twig (93%) rename templates/{ => mods}/_partial/mod_tabs/_mod_tabs_table.html.twig (73%) rename templates/{ => mods}/dlc/form.html.twig (79%) rename templates/{ => mods}/dlc/list.html.twig (72%) rename templates/{ => mods}/mod/form.html.twig (81%) rename templates/{ => mods}/mod/list.html.twig (75%) rename templates/{ => mods}/mod_group/form.html.twig (72%) rename templates/{ => mods}/mod_group/list.html.twig (72%) rename templates/{ => mods}/mod_list/form.html.twig (66%) rename templates/{ => mods}/mod_list/list.html.twig (76%) rename templates/{ => mods}/mod_list_public/_partial/_description.html.twig (100%) rename templates/{ => mods}/mod_list_public/_partial/_optional_mods_tab.html.twig (87%) rename templates/{ => mods}/mod_list_public/_partial/_required_mods_tab.html.twig (80%) rename templates/{ => mods}/mod_list_public/customize.html.twig (81%) rename templates/{ => mods}/mod_list_public/launcher_preset_template.html.twig (89%) rename templates/{ => mods}/mod_list_public/select.html.twig (83%) rename templates/{ => shared}/_macro/common_macro.html.twig (100%) rename templates/{ => shared}/_macro/tab_macro.html.twig (100%) rename templates/{ => shared}/_macro/table_macro.html.twig (64%) rename templates/{ => shared}/_partial/_footer.html.twig (100%) rename templates/{ => shared}/_partial/_mission_widget.html.twig (94%) rename templates/{ => shared}/_partial/_modal.html.twig (100%) rename templates/{ => shared}/_partial/_page_header.html.twig (100%) rename templates/{ => shared}/_partial/_table.html.twig (100%) rename templates/{ => shared}/_partial/navbar/_navbar.html.twig (81%) rename templates/{ => shared}/_partial/navbar/_navbar_icons.html.twig (100%) rename templates/{ => shared}/_partial/navbar/_navbar_links.html.twig (62%) rename templates/{ => shared}/app_theme.html.twig (100%) rename templates/{ => shared}/base.html.twig (96%) rename templates/{ => shared}/bundles/TwigBundle/Exception/error.html.twig (100%) rename templates/{ => shared}/bundles/TwigBundle/Exception/error403.html.twig (100%) rename templates/{ => shared}/bundles/TwigBundle/Exception/error404.html.twig (100%) rename templates/{ => shared}/card.html.twig (85%) rename templates/{ => shared}/container.html.twig (81%) rename templates/{ => shared}/container_fluid.html.twig (82%) rename templates/{ => shared}/default.html.twig (58%) rename templates/{ => shared}/home/index/_partial/_about.html.twig (72%) rename templates/{ => shared}/home/index/_partial/_missions.html.twig (60%) rename templates/{ => shared}/home/index/_partial/pl/_about_us.html.twig (100%) rename templates/{ => shared}/home/index/_partial/pl/_community.html.twig (100%) rename templates/{ => shared}/home/index/_partial/pl/_fun.html.twig (100%) rename templates/{ => shared}/home/index/_partial/pl/_games.html.twig (100%) rename templates/{ => shared}/home/index/_partial/pl/_gaming.html.twig (100%) rename templates/{ => shared}/home/index/index.html.twig (85%) rename templates/{ => shared}/home/join_us/_partial/pl/join_steps.html.twig (100%) rename templates/{ => shared}/home/join_us/join_us.html.twig (83%) rename templates/{ => shared}/home/missions/missions.html.twig (81%) rename templates/{ => users}/_partial/permissions/form.html.twig (100%) rename templates/{ => users}/user/form.html.twig (67%) rename templates/{ => users}/user/list.html.twig (78%) rename templates/{ => users}/user_group/_partial/_users_table.html.twig (88%) rename templates/{ => users}/user_group/_partial/combo_tabs/_combo_tabs.html.twig (61%) rename templates/{ => users}/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig (60%) rename templates/{ => users}/user_group/_partial/combo_tabs/_combo_tabs_nav.html.twig (86%) rename templates/{ => users}/user_group/form.html.twig (68%) rename templates/{ => users}/user_group/list.html.twig (72%) rename tests/functional/{ => Attendances}/Api/Attendance/CreateAttendanceCest.php (96%) rename tests/functional/{ => Attendances}/Api/Attendance/ListAttendancesCest.php (98%) rename tests/functional/{ => Mods}/Api/ModList/GetModListsByIdCest.php (99%) rename tests/functional/{ => Mods}/Api/ModList/GetModListsByNameCest.php (99%) rename tests/functional/{ => Mods}/Api/ModList/ListModListsCest.php (98%) rename tests/functional/{ => Mods}/Web/Dlc/CreateDlcCest.php (97%) rename tests/functional/{ => Mods}/Web/Dlc/DeleteDlcCest.php (89%) rename tests/functional/{ => Mods}/Web/Dlc/ListDlcsCest.php (95%) rename tests/functional/{ => Mods}/Web/Dlc/UpdateDlcCest.php (96%) rename tests/functional/{ => Mods}/Web/Mod/CreateDirectoryModCest.php (95%) rename tests/functional/{ => Mods}/Web/Mod/CreateSteamWorkshopModCest.php (95%) rename tests/functional/{ => Mods}/Web/Mod/DeleteModCest.php (88%) rename tests/functional/{ => Mods}/Web/Mod/ListModsCest.php (95%) rename tests/functional/{ => Mods}/Web/Mod/UpdateDirectoryModCest.php (95%) rename tests/functional/{ => Mods}/Web/Mod/UpdateSteamWorkshopModCest.php (95%) rename tests/functional/{ => Mods}/Web/ModGroup/CreateModGroupCest.php (91%) rename tests/functional/{ => Mods}/Web/ModGroup/DeleteModGroupCest.php (88%) rename tests/functional/{ => Mods}/Web/ModGroup/ListModGroupsCest.php (95%) rename tests/functional/{ => Mods}/Web/ModGroup/UpdateModGroupCest.php (89%) rename tests/functional/{ => Mods}/Web/ModList/CopyModListCest.php (91%) rename tests/functional/{ => Mods}/Web/ModList/CreateModListCest.php (94%) rename tests/functional/{ => Mods}/Web/ModList/DeleteModListCest.php (89%) rename tests/functional/{ => Mods}/Web/ModList/ListModListsCest.php (96%) rename tests/functional/{ => Mods}/Web/ModList/UpdateModListCest.php (91%) rename tests/functional/{ => Mods}/Web/ModListPublic/CustomizeModListCest.php (86%) rename tests/functional/{ => Mods}/Web/ModListPublic/DownloadModListCest.php (76%) rename tests/functional/{ => Mods}/Web/ModListPublic/SelectModListCest.php (73%) rename tests/functional/{Web => Shared}/Api/IndexCest.php (87%) rename tests/functional/{ => Shared}/Web/Home/IndexCest.php (91%) rename tests/functional/{ => Shared}/Web/Home/JoinUsCest.php (93%) rename tests/functional/{ => Shared}/Web/Home/MissionsCest.php (89%) rename tests/functional/{ => Shared}/Web/Security/ConnectCest.php (86%) rename tests/functional/{ => Shared}/Web/Security/LogoutCest.php (87%) rename tests/functional/{ => Users}/Web/User/DeleteUserCest.php (92%) rename tests/functional/{ => Users}/Web/User/ListUsersCest.php (94%) rename tests/functional/{ => Users}/Web/User/UpdateUserCest.php (98%) rename tests/functional/{ => Users}/Web/UserGroup/CreateUserGroupCest.php (95%) rename tests/functional/{ => Users}/Web/UserGroup/DeleteUserGroupCest.php (88%) rename tests/functional/{ => Users}/Web/UserGroup/ListUserGroupsCest.php (95%) rename tests/functional/{ => Users}/Web/UserGroup/UpdateUserGroupCest.php (94%) rename tests/integration/{ => Shared}/Service/SteamApiClient/SteamApiClientCest.php (87%) rename tests/integration/{ => Shared}/Service/Version/VersionProviderCest.php (90%) rename tests/unit/{ => Shared}/EventSubscriber/Doctrine/EntityBlamableSubscriberTest.php (95%) rename tests/unit/{ => Shared}/Service/Discord/DiscordClientFactoryTest.php (93%) rename tests/unit/{ => Shared}/Service/Mission/MissionClientTest.php (96%) rename tests/unit/{ => Shared}/Service/SteamApiClient/Helper/SteamHelperTest.php (89%) diff --git a/assets/mod/modForm.js b/assets/mods/mod/modForm.js similarity index 100% rename from assets/mod/modForm.js rename to assets/mods/mod/modForm.js diff --git a/assets/modListPublic/modListCustomize.js b/assets/mods/modListPublic/modListCustomize.js similarity index 100% rename from assets/modListPublic/modListCustomize.js rename to assets/mods/modListPublic/modListCustomize.js diff --git a/assets/_bootstrap.scss b/assets/shared/_bootstrap.scss similarity index 100% rename from assets/_bootstrap.scss rename to assets/shared/_bootstrap.scss diff --git a/assets/app.js b/assets/shared/app.js similarity index 100% rename from assets/app.js rename to assets/shared/app.js diff --git a/assets/app.scss b/assets/shared/app.scss similarity index 100% rename from assets/app.scss rename to assets/shared/app.scss diff --git a/assets/font/Good Brush.woff b/assets/shared/font/Good Brush.woff similarity index 100% rename from assets/font/Good Brush.woff rename to assets/shared/font/Good Brush.woff diff --git a/assets/form.js b/assets/shared/form.js similarity index 100% rename from assets/form.js rename to assets/shared/form.js diff --git a/assets/landing.js b/assets/shared/index/landing.js similarity index 100% rename from assets/landing.js rename to assets/shared/index/landing.js diff --git a/assets/landing.scss b/assets/shared/index/landing.scss similarity index 100% rename from assets/landing.scss rename to assets/shared/index/landing.scss diff --git a/assets/joinUs.js b/assets/shared/joinUs/joinUs.js similarity index 100% rename from assets/joinUs.js rename to assets/shared/joinUs/joinUs.js diff --git a/assets/joinUs.scss b/assets/shared/joinUs/joinUs.scss similarity index 100% rename from assets/joinUs.scss rename to assets/shared/joinUs/joinUs.scss diff --git a/assets/multiRowSelect.js b/assets/shared/multiRowSelect.js similarity index 100% rename from assets/multiRowSelect.js rename to assets/shared/multiRowSelect.js diff --git a/config/api_platform/filters/Attendance.yaml b/config/api_platform/attendances/filters/Attendance.yaml similarity index 100% rename from config/api_platform/filters/Attendance.yaml rename to config/api_platform/attendances/filters/Attendance.yaml diff --git a/config/api_platform/attendances/resources/Attendance.yaml b/config/api_platform/attendances/resources/Attendance.yaml new file mode 100644 index 00000000..fd1a34b0 --- /dev/null +++ b/config/api_platform/attendances/resources/Attendance.yaml @@ -0,0 +1,19 @@ +resources: + App\Attendances\Entity\Attendance\Attendance: + operations: + ApiPlatform\Metadata\GetCollection: + provider: 'App\Attendances\Api\Provider\Attendance\AttendanceDataProvider' + output: 'App\Attendances\Api\Output\Attendance\AttendanceOutput' + filters: + - 'attendance.search_filter' + - 'attendance.date_filter' + - 'attendance.order_filter' + + ApiPlatform\Metadata\Get: + provider: 'App\Attendances\Api\Provider\Attendance\AttendanceDataProvider' + output: 'App\Attendances\Api\Output\Attendance\AttendanceOutput' + + ApiPlatform\Metadata\Post: + input: 'App\Attendances\Api\Input\Attendance\AttendanceInput' + processor: 'App\Attendances\Api\Processor\Attendance\AttendanceProcessor' + output: 'App\Attendances\Api\Output\Attendance\AttendanceOutput' diff --git a/config/api_platform/filters/ModList.yaml b/config/api_platform/mods/filters/ModList.yaml similarity index 100% rename from config/api_platform/filters/ModList.yaml rename to config/api_platform/mods/filters/ModList.yaml diff --git a/config/api_platform/mods/resources/ModList.yaml b/config/api_platform/mods/resources/ModList.yaml new file mode 100644 index 00000000..32e13769 --- /dev/null +++ b/config/api_platform/mods/resources/ModList.yaml @@ -0,0 +1,25 @@ +resources: + App\Mods\Entity\ModList\ModList: + operations: + ApiPlatform\Metadata\GetCollection: + provider: 'App\Mods\Api\Provider\ModList\ModListDataProvider' + output: 'App\Mods\Api\Output\ModList\ModListOutput' + filters: + - 'mod_list.search_filter' + - 'mod_list.date_filter' + - 'mod_list.order_filter' + + ApiPlatform\Metadata\Get: + provider: 'App\Mods\Api\Provider\ModList\ModListDetailsDataProvider' + output: 'App\Mods\Api\Output\ModList\ModListDetailsOutput' + + get_by_name: + output: 'App\Mods\Api\Output\ModList\ModListDetailsOutput' + class: 'ApiPlatform\Metadata\Get' + uriTemplate: '/mod-lists/by-name/{name}' + uriVariables: + name: + fromClass: 'App\Mods\Entity\ModList\ModList' + fromProperty: 'name' + controller: 'App\Mods\Api\Controller\ModList\GetModListByNameOperation' + read: false diff --git a/config/api_platform/resources/Attendance.yaml b/config/api_platform/resources/Attendance.yaml deleted file mode 100644 index 6124d00a..00000000 --- a/config/api_platform/resources/Attendance.yaml +++ /dev/null @@ -1,19 +0,0 @@ -resources: - App\Entity\Attendance\Attendance: - operations: - ApiPlatform\Metadata\GetCollection: - provider: 'App\Api\Provider\Attendance\AttendanceDataProvider' - output: 'App\Api\Output\Attendance\AttendanceOutput' - filters: - - 'attendance.search_filter' - - 'attendance.date_filter' - - 'attendance.order_filter' - - ApiPlatform\Metadata\Get: - provider: 'App\Api\Provider\Attendance\AttendanceDataProvider' - output: 'App\Api\Output\Attendance\AttendanceOutput' - - ApiPlatform\Metadata\Post: - input: 'App\Api\Input\Attendance\AttendanceInput' - processor: 'App\Api\Processor\Attendance\AttendanceProcessor' - output: 'App\Api\Output\Attendance\AttendanceOutput' diff --git a/config/api_platform/resources/ModList.yaml b/config/api_platform/resources/ModList.yaml deleted file mode 100644 index 0aabeca7..00000000 --- a/config/api_platform/resources/ModList.yaml +++ /dev/null @@ -1,25 +0,0 @@ -resources: - App\Entity\ModList\ModList: - operations: - ApiPlatform\Metadata\GetCollection: - provider: 'App\Api\Provider\ModList\ModListDataProvider' - output: 'App\Api\Output\ModList\ModListOutput' - filters: - - 'mod_list.search_filter' - - 'mod_list.date_filter' - - 'mod_list.order_filter' - - ApiPlatform\Metadata\Get: - provider: 'App\Api\Provider\ModList\ModListDetailsDataProvider' - output: 'App\Api\Output\ModList\ModListDetailsOutput' - - get_by_name: - output: 'App\Api\Output\ModList\ModListDetailsOutput' - class: 'ApiPlatform\Metadata\Get' - uriTemplate: '/mod-lists/by-name/{name}' - uriVariables: - name: - fromClass: 'App\Entity\ModList\ModList' - fromProperty: 'name' - controller: 'App\Api\Controller\ModList\GetModListByNameOperation' - read: false diff --git a/config/doctrine/Attendance/Attendance.orm.xml b/config/doctrine/Attendances/Attendance.Attendance.orm.xml similarity index 83% rename from config/doctrine/Attendance/Attendance.orm.xml rename to config/doctrine/Attendances/Attendance.Attendance.orm.xml index f87b13c6..715a2ecc 100644 --- a/config/doctrine/Attendance/Attendance.orm.xml +++ b/config/doctrine/Attendances/Attendance.Attendance.orm.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + diff --git a/config/doctrine/Dlc/Dlc.orm.xml b/config/doctrine/Mods/Dlc.Dlc.orm.xml similarity index 87% rename from config/doctrine/Dlc/Dlc.orm.xml rename to config/doctrine/Mods/Dlc.Dlc.orm.xml index 9e75395a..81699181 100644 --- a/config/doctrine/Dlc/Dlc.orm.xml +++ b/config/doctrine/Mods/Dlc.Dlc.orm.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + diff --git a/config/doctrine/Mod/AbstractMod.orm.xml b/config/doctrine/Mods/Mod.AbstractMod.orm.xml similarity index 71% rename from config/doctrine/Mod/AbstractMod.orm.xml rename to config/doctrine/Mods/Mod.AbstractMod.orm.xml index 01c9bfbb..9b5afec4 100644 --- a/config/doctrine/Mod/AbstractMod.orm.xml +++ b/config/doctrine/Mods/Mod.AbstractMod.orm.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + - + - - + + diff --git a/config/doctrine/Mod/DirectoryMod.orm.xml b/config/doctrine/Mods/Mod.DirectoryMod.orm.xml similarity index 80% rename from config/doctrine/Mod/DirectoryMod.orm.xml rename to config/doctrine/Mods/Mod.DirectoryMod.orm.xml index 55d03263..b0e28de6 100644 --- a/config/doctrine/Mod/DirectoryMod.orm.xml +++ b/config/doctrine/Mods/Mod.DirectoryMod.orm.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + diff --git a/config/doctrine/Mod/SteamWorkshopMod.orm.xml b/config/doctrine/Mods/Mod.SteamWorkshopMod.orm.xml similarity index 69% rename from config/doctrine/Mod/SteamWorkshopMod.orm.xml rename to config/doctrine/Mods/Mod.SteamWorkshopMod.orm.xml index ac3aa644..fb6ac1d7 100644 --- a/config/doctrine/Mod/SteamWorkshopMod.orm.xml +++ b/config/doctrine/Mods/Mod.SteamWorkshopMod.orm.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - - + + diff --git a/config/doctrine/ModGroup/ModGroup.orm.xml b/config/doctrine/Mods/ModGroup.ModGroup.orm.xml similarity index 84% rename from config/doctrine/ModGroup/ModGroup.orm.xml rename to config/doctrine/Mods/ModGroup.ModGroup.orm.xml index 32de9fe3..639258aa 100644 --- a/config/doctrine/ModGroup/ModGroup.orm.xml +++ b/config/doctrine/Mods/ModGroup.ModGroup.orm.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + - + diff --git a/config/doctrine/ModList/ModList.orm.xml b/config/doctrine/Mods/ModList.ModList.orm.xml similarity index 85% rename from config/doctrine/ModList/ModList.orm.xml rename to config/doctrine/Mods/ModList.ModList.orm.xml index 62923115..fd7894e5 100644 --- a/config/doctrine/ModList/ModList.orm.xml +++ b/config/doctrine/Mods/ModList.ModList.orm.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + - + @@ -22,7 +22,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/config/doctrine/AbstractBlamableEntity.orm.xml b/config/doctrine/Shared/Common.AbstractBlamableEntity.orm.xml similarity index 82% rename from config/doctrine/AbstractBlamableEntity.orm.xml rename to config/doctrine/Shared/Common.AbstractBlamableEntity.orm.xml index b6dcbae4..b889ada2 100644 --- a/config/doctrine/AbstractBlamableEntity.orm.xml +++ b/config/doctrine/Shared/Common.AbstractBlamableEntity.orm.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - - + + @@ -13,7 +13,7 @@ - + diff --git a/config/doctrine/AbstractEntity.orm.xml b/config/doctrine/Shared/Common.AbstractEntity.orm.xml similarity index 89% rename from config/doctrine/AbstractEntity.orm.xml rename to config/doctrine/Shared/Common.AbstractEntity.orm.xml index cb4f7ff0..da3ad0c9 100644 --- a/config/doctrine/AbstractEntity.orm.xml +++ b/config/doctrine/Shared/Common.AbstractEntity.orm.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + diff --git a/config/doctrine/Permissions/AbstractPermissions.orm.xml b/config/doctrine/Users/Permissions.AbstractPermissions.orm.xml similarity index 85% rename from config/doctrine/Permissions/AbstractPermissions.orm.xml rename to config/doctrine/Users/Permissions.AbstractPermissions.orm.xml index c689212c..24a1ffa9 100644 --- a/config/doctrine/Permissions/AbstractPermissions.orm.xml +++ b/config/doctrine/Users/Permissions.AbstractPermissions.orm.xml @@ -5,9 +5,9 @@ https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> @@ -50,8 +50,8 @@ - - + + diff --git a/config/doctrine/Permissions/UserPermissions.orm.xml b/config/doctrine/Users/Permissions.UserGroupPermissions.orm.xml similarity index 72% rename from config/doctrine/Permissions/UserPermissions.orm.xml rename to config/doctrine/Users/Permissions.UserGroupPermissions.orm.xml index 5b58a950..31ec2b99 100644 --- a/config/doctrine/Permissions/UserPermissions.orm.xml +++ b/config/doctrine/Users/Permissions.UserGroupPermissions.orm.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + diff --git a/config/doctrine/Permissions/UserGroupPermissions.orm.xml b/config/doctrine/Users/Permissions.UserPermissions.orm.xml similarity index 73% rename from config/doctrine/Permissions/UserGroupPermissions.orm.xml rename to config/doctrine/Users/Permissions.UserPermissions.orm.xml index ba31af8f..f045d26b 100644 --- a/config/doctrine/Permissions/UserGroupPermissions.orm.xml +++ b/config/doctrine/Users/Permissions.UserPermissions.orm.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + diff --git a/config/doctrine/User/User.orm.xml b/config/doctrine/Users/User.User.orm.xml similarity index 81% rename from config/doctrine/User/User.orm.xml rename to config/doctrine/Users/User.User.orm.xml index 25808b0f..bed38277 100644 --- a/config/doctrine/User/User.orm.xml +++ b/config/doctrine/Users/User.User.orm.xml @@ -4,19 +4,19 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + - + - + diff --git a/config/doctrine/UserGroup/UserGroup.orm.xml b/config/doctrine/Users/UserGroup.UserGroup.orm.xml similarity index 79% rename from config/doctrine/UserGroup/UserGroup.orm.xml rename to config/doctrine/Users/UserGroup.UserGroup.orm.xml index 4311801d..7c030fc9 100644 --- a/config/doctrine/UserGroup/UserGroup.orm.xml +++ b/config/doctrine/Users/UserGroup.UserGroup.orm.xml @@ -4,18 +4,18 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + - + - + diff --git a/config/packages/api_platform.yaml b/config/packages/api_platform.yaml index 11983979..cc046e6c 100644 --- a/config/packages/api_platform.yaml +++ b/config/packages/api_platform.yaml @@ -1,5 +1,6 @@ imports: - - { resource: ../api_platform/filters/ } + - { resource: ../api_platform/mods/filters/ } + - { resource: ../api_platform/attendances/filters/ } api_platform: title: "%app.api.name%" @@ -16,7 +17,9 @@ api_platform: path_segment_name_generator: api_platform.path_segment_name_generator.dash mapping: - paths: [ '%kernel.project_dir%/config/api_platform/resources' ] + paths: + - '%kernel.project_dir%/config/api_platform/mods/resources' + - '%kernel.project_dir%/config/api_platform/attendances/resources' formats: json: [ 'application/json' ] diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index dfe9063a..9ca6f9a6 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -2,7 +2,7 @@ doctrine: dbal: url: '%env(resolve:DATABASE_URL)%' types: - bigint: App\Doctrine\Dbal\Types\BigIntType + bigint: App\Shared\Doctrine\Dbal\Types\BigIntType # IMPORTANT: You MUST configure your server version, # either here or in the DATABASE_URL env var (see .env file) @@ -17,60 +17,30 @@ doctrine: naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware auto_mapping: true mappings: - App: + Shared: is_bundle: false type: xml - dir: '%kernel.project_dir%/config/doctrine' - prefix: 'App\Entity' - alias: App - Attendance: + dir: '%kernel.project_dir%/config/doctrine/Shared' + prefix: 'App\Shared\Entity' + alias: Shared + Users: is_bundle: false type: xml - dir: '%kernel.project_dir%/config/doctrine/Attendance' - prefix: 'App\Entity\Attendance' - alias: Attendance - User: + dir: '%kernel.project_dir%/config/doctrine/Users' + prefix: 'App\Users\Entity' + alias: Users + Mods: is_bundle: false type: xml - dir: '%kernel.project_dir%/config/doctrine/User' - prefix: 'App\Entity\User' - alias: User - UserGroup: + dir: '%kernel.project_dir%/config/doctrine/Mods' + prefix: 'App\Mods\Entity' + alias: Mods + Attendances: is_bundle: false type: xml - dir: '%kernel.project_dir%/config/doctrine/UserGroup' - prefix: 'App\Entity\UserGroup' - alias: UserGroup - Mod: - is_bundle: false - type: xml - dir: '%kernel.project_dir%/config/doctrine/Mod' - prefix: 'App\Entity\Mod' - alias: Mod - ModGroup: - is_bundle: false - type: xml - dir: '%kernel.project_dir%/config/doctrine/ModGroup' - prefix: 'App\Entity\ModGroup' - alias: ModGroup - Dlc: - is_bundle: false - type: xml - dir: '%kernel.project_dir%/config/doctrine/Dlc' - prefix: 'App\Entity\Dlc' - alias: Dlc - ModList: - is_bundle: false - type: xml - dir: '%kernel.project_dir%/config/doctrine/ModList' - prefix: 'App\Entity\ModList' - alias: Mod - Permissions: - is_bundle: false - type: xml - dir: '%kernel.project_dir%/config/doctrine/Permissions' - prefix: 'App\Entity\Permissions' - alias: Permissions + dir: '%kernel.project_dir%/config/doctrine/Attendances' + prefix: 'App\Attendances\Entity' + alias: Attendances when@test: doctrine: diff --git a/config/packages/http_client.yaml b/config/packages/http_client.yaml index c7563762..c92cdd0f 100644 --- a/config/packages/http_client.yaml +++ b/config/packages/http_client.yaml @@ -9,4 +9,4 @@ when@test: client.steam_api: class: Symfony\Component\HttpClient\MockHttpClient arguments: - $responseFactory: '@App\Service\SteamApiClient\Test\SteamApiClientMockResponseFactory' + $responseFactory: '@App\Shared\Service\SteamApiClient\Test\SteamApiClientMockResponseFactory' diff --git a/config/packages/security.yaml b/config/packages/security.yaml index c95cf4c9..f29d7b9e 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -7,7 +7,7 @@ security: users: entity: # the class of the entity that represents users - class: 'App\Entity\User\User' + class: 'App\Users\Entity\User\User' # the property to query by - e.g. username, email, etc property: 'externalId' @@ -22,7 +22,7 @@ security: pattern: ^/api/attendances methods: [ 'POST' ] custom_authenticators: - - App\Security\Authenticator\ApiKeyAuthenticator + - App\Shared\Security\Authenticator\ApiKeyAuthenticator main: lazy: true @@ -31,7 +31,7 @@ security: lifetime: 604800 # 1 week in seconds always_remember_me: true custom_authenticators: - - App\Security\Authenticator\DiscordAuthenticator + - App\Shared\Security\Authenticator\DiscordAuthenticator logout: path: app_security_logout diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index 3ac6bccc..b9141cd0 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -9,7 +9,7 @@ twig: strict_variables: '%kernel.debug%' exception_controller: null form_themes: - - 'app_theme.html.twig' + - 'shared/app_theme.html.twig' globals: global: app: diff --git a/config/routes.yaml b/config/routes.yaml index 41ef8140..15f15913 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -1,5 +1,5 @@ controllers: resource: - path: ../src/Controller/ - namespace: App\Controller + path: ../src/ + namespace: App type: attribute diff --git a/config/routes/annotations.yaml b/config/routes/annotations.yaml index e92efc59..5298abca 100644 --- a/config/routes/annotations.yaml +++ b/config/routes/annotations.yaml @@ -1,5 +1,5 @@ controllers: - resource: ../../src/Controller/ + resource: ../../src/ type: annotation kernel: diff --git a/config/services.yaml b/config/services.yaml index 78eeb3c7..156e5e05 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -29,21 +29,18 @@ services: resource: '../src/' exclude: - '../src/DependencyInjection/' - - '../src/Entity/' - '../src/Kernel.php' - - '../src/Tests/' - - # controllers are imported separately to make sure services can be injected - # as action arguments even if you don't extend any base controller class - App\Controller\: - resource: '../src/Controller/' - tags: [ 'controller.service_arguments' ] + - '../src/Shared/Entity/' + - '../src/Users/Entity/' + - '../src/Mods/Entity/' + - '../src/Attendances/Entity/' + - '../src/Shared/Tests/' # add more service definitions when explicit configuration is needed # please note that last definitions always *replace* previous ones - App\Service\IdentifierFactory\IdentifierFactoryInterface: '@App\Service\IdentifierFactory\IdentifierFactory' + App\Shared\Service\IdentifierFactory\IdentifierFactoryInterface: '@App\Shared\Service\IdentifierFactory\IdentifierFactory' - App\Security\Authenticator\DiscordAuthenticator: + App\Shared\Security\Authenticator\DiscordAuthenticator: arguments: $discordServerId: '%app.security.oauth.discord.server_id%' $botToken: '%app.security.oauth.discord.bot_token%' @@ -51,7 +48,7 @@ services: - '%app.security.oauth.discord.recruit_role_name%' - '%app.security.oauth.discord.member_role_name%' - App\Security\Authenticator\ApiKeyAuthenticator: + App\Shared\Security\Authenticator\ApiKeyAuthenticator: arguments: $apiKeyHeaderName: '%app.security.api.key_header_name%' $apiAllowedKeys: '%app.security.api.allowed_keys%' @@ -62,28 +59,23 @@ services: - '%env(DATABASE_URL)%' # Register Doctrine subscribers - App\EventSubscriber\Doctrine\: - resource: '../src/EventSubscriber/Doctrine' - tags: - - { name: 'doctrine.event_subscriber' } - - App\Service\Mission\MissionClient: + App\Shared\Service\Mission\MissionClient: arguments: $missionApiUrl: '%env(APP_URL_API_MISSION)%' - App\Service\Mission\MissionStore: + App\Shared\Service\Mission\MissionStore: arguments: $storagePath: '%kernel.project_dir%/var/cache_http/%kernel.environment%' - App\Service\SteamApiClient\SteamApiClient: + App\Shared\Service\SteamApiClient\SteamApiClient: arguments: $httpClient: '@client.steam_api' - App\Service\Version\VersionProvider: + App\Shared\Service\Version\VersionProvider: arguments: $projectDir: '%kernel.project_dir%' - App\Twig\ImgproxyExtension: + App\Shared\Twig\ImgproxyExtension: arguments: $baseProxyUrl: '%env(APP_IMGPROXY_URL)%' $proxyKey: '%env(APP_IMGPROXY_KEY)%' @@ -96,12 +88,12 @@ services: $defaultLifetime: 3600 $directory: '%kernel.cache_dir%' - App\Twig\BackgroundImageExtension: + App\Shared\Twig\BackgroundImageExtension: arguments: $cacheAdapter: '@app.cache.background_images' $backgroundImagesDirectory: '%kernel.project_dir%/public/img/background' - App\Twig\UtilsExtension: + App\Shared\Twig\UtilsExtension: arguments: $defaultLocale: '%kernel.default_locale%' @@ -112,4 +104,4 @@ when@test: arguments: - '@test.service_container' - App\Service\IdentifierFactory\IdentifierFactoryInterface: '@App\Service\IdentifierFactory\IdentifierFactoryStub' + App\Shared\Service\IdentifierFactory\IdentifierFactoryInterface: '@App\Shared\Service\IdentifierFactory\IdentifierFactoryStub' diff --git a/src/Api/DataTransformer/Attendance/AttendanceInputDataTransformer.php b/src/Attendances/Api/DataTransformer/Attendance/AttendanceInputDataTransformer.php similarity index 71% rename from src/Api/DataTransformer/Attendance/AttendanceInputDataTransformer.php rename to src/Attendances/Api/DataTransformer/Attendance/AttendanceInputDataTransformer.php index 4cdf1506..8662614a 100644 --- a/src/Api/DataTransformer/Attendance/AttendanceInputDataTransformer.php +++ b/src/Attendances/Api/DataTransformer/Attendance/AttendanceInputDataTransformer.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Api\DataTransformer\Attendance; +namespace App\Attendances\Api\DataTransformer\Attendance; use ApiPlatform\Validator\ValidatorInterface; -use App\Api\Input\Attendance\AttendanceInput; -use App\Entity\Attendance\Attendance; -use App\Service\IdentifierFactory\IdentifierFactoryInterface; +use App\Attendances\Api\Input\Attendance\AttendanceInput; +use App\Attendances\Entity\Attendance\Attendance; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryInterface; class AttendanceInputDataTransformer { diff --git a/src/Api/DataTransformer/Attendance/AttendanceOutputDataTransformer.php b/src/Attendances/Api/DataTransformer/Attendance/AttendanceOutputDataTransformer.php similarity index 69% rename from src/Api/DataTransformer/Attendance/AttendanceOutputDataTransformer.php rename to src/Attendances/Api/DataTransformer/Attendance/AttendanceOutputDataTransformer.php index 435ec16d..8c1144b6 100644 --- a/src/Api/DataTransformer/Attendance/AttendanceOutputDataTransformer.php +++ b/src/Attendances/Api/DataTransformer/Attendance/AttendanceOutputDataTransformer.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Api\DataTransformer\Attendance; +namespace App\Attendances\Api\DataTransformer\Attendance; -use App\Api\Output\Attendance\AttendanceOutput; -use App\Entity\Attendance\Attendance; +use App\Attendances\Api\Output\Attendance\AttendanceOutput; +use App\Attendances\Entity\Attendance\Attendance; class AttendanceOutputDataTransformer { diff --git a/src/Api/Input/Attendance/AttendanceInput.php b/src/Attendances/Api/Input/Attendance/AttendanceInput.php similarity index 65% rename from src/Api/Input/Attendance/AttendanceInput.php rename to src/Attendances/Api/Input/Attendance/AttendanceInput.php index 4132c899..11e8f129 100644 --- a/src/Api/Input/Attendance/AttendanceInput.php +++ b/src/Attendances/Api/Input/Attendance/AttendanceInput.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Api\Input\Attendance; +namespace App\Attendances\Api\Input\Attendance; -use App\Validator\Attendance\UniqueAttendance; -use App\Validator\SteamProfileId; +use App\Attendances\Validator\Attendance\UniqueAttendance; +use App\Shared\Validator\Common\SteamProfileId; use Symfony\Component\Validator\Constraints as Assert; #[UniqueAttendance] diff --git a/src/Api/Output/Attendance/AttendanceOutput.php b/src/Attendances/Api/Output/Attendance/AttendanceOutput.php similarity index 83% rename from src/Api/Output/Attendance/AttendanceOutput.php rename to src/Attendances/Api/Output/Attendance/AttendanceOutput.php index 92fb7fae..a55e2e66 100644 --- a/src/Api/Output/Attendance/AttendanceOutput.php +++ b/src/Attendances/Api/Output/Attendance/AttendanceOutput.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Api\Output\Attendance; +namespace App\Attendances\Api\Output\Attendance; class AttendanceOutput { diff --git a/src/Api/Processor/Attendance/AttendanceProcessor.php b/src/Attendances/Api/Processor/Attendance/AttendanceProcessor.php similarity index 79% rename from src/Api/Processor/Attendance/AttendanceProcessor.php rename to src/Attendances/Api/Processor/Attendance/AttendanceProcessor.php index 8255708c..10188fec 100644 --- a/src/Api/Processor/Attendance/AttendanceProcessor.php +++ b/src/Attendances/Api/Processor/Attendance/AttendanceProcessor.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace App\Api\Processor\Attendance; +namespace App\Attendances\Api\Processor\Attendance; use ApiPlatform\Doctrine\Common\State\PersistProcessor; use ApiPlatform\Metadata\Operation; use ApiPlatform\State\ProcessorInterface; use ApiPlatform\Validator\ValidatorInterface; -use App\Api\DataTransformer\Attendance\AttendanceInputDataTransformer; -use App\Api\DataTransformer\Attendance\AttendanceOutputDataTransformer; -use App\Api\Input\Attendance\AttendanceInput; +use App\Attendances\Api\DataTransformer\Attendance\AttendanceInputDataTransformer; +use App\Attendances\Api\DataTransformer\Attendance\AttendanceOutputDataTransformer; +use App\Attendances\Api\Input\Attendance\AttendanceInput; class AttendanceProcessor implements ProcessorInterface { diff --git a/src/Api/Provider/Attendance/AttendanceDataProvider.php b/src/Attendances/Api/Provider/Attendance/AttendanceDataProvider.php similarity index 79% rename from src/Api/Provider/Attendance/AttendanceDataProvider.php rename to src/Attendances/Api/Provider/Attendance/AttendanceDataProvider.php index 2af1717d..de0b5aa1 100644 --- a/src/Api/Provider/Attendance/AttendanceDataProvider.php +++ b/src/Attendances/Api/Provider/Attendance/AttendanceDataProvider.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Api\Provider\Attendance; +namespace App\Attendances\Api\Provider\Attendance; use ApiPlatform\Doctrine\Orm\State\CollectionProvider; use ApiPlatform\Doctrine\Orm\State\ItemProvider; use ApiPlatform\Metadata\Operation; -use App\Api\DataTransformer\Attendance\AttendanceOutputDataTransformer; -use App\Api\Provider\Common\AbstractDataProvider; +use App\Attendances\Api\DataTransformer\Attendance\AttendanceOutputDataTransformer; +use App\Shared\Api\Provider\Common\AbstractDataProvider; class AttendanceDataProvider extends AbstractDataProvider { diff --git a/src/DataFixtures/Attendance/AttendanceFixtures.php b/src/Attendances/DataFixtures/Attendance/AttendanceFixtures.php similarity index 92% rename from src/DataFixtures/Attendance/AttendanceFixtures.php rename to src/Attendances/DataFixtures/Attendance/AttendanceFixtures.php index d4da21b9..6210b7c3 100644 --- a/src/DataFixtures/Attendance/AttendanceFixtures.php +++ b/src/Attendances/DataFixtures/Attendance/AttendanceFixtures.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\DataFixtures\Attendance; +namespace App\Attendances\DataFixtures\Attendance; -use App\Entity\Attendance\Attendance; -use App\Test\Traits\TimeTrait; +use App\Attendances\Entity\Attendance\Attendance; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/Entity/Attendance/Attendance.php b/src/Attendances/Entity/Attendance/Attendance.php similarity index 86% rename from src/Entity/Attendance/Attendance.php rename to src/Attendances/Entity/Attendance/Attendance.php index 395a0fe0..073a9216 100644 --- a/src/Entity/Attendance/Attendance.php +++ b/src/Attendances/Entity/Attendance/Attendance.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Entity\Attendance; +namespace App\Attendances\Entity\Attendance; -use App\Entity\AbstractEntity; +use App\Shared\Entity\Common\AbstractEntity; use Ramsey\Uuid\UuidInterface; class Attendance extends AbstractEntity diff --git a/src/Repository/Attendance/AttendanceRepository.php b/src/Attendances/Repository/Attendance/AttendanceRepository.php similarity index 86% rename from src/Repository/Attendance/AttendanceRepository.php rename to src/Attendances/Repository/Attendance/AttendanceRepository.php index 48654262..c5f26921 100644 --- a/src/Repository/Attendance/AttendanceRepository.php +++ b/src/Attendances/Repository/Attendance/AttendanceRepository.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Repository\Attendance; +namespace App\Attendances\Repository\Attendance; -use App\Entity\Attendance\Attendance; +use App\Attendances\Entity\Attendance\Attendance; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Validator/Attendance/UniqueAttendance.php b/src/Attendances/Validator/Attendance/UniqueAttendance.php similarity index 94% rename from src/Validator/Attendance/UniqueAttendance.php rename to src/Attendances/Validator/Attendance/UniqueAttendance.php index 5cf1d713..4fe0a93e 100644 --- a/src/Validator/Attendance/UniqueAttendance.php +++ b/src/Attendances/Validator/Attendance/UniqueAttendance.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\Attendance; +namespace App\Attendances\Validator\Attendance; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/Attendance/UniqueAttendanceValidator.php b/src/Attendances/Validator/Attendance/UniqueAttendanceValidator.php similarity index 84% rename from src/Validator/Attendance/UniqueAttendanceValidator.php rename to src/Attendances/Validator/Attendance/UniqueAttendanceValidator.php index 065b540d..cf0dd6bc 100644 --- a/src/Validator/Attendance/UniqueAttendanceValidator.php +++ b/src/Attendances/Validator/Attendance/UniqueAttendanceValidator.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Validator\Attendance; +namespace App\Attendances\Validator\Attendance; -use App\Api\Input\Attendance\AttendanceInput; -use App\Entity\Attendance\Attendance; -use App\Validator\AbstractValidator; +use App\Attendances\Api\Input\Attendance\AttendanceInput; +use App\Attendances\Entity\Attendance\Attendance; +use App\Shared\Validator\Common\AbstractValidator; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Controller/.gitignore b/src/Controller/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Entity/.gitignore b/src/Entity/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Api/Controller/ModList/GetModListByNameOperation.php b/src/Mods/Api/Controller/ModList/GetModListByNameOperation.php similarity index 76% rename from src/Api/Controller/ModList/GetModListByNameOperation.php rename to src/Mods/Api/Controller/ModList/GetModListByNameOperation.php index c6bff581..95b76ad3 100644 --- a/src/Api/Controller/ModList/GetModListByNameOperation.php +++ b/src/Mods/Api/Controller/ModList/GetModListByNameOperation.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Api\Controller\ModList; +namespace App\Mods\Api\Controller\ModList; -use App\Api\DataTransformer\ModList\ModListDetailsOutputDataTransformer; -use App\Api\Output\ModList\ModListOutput; -use App\Repository\ModList\ModListRepository; +use App\Mods\Api\DataTransformer\ModList\ModListDetailsOutputDataTransformer; +use App\Mods\Api\Output\ModList\ModListOutput; +use App\Mods\Repository\ModList\ModListRepository; use Symfony\Component\HttpKernel\Attribute\AsController; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; diff --git a/src/Api/DataTransformer/Dlc/DlcOutputDataTransformer.php b/src/Mods/Api/DataTransformer/Dlc/DlcOutputDataTransformer.php similarity index 77% rename from src/Api/DataTransformer/Dlc/DlcOutputDataTransformer.php rename to src/Mods/Api/DataTransformer/Dlc/DlcOutputDataTransformer.php index aca60109..b5fe663c 100644 --- a/src/Api/DataTransformer/Dlc/DlcOutputDataTransformer.php +++ b/src/Mods/Api/DataTransformer/Dlc/DlcOutputDataTransformer.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Api\DataTransformer\Dlc; +namespace App\Mods\Api\DataTransformer\Dlc; -use App\Api\Output\Dlc\DlcOutput; -use App\Entity\Dlc\Dlc; +use App\Mods\Api\Output\Dlc\DlcOutput; +use App\Mods\Entity\Dlc\Dlc; class DlcOutputDataTransformer { diff --git a/src/Api/DataTransformer/Mod/ModOutputDataTransformer.php b/src/Mods/Api/DataTransformer/Mod/ModOutputDataTransformer.php similarity index 71% rename from src/Api/DataTransformer/Mod/ModOutputDataTransformer.php rename to src/Mods/Api/DataTransformer/Mod/ModOutputDataTransformer.php index 009298ff..c6a9e0e1 100644 --- a/src/Api/DataTransformer/Mod/ModOutputDataTransformer.php +++ b/src/Mods/Api/DataTransformer/Mod/ModOutputDataTransformer.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Api\DataTransformer\Mod; +namespace App\Mods\Api\DataTransformer\Mod; -use App\Api\Output\Mod\ModOutput; -use App\Entity\Mod\AbstractMod; -use App\Entity\Mod\DirectoryMod; -use App\Entity\Mod\Enum\ModSourceEnum; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; +use App\Mods\Api\Output\Mod\ModOutput; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\Mod\DirectoryMod; +use App\Mods\Entity\Mod\Enum\ModSourceEnum; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; class ModOutputDataTransformer { diff --git a/src/Api/DataTransformer/ModList/ModListDetailsOutputDataTransformer.php b/src/Mods/Api/DataTransformer/ModList/ModListDetailsOutputDataTransformer.php similarity index 70% rename from src/Api/DataTransformer/ModList/ModListDetailsOutputDataTransformer.php rename to src/Mods/Api/DataTransformer/ModList/ModListDetailsOutputDataTransformer.php index 2456e119..4382cc13 100644 --- a/src/Api/DataTransformer/ModList/ModListDetailsOutputDataTransformer.php +++ b/src/Mods/Api/DataTransformer/ModList/ModListDetailsOutputDataTransformer.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace App\Api\DataTransformer\ModList; +namespace App\Mods\Api\DataTransformer\ModList; -use App\Api\DataTransformer\Dlc\DlcOutputDataTransformer; -use App\Api\DataTransformer\Mod\ModOutputDataTransformer; -use App\Api\Output\ModList\ModListDetailsOutput; -use App\Api\Output\ModList\ModListOutput; -use App\Entity\Dlc\Dlc; -use App\Entity\Mod\AbstractMod; -use App\Entity\ModList\ModList; -use App\Repository\Mod\ModRepository; +use App\Mods\Api\DataTransformer\Dlc\DlcOutputDataTransformer; +use App\Mods\Api\DataTransformer\Mod\ModOutputDataTransformer; +use App\Mods\Api\Output\ModList\ModListDetailsOutput; +use App\Mods\Api\Output\ModList\ModListOutput; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\ModList\ModList; +use App\Mods\Repository\Mod\ModRepository; class ModListDetailsOutputDataTransformer { diff --git a/src/Api/DataTransformer/ModList/ModListOutputDataTransformer.php b/src/Mods/Api/DataTransformer/ModList/ModListOutputDataTransformer.php similarity index 76% rename from src/Api/DataTransformer/ModList/ModListOutputDataTransformer.php rename to src/Mods/Api/DataTransformer/ModList/ModListOutputDataTransformer.php index 6d8180bb..bc23afaa 100644 --- a/src/Api/DataTransformer/ModList/ModListOutputDataTransformer.php +++ b/src/Mods/Api/DataTransformer/ModList/ModListOutputDataTransformer.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Api\DataTransformer\ModList; +namespace App\Mods\Api\DataTransformer\ModList; -use App\Api\Output\ModList\ModListOutput; -use App\Entity\ModList\ModList; +use App\Mods\Api\Output\ModList\ModListOutput; +use App\Mods\Entity\ModList\ModList; class ModListOutputDataTransformer { diff --git a/src/Api/Output/Dlc/DlcOutput.php b/src/Mods/Api/Output/Dlc/DlcOutput.php similarity index 90% rename from src/Api/Output/Dlc/DlcOutput.php rename to src/Mods/Api/Output/Dlc/DlcOutput.php index c7911eb1..abc9dd8f 100644 --- a/src/Api/Output/Dlc/DlcOutput.php +++ b/src/Mods/Api/Output/Dlc/DlcOutput.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Api\Output\Dlc; +namespace App\Mods\Api\Output\Dlc; class DlcOutput { diff --git a/src/Api/Output/Mod/ModOutput.php b/src/Mods/Api/Output/Mod/ModOutput.php similarity index 92% rename from src/Api/Output/Mod/ModOutput.php rename to src/Mods/Api/Output/Mod/ModOutput.php index 5feb4e52..ad415016 100644 --- a/src/Api/Output/Mod/ModOutput.php +++ b/src/Mods/Api/Output/Mod/ModOutput.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Api\Output\Mod; +namespace App\Mods\Api\Output\Mod; class ModOutput { diff --git a/src/Api/Output/ModList/ModListDetailsOutput.php b/src/Mods/Api/Output/ModList/ModListDetailsOutput.php similarity index 83% rename from src/Api/Output/ModList/ModListDetailsOutput.php rename to src/Mods/Api/Output/ModList/ModListDetailsOutput.php index 482e6853..28d9f70c 100644 --- a/src/Api/Output/ModList/ModListDetailsOutput.php +++ b/src/Mods/Api/Output/ModList/ModListDetailsOutput.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Api\Output\ModList; +namespace App\Mods\Api\Output\ModList; -use App\Api\Output\Dlc\DlcOutput; -use App\Api\Output\Mod\ModOutput; +use App\Mods\Api\Output\Dlc\DlcOutput; +use App\Mods\Api\Output\Mod\ModOutput; class ModListDetailsOutput extends ModListOutput { diff --git a/src/Api/Output/ModList/ModListOutput.php b/src/Mods/Api/Output/ModList/ModListOutput.php similarity index 89% rename from src/Api/Output/ModList/ModListOutput.php rename to src/Mods/Api/Output/ModList/ModListOutput.php index 1be77130..0ee0b3a7 100644 --- a/src/Api/Output/ModList/ModListOutput.php +++ b/src/Mods/Api/Output/ModList/ModListOutput.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Api\Output\ModList; +namespace App\Mods\Api\Output\ModList; class ModListOutput { diff --git a/src/Api/Provider/ModList/ModListDataProvider.php b/src/Mods/Api/Provider/ModList/ModListDataProvider.php similarity index 81% rename from src/Api/Provider/ModList/ModListDataProvider.php rename to src/Mods/Api/Provider/ModList/ModListDataProvider.php index b4c07274..cf11cc9d 100644 --- a/src/Api/Provider/ModList/ModListDataProvider.php +++ b/src/Mods/Api/Provider/ModList/ModListDataProvider.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Api\Provider\ModList; +namespace App\Mods\Api\Provider\ModList; use ApiPlatform\Doctrine\Orm\State\CollectionProvider; use ApiPlatform\Doctrine\Orm\State\ItemProvider; use ApiPlatform\Metadata\Operation; -use App\Api\DataTransformer\ModList\ModListOutputDataTransformer; -use App\Api\Provider\Common\AbstractDataProvider; +use App\Mods\Api\DataTransformer\ModList\ModListOutputDataTransformer; +use App\Shared\Api\Provider\Common\AbstractDataProvider; class ModListDataProvider extends AbstractDataProvider { diff --git a/src/Api/Provider/ModList/ModListDetailsDataProvider.php b/src/Mods/Api/Provider/ModList/ModListDetailsDataProvider.php similarity index 81% rename from src/Api/Provider/ModList/ModListDetailsDataProvider.php rename to src/Mods/Api/Provider/ModList/ModListDetailsDataProvider.php index 854e91ae..2901d622 100644 --- a/src/Api/Provider/ModList/ModListDetailsDataProvider.php +++ b/src/Mods/Api/Provider/ModList/ModListDetailsDataProvider.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Api\Provider\ModList; +namespace App\Mods\Api\Provider\ModList; use ApiPlatform\Doctrine\Orm\State\CollectionProvider; use ApiPlatform\Doctrine\Orm\State\ItemProvider; use ApiPlatform\Metadata\Operation; -use App\Api\DataTransformer\ModList\ModListDetailsOutputDataTransformer; -use App\Api\Provider\Common\AbstractDataProvider; +use App\Mods\Api\DataTransformer\ModList\ModListDetailsOutputDataTransformer; +use App\Shared\Api\Provider\Common\AbstractDataProvider; class ModListDetailsDataProvider extends AbstractDataProvider { diff --git a/src/Controller/Dlc/CreateAction.php b/src/Mods/Controller/Dlc/CreateAction.php similarity index 82% rename from src/Controller/Dlc/CreateAction.php rename to src/Mods/Controller/Dlc/CreateAction.php index 93b85536..08c6fba3 100644 --- a/src/Controller/Dlc/CreateAction.php +++ b/src/Mods/Controller/Dlc/CreateAction.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Controller\Dlc; +namespace App\Mods\Controller\Dlc; -use App\Form\Dlc\DataTransformer\DlcFormDtoDataTransformer; -use App\Form\Dlc\DlcFormType; -use App\Form\Dlc\Dto\DlcFormDto; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Form\Dlc\DataTransformer\DlcFormDtoDataTransformer; +use App\Mods\Form\Dlc\DlcFormType; +use App\Mods\Form\Dlc\Dto\DlcFormDto; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request): Response return $this->redirectToRoute('app_dlc_list'); } - return $this->render('dlc/form.html.twig', [ + return $this->render('mods/dlc/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/Dlc/DeleteAction.php b/src/Mods/Controller/Dlc/DeleteAction.php similarity index 87% rename from src/Controller/Dlc/DeleteAction.php rename to src/Mods/Controller/Dlc/DeleteAction.php index 469c5572..b902983e 100644 --- a/src/Controller/Dlc/DeleteAction.php +++ b/src/Mods/Controller/Dlc/DeleteAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\Dlc; +namespace App\Mods\Controller\Dlc; -use App\Entity\Dlc\Dlc; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\Dlc\Dlc; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Controller/Dlc/ListAction.php b/src/Mods/Controller/Dlc/ListAction.php similarity index 78% rename from src/Controller/Dlc/ListAction.php rename to src/Mods/Controller/Dlc/ListAction.php index f42f3722..1fdf5af8 100644 --- a/src/Controller/Dlc/ListAction.php +++ b/src/Mods/Controller/Dlc/ListAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\Dlc; +namespace App\Mods\Controller\Dlc; -use App\Repository\Dlc\DlcRepository; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Repository\Dlc\DlcRepository; +use App\Shared\Security\Enum\PermissionsEnum; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -24,7 +24,7 @@ public function __invoke(): Response { $dlcs = $this->dlcRepository->findBy([], ['name' => 'ASC']); - return $this->render('dlc/list.html.twig', [ + return $this->render('mods/dlc/list.html.twig', [ 'dlcs' => $dlcs, ]); } diff --git a/src/Controller/Dlc/UpdateAction.php b/src/Mods/Controller/Dlc/UpdateAction.php similarity index 80% rename from src/Controller/Dlc/UpdateAction.php rename to src/Mods/Controller/Dlc/UpdateAction.php index 0fceca95..b9ce507e 100644 --- a/src/Controller/Dlc/UpdateAction.php +++ b/src/Mods/Controller/Dlc/UpdateAction.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Controller\Dlc; +namespace App\Mods\Controller\Dlc; -use App\Entity\Dlc\Dlc; -use App\Form\Dlc\DataTransformer\DlcFormDtoDataTransformer; -use App\Form\Dlc\DlcFormType; -use App\Form\Dlc\Dto\DlcFormDto; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Form\Dlc\DataTransformer\DlcFormDtoDataTransformer; +use App\Mods\Form\Dlc\DlcFormType; +use App\Mods\Form\Dlc\Dto\DlcFormDto; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request, Dlc $dlc): Response return $this->redirectToRoute('app_dlc_list'); } - return $this->render('dlc/form.html.twig', [ + return $this->render('mods/dlc/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/Mod/CreateAction.php b/src/Mods/Controller/Mod/CreateAction.php similarity index 82% rename from src/Controller/Mod/CreateAction.php rename to src/Mods/Controller/Mod/CreateAction.php index 177757e2..f8b6eb7c 100644 --- a/src/Controller/Mod/CreateAction.php +++ b/src/Mods/Controller/Mod/CreateAction.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Controller\Mod; +namespace App\Mods\Controller\Mod; -use App\Form\Mod\DataTransformer\ModFormDtoDataTransformer; -use App\Form\Mod\Dto\ModFormDto; -use App\Form\Mod\ModFormType; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Form\Mod\DataTransformer\ModFormDtoDataTransformer; +use App\Mods\Form\Mod\Dto\ModFormDto; +use App\Mods\Form\Mod\ModFormType; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request): Response return $this->redirectToRoute('app_mod_list'); } - return $this->render('mod/form.html.twig', [ + return $this->render('mods/mod/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/Mod/DeleteAction.php b/src/Mods/Controller/Mod/DeleteAction.php similarity index 86% rename from src/Controller/Mod/DeleteAction.php rename to src/Mods/Controller/Mod/DeleteAction.php index ecdaa2cc..46d44a05 100644 --- a/src/Controller/Mod/DeleteAction.php +++ b/src/Mods/Controller/Mod/DeleteAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\Mod; +namespace App\Mods\Controller\Mod; -use App\Entity\Mod\AbstractMod; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\Mod\AbstractMod; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Controller/Mod/ListAction.php b/src/Mods/Controller/Mod/ListAction.php similarity index 78% rename from src/Controller/Mod/ListAction.php rename to src/Mods/Controller/Mod/ListAction.php index 28684466..129a960d 100644 --- a/src/Controller/Mod/ListAction.php +++ b/src/Mods/Controller/Mod/ListAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\Mod; +namespace App\Mods\Controller\Mod; -use App\Repository\Mod\ModRepository; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Repository\Mod\ModRepository; +use App\Shared\Security\Enum\PermissionsEnum; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -24,7 +24,7 @@ public function __invoke(): Response { $mods = $this->modRepository->findBy([], ['name' => 'ASC']); - return $this->render('mod/list.html.twig', [ + return $this->render('mods/mod/list.html.twig', [ 'mods' => $mods, ]); } diff --git a/src/Controller/Mod/UpdateAction.php b/src/Mods/Controller/Mod/UpdateAction.php similarity index 80% rename from src/Controller/Mod/UpdateAction.php rename to src/Mods/Controller/Mod/UpdateAction.php index 24405ff6..43840cbf 100644 --- a/src/Controller/Mod/UpdateAction.php +++ b/src/Mods/Controller/Mod/UpdateAction.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Controller\Mod; +namespace App\Mods\Controller\Mod; -use App\Entity\Mod\AbstractMod; -use App\Form\Mod\DataTransformer\ModFormDtoDataTransformer; -use App\Form\Mod\Dto\ModFormDto; -use App\Form\Mod\ModFormType; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Form\Mod\DataTransformer\ModFormDtoDataTransformer; +use App\Mods\Form\Mod\Dto\ModFormDto; +use App\Mods\Form\Mod\ModFormType; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request, AbstractMod $mod): Response return $this->redirectToRoute('app_mod_list'); } - return $this->render('mod/form.html.twig', [ + return $this->render('mods/mod/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/ModGroup/CreateAction.php b/src/Mods/Controller/ModGroup/CreateAction.php similarity index 81% rename from src/Controller/ModGroup/CreateAction.php rename to src/Mods/Controller/ModGroup/CreateAction.php index e9c6339a..c2180ecf 100644 --- a/src/Controller/ModGroup/CreateAction.php +++ b/src/Mods/Controller/ModGroup/CreateAction.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Controller\ModGroup; +namespace App\Mods\Controller\ModGroup; -use App\Form\ModGroup\DataTransformer\ModGroupFormDtoDataTransformer; -use App\Form\ModGroup\Dto\ModGroupFormDto; -use App\Form\ModGroup\ModGroupFormType; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Form\ModGroup\DataTransformer\ModGroupFormDtoDataTransformer; +use App\Mods\Form\ModGroup\Dto\ModGroupFormDto; +use App\Mods\Form\ModGroup\ModGroupFormType; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request): Response return $this->redirectToRoute('app_mod_group_list'); } - return $this->render('mod_group/form.html.twig', [ + return $this->render('mods/mod_group/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/ModGroup/DeleteAction.php b/src/Mods/Controller/ModGroup/DeleteAction.php similarity index 86% rename from src/Controller/ModGroup/DeleteAction.php rename to src/Mods/Controller/ModGroup/DeleteAction.php index ff0d431a..833157c1 100644 --- a/src/Controller/ModGroup/DeleteAction.php +++ b/src/Mods/Controller/ModGroup/DeleteAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\ModGroup; +namespace App\Mods\Controller\ModGroup; -use App\Entity\ModGroup\ModGroup; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Controller/ModGroup/ListAction.php b/src/Mods/Controller/ModGroup/ListAction.php similarity index 77% rename from src/Controller/ModGroup/ListAction.php rename to src/Mods/Controller/ModGroup/ListAction.php index ed64f18b..0b9d4887 100644 --- a/src/Controller/ModGroup/ListAction.php +++ b/src/Mods/Controller/ModGroup/ListAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\ModGroup; +namespace App\Mods\Controller\ModGroup; -use App\Repository\ModGroup\ModGroupRepository; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Repository\ModGroup\ModGroupRepository; +use App\Shared\Security\Enum\PermissionsEnum; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -24,7 +24,7 @@ public function __invoke(): Response { $modGroups = $this->modGroupRepository->findBy([], ['name' => 'ASC']); - return $this->render('mod_group/list.html.twig', [ + return $this->render('mods/mod_group/list.html.twig', [ 'modGroups' => $modGroups, ]); } diff --git a/src/Controller/ModGroup/UpdateAction.php b/src/Mods/Controller/ModGroup/UpdateAction.php similarity index 79% rename from src/Controller/ModGroup/UpdateAction.php rename to src/Mods/Controller/ModGroup/UpdateAction.php index 55c02fb0..4737b8d8 100644 --- a/src/Controller/ModGroup/UpdateAction.php +++ b/src/Mods/Controller/ModGroup/UpdateAction.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Controller\ModGroup; +namespace App\Mods\Controller\ModGroup; -use App\Entity\ModGroup\ModGroup; -use App\Form\ModGroup\DataTransformer\ModGroupFormDtoDataTransformer; -use App\Form\ModGroup\Dto\ModGroupFormDto; -use App\Form\ModGroup\ModGroupFormType; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Form\ModGroup\DataTransformer\ModGroupFormDtoDataTransformer; +use App\Mods\Form\ModGroup\Dto\ModGroupFormDto; +use App\Mods\Form\ModGroup\ModGroupFormType; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request, ModGroup $modGroup): Response return $this->redirectToRoute('app_mod_group_list'); } - return $this->render('mod_group/form.html.twig', [ + return $this->render('mods/mod_group/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/ModList/CopyAction.php b/src/Mods/Controller/ModList/CopyAction.php similarity index 80% rename from src/Controller/ModList/CopyAction.php rename to src/Mods/Controller/ModList/CopyAction.php index 40c6f0de..a12cb02b 100644 --- a/src/Controller/ModList/CopyAction.php +++ b/src/Mods/Controller/ModList/CopyAction.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Controller\ModList; +namespace App\Mods\Controller\ModList; -use App\Entity\ModList\ModList; -use App\Form\ModList\DataTransformer\ModListFormDtoDataTransformer; -use App\Form\ModList\Dto\ModListFormDto; -use App\Form\ModList\ModListFormType; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModList\ModList; +use App\Mods\Form\ModList\DataTransformer\ModListFormDtoDataTransformer; +use App\Mods\Form\ModList\Dto\ModListFormDto; +use App\Mods\Form\ModList\ModListFormType; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -41,7 +41,7 @@ public function __invoke(Request $request, ModList $modList): Response return $this->redirectToRoute('app_mod_list_list'); } - return $this->render('mod_list/form.html.twig', [ + return $this->render('mods/mod_list/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/ModList/CreateAction.php b/src/Mods/Controller/ModList/CreateAction.php similarity index 81% rename from src/Controller/ModList/CreateAction.php rename to src/Mods/Controller/ModList/CreateAction.php index c1374011..2c3a1dbc 100644 --- a/src/Controller/ModList/CreateAction.php +++ b/src/Mods/Controller/ModList/CreateAction.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Controller\ModList; +namespace App\Mods\Controller\ModList; -use App\Form\ModList\DataTransformer\ModListFormDtoDataTransformer; -use App\Form\ModList\Dto\ModListFormDto; -use App\Form\ModList\ModListFormType; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Form\ModList\DataTransformer\ModListFormDtoDataTransformer; +use App\Mods\Form\ModList\Dto\ModListFormDto; +use App\Mods\Form\ModList\ModListFormType; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request): Response return $this->redirectToRoute('app_mod_list_list'); } - return $this->render('mod_list/form.html.twig', [ + return $this->render('mods/mod_list/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/ModList/DeleteAction.php b/src/Mods/Controller/ModList/DeleteAction.php similarity index 86% rename from src/Controller/ModList/DeleteAction.php rename to src/Mods/Controller/ModList/DeleteAction.php index f25276f3..69d225e9 100644 --- a/src/Controller/ModList/DeleteAction.php +++ b/src/Mods/Controller/ModList/DeleteAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\ModList; +namespace App\Mods\Controller\ModList; -use App\Entity\ModList\ModList; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Controller/ModList/ListAction.php b/src/Mods/Controller/ModList/ListAction.php similarity index 79% rename from src/Controller/ModList/ListAction.php rename to src/Mods/Controller/ModList/ListAction.php index 2f153e9a..c0263fe0 100644 --- a/src/Controller/ModList/ListAction.php +++ b/src/Mods/Controller/ModList/ListAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\ModList; +namespace App\Mods\Controller\ModList; -use App\Repository\ModList\ModListRepository; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Repository\ModList\ModListRepository; +use App\Shared\Security\Enum\PermissionsEnum; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -27,7 +27,7 @@ public function __invoke(): Response 'name' => 'ASC', ]); - return $this->render('mod_list/list.html.twig', [ + return $this->render('mods/mod_list/list.html.twig', [ 'modLists' => $modLists, ]); } diff --git a/src/Controller/ModList/UpdateAction.php b/src/Mods/Controller/ModList/UpdateAction.php similarity index 79% rename from src/Controller/ModList/UpdateAction.php rename to src/Mods/Controller/ModList/UpdateAction.php index 0fea5f81..1a396829 100644 --- a/src/Controller/ModList/UpdateAction.php +++ b/src/Mods/Controller/ModList/UpdateAction.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Controller\ModList; +namespace App\Mods\Controller\ModList; -use App\Entity\ModList\ModList; -use App\Form\ModList\DataTransformer\ModListFormDtoDataTransformer; -use App\Form\ModList\Dto\ModListFormDto; -use App\Form\ModList\ModListFormType; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModList\ModList; +use App\Mods\Form\ModList\DataTransformer\ModListFormDtoDataTransformer; +use App\Mods\Form\ModList\Dto\ModListFormDto; +use App\Mods\Form\ModList\ModListFormType; +use App\Shared\Security\Enum\PermissionsEnum; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request, ModList $modList): Response return $this->redirectToRoute('app_mod_list_list'); } - return $this->render('mod_list/form.html.twig', [ + return $this->render('mods/mod_list/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/ModListPublic/CustomizeAction.php b/src/Mods/Controller/ModListPublic/CustomizeAction.php similarity index 79% rename from src/Controller/ModListPublic/CustomizeAction.php rename to src/Mods/Controller/ModListPublic/CustomizeAction.php index 71ae4ca4..a8fab737 100644 --- a/src/Controller/ModListPublic/CustomizeAction.php +++ b/src/Mods/Controller/ModListPublic/CustomizeAction.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Controller\ModListPublic; +namespace App\Mods\Controller\ModListPublic; -use App\Entity\ModList\ModList; -use App\Repository\Mod\ModRepository; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModList\ModList; +use App\Mods\Repository\Mod\ModRepository; +use App\Shared\Security\Enum\PermissionsEnum; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -26,7 +26,7 @@ public function __invoke(ModList $modList): Response $optionalMods = $this->modRepository->findIncludedOptionalSteamWorkshopMods($modList); $requiredMods = $this->modRepository->findIncludedRequiredSteamWorkshopMods($modList); - return $this->render('mod_list_public/customize.html.twig', [ + return $this->render('mods/mod_list_public/customize.html.twig', [ 'modList' => $modList, 'optionalMods' => $optionalMods, 'requiredMods' => $requiredMods, diff --git a/src/Controller/ModListPublic/DownloadAction.php b/src/Mods/Controller/ModListPublic/DownloadAction.php similarity index 84% rename from src/Controller/ModListPublic/DownloadAction.php rename to src/Mods/Controller/ModListPublic/DownloadAction.php index dc50c1c9..5d6a9436 100644 --- a/src/Controller/ModListPublic/DownloadAction.php +++ b/src/Mods/Controller/ModListPublic/DownloadAction.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Controller\ModListPublic; +namespace App\Mods\Controller\ModListPublic; -use App\Entity\ModList\ModList; -use App\Repository\Mod\ModRepository; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModList\ModList; +use App\Mods\Repository\Mod\ModRepository; +use App\Shared\Security\Enum\PermissionsEnum; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\HeaderUtils; use Symfony\Component\HttpFoundation\Response; @@ -30,7 +30,7 @@ public function __invoke(ModList $modList, string $optionalModsJson = null): Res $mods = $this->modRepository->findIncludedSteamWorkshopMods($modList); $optionalMods = json_decode($optionalModsJson ?? '', true) ?: []; - $template = $this->renderView('mod_list_public/launcher_preset_template.html.twig', [ + $template = $this->renderView('mods/mod_list_public/launcher_preset_template.html.twig', [ 'name' => $name, 'modList' => $modList, 'mods' => $mods, diff --git a/src/Controller/ModListPublic/SelectAction.php b/src/Mods/Controller/ModListPublic/SelectAction.php similarity index 85% rename from src/Controller/ModListPublic/SelectAction.php rename to src/Mods/Controller/ModListPublic/SelectAction.php index 346a0393..8f3cd6d5 100644 --- a/src/Controller/ModListPublic/SelectAction.php +++ b/src/Mods/Controller/ModListPublic/SelectAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\ModListPublic; +namespace App\Mods\Controller\ModListPublic; -use App\Repository\ModList\ModListRepository; -use App\Service\Mission\MissionClientInterface; +use App\Mods\Repository\ModList\ModListRepository; +use App\Shared\Service\Mission\MissionClientInterface; use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; @@ -40,7 +40,7 @@ public function __invoke(): Response $nextMissionModList = $this->modListRepository->findOneByName($nextMission->getModlist()); } - return $this->render('mod_list_public/select.html.twig', [ + return $this->render('mods/mod_list_public/select.html.twig', [ 'modLists' => $modLists, 'nextMission' => $nextMission, 'nextMissionModList' => $nextMissionModList, diff --git a/src/DataFixtures/Dlc/CslaIronCurtainDlcFixture.php b/src/Mods/DataFixtures/Dlc/CslaIronCurtainDlcFixture.php similarity index 88% rename from src/DataFixtures/Dlc/CslaIronCurtainDlcFixture.php rename to src/Mods/DataFixtures/Dlc/CslaIronCurtainDlcFixture.php index c288bbd6..b1ec47a7 100644 --- a/src/DataFixtures/Dlc/CslaIronCurtainDlcFixture.php +++ b/src/Mods/DataFixtures/Dlc/CslaIronCurtainDlcFixture.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\DataFixtures\Dlc; +namespace App\Mods\DataFixtures\Dlc; -use App\Entity\Dlc\Dlc; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Dlc\Dlc; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Dlc/GlobalMobilizationDlcFixture.php b/src/Mods/DataFixtures/Dlc/GlobalMobilizationDlcFixture.php similarity index 89% rename from src/DataFixtures/Dlc/GlobalMobilizationDlcFixture.php rename to src/Mods/DataFixtures/Dlc/GlobalMobilizationDlcFixture.php index 0118e95b..7726e4a9 100644 --- a/src/DataFixtures/Dlc/GlobalMobilizationDlcFixture.php +++ b/src/Mods/DataFixtures/Dlc/GlobalMobilizationDlcFixture.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\DataFixtures\Dlc; +namespace App\Mods\DataFixtures\Dlc; -use App\Entity\Dlc\Dlc; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Dlc\Dlc; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Dlc/SogPrairieFireDlcFixture.php b/src/Mods/DataFixtures/Dlc/SogPrairieFireDlcFixture.php similarity index 88% rename from src/DataFixtures/Dlc/SogPrairieFireDlcFixture.php rename to src/Mods/DataFixtures/Dlc/SogPrairieFireDlcFixture.php index e28f6052..0386fbb3 100644 --- a/src/DataFixtures/Dlc/SogPrairieFireDlcFixture.php +++ b/src/Mods/DataFixtures/Dlc/SogPrairieFireDlcFixture.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\DataFixtures\Dlc; +namespace App\Mods\DataFixtures\Dlc; -use App\Entity\Dlc\Dlc; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Dlc\Dlc; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Dlc/Spearhead1944DlcFixture.php b/src/Mods/DataFixtures/Dlc/Spearhead1944DlcFixture.php similarity index 88% rename from src/DataFixtures/Dlc/Spearhead1944DlcFixture.php rename to src/Mods/DataFixtures/Dlc/Spearhead1944DlcFixture.php index 88bddb35..0119bd99 100644 --- a/src/DataFixtures/Dlc/Spearhead1944DlcFixture.php +++ b/src/Mods/DataFixtures/Dlc/Spearhead1944DlcFixture.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\DataFixtures\Dlc; +namespace App\Mods\DataFixtures\Dlc; -use App\Entity\Dlc\Dlc; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Dlc\Dlc; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/Directory/ArmaScriptProfilerModFixture.php b/src/Mods/DataFixtures/Mod/Directory/ArmaScriptProfilerModFixture.php similarity index 87% rename from src/DataFixtures/Mod/Directory/ArmaScriptProfilerModFixture.php rename to src/Mods/DataFixtures/Mod/Directory/ArmaScriptProfilerModFixture.php index f51377df..be74a050 100644 --- a/src/DataFixtures/Mod/Directory/ArmaScriptProfilerModFixture.php +++ b/src/Mods/DataFixtures/Mod/Directory/ArmaScriptProfilerModFixture.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\Directory; +namespace App\Mods\DataFixtures\Mod\Directory; -use App\Entity\Mod\DirectoryMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\DirectoryMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/Directory/Deprecated/R3ModFixture.php b/src/Mods/DataFixtures/Mod/Directory/Deprecated/R3ModFixture.php similarity index 81% rename from src/DataFixtures/Mod/Directory/Deprecated/R3ModFixture.php rename to src/Mods/DataFixtures/Mod/Directory/Deprecated/R3ModFixture.php index 87aabec8..bf2b4139 100644 --- a/src/DataFixtures/Mod/Directory/Deprecated/R3ModFixture.php +++ b/src/Mods/DataFixtures/Mod/Directory/Deprecated/R3ModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\Directory\Deprecated; +namespace App\Mods\DataFixtures\Mod\Directory\Deprecated; -use App\Entity\Mod\DirectoryMod; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\DirectoryMod; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Optional/AceInteractionMenuExpansionModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Optional/AceInteractionMenuExpansionModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Optional/AceInteractionMenuExpansionModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Optional/AceInteractionMenuExpansionModFixture.php index 667baaec..9799e283 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Optional/AceInteractionMenuExpansionModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Optional/AceInteractionMenuExpansionModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Optional; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Optional; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/ArmaForcesMedicalModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/ArmaForcesMedicalModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Required/ArmaForcesMedicalModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/ArmaForcesMedicalModFixture.php index c8516acc..486e3910 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/ArmaForcesMedicalModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/ArmaForcesMedicalModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/Broken/ArmaForcesAceMedicalModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/Broken/ArmaForcesAceMedicalModFixture.php similarity index 79% rename from src/DataFixtures/Mod/SteamWorkshop/Required/Broken/ArmaForcesAceMedicalModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/Broken/ArmaForcesAceMedicalModFixture.php index 3165a073..2148dc5a 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/Broken/ArmaForcesAceMedicalModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/Broken/ArmaForcesAceMedicalModFixture.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required\Broken; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Broken; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsCoreModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsCoreModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsCoreModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsCoreModFixture.php index 6d1997f7..9137605e 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsCoreModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsCoreModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsMapsModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsMapsModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsMapsModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsMapsModFixture.php index c3cc41c3..29de77a0 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsMapsModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupTerrainsMapsModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/CupUnitsModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupUnitsModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Required/CupUnitsModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupUnitsModFixture.php index 5b6a64d1..0a37c7c7 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/CupUnitsModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupUnitsModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/CupVehiclesModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupVehiclesModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Required/CupVehiclesModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupVehiclesModFixture.php index 1cf0f7e0..6e32004d 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/CupVehiclesModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupVehiclesModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/CupWeaponsModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupWeaponsModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Required/CupWeaponsModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupWeaponsModFixture.php index 04e763b0..7436221e 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/CupWeaponsModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/CupWeaponsModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/Deprecated/LegacyArmaForcesModsModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/Deprecated/LegacyArmaForcesModsModFixture.php similarity index 79% rename from src/DataFixtures/Mod/SteamWorkshop/Required/Deprecated/LegacyArmaForcesModsModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/Deprecated/LegacyArmaForcesModsModFixture.php index c5c34326..654c5537 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/Deprecated/LegacyArmaForcesModsModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/Deprecated/LegacyArmaForcesModsModFixture.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Deprecated; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/Disabled/ArmaForcesJbadBuildingFixModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/Disabled/ArmaForcesJbadBuildingFixModFixture.php similarity index 79% rename from src/DataFixtures/Mod/SteamWorkshop/Required/Disabled/ArmaForcesJbadBuildingFixModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/Disabled/ArmaForcesJbadBuildingFixModFixture.php index cc18ac15..bdfaf671 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/Disabled/ArmaForcesJbadBuildingFixModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/Disabled/ArmaForcesJbadBuildingFixModFixture.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required\Disabled; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Disabled; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/RhsAfrfModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/RhsAfrfModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Required/RhsAfrfModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/RhsAfrfModFixture.php index b848526d..be8011be 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/RhsAfrfModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/RhsAfrfModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/RhsGrefModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/RhsGrefModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Required/RhsGrefModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/RhsGrefModFixture.php index 2e8364ad..920fd23f 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/RhsGrefModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/RhsGrefModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/Mod/SteamWorkshop/Required/RhsUsafModFixture.php b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/RhsUsafModFixture.php similarity index 82% rename from src/DataFixtures/Mod/SteamWorkshop/Required/RhsUsafModFixture.php rename to src/Mods/DataFixtures/Mod/SteamWorkshop/Required/RhsUsafModFixture.php index d8cba558..2028b680 100644 --- a/src/DataFixtures/Mod/SteamWorkshop/Required/RhsUsafModFixture.php +++ b/src/Mods/DataFixtures/Mod/SteamWorkshop/Required/RhsUsafModFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\Mod\SteamWorkshop\Required; +namespace App\Mods\DataFixtures\Mod\SteamWorkshop\Required; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Test\Traits\TimeTrait; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/ModGroup/CupModGroupFixture.php b/src/Mods/DataFixtures/ModGroup/CupModGroupFixture.php similarity index 75% rename from src/DataFixtures/ModGroup/CupModGroupFixture.php rename to src/Mods/DataFixtures/ModGroup/CupModGroupFixture.php index 0e7525b4..d39e8167 100644 --- a/src/DataFixtures/ModGroup/CupModGroupFixture.php +++ b/src/Mods/DataFixtures/ModGroup/CupModGroupFixture.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace App\DataFixtures\ModGroup; - -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupUnitsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupVehiclesModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupWeaponsModFixture; -use App\Entity\ModGroup\ModGroup; -use App\Test\Traits\TimeTrait; +namespace App\Mods\DataFixtures\ModGroup; + +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupUnitsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupVehiclesModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupWeaponsModFixture; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; diff --git a/src/DataFixtures/ModGroup/RhsModGroupFixture.php b/src/Mods/DataFixtures/ModGroup/RhsModGroupFixture.php similarity index 79% rename from src/DataFixtures/ModGroup/RhsModGroupFixture.php rename to src/Mods/DataFixtures/ModGroup/RhsModGroupFixture.php index 2d6629f6..0f5c5d4a 100644 --- a/src/DataFixtures/ModGroup/RhsModGroupFixture.php +++ b/src/Mods/DataFixtures/ModGroup/RhsModGroupFixture.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\DataFixtures\ModGroup; +namespace App\Mods\DataFixtures\ModGroup; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsGrefModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsUsafModFixture; -use App\Entity\ModGroup\ModGroup; -use App\Test\Traits\TimeTrait; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsGrefModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsUsafModFixture; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; diff --git a/src/DataFixtures/ModList/CupModListFixture.php b/src/Mods/DataFixtures/ModList/CupModListFixture.php similarity index 73% rename from src/DataFixtures/ModList/CupModListFixture.php rename to src/Mods/DataFixtures/ModList/CupModListFixture.php index 4a2950d2..d30387cb 100644 --- a/src/DataFixtures/ModList/CupModListFixture.php +++ b/src/Mods/DataFixtures/ModList/CupModListFixture.php @@ -2,20 +2,20 @@ declare(strict_types=1); -namespace App\DataFixtures\ModList; - -use App\DataFixtures\Dlc\CslaIronCurtainDlcFixture; -use App\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; -use App\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; -use App\DataFixtures\ModGroup\CupModGroupFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\ModList\ModList; -use App\Test\Traits\TimeTrait; +namespace App\Mods\DataFixtures\ModList; + +use App\Mods\DataFixtures\Dlc\CslaIronCurtainDlcFixture; +use App\Mods\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; +use App\Mods\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; +use App\Mods\DataFixtures\ModGroup\CupModGroupFixture; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Test\Traits\TimeTrait; +use App\Users\DataFixtures\User\User1Fixture; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; diff --git a/src/DataFixtures/ModList/DefaultModListFixture.php b/src/Mods/DataFixtures/ModList/DefaultModListFixture.php similarity index 67% rename from src/DataFixtures/ModList/DefaultModListFixture.php rename to src/Mods/DataFixtures/ModList/DefaultModListFixture.php index 90b0046e..805d03e0 100644 --- a/src/DataFixtures/ModList/DefaultModListFixture.php +++ b/src/Mods/DataFixtures/ModList/DefaultModListFixture.php @@ -2,31 +2,31 @@ declare(strict_types=1); -namespace App\DataFixtures\ModList; - -use App\DataFixtures\Dlc\CslaIronCurtainDlcFixture; -use App\DataFixtures\Dlc\GlobalMobilizationDlcFixture; -use App\DataFixtures\Dlc\SogPrairieFireDlcFixture; -use App\DataFixtures\Dlc\Spearhead1944DlcFixture; -use App\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; -use App\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupUnitsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupVehiclesModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupWeaponsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsGrefModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsUsafModFixture; -use App\DataFixtures\ModGroup\CupModGroupFixture; -use App\DataFixtures\ModGroup\RhsModGroupFixture; -use App\Entity\ModList\ModList; -use App\Test\Traits\TimeTrait; +namespace App\Mods\DataFixtures\ModList; + +use App\Mods\DataFixtures\Dlc\CslaIronCurtainDlcFixture; +use App\Mods\DataFixtures\Dlc\GlobalMobilizationDlcFixture; +use App\Mods\DataFixtures\Dlc\SogPrairieFireDlcFixture; +use App\Mods\DataFixtures\Dlc\Spearhead1944DlcFixture; +use App\Mods\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; +use App\Mods\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupUnitsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupVehiclesModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupWeaponsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsGrefModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsUsafModFixture; +use App\Mods\DataFixtures\ModGroup\CupModGroupFixture; +use App\Mods\DataFixtures\ModGroup\RhsModGroupFixture; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Test\Traits\TimeTrait; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; diff --git a/src/DataFixtures/ModList/RhsModListFixture.php b/src/Mods/DataFixtures/ModList/RhsModListFixture.php similarity index 73% rename from src/DataFixtures/ModList/RhsModListFixture.php rename to src/Mods/DataFixtures/ModList/RhsModListFixture.php index 887fcaa2..1604611c 100644 --- a/src/DataFixtures/ModList/RhsModListFixture.php +++ b/src/Mods/DataFixtures/ModList/RhsModListFixture.php @@ -2,20 +2,20 @@ declare(strict_types=1); -namespace App\DataFixtures\ModList; - -use App\DataFixtures\Dlc\CslaIronCurtainDlcFixture; -use App\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; -use App\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; -use App\DataFixtures\ModGroup\RhsModGroupFixture; -use App\DataFixtures\User\User2Fixture; -use App\Entity\ModList\ModList; -use App\Test\Traits\TimeTrait; +namespace App\Mods\DataFixtures\ModList; + +use App\Mods\DataFixtures\Dlc\CslaIronCurtainDlcFixture; +use App\Mods\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; +use App\Mods\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; +use App\Mods\DataFixtures\ModGroup\RhsModGroupFixture; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Test\Traits\TimeTrait; +use App\Users\DataFixtures\User\User2Fixture; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; diff --git a/src/Entity/Dlc/Dlc.php b/src/Mods/Entity/Dlc/Dlc.php similarity index 93% rename from src/Entity/Dlc/Dlc.php rename to src/Mods/Entity/Dlc/Dlc.php index 913661b3..5362bc16 100644 --- a/src/Entity/Dlc/Dlc.php +++ b/src/Mods/Entity/Dlc/Dlc.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Entity\Dlc; +namespace App\Mods\Entity\Dlc; -use App\Entity\AbstractBlamableEntity; +use App\Shared\Entity\Common\AbstractBlamableEntity; use Ramsey\Uuid\UuidInterface; class Dlc extends AbstractBlamableEntity diff --git a/src/Entity/Mod/AbstractMod.php b/src/Mods/Entity/Mod/AbstractMod.php similarity index 86% rename from src/Entity/Mod/AbstractMod.php rename to src/Mods/Entity/Mod/AbstractMod.php index fe9fe7c4..7e0720f5 100644 --- a/src/Entity/Mod/AbstractMod.php +++ b/src/Mods/Entity/Mod/AbstractMod.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Entity\Mod; +namespace App\Mods\Entity\Mod; -use App\Entity\AbstractBlamableEntity; -use App\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Shared\Entity\Common\AbstractBlamableEntity; use Ramsey\Uuid\UuidInterface; abstract class AbstractMod extends AbstractBlamableEntity diff --git a/src/Entity/Mod/DirectoryMod.php b/src/Mods/Entity/Mod/DirectoryMod.php similarity index 91% rename from src/Entity/Mod/DirectoryMod.php rename to src/Mods/Entity/Mod/DirectoryMod.php index c2023eec..51c267a5 100644 --- a/src/Entity/Mod/DirectoryMod.php +++ b/src/Mods/Entity/Mod/DirectoryMod.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Entity\Mod; +namespace App\Mods\Entity\Mod; -use App\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; use Ramsey\Uuid\UuidInterface; class DirectoryMod extends AbstractMod diff --git a/src/Entity/Mod/Enum/ModSourceEnum.php b/src/Mods/Entity/Mod/Enum/ModSourceEnum.php similarity index 80% rename from src/Entity/Mod/Enum/ModSourceEnum.php rename to src/Mods/Entity/Mod/Enum/ModSourceEnum.php index 1fe94847..46f80410 100644 --- a/src/Entity/Mod/Enum/ModSourceEnum.php +++ b/src/Mods/Entity/Mod/Enum/ModSourceEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Mod\Enum; +namespace App\Mods\Entity\Mod\Enum; enum ModSourceEnum: string { diff --git a/src/Entity/Mod/Enum/ModStatusEnum.php b/src/Mods/Entity/Mod/Enum/ModStatusEnum.php similarity index 92% rename from src/Entity/Mod/Enum/ModStatusEnum.php rename to src/Mods/Entity/Mod/Enum/ModStatusEnum.php index d162df79..30c81b0e 100644 --- a/src/Entity/Mod/Enum/ModStatusEnum.php +++ b/src/Mods/Entity/Mod/Enum/ModStatusEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Mod\Enum; +namespace App\Mods\Entity\Mod\Enum; enum ModStatusEnum: string { diff --git a/src/Entity/Mod/Enum/ModTypeEnum.php b/src/Mods/Entity/Mod/Enum/ModTypeEnum.php similarity index 91% rename from src/Entity/Mod/Enum/ModTypeEnum.php rename to src/Mods/Entity/Mod/Enum/ModTypeEnum.php index 8067b2a8..33842d61 100644 --- a/src/Entity/Mod/Enum/ModTypeEnum.php +++ b/src/Mods/Entity/Mod/Enum/ModTypeEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Mod\Enum; +namespace App\Mods\Entity\Mod\Enum; enum ModTypeEnum: string { diff --git a/src/Entity/Mod/SteamWorkshopMod.php b/src/Mods/Entity/Mod/SteamWorkshopMod.php similarity index 89% rename from src/Entity/Mod/SteamWorkshopMod.php rename to src/Mods/Entity/Mod/SteamWorkshopMod.php index d922f040..9f097320 100644 --- a/src/Entity/Mod/SteamWorkshopMod.php +++ b/src/Mods/Entity/Mod/SteamWorkshopMod.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Entity\Mod; +namespace App\Mods\Entity\Mod; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; use Ramsey\Uuid\UuidInterface; class SteamWorkshopMod extends AbstractMod diff --git a/src/Entity/ModGroup/ModGroup.php b/src/Mods/Entity/ModGroup/ModGroup.php similarity index 92% rename from src/Entity/ModGroup/ModGroup.php rename to src/Mods/Entity/ModGroup/ModGroup.php index 1547b799..8a5e0213 100644 --- a/src/Entity/ModGroup/ModGroup.php +++ b/src/Mods/Entity/ModGroup/ModGroup.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Entity\ModGroup; +namespace App\Mods\Entity\ModGroup; -use App\Entity\AbstractBlamableEntity; -use App\Entity\Mod\AbstractMod; +use App\Mods\Entity\Mod\AbstractMod; +use App\Shared\Entity\Common\AbstractBlamableEntity; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Ramsey\Uuid\UuidInterface; diff --git a/src/Entity/ModList/ModList.php b/src/Mods/Entity/ModList/ModList.php similarity index 94% rename from src/Entity/ModList/ModList.php rename to src/Mods/Entity/ModList/ModList.php index b891cc46..e99fefe9 100644 --- a/src/Entity/ModList/ModList.php +++ b/src/Mods/Entity/ModList/ModList.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Entity\ModList; +namespace App\Mods\Entity\ModList; -use App\Entity\AbstractBlamableEntity; -use App\Entity\Dlc\Dlc; -use App\Entity\Mod\AbstractMod; -use App\Entity\ModGroup\ModGroup; -use App\Entity\User\User; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Shared\Entity\Common\AbstractBlamableEntity; +use App\Users\Entity\User\User; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Ramsey\Uuid\UuidInterface; diff --git a/src/EventSubscriber/Doctrine/ModGroupUpdatedSubscriber.php b/src/Mods/EventSubscriber/Doctrine/ModGroupUpdatedSubscriber.php similarity index 78% rename from src/EventSubscriber/Doctrine/ModGroupUpdatedSubscriber.php rename to src/Mods/EventSubscriber/Doctrine/ModGroupUpdatedSubscriber.php index ee38e9a9..72f6138d 100644 --- a/src/EventSubscriber/Doctrine/ModGroupUpdatedSubscriber.php +++ b/src/Mods/EventSubscriber/Doctrine/ModGroupUpdatedSubscriber.php @@ -2,15 +2,17 @@ declare(strict_types=1); -namespace App\EventSubscriber\Doctrine; +namespace App\Mods\EventSubscriber\Doctrine; -use App\Entity\ModGroup\ModGroup; -use App\Service\ModListUpdateService\ModListUpdateServiceInterface; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Service\ModListUpdateService\ModListUpdateServiceInterface; use Doctrine\Common\EventSubscriber; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Event\PreUpdateEventArgs; use Doctrine\ORM\Events; +use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag; +#[AutoconfigureTag('doctrine.event_subscriber')] class ModGroupUpdatedSubscriber implements EventSubscriber { public function __construct( diff --git a/src/Form/Dlc/DataTransformer/DlcFormDtoDataTransformer.php b/src/Mods/Form/Dlc/DataTransformer/DlcFormDtoDataTransformer.php similarity index 83% rename from src/Form/Dlc/DataTransformer/DlcFormDtoDataTransformer.php rename to src/Mods/Form/Dlc/DataTransformer/DlcFormDtoDataTransformer.php index 17da1f0e..87117de6 100644 --- a/src/Form/Dlc/DataTransformer/DlcFormDtoDataTransformer.php +++ b/src/Mods/Form/Dlc/DataTransformer/DlcFormDtoDataTransformer.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Form\Dlc\DataTransformer; +namespace App\Mods\Form\Dlc\DataTransformer; -use App\Entity\Dlc\Dlc; -use App\Form\Dlc\Dto\DlcFormDto; -use App\Service\IdentifierFactory\IdentifierFactoryInterface; -use App\Service\SteamApiClient\Helper\SteamHelper; -use App\Service\SteamApiClient\SteamApiClientInterface; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Form\Dlc\Dto\DlcFormDto; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryInterface; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; +use App\Shared\Service\SteamApiClient\SteamApiClientInterface; class DlcFormDtoDataTransformer { diff --git a/src/Form/Dlc/DlcFormType.php b/src/Mods/Form/Dlc/DlcFormType.php similarity index 94% rename from src/Form/Dlc/DlcFormType.php rename to src/Mods/Form/Dlc/DlcFormType.php index aac7f41f..8f31bb93 100644 --- a/src/Form/Dlc/DlcFormType.php +++ b/src/Mods/Form/Dlc/DlcFormType.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Form\Dlc; +namespace App\Mods\Form\Dlc; -use App\Form\Dlc\Dto\DlcFormDto; +use App\Mods\Form\Dlc\Dto\DlcFormDto; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; diff --git a/src/Form/Dlc/Dto/DlcFormDto.php b/src/Mods/Form/Dlc/Dto/DlcFormDto.php similarity index 86% rename from src/Form/Dlc/Dto/DlcFormDto.php rename to src/Mods/Form/Dlc/Dto/DlcFormDto.php index 0e6aa469..e4771b90 100644 --- a/src/Form/Dlc/Dto/DlcFormDto.php +++ b/src/Mods/Form/Dlc/Dto/DlcFormDto.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Form\Dlc\Dto; +namespace App\Mods\Form\Dlc\Dto; -use App\Validator\Dlc\SteamStoreArma3DlcUrl; -use App\Validator\Dlc\UniqueDirectoryDlc; -use App\Validator\Dlc\UniqueSteamStoreDlc; -use App\Validator\WindowsDirectoryName; +use App\Mods\Validator\Dlc\SteamStoreArma3DlcUrl; +use App\Mods\Validator\Dlc\UniqueDirectoryDlc; +use App\Mods\Validator\Dlc\UniqueSteamStoreDlc; +use App\Shared\Validator\Common\WindowsDirectoryName; use Ramsey\Uuid\UuidInterface; use Symfony\Component\Validator\Constraints as Assert; diff --git a/src/Form/Mod/DataTransformer/ModFormDtoDataTransformer.php b/src/Mods/Form/Mod/DataTransformer/ModFormDtoDataTransformer.php similarity index 85% rename from src/Form/Mod/DataTransformer/ModFormDtoDataTransformer.php rename to src/Mods/Form/Mod/DataTransformer/ModFormDtoDataTransformer.php index 67c7856b..a517a760 100644 --- a/src/Form/Mod/DataTransformer/ModFormDtoDataTransformer.php +++ b/src/Mods/Form/Mod/DataTransformer/ModFormDtoDataTransformer.php @@ -2,18 +2,18 @@ declare(strict_types=1); -namespace App\Form\Mod\DataTransformer; - -use App\Entity\Mod\AbstractMod; -use App\Entity\Mod\DirectoryMod; -use App\Entity\Mod\Enum\ModSourceEnum; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Form\Mod\Dto\ModFormDto; -use App\Service\IdentifierFactory\IdentifierFactoryInterface; -use App\Service\SteamApiClient\Helper\SteamHelper; -use App\Service\SteamApiClient\SteamApiClientInterface; +namespace App\Mods\Form\Mod\DataTransformer; + +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\Mod\DirectoryMod; +use App\Mods\Entity\Mod\Enum\ModSourceEnum; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Mods\Form\Mod\Dto\ModFormDto; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryInterface; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; +use App\Shared\Service\SteamApiClient\SteamApiClientInterface; class ModFormDtoDataTransformer { diff --git a/src/Form/Mod/Dto/ModFormDto.php b/src/Mods/Form/Mod/Dto/ModFormDto.php similarity index 90% rename from src/Form/Mod/Dto/ModFormDto.php rename to src/Mods/Form/Mod/Dto/ModFormDto.php index 6db0fefc..143e0724 100644 --- a/src/Form/Mod/Dto/ModFormDto.php +++ b/src/Mods/Form/Mod/Dto/ModFormDto.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Form\Mod\Dto; +namespace App\Mods\Form\Mod\Dto; -use App\Entity\Mod\Enum\ModSourceEnum; -use App\Validator\Mod\SteamWorkshopArma3ModUrl; -use App\Validator\Mod\UniqueDirectoryMod; -use App\Validator\Mod\UniqueSteamWorkshopMod; -use App\Validator\WindowsDirectoryName; +use App\Mods\Entity\Mod\Enum\ModSourceEnum; +use App\Mods\Validator\Mod\SteamWorkshopArma3ModUrl; +use App\Mods\Validator\Mod\UniqueDirectoryMod; +use App\Mods\Validator\Mod\UniqueSteamWorkshopMod; +use App\Shared\Validator\Common\WindowsDirectoryName; use Ramsey\Uuid\UuidInterface; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraints as Assert; diff --git a/src/Form/Mod/ModFormType.php b/src/Mods/Form/Mod/ModFormType.php similarity index 93% rename from src/Form/Mod/ModFormType.php rename to src/Mods/Form/Mod/ModFormType.php index 2d52a748..7aa464b3 100644 --- a/src/Form/Mod/ModFormType.php +++ b/src/Mods/Form/Mod/ModFormType.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Form\Mod; +namespace App\Mods\Form\Mod; -use App\Entity\Mod\Enum\ModSourceEnum; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Form\Mod\Dto\ModFormDto; +use App\Mods\Entity\Mod\Enum\ModSourceEnum; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Form\Mod\Dto\ModFormDto; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; diff --git a/src/Form/ModGroup/DataTransformer/ModGroupFormDtoDataTransformer.php b/src/Mods/Form/ModGroup/DataTransformer/ModGroupFormDtoDataTransformer.php similarity index 86% rename from src/Form/ModGroup/DataTransformer/ModGroupFormDtoDataTransformer.php rename to src/Mods/Form/ModGroup/DataTransformer/ModGroupFormDtoDataTransformer.php index 3f5f9069..b0b74d1e 100644 --- a/src/Form/ModGroup/DataTransformer/ModGroupFormDtoDataTransformer.php +++ b/src/Mods/Form/ModGroup/DataTransformer/ModGroupFormDtoDataTransformer.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Form\ModGroup\DataTransformer; +namespace App\Mods\Form\ModGroup\DataTransformer; -use App\Entity\ModGroup\ModGroup; -use App\Form\ModGroup\Dto\ModGroupFormDto; -use App\Service\IdentifierFactory\IdentifierFactoryInterface; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Form\ModGroup\Dto\ModGroupFormDto; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryInterface; class ModGroupFormDtoDataTransformer { diff --git a/src/Form/ModGroup/Dto/ModGroupFormDto.php b/src/Mods/Form/ModGroup/Dto/ModGroupFormDto.php similarity index 93% rename from src/Form/ModGroup/Dto/ModGroupFormDto.php rename to src/Mods/Form/ModGroup/Dto/ModGroupFormDto.php index 9fd3d241..ecd8854e 100644 --- a/src/Form/ModGroup/Dto/ModGroupFormDto.php +++ b/src/Mods/Form/ModGroup/Dto/ModGroupFormDto.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Form\ModGroup\Dto; +namespace App\Mods\Form\ModGroup\Dto; -use App\Entity\Mod\AbstractMod; -use App\Validator\ModGroup\UniqueModGroupName; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Validator\ModGroup\UniqueModGroupName; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Ramsey\Uuid\UuidInterface; diff --git a/src/Form/ModGroup/ModGroupFormType.php b/src/Mods/Form/ModGroup/ModGroupFormType.php similarity index 92% rename from src/Form/ModGroup/ModGroupFormType.php rename to src/Mods/Form/ModGroup/ModGroupFormType.php index bd98fca7..68b77807 100644 --- a/src/Form/ModGroup/ModGroupFormType.php +++ b/src/Mods/Form/ModGroup/ModGroupFormType.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Form\ModGroup; +namespace App\Mods\Form\ModGroup; -use App\Entity\Mod\AbstractMod; -use App\Form\ModGroup\Dto\ModGroupFormDto; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Form\ModGroup\Dto\ModGroupFormDto; use Doctrine\ORM\EntityRepository; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; diff --git a/src/Form/ModList/DataTransformer/ModListFormDtoDataTransformer.php b/src/Mods/Form/ModList/DataTransformer/ModListFormDtoDataTransformer.php similarity index 90% rename from src/Form/ModList/DataTransformer/ModListFormDtoDataTransformer.php rename to src/Mods/Form/ModList/DataTransformer/ModListFormDtoDataTransformer.php index 758a29a6..34579e98 100644 --- a/src/Form/ModList/DataTransformer/ModListFormDtoDataTransformer.php +++ b/src/Mods/Form/ModList/DataTransformer/ModListFormDtoDataTransformer.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Form\ModList\DataTransformer; +namespace App\Mods\Form\ModList\DataTransformer; -use App\Entity\ModList\ModList; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Form\ModList\Dto\ModListFormDto; -use App\Service\IdentifierFactory\IdentifierFactoryInterface; +use App\Mods\Entity\ModList\ModList; +use App\Mods\Form\ModList\Dto\ModListFormDto; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryInterface; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Bundle\SecurityBundle\Security; class ModListFormDtoDataTransformer diff --git a/src/Form/ModList/Dto/ModListFormDto.php b/src/Mods/Form/ModList/Dto/ModListFormDto.php similarity index 95% rename from src/Form/ModList/Dto/ModListFormDto.php rename to src/Mods/Form/ModList/Dto/ModListFormDto.php index 1155a2cc..597917b1 100644 --- a/src/Form/ModList/Dto/ModListFormDto.php +++ b/src/Mods/Form/ModList/Dto/ModListFormDto.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Form\ModList\Dto; +namespace App\Mods\Form\ModList\Dto; -use App\Entity\Dlc\Dlc; -use App\Entity\Mod\AbstractMod; -use App\Entity\ModGroup\ModGroup; -use App\Entity\User\User; -use App\Validator\ModList\UniqueModListName; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Validator\ModList\UniqueModListName; +use App\Users\Entity\User\User; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Ramsey\Uuid\UuidInterface; diff --git a/src/Form/ModList/ModListFormType.php b/src/Mods/Form/ModList/ModListFormType.php similarity index 94% rename from src/Form/ModList/ModListFormType.php rename to src/Mods/Form/ModList/ModListFormType.php index 0734cbbf..0b1a6c3b 100644 --- a/src/Form/ModList/ModListFormType.php +++ b/src/Mods/Form/ModList/ModListFormType.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Form\ModList; - -use App\Entity\Dlc\Dlc; -use App\Entity\Mod\AbstractMod; -use App\Entity\ModGroup\ModGroup; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Form\ModList\Dto\ModListFormDto; +namespace App\Mods\Form\ModList; + +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Form\ModList\Dto\ModListFormDto; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Doctrine\ORM\EntityRepository; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Bundle\SecurityBundle\Security; diff --git a/src/Repository/Dlc/DlcRepository.php b/src/Mods/Repository/Dlc/DlcRepository.php similarity index 90% rename from src/Repository/Dlc/DlcRepository.php rename to src/Mods/Repository/Dlc/DlcRepository.php index ac9f8512..ac95f49f 100644 --- a/src/Repository/Dlc/DlcRepository.php +++ b/src/Mods/Repository/Dlc/DlcRepository.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Repository\Dlc; +namespace App\Mods\Repository\Dlc; -use App\Entity\Dlc\Dlc; +use App\Mods\Entity\Dlc\Dlc; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Repository/Mod/DirectoryModRepository.php b/src/Mods/Repository/Mod/DirectoryModRepository.php similarity index 91% rename from src/Repository/Mod/DirectoryModRepository.php rename to src/Mods/Repository/Mod/DirectoryModRepository.php index e44e8890..49e593eb 100644 --- a/src/Repository/Mod/DirectoryModRepository.php +++ b/src/Mods/Repository/Mod/DirectoryModRepository.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Repository\Mod; +namespace App\Mods\Repository\Mod; -use App\Entity\Mod\DirectoryMod; +use App\Mods\Entity\Mod\DirectoryMod; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Repository/Mod/ModRepository.php b/src/Mods/Repository/Mod/ModRepository.php similarity index 94% rename from src/Repository/Mod/ModRepository.php rename to src/Mods/Repository/Mod/ModRepository.php index 65f6e276..2bfddee7 100644 --- a/src/Repository/Mod/ModRepository.php +++ b/src/Mods/Repository/Mod/ModRepository.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Repository\Mod; +namespace App\Mods\Repository\Mod; -use App\Entity\Mod\AbstractMod; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Entity\ModGroup\ModGroup; -use App\Entity\ModList\ModList; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Entity\ModList\ModList; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\QueryBuilder; diff --git a/src/Repository/Mod/SteamWorkshopModRepository.php b/src/Mods/Repository/Mod/SteamWorkshopModRepository.php similarity index 91% rename from src/Repository/Mod/SteamWorkshopModRepository.php rename to src/Mods/Repository/Mod/SteamWorkshopModRepository.php index 894fd106..40890686 100644 --- a/src/Repository/Mod/SteamWorkshopModRepository.php +++ b/src/Mods/Repository/Mod/SteamWorkshopModRepository.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Repository\Mod; +namespace App\Mods\Repository\Mod; -use App\Entity\Mod\SteamWorkshopMod; +use App\Mods\Entity\Mod\SteamWorkshopMod; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Repository/ModGroup/ModGroupRepository.php b/src/Mods/Repository/ModGroup/ModGroupRepository.php similarity index 88% rename from src/Repository/ModGroup/ModGroupRepository.php rename to src/Mods/Repository/ModGroup/ModGroupRepository.php index 2e48eb59..1c2dd821 100644 --- a/src/Repository/ModGroup/ModGroupRepository.php +++ b/src/Mods/Repository/ModGroup/ModGroupRepository.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Repository\ModGroup; +namespace App\Mods\Repository\ModGroup; -use App\Entity\ModGroup\ModGroup; +use App\Mods\Entity\ModGroup\ModGroup; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Repository/ModList/ModListRepository.php b/src/Mods/Repository/ModList/ModListRepository.php similarity index 90% rename from src/Repository/ModList/ModListRepository.php rename to src/Mods/Repository/ModList/ModListRepository.php index 314e98be..6b196625 100644 --- a/src/Repository/ModList/ModListRepository.php +++ b/src/Mods/Repository/ModList/ModListRepository.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Repository\ModList; +namespace App\Mods\Repository\ModList; -use App\Entity\ModList\ModList; +use App\Mods\Entity\ModList\ModList; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Security/Voter/Dlc/CreateDlcVoter.php b/src/Mods/Security/Voter/Dlc/CreateDlcVoter.php similarity index 80% rename from src/Security/Voter/Dlc/CreateDlcVoter.php rename to src/Mods/Security/Voter/Dlc/CreateDlcVoter.php index fc653aca..5af1c640 100644 --- a/src/Security/Voter/Dlc/CreateDlcVoter.php +++ b/src/Mods/Security/Voter/Dlc/CreateDlcVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\Dlc; +namespace App\Mods\Security\Voter\Dlc; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/Dlc/DeleteDlcVoter.php b/src/Mods/Security/Voter/Dlc/DeleteDlcVoter.php similarity index 78% rename from src/Security/Voter/Dlc/DeleteDlcVoter.php rename to src/Mods/Security/Voter/Dlc/DeleteDlcVoter.php index 829f88e2..f0474500 100644 --- a/src/Security/Voter/Dlc/DeleteDlcVoter.php +++ b/src/Mods/Security/Voter/Dlc/DeleteDlcVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\Dlc; +namespace App\Mods\Security\Voter\Dlc; -use App\Entity\Dlc\Dlc; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\Dlc\Dlc; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/Dlc/ListDlcsVoter.php b/src/Mods/Security/Voter/Dlc/ListDlcsVoter.php similarity index 80% rename from src/Security/Voter/Dlc/ListDlcsVoter.php rename to src/Mods/Security/Voter/Dlc/ListDlcsVoter.php index 7505a5b9..2f90b401 100644 --- a/src/Security/Voter/Dlc/ListDlcsVoter.php +++ b/src/Mods/Security/Voter/Dlc/ListDlcsVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\Dlc; +namespace App\Mods\Security\Voter\Dlc; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/Dlc/UpdateDlcVoter.php b/src/Mods/Security/Voter/Dlc/UpdateDlcVoter.php similarity index 78% rename from src/Security/Voter/Dlc/UpdateDlcVoter.php rename to src/Mods/Security/Voter/Dlc/UpdateDlcVoter.php index bb0f4c3f..22a6455d 100644 --- a/src/Security/Voter/Dlc/UpdateDlcVoter.php +++ b/src/Mods/Security/Voter/Dlc/UpdateDlcVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\Dlc; +namespace App\Mods\Security\Voter\Dlc; -use App\Entity\Dlc\Dlc; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\Dlc\Dlc; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/Mod/CreateModVoter.php b/src/Mods/Security/Voter/Mod/CreateModVoter.php similarity index 80% rename from src/Security/Voter/Mod/CreateModVoter.php rename to src/Mods/Security/Voter/Mod/CreateModVoter.php index 20a94803..776e1bf4 100644 --- a/src/Security/Voter/Mod/CreateModVoter.php +++ b/src/Mods/Security/Voter/Mod/CreateModVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\Mod; +namespace App\Mods\Security\Voter\Mod; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/Mod/DeleteModVoter.php b/src/Mods/Security/Voter/Mod/DeleteModVoter.php similarity index 78% rename from src/Security/Voter/Mod/DeleteModVoter.php rename to src/Mods/Security/Voter/Mod/DeleteModVoter.php index 7f1f9b99..0f5fc29f 100644 --- a/src/Security/Voter/Mod/DeleteModVoter.php +++ b/src/Mods/Security/Voter/Mod/DeleteModVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\Mod; +namespace App\Mods\Security\Voter\Mod; -use App\Entity\Mod\AbstractMod; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\Mod\AbstractMod; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/Mod/ListModsVoter.php b/src/Mods/Security/Voter/Mod/ListModsVoter.php similarity index 80% rename from src/Security/Voter/Mod/ListModsVoter.php rename to src/Mods/Security/Voter/Mod/ListModsVoter.php index 06823c66..f8eef6b7 100644 --- a/src/Security/Voter/Mod/ListModsVoter.php +++ b/src/Mods/Security/Voter/Mod/ListModsVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\Mod; +namespace App\Mods\Security\Voter\Mod; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/Mod/UpdateModVoter.php b/src/Mods/Security/Voter/Mod/UpdateModVoter.php similarity index 78% rename from src/Security/Voter/Mod/UpdateModVoter.php rename to src/Mods/Security/Voter/Mod/UpdateModVoter.php index 0664fab7..a90ff455 100644 --- a/src/Security/Voter/Mod/UpdateModVoter.php +++ b/src/Mods/Security/Voter/Mod/UpdateModVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\Mod; +namespace App\Mods\Security\Voter\Mod; -use App\Entity\Mod\AbstractMod; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\Mod\AbstractMod; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModGroup/CreateModGroupVoter.php b/src/Mods/Security/Voter/ModGroup/CreateModGroupVoter.php similarity index 80% rename from src/Security/Voter/ModGroup/CreateModGroupVoter.php rename to src/Mods/Security/Voter/ModGroup/CreateModGroupVoter.php index b3fac88d..b31a9ff8 100644 --- a/src/Security/Voter/ModGroup/CreateModGroupVoter.php +++ b/src/Mods/Security/Voter/ModGroup/CreateModGroupVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\ModGroup; +namespace App\Mods\Security\Voter\ModGroup; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModGroup/DeleteModGroupVoter.php b/src/Mods/Security/Voter/ModGroup/DeleteModGroupVoter.php similarity index 77% rename from src/Security/Voter/ModGroup/DeleteModGroupVoter.php rename to src/Mods/Security/Voter/ModGroup/DeleteModGroupVoter.php index 87199642..e6ed8e4d 100644 --- a/src/Security/Voter/ModGroup/DeleteModGroupVoter.php +++ b/src/Mods/Security/Voter/ModGroup/DeleteModGroupVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\ModGroup; +namespace App\Mods\Security\Voter\ModGroup; -use App\Entity\ModGroup\ModGroup; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModGroup/ListModGroupsVoter.php b/src/Mods/Security/Voter/ModGroup/ListModGroupsVoter.php similarity index 80% rename from src/Security/Voter/ModGroup/ListModGroupsVoter.php rename to src/Mods/Security/Voter/ModGroup/ListModGroupsVoter.php index 06468d80..94fae517 100644 --- a/src/Security/Voter/ModGroup/ListModGroupsVoter.php +++ b/src/Mods/Security/Voter/ModGroup/ListModGroupsVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\ModGroup; +namespace App\Mods\Security\Voter\ModGroup; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModGroup/UpdateModGroupVoter.php b/src/Mods/Security/Voter/ModGroup/UpdateModGroupVoter.php similarity index 77% rename from src/Security/Voter/ModGroup/UpdateModGroupVoter.php rename to src/Mods/Security/Voter/ModGroup/UpdateModGroupVoter.php index b2dbccc3..0f7cd487 100644 --- a/src/Security/Voter/ModGroup/UpdateModGroupVoter.php +++ b/src/Mods/Security/Voter/ModGroup/UpdateModGroupVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\ModGroup; +namespace App\Mods\Security\Voter\ModGroup; -use App\Entity\ModGroup\ModGroup; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModList/ApproveModListVoter.php b/src/Mods/Security/Voter/ModList/ApproveModListVoter.php similarity index 80% rename from src/Security/Voter/ModList/ApproveModListVoter.php rename to src/Mods/Security/Voter/ModList/ApproveModListVoter.php index d2519062..2bd969ea 100644 --- a/src/Security/Voter/ModList/ApproveModListVoter.php +++ b/src/Mods/Security/Voter/ModList/ApproveModListVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\ModList; +namespace App\Mods\Security\Voter\ModList; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModList/CopyModListVoter.php b/src/Mods/Security/Voter/ModList/CopyModListVoter.php similarity index 77% rename from src/Security/Voter/ModList/CopyModListVoter.php rename to src/Mods/Security/Voter/ModList/CopyModListVoter.php index bee32aca..04c029eb 100644 --- a/src/Security/Voter/ModList/CopyModListVoter.php +++ b/src/Mods/Security/Voter/ModList/CopyModListVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\ModList; +namespace App\Mods\Security\Voter\ModList; -use App\Entity\ModList\ModList; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModList/CreateModListVoter.php b/src/Mods/Security/Voter/ModList/CreateModListVoter.php similarity index 80% rename from src/Security/Voter/ModList/CreateModListVoter.php rename to src/Mods/Security/Voter/ModList/CreateModListVoter.php index 5c2b89b5..75a6c9ef 100644 --- a/src/Security/Voter/ModList/CreateModListVoter.php +++ b/src/Mods/Security/Voter/ModList/CreateModListVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\ModList; +namespace App\Mods\Security\Voter\ModList; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModList/DeleteModListVoter.php b/src/Mods/Security/Voter/ModList/DeleteModListVoter.php similarity index 80% rename from src/Security/Voter/ModList/DeleteModListVoter.php rename to src/Mods/Security/Voter/ModList/DeleteModListVoter.php index a496e3e4..bedca518 100644 --- a/src/Security/Voter/ModList/DeleteModListVoter.php +++ b/src/Mods/Security/Voter/ModList/DeleteModListVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\ModList; +namespace App\Mods\Security\Voter\ModList; -use App\Entity\ModList\ModList; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModList/DownloadModListVoter.php b/src/Mods/Security/Voter/ModList/DownloadModListVoter.php similarity index 82% rename from src/Security/Voter/ModList/DownloadModListVoter.php rename to src/Mods/Security/Voter/ModList/DownloadModListVoter.php index 66d6d585..17599fec 100644 --- a/src/Security/Voter/ModList/DownloadModListVoter.php +++ b/src/Mods/Security/Voter/ModList/DownloadModListVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\ModList; +namespace App\Mods\Security\Voter\ModList; -use App\Entity\ModList\ModList; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModList/ListModListsVoter.php b/src/Mods/Security/Voter/ModList/ListModListsVoter.php similarity index 80% rename from src/Security/Voter/ModList/ListModListsVoter.php rename to src/Mods/Security/Voter/ModList/ListModListsVoter.php index 5c6acf5d..fa8c9767 100644 --- a/src/Security/Voter/ModList/ListModListsVoter.php +++ b/src/Mods/Security/Voter/ModList/ListModListsVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\ModList; +namespace App\Mods\Security\Voter\ModList; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/ModList/UpdateModListVoter.php b/src/Mods/Security/Voter/ModList/UpdateModListVoter.php similarity index 80% rename from src/Security/Voter/ModList/UpdateModListVoter.php rename to src/Mods/Security/Voter/ModList/UpdateModListVoter.php index d8177f47..033504ce 100644 --- a/src/Security/Voter/ModList/UpdateModListVoter.php +++ b/src/Mods/Security/Voter/ModList/UpdateModListVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\ModList; +namespace App\Mods\Security\Voter\ModList; -use App\Entity\ModList\ModList; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Service/ModListUpdateService/ModListUpdateService.php b/src/Mods/Service/ModListUpdateService/ModListUpdateService.php similarity index 87% rename from src/Service/ModListUpdateService/ModListUpdateService.php rename to src/Mods/Service/ModListUpdateService/ModListUpdateService.php index 376113ca..b8c93103 100644 --- a/src/Service/ModListUpdateService/ModListUpdateService.php +++ b/src/Mods/Service/ModListUpdateService/ModListUpdateService.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Service\ModListUpdateService; +namespace App\Mods\Service\ModListUpdateService; -use App\Entity\ModGroup\ModGroup; -use App\Entity\ModList\ModList; -use App\Entity\User\User; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Entity\ModList\ModList; +use App\Users\Entity\User\User; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\SecurityBundle\Security; diff --git a/src/Service/ModListUpdateService/ModListUpdateServiceInterface.php b/src/Mods/Service/ModListUpdateService/ModListUpdateServiceInterface.php similarity index 64% rename from src/Service/ModListUpdateService/ModListUpdateServiceInterface.php rename to src/Mods/Service/ModListUpdateService/ModListUpdateServiceInterface.php index 828ae4c9..2557c1e8 100644 --- a/src/Service/ModListUpdateService/ModListUpdateServiceInterface.php +++ b/src/Mods/Service/ModListUpdateService/ModListUpdateServiceInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Service\ModListUpdateService; +namespace App\Mods\Service\ModListUpdateService; -use App\Entity\ModGroup\ModGroup; +use App\Mods\Entity\ModGroup\ModGroup; interface ModListUpdateServiceInterface { diff --git a/src/Validator/Dlc/SteamStoreArma3DlcUrl.php b/src/Mods/Validator/Dlc/SteamStoreArma3DlcUrl.php similarity index 97% rename from src/Validator/Dlc/SteamStoreArma3DlcUrl.php rename to src/Mods/Validator/Dlc/SteamStoreArma3DlcUrl.php index e6a8a0f9..9d392fd1 100644 --- a/src/Validator/Dlc/SteamStoreArma3DlcUrl.php +++ b/src/Mods/Validator/Dlc/SteamStoreArma3DlcUrl.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\Dlc; +namespace App\Mods\Validator\Dlc; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/Dlc/SteamStoreArma3DlcUrlValidator.php b/src/Mods/Validator/Dlc/SteamStoreArma3DlcUrlValidator.php similarity index 81% rename from src/Validator/Dlc/SteamStoreArma3DlcUrlValidator.php rename to src/Mods/Validator/Dlc/SteamStoreArma3DlcUrlValidator.php index f1d37590..99bae4ff 100644 --- a/src/Validator/Dlc/SteamStoreArma3DlcUrlValidator.php +++ b/src/Mods/Validator/Dlc/SteamStoreArma3DlcUrlValidator.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Validator\Dlc; +namespace App\Mods\Validator\Dlc; -use App\Form\Dlc\Dto\DlcFormDto; -use App\Service\SteamApiClient\Exception\AppNotFoundException; -use App\Service\SteamApiClient\Helper\Exception\InvalidAppUrlFormatException; -use App\Service\SteamApiClient\Helper\SteamHelper; -use App\Service\SteamApiClient\SteamApiClientInterface; -use App\Validator\AbstractValidator; +use App\Mods\Form\Dlc\Dto\DlcFormDto; +use App\Shared\Service\SteamApiClient\Exception\AppNotFoundException; +use App\Shared\Service\SteamApiClient\Helper\Exception\InvalidAppUrlFormatException; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; +use App\Shared\Service\SteamApiClient\SteamApiClientInterface; +use App\Shared\Validator\Common\AbstractValidator; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Validator/Dlc/UniqueDirectoryDlc.php b/src/Mods/Validator/Dlc/UniqueDirectoryDlc.php similarity index 95% rename from src/Validator/Dlc/UniqueDirectoryDlc.php rename to src/Mods/Validator/Dlc/UniqueDirectoryDlc.php index ce42ed22..d8fef22d 100644 --- a/src/Validator/Dlc/UniqueDirectoryDlc.php +++ b/src/Mods/Validator/Dlc/UniqueDirectoryDlc.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\Dlc; +namespace App\Mods\Validator\Dlc; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/Dlc/UniqueDirectoryDlcValidator.php b/src/Mods/Validator/Dlc/UniqueDirectoryDlcValidator.php similarity index 87% rename from src/Validator/Dlc/UniqueDirectoryDlcValidator.php rename to src/Mods/Validator/Dlc/UniqueDirectoryDlcValidator.php index 04e5f6ff..c639efbd 100644 --- a/src/Validator/Dlc/UniqueDirectoryDlcValidator.php +++ b/src/Mods/Validator/Dlc/UniqueDirectoryDlcValidator.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Validator\Dlc; +namespace App\Mods\Validator\Dlc; -use App\Entity\Dlc\Dlc; -use App\Form\Dlc\Dto\DlcFormDto; -use App\Validator\AbstractValidator; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Form\Dlc\Dto\DlcFormDto; +use App\Shared\Validator\Common\AbstractValidator; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Validator/Dlc/UniqueSteamStoreDlc.php b/src/Mods/Validator/Dlc/UniqueSteamStoreDlc.php similarity index 95% rename from src/Validator/Dlc/UniqueSteamStoreDlc.php rename to src/Mods/Validator/Dlc/UniqueSteamStoreDlc.php index fac5ab0b..78a64578 100644 --- a/src/Validator/Dlc/UniqueSteamStoreDlc.php +++ b/src/Mods/Validator/Dlc/UniqueSteamStoreDlc.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\Dlc; +namespace App\Mods\Validator\Dlc; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/Dlc/UniqueSteamStoreDlcValidator.php b/src/Mods/Validator/Dlc/UniqueSteamStoreDlcValidator.php similarity index 79% rename from src/Validator/Dlc/UniqueSteamStoreDlcValidator.php rename to src/Mods/Validator/Dlc/UniqueSteamStoreDlcValidator.php index 556a48eb..d4cc7d25 100644 --- a/src/Validator/Dlc/UniqueSteamStoreDlcValidator.php +++ b/src/Mods/Validator/Dlc/UniqueSteamStoreDlcValidator.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Validator\Dlc; +namespace App\Mods\Validator\Dlc; -use App\Entity\Dlc\Dlc; -use App\Form\Dlc\Dto\DlcFormDto; -use App\Service\SteamApiClient\Helper\Exception\InvalidAppUrlFormatException; -use App\Service\SteamApiClient\Helper\SteamHelper; -use App\Validator\AbstractValidator; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Form\Dlc\Dto\DlcFormDto; +use App\Shared\Service\SteamApiClient\Helper\Exception\InvalidAppUrlFormatException; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; +use App\Shared\Validator\Common\AbstractValidator; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Validator/Mod/SteamWorkshopArma3ModUrl.php b/src/Mods/Validator/Mod/SteamWorkshopArma3ModUrl.php similarity index 97% rename from src/Validator/Mod/SteamWorkshopArma3ModUrl.php rename to src/Mods/Validator/Mod/SteamWorkshopArma3ModUrl.php index 966bc672..e4501db7 100644 --- a/src/Validator/Mod/SteamWorkshopArma3ModUrl.php +++ b/src/Mods/Validator/Mod/SteamWorkshopArma3ModUrl.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\Mod; +namespace App\Mods\Validator\Mod; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php b/src/Mods/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php similarity index 82% rename from src/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php rename to src/Mods/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php index d55b38d8..e3839f93 100644 --- a/src/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php +++ b/src/Mods/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Validator\Mod; +namespace App\Mods\Validator\Mod; -use App\Form\Mod\Dto\ModFormDto; -use App\Service\SteamApiClient\Exception\WorkshopItemNotFoundException; -use App\Service\SteamApiClient\Helper\Exception\InvalidWorkshopItemUrlFormatException; -use App\Service\SteamApiClient\Helper\SteamHelper; -use App\Service\SteamApiClient\SteamApiClientInterface; -use App\Validator\AbstractValidator; +use App\Mods\Form\Mod\Dto\ModFormDto; +use App\Shared\Service\SteamApiClient\Exception\WorkshopItemNotFoundException; +use App\Shared\Service\SteamApiClient\Helper\Exception\InvalidWorkshopItemUrlFormatException; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; +use App\Shared\Service\SteamApiClient\SteamApiClientInterface; +use App\Shared\Validator\Common\AbstractValidator; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Validator/Mod/UniqueDirectoryMod.php b/src/Mods/Validator/Mod/UniqueDirectoryMod.php similarity index 95% rename from src/Validator/Mod/UniqueDirectoryMod.php rename to src/Mods/Validator/Mod/UniqueDirectoryMod.php index f6a6b1a4..71ec33f0 100644 --- a/src/Validator/Mod/UniqueDirectoryMod.php +++ b/src/Mods/Validator/Mod/UniqueDirectoryMod.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\Mod; +namespace App\Mods\Validator\Mod; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/Mod/UniqueDirectoryModValidator.php b/src/Mods/Validator/Mod/UniqueDirectoryModValidator.php similarity index 86% rename from src/Validator/Mod/UniqueDirectoryModValidator.php rename to src/Mods/Validator/Mod/UniqueDirectoryModValidator.php index 70266a76..c9f3fb17 100644 --- a/src/Validator/Mod/UniqueDirectoryModValidator.php +++ b/src/Mods/Validator/Mod/UniqueDirectoryModValidator.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Validator\Mod; +namespace App\Mods\Validator\Mod; -use App\Entity\Mod\DirectoryMod; -use App\Form\Mod\Dto\ModFormDto; -use App\Validator\AbstractValidator; +use App\Mods\Entity\Mod\DirectoryMod; +use App\Mods\Form\Mod\Dto\ModFormDto; +use App\Shared\Validator\Common\AbstractValidator; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Validator/Mod/UniqueSteamWorkshopMod.php b/src/Mods/Validator/Mod/UniqueSteamWorkshopMod.php similarity index 95% rename from src/Validator/Mod/UniqueSteamWorkshopMod.php rename to src/Mods/Validator/Mod/UniqueSteamWorkshopMod.php index 014829e7..ce944a83 100644 --- a/src/Validator/Mod/UniqueSteamWorkshopMod.php +++ b/src/Mods/Validator/Mod/UniqueSteamWorkshopMod.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\Mod; +namespace App\Mods\Validator\Mod; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/Mod/UniqueSteamWorkshopModValidator.php b/src/Mods/Validator/Mod/UniqueSteamWorkshopModValidator.php similarity index 78% rename from src/Validator/Mod/UniqueSteamWorkshopModValidator.php rename to src/Mods/Validator/Mod/UniqueSteamWorkshopModValidator.php index 3692ae9b..0e7a5078 100644 --- a/src/Validator/Mod/UniqueSteamWorkshopModValidator.php +++ b/src/Mods/Validator/Mod/UniqueSteamWorkshopModValidator.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Validator\Mod; +namespace App\Mods\Validator\Mod; -use App\Entity\Mod\SteamWorkshopMod; -use App\Form\Mod\Dto\ModFormDto; -use App\Service\SteamApiClient\Helper\Exception\InvalidWorkshopItemUrlFormatException; -use App\Service\SteamApiClient\Helper\SteamHelper; -use App\Validator\AbstractValidator; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Mods\Form\Mod\Dto\ModFormDto; +use App\Shared\Service\SteamApiClient\Helper\Exception\InvalidWorkshopItemUrlFormatException; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; +use App\Shared\Validator\Common\AbstractValidator; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Validator/ModGroup/UniqueModGroupName.php b/src/Mods/Validator/ModGroup/UniqueModGroupName.php similarity index 95% rename from src/Validator/ModGroup/UniqueModGroupName.php rename to src/Mods/Validator/ModGroup/UniqueModGroupName.php index cbc80246..690a12e0 100644 --- a/src/Validator/ModGroup/UniqueModGroupName.php +++ b/src/Mods/Validator/ModGroup/UniqueModGroupName.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\ModGroup; +namespace App\Mods\Validator\ModGroup; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/ModGroup/UniqueModGroupNameValidator.php b/src/Mods/Validator/ModGroup/UniqueModGroupNameValidator.php similarity index 85% rename from src/Validator/ModGroup/UniqueModGroupNameValidator.php rename to src/Mods/Validator/ModGroup/UniqueModGroupNameValidator.php index 7261dc0c..bb39bcf6 100644 --- a/src/Validator/ModGroup/UniqueModGroupNameValidator.php +++ b/src/Mods/Validator/ModGroup/UniqueModGroupNameValidator.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Validator\ModGroup; +namespace App\Mods\Validator\ModGroup; -use App\Entity\ModGroup\ModGroup; -use App\Form\ModGroup\Dto\ModGroupFormDto; -use App\Validator\AbstractValidator; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Form\ModGroup\Dto\ModGroupFormDto; +use App\Shared\Validator\Common\AbstractValidator; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Validator/ModList/UniqueModListName.php b/src/Mods/Validator/ModList/UniqueModListName.php similarity index 95% rename from src/Validator/ModList/UniqueModListName.php rename to src/Mods/Validator/ModList/UniqueModListName.php index 1dbff1f3..ab4a8d66 100644 --- a/src/Validator/ModList/UniqueModListName.php +++ b/src/Mods/Validator/ModList/UniqueModListName.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\ModList; +namespace App\Mods\Validator\ModList; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/ModList/UniqueModListNameValidator.php b/src/Mods/Validator/ModList/UniqueModListNameValidator.php similarity index 85% rename from src/Validator/ModList/UniqueModListNameValidator.php rename to src/Mods/Validator/ModList/UniqueModListNameValidator.php index 2ce9638c..51b3845f 100644 --- a/src/Validator/ModList/UniqueModListNameValidator.php +++ b/src/Mods/Validator/ModList/UniqueModListNameValidator.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Validator\ModList; +namespace App\Mods\Validator\ModList; -use App\Entity\ModList\ModList; -use App\Form\ModList\Dto\ModListFormDto; -use App\Validator\AbstractValidator; +use App\Mods\Entity\ModList\ModList; +use App\Mods\Form\ModList\Dto\ModListFormDto; +use App\Shared\Validator\Common\AbstractValidator; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Repository/.gitignore b/src/Repository/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/src/Api/Provider/Common/AbstractDataProvider.php b/src/Shared/Api/Provider/Common/AbstractDataProvider.php similarity index 97% rename from src/Api/Provider/Common/AbstractDataProvider.php rename to src/Shared/Api/Provider/Common/AbstractDataProvider.php index 871290e2..1506bf16 100644 --- a/src/Api/Provider/Common/AbstractDataProvider.php +++ b/src/Shared/Api/Provider/Common/AbstractDataProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Api\Provider\Common; +namespace App\Shared\Api\Provider\Common; use ApiPlatform\Doctrine\Orm\Paginator; use ApiPlatform\Doctrine\Orm\State\CollectionProvider; diff --git a/src/Api/Serializer/Normalizer/PaginatorNormalizer.php b/src/Shared/Api/Serializer/Normalizer/PaginatorNormalizer.php similarity index 96% rename from src/Api/Serializer/Normalizer/PaginatorNormalizer.php rename to src/Shared/Api/Serializer/Normalizer/PaginatorNormalizer.php index 63f70c67..cacf2af4 100644 --- a/src/Api/Serializer/Normalizer/PaginatorNormalizer.php +++ b/src/Shared/Api/Serializer/Normalizer/PaginatorNormalizer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Api\Serializer\Normalizer; +namespace App\Shared\Api\Serializer\Normalizer; use ApiPlatform\State\Pagination\TraversablePaginator; use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface; diff --git a/src/Controller/Home/IndexAction.php b/src/Shared/Controller/Home/IndexAction.php similarity index 83% rename from src/Controller/Home/IndexAction.php rename to src/Shared/Controller/Home/IndexAction.php index 4c6dc0f1..01606ad2 100644 --- a/src/Controller/Home/IndexAction.php +++ b/src/Shared/Controller/Home/IndexAction.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Controller\Home; +namespace App\Shared\Controller\Home; -use App\Service\Mission\MissionClientInterface; +use App\Shared\Service\Mission\MissionClientInterface; use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; @@ -28,7 +28,7 @@ public function __invoke(): Response $nearestMission = null; } - return $this->render('home/index/index.html.twig', [ + return $this->render('shared/home/index/index.html.twig', [ 'nearestMission' => $nearestMission, ]); } diff --git a/src/Controller/Home/JoinUsAction.php b/src/Shared/Controller/Home/JoinUsAction.php similarity index 76% rename from src/Controller/Home/JoinUsAction.php rename to src/Shared/Controller/Home/JoinUsAction.php index 74fe0b55..f5d55d57 100644 --- a/src/Controller/Home/JoinUsAction.php +++ b/src/Shared/Controller/Home/JoinUsAction.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Controller\Home; +namespace App\Shared\Controller\Home; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; @@ -13,6 +13,6 @@ class JoinUsAction extends AbstractController #[Route('/join-us', name: 'app_home_join_us')] public function __invoke(): Response { - return $this->render('home/join_us/join_us.html.twig'); + return $this->render('shared/home/join_us/join_us.html.twig'); } } diff --git a/src/Controller/Home/MissionsAction.php b/src/Shared/Controller/Home/MissionsAction.php similarity index 85% rename from src/Controller/Home/MissionsAction.php rename to src/Shared/Controller/Home/MissionsAction.php index 87c1e3a5..da571f0b 100644 --- a/src/Controller/Home/MissionsAction.php +++ b/src/Shared/Controller/Home/MissionsAction.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Controller\Home; +namespace App\Shared\Controller\Home; -use App\Service\Mission\MissionClientInterface; +use App\Shared\Service\Mission\MissionClientInterface; use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; @@ -30,7 +30,7 @@ public function __invoke(): Response $archivedMissions = null; } - return $this->render('home/missions/missions.html.twig', [ + return $this->render('shared/home/missions/missions.html.twig', [ 'upcomingMissions' => $upcomingMissions, 'archivedMissions' => $archivedMissions, ]); diff --git a/src/Controller/Security/ConnectAction.php b/src/Shared/Controller/Security/ConnectAction.php similarity index 91% rename from src/Controller/Security/ConnectAction.php rename to src/Shared/Controller/Security/ConnectAction.php index 2bd768e7..cc122928 100644 --- a/src/Controller/Security/ConnectAction.php +++ b/src/Shared/Controller/Security/ConnectAction.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Controller\Security; +namespace App\Shared\Controller\Security; -use App\Security\Enum\ScopeEnum; +use App\Shared\Security\Enum\ScopeEnum; use KnpU\OAuth2ClientBundle\Client\ClientRegistry; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RedirectResponse; diff --git a/src/Controller/Security/ConnectCheckAction.php b/src/Shared/Controller/Security/ConnectCheckAction.php similarity index 92% rename from src/Controller/Security/ConnectCheckAction.php rename to src/Shared/Controller/Security/ConnectCheckAction.php index 75fee6b4..1fa33729 100644 --- a/src/Controller/Security/ConnectCheckAction.php +++ b/src/Shared/Controller/Security/ConnectCheckAction.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Controller\Security; +namespace App\Shared\Controller\Security; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RedirectResponse; diff --git a/src/Controller/Security/LogoutAction.php b/src/Shared/Controller/Security/LogoutAction.php similarity index 91% rename from src/Controller/Security/LogoutAction.php rename to src/Shared/Controller/Security/LogoutAction.php index c47f975c..4186f06e 100644 --- a/src/Controller/Security/LogoutAction.php +++ b/src/Shared/Controller/Security/LogoutAction.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Controller\Security; +namespace App\Shared\Controller\Security; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RedirectResponse; diff --git a/src/Doctrine/Dbal/Types/BigIntType.php b/src/Shared/Doctrine/Dbal/Types/BigIntType.php similarity index 88% rename from src/Doctrine/Dbal/Types/BigIntType.php rename to src/Shared/Doctrine/Dbal/Types/BigIntType.php index d062d6a6..e4c3a2b7 100644 --- a/src/Doctrine/Dbal/Types/BigIntType.php +++ b/src/Shared/Doctrine/Dbal/Types/BigIntType.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Doctrine\Dbal\Types; +namespace App\Shared\Doctrine\Dbal\Types; use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\BigIntType as BaseBigIntType; diff --git a/src/Entity/AbstractBlamableEntity.php b/src/Shared/Entity/Common/AbstractBlamableEntity.php similarity index 92% rename from src/Entity/AbstractBlamableEntity.php rename to src/Shared/Entity/Common/AbstractBlamableEntity.php index 02a16381..982bdfad 100644 --- a/src/Entity/AbstractBlamableEntity.php +++ b/src/Shared/Entity/Common/AbstractBlamableEntity.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Entity; +namespace App\Shared\Entity\Common; -use App\Entity\User\User; +use App\Users\Entity\User\User; use function Symfony\Component\Clock\now; diff --git a/src/Entity/AbstractEntity.php b/src/Shared/Entity/Common/AbstractEntity.php similarity index 93% rename from src/Entity/AbstractEntity.php rename to src/Shared/Entity/Common/AbstractEntity.php index 1c6b056a..6697ffb9 100644 --- a/src/Entity/AbstractEntity.php +++ b/src/Shared/Entity/Common/AbstractEntity.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity; +namespace App\Shared\Entity\Common; use Ramsey\Uuid\UuidInterface; diff --git a/src/EventSubscriber/Doctrine/EntityBlamableSubscriber.php b/src/Shared/EventSubscriber/Doctrine/EntityBlamableSubscriber.php similarity index 81% rename from src/EventSubscriber/Doctrine/EntityBlamableSubscriber.php rename to src/Shared/EventSubscriber/Doctrine/EntityBlamableSubscriber.php index c26f3757..0c1ba8cd 100644 --- a/src/EventSubscriber/Doctrine/EntityBlamableSubscriber.php +++ b/src/Shared/EventSubscriber/Doctrine/EntityBlamableSubscriber.php @@ -2,16 +2,18 @@ declare(strict_types=1); -namespace App\EventSubscriber\Doctrine; +namespace App\Shared\EventSubscriber\Doctrine; -use App\Entity\AbstractBlamableEntity; -use App\Entity\User\User; +use App\Shared\Entity\Common\AbstractBlamableEntity; +use App\Users\Entity\User\User; use Doctrine\Common\EventSubscriber; use Doctrine\ORM\Event\PrePersistEventArgs; use Doctrine\ORM\Event\PreUpdateEventArgs; use Doctrine\ORM\Events; use Symfony\Bundle\SecurityBundle\Security; +use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag; +#[AutoconfigureTag('doctrine.event_subscriber')] class EntityBlamableSubscriber implements EventSubscriber { public function __construct( diff --git a/src/EventSubscriber/UserLocaleRequestSubscriber.php b/src/Shared/EventSubscriber/UserLocaleRequestSubscriber.php similarity index 98% rename from src/EventSubscriber/UserLocaleRequestSubscriber.php rename to src/Shared/EventSubscriber/UserLocaleRequestSubscriber.php index 42d16255..4c74ca1e 100644 --- a/src/EventSubscriber/UserLocaleRequestSubscriber.php +++ b/src/Shared/EventSubscriber/UserLocaleRequestSubscriber.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\EventSubscriber; +namespace App\Shared\EventSubscriber; use Negotiation\AcceptLanguage; use Negotiation\LanguageNegotiator; diff --git a/src/Security/Authenticator/ApiKeyAuthenticator.php b/src/Shared/Security/Authenticator/ApiKeyAuthenticator.php similarity index 95% rename from src/Security/Authenticator/ApiKeyAuthenticator.php rename to src/Shared/Security/Authenticator/ApiKeyAuthenticator.php index 51299920..046d2707 100644 --- a/src/Security/Authenticator/ApiKeyAuthenticator.php +++ b/src/Shared/Security/Authenticator/ApiKeyAuthenticator.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Security\Authenticator; +namespace App\Shared\Security\Authenticator; -use App\Security\Model\ApiTokenUser; +use App\Shared\Security\Model\ApiTokenUser; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; diff --git a/src/Security/Authenticator/DiscordAuthenticator.php b/src/Shared/Security/Authenticator/DiscordAuthenticator.php similarity index 92% rename from src/Security/Authenticator/DiscordAuthenticator.php rename to src/Shared/Security/Authenticator/DiscordAuthenticator.php index 84cac7f0..c88f73b7 100644 --- a/src/Security/Authenticator/DiscordAuthenticator.php +++ b/src/Shared/Security/Authenticator/DiscordAuthenticator.php @@ -2,18 +2,18 @@ declare(strict_types=1); -namespace App\Security\Authenticator; - -use App\Entity\Permissions\UserPermissions; -use App\Entity\User\User; -use App\Repository\User\UserRepository; -use App\Security\Enum\ConnectionsEnum; -use App\Security\Exception\MultipleRolesFound; -use App\Security\Exception\RequiredRolesNotAssignedException; -use App\Security\Exception\RoleNotFoundException; -use App\Security\Exception\UserNotADiscordMemberException; -use App\Service\Discord\DiscordClientFactory; -use App\Service\IdentifierFactory\IdentifierFactoryInterface; +namespace App\Shared\Security\Authenticator; + +use App\Shared\Security\Enum\ConnectionsEnum; +use App\Shared\Security\Exception\MultipleRolesFound; +use App\Shared\Security\Exception\RequiredRolesNotAssignedException; +use App\Shared\Security\Exception\RoleNotFoundException; +use App\Shared\Security\Exception\UserNotADiscordMemberException; +use App\Shared\Service\Discord\DiscordClientFactory; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryInterface; +use App\Users\Entity\Permissions\UserPermissions; +use App\Users\Entity\User\User; +use App\Users\Repository\User\UserRepository; use Discord\Http\Endpoint; use Discord\Http\Exceptions\NotFoundException; use Doctrine\Common\Collections\ArrayCollection; diff --git a/src/Security/Enum/ConnectionsEnum.php b/src/Shared/Security/Enum/ConnectionsEnum.php similarity index 72% rename from src/Security/Enum/ConnectionsEnum.php rename to src/Shared/Security/Enum/ConnectionsEnum.php index 7b1a9e60..dff25407 100644 --- a/src/Security/Enum/ConnectionsEnum.php +++ b/src/Shared/Security/Enum/ConnectionsEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Security\Enum; +namespace App\Shared\Security\Enum; enum ConnectionsEnum: string { diff --git a/src/Security/Enum/PermissionsEnum.php b/src/Shared/Security/Enum/PermissionsEnum.php similarity index 97% rename from src/Security/Enum/PermissionsEnum.php rename to src/Shared/Security/Enum/PermissionsEnum.php index 6da859df..cfe01203 100644 --- a/src/Security/Enum/PermissionsEnum.php +++ b/src/Shared/Security/Enum/PermissionsEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Security\Enum; +namespace App\Shared\Security\Enum; enum PermissionsEnum: string { diff --git a/src/Security/Enum/RoleEnum.php b/src/Shared/Security/Enum/RoleEnum.php similarity index 72% rename from src/Security/Enum/RoleEnum.php rename to src/Shared/Security/Enum/RoleEnum.php index b3c8141d..66887f67 100644 --- a/src/Security/Enum/RoleEnum.php +++ b/src/Shared/Security/Enum/RoleEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Security\Enum; +namespace App\Shared\Security\Enum; enum RoleEnum: string { diff --git a/src/Security/Enum/ScopeEnum.php b/src/Shared/Security/Enum/ScopeEnum.php similarity index 83% rename from src/Security/Enum/ScopeEnum.php rename to src/Shared/Security/Enum/ScopeEnum.php index c764b736..e6af61f3 100644 --- a/src/Security/Enum/ScopeEnum.php +++ b/src/Shared/Security/Enum/ScopeEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Security\Enum; +namespace App\Shared\Security\Enum; enum ScopeEnum: string { diff --git a/src/Security/Exception/MultipleRolesFound.php b/src/Shared/Security/Exception/MultipleRolesFound.php similarity index 68% rename from src/Security/Exception/MultipleRolesFound.php rename to src/Shared/Security/Exception/MultipleRolesFound.php index 6da112fa..0c8aef1f 100644 --- a/src/Security/Exception/MultipleRolesFound.php +++ b/src/Shared/Security/Exception/MultipleRolesFound.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Security\Exception; +namespace App\Shared\Security\Exception; class MultipleRolesFound extends \RuntimeException { diff --git a/src/Security/Exception/RequiredRolesNotAssignedException.php b/src/Shared/Security/Exception/RequiredRolesNotAssignedException.php similarity index 81% rename from src/Security/Exception/RequiredRolesNotAssignedException.php rename to src/Shared/Security/Exception/RequiredRolesNotAssignedException.php index 4368bcaa..6a490cf1 100644 --- a/src/Security/Exception/RequiredRolesNotAssignedException.php +++ b/src/Shared/Security/Exception/RequiredRolesNotAssignedException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Security\Exception; +namespace App\Shared\Security\Exception; use Symfony\Component\Security\Core\Exception\AuthenticationException; diff --git a/src/Security/Exception/RoleNotFoundException.php b/src/Shared/Security/Exception/RoleNotFoundException.php similarity index 69% rename from src/Security/Exception/RoleNotFoundException.php rename to src/Shared/Security/Exception/RoleNotFoundException.php index a27a0614..9436063b 100644 --- a/src/Security/Exception/RoleNotFoundException.php +++ b/src/Shared/Security/Exception/RoleNotFoundException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Security\Exception; +namespace App\Shared\Security\Exception; class RoleNotFoundException extends \RuntimeException { diff --git a/src/Security/Exception/UserNotADiscordMemberException.php b/src/Shared/Security/Exception/UserNotADiscordMemberException.php similarity index 81% rename from src/Security/Exception/UserNotADiscordMemberException.php rename to src/Shared/Security/Exception/UserNotADiscordMemberException.php index 3b260635..7a13fc32 100644 --- a/src/Security/Exception/UserNotADiscordMemberException.php +++ b/src/Shared/Security/Exception/UserNotADiscordMemberException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Security\Exception; +namespace App\Shared\Security\Exception; use Symfony\Component\Security\Core\Exception\AuthenticationException; diff --git a/src/Security/Model/ApiTokenUser.php b/src/Shared/Security/Model/ApiTokenUser.php similarity index 79% rename from src/Security/Model/ApiTokenUser.php rename to src/Shared/Security/Model/ApiTokenUser.php index 875d6c26..c8aba64e 100644 --- a/src/Security/Model/ApiTokenUser.php +++ b/src/Shared/Security/Model/ApiTokenUser.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Security\Model; +namespace App\Shared\Security\Model; -use App\Security\Traits\UserInterfaceTrait; +use App\Shared\Security\Traits\UserInterfaceTrait; use Symfony\Component\Security\Core\User\UserInterface; class ApiTokenUser implements UserInterface diff --git a/src/Security/Traits/UserInterfaceTrait.php b/src/Shared/Security/Traits/UserInterfaceTrait.php similarity index 82% rename from src/Security/Traits/UserInterfaceTrait.php rename to src/Shared/Security/Traits/UserInterfaceTrait.php index bcc9dda8..35a0f47a 100644 --- a/src/Security/Traits/UserInterfaceTrait.php +++ b/src/Shared/Security/Traits/UserInterfaceTrait.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Security\Traits; +namespace App\Shared\Security\Traits; -use App\Security\Enum\RoleEnum; +use App\Shared\Security\Enum\RoleEnum; trait UserInterfaceTrait { diff --git a/src/Service/Discord/DiscordClientFactory.php b/src/Shared/Service/Discord/DiscordClientFactory.php similarity index 95% rename from src/Service/Discord/DiscordClientFactory.php rename to src/Shared/Service/Discord/DiscordClientFactory.php index 10e0ad8d..f76d70f2 100644 --- a/src/Service/Discord/DiscordClientFactory.php +++ b/src/Shared/Service/Discord/DiscordClientFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\Discord; +namespace App\Shared\Service\Discord; use Discord\Http\Drivers\React; use Discord\Http\Http; diff --git a/src/Service/IdentifierFactory/IdentifierFactory.php b/src/Shared/Service/IdentifierFactory/IdentifierFactory.php similarity index 83% rename from src/Service/IdentifierFactory/IdentifierFactory.php rename to src/Shared/Service/IdentifierFactory/IdentifierFactory.php index b9a40a20..7d403135 100644 --- a/src/Service/IdentifierFactory/IdentifierFactory.php +++ b/src/Shared/Service/IdentifierFactory/IdentifierFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\IdentifierFactory; +namespace App\Shared\Service\IdentifierFactory; use Ramsey\Uuid\Uuid; use Ramsey\Uuid\UuidInterface; diff --git a/src/Service/IdentifierFactory/IdentifierFactoryInterface.php b/src/Shared/Service/IdentifierFactory/IdentifierFactoryInterface.php similarity index 76% rename from src/Service/IdentifierFactory/IdentifierFactoryInterface.php rename to src/Shared/Service/IdentifierFactory/IdentifierFactoryInterface.php index 47855d2d..95a7061c 100644 --- a/src/Service/IdentifierFactory/IdentifierFactoryInterface.php +++ b/src/Shared/Service/IdentifierFactory/IdentifierFactoryInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\IdentifierFactory; +namespace App\Shared\Service\IdentifierFactory; use Ramsey\Uuid\UuidInterface; diff --git a/src/Service/IdentifierFactory/IdentifierFactoryStub.php b/src/Shared/Service/IdentifierFactory/IdentifierFactoryStub.php similarity index 95% rename from src/Service/IdentifierFactory/IdentifierFactoryStub.php rename to src/Shared/Service/IdentifierFactory/IdentifierFactoryStub.php index bacfdc89..4efdc561 100644 --- a/src/Service/IdentifierFactory/IdentifierFactoryStub.php +++ b/src/Shared/Service/IdentifierFactory/IdentifierFactoryStub.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\IdentifierFactory; +namespace App\Shared\Service\IdentifierFactory; use Ramsey\Uuid\UuidInterface; diff --git a/src/Service/Mission/Dto/MissionDto.php b/src/Shared/Service/Mission/Dto/MissionDto.php similarity index 98% rename from src/Service/Mission/Dto/MissionDto.php rename to src/Shared/Service/Mission/Dto/MissionDto.php index 4f7284ca..a3f72090 100644 --- a/src/Service/Mission/Dto/MissionDto.php +++ b/src/Shared/Service/Mission/Dto/MissionDto.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\Mission\Dto; +namespace App\Shared\Service\Mission\Dto; class MissionDto { diff --git a/src/Service/Mission/Enum/MissionStateEnum.php b/src/Shared/Service/Mission/Enum/MissionStateEnum.php similarity index 77% rename from src/Service/Mission/Enum/MissionStateEnum.php rename to src/Shared/Service/Mission/Enum/MissionStateEnum.php index 1bce9dc5..b868228b 100644 --- a/src/Service/Mission/Enum/MissionStateEnum.php +++ b/src/Shared/Service/Mission/Enum/MissionStateEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\Mission\Enum; +namespace App\Shared\Service\Mission\Enum; enum MissionStateEnum: string { diff --git a/src/Service/Mission/MissionClient.php b/src/Shared/Service/Mission/MissionClient.php similarity index 94% rename from src/Service/Mission/MissionClient.php rename to src/Shared/Service/Mission/MissionClient.php index c3bea4a6..854b17d6 100644 --- a/src/Service/Mission/MissionClient.php +++ b/src/Shared/Service/Mission/MissionClient.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Service\Mission; +namespace App\Shared\Service\Mission; -use App\Service\Mission\Dto\MissionDto; -use App\Service\Mission\Enum\MissionStateEnum; +use App\Shared\Service\Mission\Dto\MissionDto; +use App\Shared\Service\Mission\Enum\MissionStateEnum; use Symfony\Component\HttpClient\CachingHttpClient; use Symfony\Component\HttpClient\ScopingHttpClient; use Symfony\Contracts\HttpClient\HttpClientInterface; diff --git a/src/Service/Mission/MissionClientInterface.php b/src/Shared/Service/Mission/MissionClientInterface.php similarity index 81% rename from src/Service/Mission/MissionClientInterface.php rename to src/Shared/Service/Mission/MissionClientInterface.php index 441308b9..50c3f3b7 100644 --- a/src/Service/Mission/MissionClientInterface.php +++ b/src/Shared/Service/Mission/MissionClientInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Service\Mission; +namespace App\Shared\Service\Mission; -use App\Service\Mission\Dto\MissionDto; +use App\Shared\Service\Mission\Dto\MissionDto; interface MissionClientInterface { diff --git a/src/Service/Mission/MissionStore.php b/src/Shared/Service/Mission/MissionStore.php similarity index 97% rename from src/Service/Mission/MissionStore.php rename to src/Shared/Service/Mission/MissionStore.php index cb6c2a6d..d541d3c6 100644 --- a/src/Service/Mission/MissionStore.php +++ b/src/Shared/Service/Mission/MissionStore.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\Mission; +namespace App\Shared\Service\Mission; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Service/SteamApiClient/Dto/AppInfoDto.php b/src/Shared/Service/SteamApiClient/Dto/AppInfoDto.php similarity index 91% rename from src/Service/SteamApiClient/Dto/AppInfoDto.php rename to src/Shared/Service/SteamApiClient/Dto/AppInfoDto.php index f1aaddc8..c139f1cb 100644 --- a/src/Service/SteamApiClient/Dto/AppInfoDto.php +++ b/src/Shared/Service/SteamApiClient/Dto/AppInfoDto.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient\Dto; +namespace App\Shared\Service\SteamApiClient\Dto; class AppInfoDto { diff --git a/src/Service/SteamApiClient/Dto/WorkshopItemInfoDto.php b/src/Shared/Service/SteamApiClient/Dto/WorkshopItemInfoDto.php similarity index 89% rename from src/Service/SteamApiClient/Dto/WorkshopItemInfoDto.php rename to src/Shared/Service/SteamApiClient/Dto/WorkshopItemInfoDto.php index 43dfe038..cc103790 100644 --- a/src/Service/SteamApiClient/Dto/WorkshopItemInfoDto.php +++ b/src/Shared/Service/SteamApiClient/Dto/WorkshopItemInfoDto.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient\Dto; +namespace App\Shared\Service\SteamApiClient\Dto; class WorkshopItemInfoDto { diff --git a/src/Service/SteamApiClient/Exception/AppNotFoundException.php b/src/Shared/Service/SteamApiClient/Exception/AppNotFoundException.php similarity index 81% rename from src/Service/SteamApiClient/Exception/AppNotFoundException.php rename to src/Shared/Service/SteamApiClient/Exception/AppNotFoundException.php index ce27c7db..f33829c6 100644 --- a/src/Service/SteamApiClient/Exception/AppNotFoundException.php +++ b/src/Shared/Service/SteamApiClient/Exception/AppNotFoundException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient\Exception; +namespace App\Shared\Service\SteamApiClient\Exception; class AppNotFoundException extends ClientException { diff --git a/src/Service/SteamApiClient/Exception/ClientException.php b/src/Shared/Service/SteamApiClient/Exception/ClientException.php similarity index 58% rename from src/Service/SteamApiClient/Exception/ClientException.php rename to src/Shared/Service/SteamApiClient/Exception/ClientException.php index a27d557a..633a3fdb 100644 --- a/src/Service/SteamApiClient/Exception/ClientException.php +++ b/src/Shared/Service/SteamApiClient/Exception/ClientException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient\Exception; +namespace App\Shared\Service\SteamApiClient\Exception; class ClientException extends \Exception { diff --git a/src/Service/SteamApiClient/Exception/WorkshopItemNotFoundException.php b/src/Shared/Service/SteamApiClient/Exception/WorkshopItemNotFoundException.php similarity index 81% rename from src/Service/SteamApiClient/Exception/WorkshopItemNotFoundException.php rename to src/Shared/Service/SteamApiClient/Exception/WorkshopItemNotFoundException.php index 5b330391..1d35b4f6 100644 --- a/src/Service/SteamApiClient/Exception/WorkshopItemNotFoundException.php +++ b/src/Shared/Service/SteamApiClient/Exception/WorkshopItemNotFoundException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient\Exception; +namespace App\Shared\Service\SteamApiClient\Exception; class WorkshopItemNotFoundException extends ClientException { diff --git a/src/Service/SteamApiClient/Helper/Exception/InvalidAppUrlFormatException.php b/src/Shared/Service/SteamApiClient/Helper/Exception/InvalidAppUrlFormatException.php similarity index 59% rename from src/Service/SteamApiClient/Helper/Exception/InvalidAppUrlFormatException.php rename to src/Shared/Service/SteamApiClient/Helper/Exception/InvalidAppUrlFormatException.php index 3f9ee5df..f10f610e 100644 --- a/src/Service/SteamApiClient/Helper/Exception/InvalidAppUrlFormatException.php +++ b/src/Shared/Service/SteamApiClient/Helper/Exception/InvalidAppUrlFormatException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient\Helper\Exception; +namespace App\Shared\Service\SteamApiClient\Helper\Exception; class InvalidAppUrlFormatException extends \Exception { diff --git a/src/Service/SteamApiClient/Helper/Exception/InvalidWorkshopItemUrlFormatException.php b/src/Shared/Service/SteamApiClient/Helper/Exception/InvalidWorkshopItemUrlFormatException.php similarity index 61% rename from src/Service/SteamApiClient/Helper/Exception/InvalidWorkshopItemUrlFormatException.php rename to src/Shared/Service/SteamApiClient/Helper/Exception/InvalidWorkshopItemUrlFormatException.php index cc964655..e43fe899 100644 --- a/src/Service/SteamApiClient/Helper/Exception/InvalidWorkshopItemUrlFormatException.php +++ b/src/Shared/Service/SteamApiClient/Helper/Exception/InvalidWorkshopItemUrlFormatException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient\Helper\Exception; +namespace App\Shared\Service\SteamApiClient\Helper\Exception; class InvalidWorkshopItemUrlFormatException extends \Exception { diff --git a/src/Service/SteamApiClient/Helper/SteamHelper.php b/src/Shared/Service/SteamApiClient/Helper/SteamHelper.php similarity index 86% rename from src/Service/SteamApiClient/Helper/SteamHelper.php rename to src/Shared/Service/SteamApiClient/Helper/SteamHelper.php index 236d73a7..f0a16a1f 100644 --- a/src/Service/SteamApiClient/Helper/SteamHelper.php +++ b/src/Shared/Service/SteamApiClient/Helper/SteamHelper.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient\Helper; +namespace App\Shared\Service\SteamApiClient\Helper; -use App\Service\SteamApiClient\Helper\Exception\InvalidAppUrlFormatException; -use App\Service\SteamApiClient\Helper\Exception\InvalidWorkshopItemUrlFormatException; +use App\Shared\Service\SteamApiClient\Helper\Exception\InvalidAppUrlFormatException; +use App\Shared\Service\SteamApiClient\Helper\Exception\InvalidWorkshopItemUrlFormatException; class SteamHelper { diff --git a/src/Service/SteamApiClient/SteamApiClient.php b/src/Shared/Service/SteamApiClient/SteamApiClient.php similarity index 86% rename from src/Service/SteamApiClient/SteamApiClient.php rename to src/Shared/Service/SteamApiClient/SteamApiClient.php index d26306e7..eeea47db 100644 --- a/src/Service/SteamApiClient/SteamApiClient.php +++ b/src/Shared/Service/SteamApiClient/SteamApiClient.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient; +namespace App\Shared\Service\SteamApiClient; -use App\Service\SteamApiClient\Dto\AppInfoDto; -use App\Service\SteamApiClient\Dto\WorkshopItemInfoDto; -use App\Service\SteamApiClient\Exception\AppNotFoundException; -use App\Service\SteamApiClient\Exception\WorkshopItemNotFoundException; +use App\Shared\Service\SteamApiClient\Dto\AppInfoDto; +use App\Shared\Service\SteamApiClient\Dto\WorkshopItemInfoDto; +use App\Shared\Service\SteamApiClient\Exception\AppNotFoundException; +use App\Shared\Service\SteamApiClient\Exception\WorkshopItemNotFoundException; use Symfony\Component\HttpFoundation\Request; use Symfony\Contracts\HttpClient\HttpClientInterface; diff --git a/src/Service/SteamApiClient/SteamApiClientInterface.php b/src/Shared/Service/SteamApiClient/SteamApiClientInterface.php similarity index 55% rename from src/Service/SteamApiClient/SteamApiClientInterface.php rename to src/Shared/Service/SteamApiClient/SteamApiClientInterface.php index 32068457..7950374a 100644 --- a/src/Service/SteamApiClient/SteamApiClientInterface.php +++ b/src/Shared/Service/SteamApiClient/SteamApiClientInterface.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient; +namespace App\Shared\Service\SteamApiClient; -use App\Service\SteamApiClient\Dto\AppInfoDto; -use App\Service\SteamApiClient\Dto\WorkshopItemInfoDto; +use App\Shared\Service\SteamApiClient\Dto\AppInfoDto; +use App\Shared\Service\SteamApiClient\Dto\WorkshopItemInfoDto; interface SteamApiClientInterface { diff --git a/src/Service/SteamApiClient/Test/SteamApiClientMockResponseFactory.php b/src/Shared/Service/SteamApiClient/Test/SteamApiClientMockResponseFactory.php similarity index 98% rename from src/Service/SteamApiClient/Test/SteamApiClientMockResponseFactory.php rename to src/Shared/Service/SteamApiClient/Test/SteamApiClientMockResponseFactory.php index 51ac84bd..5e61ca4e 100644 --- a/src/Service/SteamApiClient/Test/SteamApiClientMockResponseFactory.php +++ b/src/Shared/Service/SteamApiClient/Test/SteamApiClientMockResponseFactory.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\SteamApiClient\Test; +namespace App\Shared\Service\SteamApiClient\Test; use Symfony\Component\HttpClient\Response\MockResponse; use Symfony\Contracts\HttpClient\ResponseInterface; diff --git a/src/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1934142795.json b/src/Shared/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1934142795.json similarity index 100% rename from src/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1934142795.json rename to src/Shared/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1934142795.json diff --git a/src/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1981535406.json b/src/Shared/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1981535406.json similarity index 100% rename from src/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1981535406.json rename to src/Shared/Service/SteamApiClient/Test/data/GetPublishedFileDetails/1981535406.json diff --git a/src/Service/SteamApiClient/Test/data/GetPublishedFileDetails/455312245.json b/src/Shared/Service/SteamApiClient/Test/data/GetPublishedFileDetails/455312245.json similarity index 100% rename from src/Service/SteamApiClient/Test/data/GetPublishedFileDetails/455312245.json rename to src/Shared/Service/SteamApiClient/Test/data/GetPublishedFileDetails/455312245.json diff --git a/src/Service/SteamApiClient/Test/data/appdetails/1227700.json b/src/Shared/Service/SteamApiClient/Test/data/appdetails/1227700.json similarity index 100% rename from src/Service/SteamApiClient/Test/data/appdetails/1227700.json rename to src/Shared/Service/SteamApiClient/Test/data/appdetails/1227700.json diff --git a/src/Service/SteamApiClient/Test/data/appdetails/1681170.json b/src/Shared/Service/SteamApiClient/Test/data/appdetails/1681170.json similarity index 100% rename from src/Service/SteamApiClient/Test/data/appdetails/1681170.json rename to src/Shared/Service/SteamApiClient/Test/data/appdetails/1681170.json diff --git a/src/Service/SteamApiClient/Test/data/appdetails/2138330.json b/src/Shared/Service/SteamApiClient/Test/data/appdetails/2138330.json similarity index 100% rename from src/Service/SteamApiClient/Test/data/appdetails/2138330.json rename to src/Shared/Service/SteamApiClient/Test/data/appdetails/2138330.json diff --git a/src/Service/Version/VersionProvider.php b/src/Shared/Service/Version/VersionProvider.php similarity index 92% rename from src/Service/Version/VersionProvider.php rename to src/Shared/Service/Version/VersionProvider.php index c3a58d84..a7397eb9 100644 --- a/src/Service/Version/VersionProvider.php +++ b/src/Shared/Service/Version/VersionProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\Version; +namespace App\Shared\Service\Version; class VersionProvider implements VersionProviderInterface { diff --git a/src/Service/Version/VersionProviderInterface.php b/src/Shared/Service/Version/VersionProviderInterface.php similarity index 75% rename from src/Service/Version/VersionProviderInterface.php rename to src/Shared/Service/Version/VersionProviderInterface.php index e50b54b4..3935095a 100644 --- a/src/Service/Version/VersionProviderInterface.php +++ b/src/Shared/Service/Version/VersionProviderInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Service\Version; +namespace App\Shared\Service\Version; interface VersionProviderInterface { diff --git a/src/Test/Traits/TimeTrait.php b/src/Shared/Test/Traits/TimeTrait.php similarity index 94% rename from src/Test/Traits/TimeTrait.php rename to src/Shared/Test/Traits/TimeTrait.php index 83fdda37..f635ccde 100644 --- a/src/Test/Traits/TimeTrait.php +++ b/src/Shared/Test/Traits/TimeTrait.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Test\Traits; +namespace App\Shared\Test\Traits; use Symfony\Component\Clock\Clock; use Symfony\Component\Clock\MockClock; diff --git a/src/Twig/BackgroundImageExtension.php b/src/Shared/Twig/BackgroundImageExtension.php similarity index 97% rename from src/Twig/BackgroundImageExtension.php rename to src/Shared/Twig/BackgroundImageExtension.php index 445c92ec..2c61d7a1 100644 --- a/src/Twig/BackgroundImageExtension.php +++ b/src/Shared/Twig/BackgroundImageExtension.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Twig; +namespace App\Shared\Twig; use Symfony\Component\Finder\Finder; use Symfony\Contracts\Cache\CacheInterface; diff --git a/src/Twig/CalendarExtension.php b/src/Shared/Twig/CalendarExtension.php similarity index 93% rename from src/Twig/CalendarExtension.php rename to src/Shared/Twig/CalendarExtension.php index f5aa98f0..bb56919f 100644 --- a/src/Twig/CalendarExtension.php +++ b/src/Shared/Twig/CalendarExtension.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Twig; +namespace App\Shared\Twig; -use App\Service\Mission\Dto\MissionDto; +use App\Shared\Service\Mission\Dto\MissionDto; use Spatie\CalendarLinks\Link; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; diff --git a/src/Twig/ImgproxyExtension.php b/src/Shared/Twig/ImgproxyExtension.php similarity index 98% rename from src/Twig/ImgproxyExtension.php rename to src/Shared/Twig/ImgproxyExtension.php index 4f8beb55..93d914ba 100644 --- a/src/Twig/ImgproxyExtension.php +++ b/src/Shared/Twig/ImgproxyExtension.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Twig; +namespace App\Shared\Twig; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; diff --git a/src/Twig/SteamExtension.php b/src/Shared/Twig/SteamExtension.php similarity index 91% rename from src/Twig/SteamExtension.php rename to src/Shared/Twig/SteamExtension.php index 07034d58..80b8345c 100644 --- a/src/Twig/SteamExtension.php +++ b/src/Shared/Twig/SteamExtension.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Twig; +namespace App\Shared\Twig; -use App\Service\SteamApiClient\Helper\SteamHelper; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; diff --git a/src/Twig/UserExtension.php b/src/Shared/Twig/UserExtension.php similarity index 96% rename from src/Twig/UserExtension.php rename to src/Shared/Twig/UserExtension.php index f8143144..c189db02 100644 --- a/src/Twig/UserExtension.php +++ b/src/Shared/Twig/UserExtension.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Twig; +namespace App\Shared\Twig; -use App\Entity\User\User; +use App\Users\Entity\User\User; use Symfony\Bundle\SecurityBundle\Security; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; diff --git a/src/Twig/UtilsExtension.php b/src/Shared/Twig/UtilsExtension.php similarity index 97% rename from src/Twig/UtilsExtension.php rename to src/Shared/Twig/UtilsExtension.php index 279160c8..76f1d4a1 100644 --- a/src/Twig/UtilsExtension.php +++ b/src/Shared/Twig/UtilsExtension.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Twig; +namespace App\Shared\Twig; use Symfony\Component\HttpFoundation\RequestStack; use Twig\Extension\AbstractExtension; diff --git a/src/Twig/VersionExtension.php b/src/Shared/Twig/VersionExtension.php similarity index 89% rename from src/Twig/VersionExtension.php rename to src/Shared/Twig/VersionExtension.php index b8674b43..b81b626c 100644 --- a/src/Twig/VersionExtension.php +++ b/src/Shared/Twig/VersionExtension.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Twig; +namespace App\Shared\Twig; -use App\Service\Version\VersionProviderInterface; +use App\Shared\Service\Version\VersionProviderInterface; use Twig\Extension\AbstractExtension; use Twig\TwigFunction; diff --git a/src/Validator/AbstractValidator.php b/src/Shared/Validator/Common/AbstractValidator.php similarity index 97% rename from src/Validator/AbstractValidator.php rename to src/Shared/Validator/Common/AbstractValidator.php index 2952938a..c710b428 100644 --- a/src/Validator/AbstractValidator.php +++ b/src/Shared/Validator/Common/AbstractValidator.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator; +namespace App\Shared\Validator\Common; use Doctrine\ORM\AbstractQuery; use Doctrine\ORM\EntityManagerInterface; diff --git a/src/Validator/SteamProfileId.php b/src/Shared/Validator/Common/SteamProfileId.php similarity index 96% rename from src/Validator/SteamProfileId.php rename to src/Shared/Validator/Common/SteamProfileId.php index f29dac56..4d793d1a 100644 --- a/src/Validator/SteamProfileId.php +++ b/src/Shared/Validator/Common/SteamProfileId.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator; +namespace App\Shared\Validator\Common; use Symfony\Component\Validator\Constraints\Regex; diff --git a/src/Validator/SteamProfileIdValidator.php b/src/Shared/Validator/Common/SteamProfileIdValidator.php similarity index 79% rename from src/Validator/SteamProfileIdValidator.php rename to src/Shared/Validator/Common/SteamProfileIdValidator.php index d3181501..38839fd5 100644 --- a/src/Validator/SteamProfileIdValidator.php +++ b/src/Shared/Validator/Common/SteamProfileIdValidator.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator; +namespace App\Shared\Validator\Common; use Symfony\Component\Validator\Constraints\RegexValidator; diff --git a/src/Validator/WindowsDirectoryName.php b/src/Shared/Validator/Common/WindowsDirectoryName.php similarity index 96% rename from src/Validator/WindowsDirectoryName.php rename to src/Shared/Validator/Common/WindowsDirectoryName.php index 3c34b395..bef1a2eb 100644 --- a/src/Validator/WindowsDirectoryName.php +++ b/src/Shared/Validator/Common/WindowsDirectoryName.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator; +namespace App\Shared\Validator\Common; use Symfony\Component\Validator\Constraints\Regex; diff --git a/src/Validator/WindowsDirectoryNameValidator.php b/src/Shared/Validator/Common/WindowsDirectoryNameValidator.php similarity index 80% rename from src/Validator/WindowsDirectoryNameValidator.php rename to src/Shared/Validator/Common/WindowsDirectoryNameValidator.php index 809e7a1f..96c5f69c 100644 --- a/src/Validator/WindowsDirectoryNameValidator.php +++ b/src/Shared/Validator/Common/WindowsDirectoryNameValidator.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator; +namespace App\Shared\Validator\Common; use Symfony\Component\Validator\Constraints\RegexValidator; diff --git a/src/Command/PermissionsMakeAdminCommand.php b/src/Users/Command/PermissionsMakeAdminCommand.php similarity index 96% rename from src/Command/PermissionsMakeAdminCommand.php rename to src/Users/Command/PermissionsMakeAdminCommand.php index 1ede5a98..c974a2e9 100644 --- a/src/Command/PermissionsMakeAdminCommand.php +++ b/src/Users/Command/PermissionsMakeAdminCommand.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Command; +namespace App\Users\Command; -use App\Entity\User\User; -use App\Repository\User\UserRepository; +use App\Users\Entity\User\User; +use App\Users\Repository\User\UserRepository; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\QuestionHelper; diff --git a/src/Controller/User/DeleteAction.php b/src/Users/Controller/User/DeleteAction.php similarity index 87% rename from src/Controller/User/DeleteAction.php rename to src/Users/Controller/User/DeleteAction.php index 991a1300..40768719 100644 --- a/src/Controller/User/DeleteAction.php +++ b/src/Users/Controller/User/DeleteAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\User; +namespace App\Users\Controller\User; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\User\User; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Controller/User/ListAction.php b/src/Users/Controller/User/ListAction.php similarity index 77% rename from src/Controller/User/ListAction.php rename to src/Users/Controller/User/ListAction.php index 11b7976d..80c0b4cb 100644 --- a/src/Controller/User/ListAction.php +++ b/src/Users/Controller/User/ListAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\User; +namespace App\Users\Controller\User; -use App\Repository\User\UserRepository; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Repository\User\UserRepository; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -24,7 +24,7 @@ public function __invoke(): Response { $users = $this->userRepository->findBy([], ['username' => 'ASC']); - return $this->render('user/list.html.twig', [ + return $this->render('users/user/list.html.twig', [ 'users' => $users, ]); } diff --git a/src/Controller/User/UpdateAction.php b/src/Users/Controller/User/UpdateAction.php similarity index 80% rename from src/Controller/User/UpdateAction.php rename to src/Users/Controller/User/UpdateAction.php index d5482bb6..be093b4a 100644 --- a/src/Controller/User/UpdateAction.php +++ b/src/Users/Controller/User/UpdateAction.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Controller\User; +namespace App\Users\Controller\User; -use App\Entity\User\User; -use App\Form\User\DataTransformer\UserFormDtoDataTransformer; -use App\Form\User\Dto\UserFormDto; -use App\Form\User\UserFormType; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\User\User; +use App\Users\Form\User\DataTransformer\UserFormDtoDataTransformer; +use App\Users\Form\User\Dto\UserFormDto; +use App\Users\Form\User\UserFormType; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -42,7 +42,7 @@ public function __invoke(Request $request, User $user): Response return $this->redirectToRoute('app_user_list'); } - return $this->render('user/form.html.twig', [ + return $this->render('users/user/form.html.twig', [ 'user' => $user, 'form' => $form->createView(), ]); diff --git a/src/Controller/UserGroup/CreateAction.php b/src/Users/Controller/UserGroup/CreateAction.php similarity index 80% rename from src/Controller/UserGroup/CreateAction.php rename to src/Users/Controller/UserGroup/CreateAction.php index aa4fbbc1..7daa7dc1 100644 --- a/src/Controller/UserGroup/CreateAction.php +++ b/src/Users/Controller/UserGroup/CreateAction.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Controller\UserGroup; +namespace App\Users\Controller\UserGroup; -use App\Form\UserGroup\DataTransformer\UserGroupFormDtoDataTransformer; -use App\Form\UserGroup\Dto\UserGroupFormDto; -use App\Form\UserGroup\UserGroupFormType; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Form\UserGroup\DataTransformer\UserGroupFormDtoDataTransformer; +use App\Users\Form\UserGroup\Dto\UserGroupFormDto; +use App\Users\Form\UserGroup\UserGroupFormType; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request): Response return $this->redirectToRoute('app_user_group_list'); } - return $this->render('user_group/form.html.twig', [ + return $this->render('users/user_group/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/Controller/UserGroup/DeleteAction.php b/src/Users/Controller/UserGroup/DeleteAction.php similarity index 86% rename from src/Controller/UserGroup/DeleteAction.php rename to src/Users/Controller/UserGroup/DeleteAction.php index 8f6aa8d1..98b0bf2a 100644 --- a/src/Controller/UserGroup/DeleteAction.php +++ b/src/Users/Controller/UserGroup/DeleteAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\UserGroup; +namespace App\Users\Controller\UserGroup; -use App\Entity\UserGroup\UserGroup; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\UserGroup\UserGroup; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Controller/UserGroup/ListAction.php b/src/Users/Controller/UserGroup/ListAction.php similarity index 77% rename from src/Controller/UserGroup/ListAction.php rename to src/Users/Controller/UserGroup/ListAction.php index ecd3b334..4440839f 100644 --- a/src/Controller/UserGroup/ListAction.php +++ b/src/Users/Controller/UserGroup/ListAction.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Controller\UserGroup; +namespace App\Users\Controller\UserGroup; -use App\Repository\UserGroup\UserGroupRepository; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Repository\UserGroup\UserGroupRepository; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -24,7 +24,7 @@ public function __invoke(): Response { $userGroups = $this->userGroupRepository->findBy([], ['name' => 'ASC']); - return $this->render('user_group/list.html.twig', [ + return $this->render('users/user_group/list.html.twig', [ 'userGroups' => $userGroups, ]); } diff --git a/src/Controller/UserGroup/UpdateAction.php b/src/Users/Controller/UserGroup/UpdateAction.php similarity index 78% rename from src/Controller/UserGroup/UpdateAction.php rename to src/Users/Controller/UserGroup/UpdateAction.php index 5bead593..c9871d22 100644 --- a/src/Controller/UserGroup/UpdateAction.php +++ b/src/Users/Controller/UserGroup/UpdateAction.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Controller\UserGroup; +namespace App\Users\Controller\UserGroup; -use App\Entity\UserGroup\UserGroup; -use App\Form\UserGroup\DataTransformer\UserGroupFormDtoDataTransformer; -use App\Form\UserGroup\Dto\UserGroupFormDto; -use App\Form\UserGroup\UserGroupFormType; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\UserGroup\UserGroup; +use App\Users\Form\UserGroup\DataTransformer\UserGroupFormDtoDataTransformer; +use App\Users\Form\UserGroup\Dto\UserGroupFormDto; +use App\Users\Form\UserGroup\UserGroupFormType; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -40,7 +40,7 @@ public function __invoke(Request $request, UserGroup $userGroup): Response return $this->redirectToRoute('app_user_group_list'); } - return $this->render('user_group/form.html.twig', [ + return $this->render('users/user_group/form.html.twig', [ 'form' => $form->createView(), ]); } diff --git a/src/DataFixtures/User/AdminFixture.php b/src/Users/DataFixtures/User/AdminFixture.php similarity index 87% rename from src/DataFixtures/User/AdminFixture.php rename to src/Users/DataFixtures/User/AdminFixture.php index 81562d1f..f6cad2eb 100644 --- a/src/DataFixtures/User/AdminFixture.php +++ b/src/Users/DataFixtures/User/AdminFixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\User; +namespace App\Users\DataFixtures\User; -use App\Entity\Permissions\UserPermissions; -use App\Entity\User\User; -use App\Test\Traits\TimeTrait; +use App\Shared\Test\Traits\TimeTrait; +use App\Users\Entity\Permissions\UserPermissions; +use App\Users\Entity\User\User; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/User/User1Fixture.php b/src/Users/DataFixtures/User/User1Fixture.php similarity index 88% rename from src/DataFixtures/User/User1Fixture.php rename to src/Users/DataFixtures/User/User1Fixture.php index 85e8716c..5d6d4141 100644 --- a/src/DataFixtures/User/User1Fixture.php +++ b/src/Users/DataFixtures/User/User1Fixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\User; +namespace App\Users\DataFixtures\User; -use App\Entity\Permissions\UserPermissions; -use App\Entity\User\User; -use App\Test\Traits\TimeTrait; +use App\Shared\Test\Traits\TimeTrait; +use App\Users\Entity\Permissions\UserPermissions; +use App\Users\Entity\User\User; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/User/User2Fixture.php b/src/Users/DataFixtures/User/User2Fixture.php similarity index 88% rename from src/DataFixtures/User/User2Fixture.php rename to src/Users/DataFixtures/User/User2Fixture.php index bd5d6c22..d69598e4 100644 --- a/src/DataFixtures/User/User2Fixture.php +++ b/src/Users/DataFixtures/User/User2Fixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\User; +namespace App\Users\DataFixtures\User; -use App\Entity\Permissions\UserPermissions; -use App\Entity\User\User; -use App\Test\Traits\TimeTrait; +use App\Shared\Test\Traits\TimeTrait; +use App\Users\Entity\Permissions\UserPermissions; +use App\Users\Entity\User\User; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/User/User3Fixture.php b/src/Users/DataFixtures/User/User3Fixture.php similarity index 88% rename from src/DataFixtures/User/User3Fixture.php rename to src/Users/DataFixtures/User/User3Fixture.php index eefdcfea..bc11d24e 100644 --- a/src/DataFixtures/User/User3Fixture.php +++ b/src/Users/DataFixtures/User/User3Fixture.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\DataFixtures\User; +namespace App\Users\DataFixtures\User; -use App\Entity\Permissions\UserPermissions; -use App\Entity\User\User; -use App\Test\Traits\TimeTrait; +use App\Shared\Test\Traits\TimeTrait; +use App\Users\Entity\Permissions\UserPermissions; +use App\Users\Entity\User\User; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Persistence\ObjectManager; use Ramsey\Uuid\Uuid; diff --git a/src/DataFixtures/UserGroup/AdminsGroupFixture.php b/src/Users/DataFixtures/UserGroup/AdminsGroupFixture.php similarity index 84% rename from src/DataFixtures/UserGroup/AdminsGroupFixture.php rename to src/Users/DataFixtures/UserGroup/AdminsGroupFixture.php index 1567a9e8..80e8c1fb 100644 --- a/src/DataFixtures/UserGroup/AdminsGroupFixture.php +++ b/src/Users/DataFixtures/UserGroup/AdminsGroupFixture.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\DataFixtures\UserGroup; +namespace App\Users\DataFixtures\UserGroup; -use App\DataFixtures\User\AdminFixture; -use App\Entity\Permissions\UserGroupPermissions; -use App\Entity\UserGroup\UserGroup; -use App\Test\Traits\TimeTrait; +use App\Shared\Test\Traits\TimeTrait; +use App\Users\DataFixtures\User\AdminFixture; +use App\Users\Entity\Permissions\UserGroupPermissions; +use App\Users\Entity\UserGroup\UserGroup; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; diff --git a/src/DataFixtures/UserGroup/UsersGroupFixture.php b/src/Users/DataFixtures/UserGroup/UsersGroupFixture.php similarity index 81% rename from src/DataFixtures/UserGroup/UsersGroupFixture.php rename to src/Users/DataFixtures/UserGroup/UsersGroupFixture.php index d392d57e..23795ff9 100644 --- a/src/DataFixtures/UserGroup/UsersGroupFixture.php +++ b/src/Users/DataFixtures/UserGroup/UsersGroupFixture.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\DataFixtures\UserGroup; - -use App\DataFixtures\User\User1Fixture; -use App\DataFixtures\User\User2Fixture; -use App\DataFixtures\User\User3Fixture; -use App\Entity\Permissions\UserGroupPermissions; -use App\Entity\UserGroup\UserGroup; -use App\Test\Traits\TimeTrait; +namespace App\Users\DataFixtures\UserGroup; + +use App\Shared\Test\Traits\TimeTrait; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\DataFixtures\User\User2Fixture; +use App\Users\DataFixtures\User\User3Fixture; +use App\Users\Entity\Permissions\UserGroupPermissions; +use App\Users\Entity\UserGroup\UserGroup; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Persistence\ObjectManager; diff --git a/src/Entity/Permissions/AbstractPermissions.php b/src/Users/Entity/Permissions/AbstractPermissions.php similarity index 96% rename from src/Entity/Permissions/AbstractPermissions.php rename to src/Users/Entity/Permissions/AbstractPermissions.php index b550e104..a748fd65 100644 --- a/src/Entity/Permissions/AbstractPermissions.php +++ b/src/Users/Entity/Permissions/AbstractPermissions.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Entity\Permissions; +namespace App\Users\Entity\Permissions; -use App\Entity\AbstractBlamableEntity; +use App\Shared\Entity\Common\AbstractBlamableEntity; abstract class AbstractPermissions extends AbstractBlamableEntity { diff --git a/src/Entity/Permissions/UserGroupPermissions.php b/src/Users/Entity/Permissions/UserGroupPermissions.php similarity index 69% rename from src/Entity/Permissions/UserGroupPermissions.php rename to src/Users/Entity/Permissions/UserGroupPermissions.php index 88c7fc74..98501dee 100644 --- a/src/Entity/Permissions/UserGroupPermissions.php +++ b/src/Users/Entity/Permissions/UserGroupPermissions.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Permissions; +namespace App\Users\Entity\Permissions; class UserGroupPermissions extends AbstractPermissions { diff --git a/src/Entity/Permissions/UserPermissions.php b/src/Users/Entity/Permissions/UserPermissions.php similarity index 68% rename from src/Entity/Permissions/UserPermissions.php rename to src/Users/Entity/Permissions/UserPermissions.php index 4c7de4b7..7cec5083 100644 --- a/src/Entity/Permissions/UserPermissions.php +++ b/src/Users/Entity/Permissions/UserPermissions.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Entity\Permissions; +namespace App\Users\Entity\Permissions; class UserPermissions extends AbstractPermissions { diff --git a/src/Entity/User/User.php b/src/Users/Entity/User/User.php similarity index 93% rename from src/Entity/User/User.php rename to src/Users/Entity/User/User.php index f7bee76a..e80fca06 100644 --- a/src/Entity/User/User.php +++ b/src/Users/Entity/User/User.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Entity\User; +namespace App\Users\Entity\User; -use App\Entity\AbstractBlamableEntity; -use App\Entity\Permissions\UserPermissions; -use App\Entity\UserGroup\UserGroup; -use App\Security\Traits\UserInterfaceTrait; +use App\Shared\Entity\Common\AbstractBlamableEntity; +use App\Shared\Security\Traits\UserInterfaceTrait; +use App\Users\Entity\Permissions\UserPermissions; +use App\Users\Entity\UserGroup\UserGroup; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Ramsey\Uuid\UuidInterface; diff --git a/src/Entity/UserGroup/UserGroup.php b/src/Users/Entity/UserGroup/UserGroup.php similarity index 91% rename from src/Entity/UserGroup/UserGroup.php rename to src/Users/Entity/UserGroup/UserGroup.php index 722636fe..8df2e89e 100644 --- a/src/Entity/UserGroup/UserGroup.php +++ b/src/Users/Entity/UserGroup/UserGroup.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Entity\UserGroup; +namespace App\Users\Entity\UserGroup; -use App\Entity\AbstractBlamableEntity; -use App\Entity\Permissions\UserGroupPermissions; -use App\Entity\User\User; +use App\Shared\Entity\Common\AbstractBlamableEntity; +use App\Users\Entity\Permissions\UserGroupPermissions; +use App\Users\Entity\User\User; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Ramsey\Uuid\UuidInterface; diff --git a/src/Form/Permissions/PermissionsType.php b/src/Users/Form/Permissions/PermissionsType.php similarity index 98% rename from src/Form/Permissions/PermissionsType.php rename to src/Users/Form/Permissions/PermissionsType.php index 20bfdbd4..f9e30002 100644 --- a/src/Form/Permissions/PermissionsType.php +++ b/src/Users/Form/Permissions/PermissionsType.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Form\Permissions; +namespace App\Users\Form\Permissions; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; diff --git a/src/Form/User/DataTransformer/UserFormDtoDataTransformer.php b/src/Users/Form/User/DataTransformer/UserFormDtoDataTransformer.php similarity index 86% rename from src/Form/User/DataTransformer/UserFormDtoDataTransformer.php rename to src/Users/Form/User/DataTransformer/UserFormDtoDataTransformer.php index 07fc95bd..e84049df 100644 --- a/src/Form/User/DataTransformer/UserFormDtoDataTransformer.php +++ b/src/Users/Form/User/DataTransformer/UserFormDtoDataTransformer.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Form\User\DataTransformer; +namespace App\Users\Form\User\DataTransformer; -use App\Entity\User\User; -use App\Form\User\Dto\UserFormDto; +use App\Users\Entity\User\User; +use App\Users\Form\User\Dto\UserFormDto; class UserFormDtoDataTransformer { diff --git a/src/Form/User/Dto/UserFormDto.php b/src/Users/Form/User/Dto/UserFormDto.php similarity index 82% rename from src/Form/User/Dto/UserFormDto.php rename to src/Users/Form/User/Dto/UserFormDto.php index 06ec91d0..25e511ad 100644 --- a/src/Form/User/Dto/UserFormDto.php +++ b/src/Users/Form/User/Dto/UserFormDto.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Form\User\Dto; +namespace App\Users\Form\User\Dto; -use App\Entity\Permissions\UserPermissions; -use App\Validator\SteamProfileId; -use App\Validator\User\UniqueUserSteamId; +use App\Shared\Validator\Common\SteamProfileId; +use App\Users\Entity\Permissions\UserPermissions; +use App\Users\Validator\User\UniqueUserSteamId; use Ramsey\Uuid\UuidInterface; #[UniqueUserSteamId(errorPath: 'steamId')] diff --git a/src/Form/User/UserFormType.php b/src/Users/Form/User/UserFormType.php similarity index 85% rename from src/Form/User/UserFormType.php rename to src/Users/Form/User/UserFormType.php index 2cf424f7..4489c978 100644 --- a/src/Form/User/UserFormType.php +++ b/src/Users/Form/User/UserFormType.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Form\User; +namespace App\Users\Form\User; -use App\Entity\Permissions\UserPermissions; -use App\Form\Permissions\PermissionsType; -use App\Form\User\Dto\UserFormDto; +use App\Users\Entity\Permissions\UserPermissions; +use App\Users\Form\Permissions\PermissionsType; +use App\Users\Form\User\Dto\UserFormDto; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\NumberType; use Symfony\Component\Form\FormBuilderInterface; diff --git a/src/Form/UserGroup/DataTransformer/UserGroupFormDtoDataTransformer.php b/src/Users/Form/UserGroup/DataTransformer/UserGroupFormDtoDataTransformer.php similarity index 86% rename from src/Form/UserGroup/DataTransformer/UserGroupFormDtoDataTransformer.php rename to src/Users/Form/UserGroup/DataTransformer/UserGroupFormDtoDataTransformer.php index e6ca01a6..928b391b 100644 --- a/src/Form/UserGroup/DataTransformer/UserGroupFormDtoDataTransformer.php +++ b/src/Users/Form/UserGroup/DataTransformer/UserGroupFormDtoDataTransformer.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Form\UserGroup\DataTransformer; +namespace App\Users\Form\UserGroup\DataTransformer; -use App\Entity\Permissions\UserGroupPermissions; -use App\Entity\UserGroup\UserGroup; -use App\Form\UserGroup\Dto\UserGroupFormDto; -use App\Service\IdentifierFactory\IdentifierFactoryInterface; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryInterface; +use App\Users\Entity\Permissions\UserGroupPermissions; +use App\Users\Entity\UserGroup\UserGroup; +use App\Users\Form\UserGroup\Dto\UserGroupFormDto; class UserGroupFormDtoDataTransformer { diff --git a/src/Form/UserGroup/Dto/UserGroupFormDto.php b/src/Users/Form/UserGroup/Dto/UserGroupFormDto.php similarity index 92% rename from src/Form/UserGroup/Dto/UserGroupFormDto.php rename to src/Users/Form/UserGroup/Dto/UserGroupFormDto.php index 4b4b0ee6..3947ca8e 100644 --- a/src/Form/UserGroup/Dto/UserGroupFormDto.php +++ b/src/Users/Form/UserGroup/Dto/UserGroupFormDto.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Form\UserGroup\Dto; +namespace App\Users\Form\UserGroup\Dto; -use App\Entity\Permissions\UserGroupPermissions; -use App\Entity\User\User; -use App\Validator\UserGroup\UniqueUserGroupName; +use App\Users\Entity\Permissions\UserGroupPermissions; +use App\Users\Entity\User\User; +use App\Users\Validator\UserGroup\UniqueUserGroupName; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Ramsey\Uuid\UuidInterface; diff --git a/src/Form/UserGroup/UserGroupFormType.php b/src/Users/Form/UserGroup/UserGroupFormType.php similarity index 88% rename from src/Form/UserGroup/UserGroupFormType.php rename to src/Users/Form/UserGroup/UserGroupFormType.php index ed3b7aa6..7fe8a28f 100644 --- a/src/Form/UserGroup/UserGroupFormType.php +++ b/src/Users/Form/UserGroup/UserGroupFormType.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Form\UserGroup; +namespace App\Users\Form\UserGroup; -use App\Entity\Permissions\UserGroupPermissions; -use App\Entity\User\User; -use App\Form\Permissions\PermissionsType; -use App\Form\UserGroup\Dto\UserGroupFormDto; +use App\Users\Entity\Permissions\UserGroupPermissions; +use App\Users\Entity\User\User; +use App\Users\Form\Permissions\PermissionsType; +use App\Users\Form\UserGroup\Dto\UserGroupFormDto; use Doctrine\ORM\EntityRepository; use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Component\Form\AbstractType; diff --git a/src/Repository/Permissions/PermissionsRepository.php b/src/Users/Repository/Permissions/PermissionsRepository.php similarity index 87% rename from src/Repository/Permissions/PermissionsRepository.php rename to src/Users/Repository/Permissions/PermissionsRepository.php index f704f443..e5085b9f 100644 --- a/src/Repository/Permissions/PermissionsRepository.php +++ b/src/Users/Repository/Permissions/PermissionsRepository.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Repository\Permissions; +namespace App\Users\Repository\Permissions; -use App\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\Permissions\AbstractPermissions; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Repository/Permissions/UserGroupPermissionsRepository.php b/src/Users/Repository/Permissions/UserGroupPermissionsRepository.php similarity index 82% rename from src/Repository/Permissions/UserGroupPermissionsRepository.php rename to src/Users/Repository/Permissions/UserGroupPermissionsRepository.php index ea95d7ef..9dcc2ad1 100644 --- a/src/Repository/Permissions/UserGroupPermissionsRepository.php +++ b/src/Users/Repository/Permissions/UserGroupPermissionsRepository.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Repository\Permissions; +namespace App\Users\Repository\Permissions; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\Permissions\UserGroupPermissions; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\Permissions\UserGroupPermissions; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Repository/Permissions/UserPermissionsRepository.php b/src/Users/Repository/Permissions/UserPermissionsRepository.php similarity index 82% rename from src/Repository/Permissions/UserPermissionsRepository.php rename to src/Users/Repository/Permissions/UserPermissionsRepository.php index 75dc8764..235da7cf 100644 --- a/src/Repository/Permissions/UserPermissionsRepository.php +++ b/src/Users/Repository/Permissions/UserPermissionsRepository.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Repository\Permissions; +namespace App\Users\Repository\Permissions; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\Permissions\UserPermissions; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\Permissions\UserPermissions; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Repository/User/UserRepository.php b/src/Users/Repository/User/UserRepository.php similarity index 91% rename from src/Repository/User/UserRepository.php rename to src/Users/Repository/User/UserRepository.php index c65df537..34d76d2b 100644 --- a/src/Repository/User/UserRepository.php +++ b/src/Users/Repository/User/UserRepository.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Repository\User; +namespace App\Users\Repository\User; -use App\Entity\User\User; +use App\Users\Entity\User\User; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Repository/UserGroup/UserGroupRepository.php b/src/Users/Repository/UserGroup/UserGroupRepository.php similarity index 88% rename from src/Repository/UserGroup/UserGroupRepository.php rename to src/Users/Repository/UserGroup/UserGroupRepository.php index d47ec48e..d747f0ad 100644 --- a/src/Repository/UserGroup/UserGroupRepository.php +++ b/src/Users/Repository/UserGroup/UserGroupRepository.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Repository\UserGroup; +namespace App\Users\Repository\UserGroup; -use App\Entity\UserGroup\UserGroup; +use App\Users\Entity\UserGroup\UserGroup; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; diff --git a/src/Security/Voter/User/DeleteUserVoter.php b/src/Users/Security/Voter/User/DeleteUserVoter.php similarity index 82% rename from src/Security/Voter/User/DeleteUserVoter.php rename to src/Users/Security/Voter/User/DeleteUserVoter.php index 0357ba2c..dd02f497 100644 --- a/src/Security/Voter/User/DeleteUserVoter.php +++ b/src/Users/Security/Voter/User/DeleteUserVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\User; +namespace App\Users\Security\Voter\User; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/User/ListUsersVoter.php b/src/Users/Security/Voter/User/ListUsersVoter.php similarity index 80% rename from src/Security/Voter/User/ListUsersVoter.php rename to src/Users/Security/Voter/User/ListUsersVoter.php index 6efc8c24..72569222 100644 --- a/src/Security/Voter/User/ListUsersVoter.php +++ b/src/Users/Security/Voter/User/ListUsersVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\User; +namespace App\Users\Security\Voter\User; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/User/UpdateUserVoter.php b/src/Users/Security/Voter/User/UpdateUserVoter.php similarity index 81% rename from src/Security/Voter/User/UpdateUserVoter.php rename to src/Users/Security/Voter/User/UpdateUserVoter.php index f229ad67..cb239080 100644 --- a/src/Security/Voter/User/UpdateUserVoter.php +++ b/src/Users/Security/Voter/User/UpdateUserVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\User; +namespace App\Users\Security\Voter\User; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/UserGroup/CreateUserGroupVoter.php b/src/Users/Security/Voter/UserGroup/CreateUserGroupVoter.php similarity index 80% rename from src/Security/Voter/UserGroup/CreateUserGroupVoter.php rename to src/Users/Security/Voter/UserGroup/CreateUserGroupVoter.php index c54d6962..6618b23e 100644 --- a/src/Security/Voter/UserGroup/CreateUserGroupVoter.php +++ b/src/Users/Security/Voter/UserGroup/CreateUserGroupVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\UserGroup; +namespace App\Users\Security\Voter\UserGroup; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/UserGroup/DeleteUserGroupVoter.php b/src/Users/Security/Voter/UserGroup/DeleteUserGroupVoter.php similarity index 77% rename from src/Security/Voter/UserGroup/DeleteUserGroupVoter.php rename to src/Users/Security/Voter/UserGroup/DeleteUserGroupVoter.php index 52c46e30..6bed7efe 100644 --- a/src/Security/Voter/UserGroup/DeleteUserGroupVoter.php +++ b/src/Users/Security/Voter/UserGroup/DeleteUserGroupVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\UserGroup; +namespace App\Users\Security\Voter\UserGroup; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Entity\UserGroup\UserGroup; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; +use App\Users\Entity\UserGroup\UserGroup; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/UserGroup/ListUserGroupsVoter.php b/src/Users/Security/Voter/UserGroup/ListUserGroupsVoter.php similarity index 80% rename from src/Security/Voter/UserGroup/ListUserGroupsVoter.php rename to src/Users/Security/Voter/UserGroup/ListUserGroupsVoter.php index 9f212f11..add3b636 100644 --- a/src/Security/Voter/UserGroup/ListUserGroupsVoter.php +++ b/src/Users/Security/Voter/UserGroup/ListUserGroupsVoter.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Security\Voter\UserGroup; +namespace App\Users\Security\Voter\UserGroup; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/UserGroup/UpdateUserGroupVoter.php b/src/Users/Security/Voter/UserGroup/UpdateUserGroupVoter.php similarity index 77% rename from src/Security/Voter/UserGroup/UpdateUserGroupVoter.php rename to src/Users/Security/Voter/UserGroup/UpdateUserGroupVoter.php index 3e696dab..6841a43d 100644 --- a/src/Security/Voter/UserGroup/UpdateUserGroupVoter.php +++ b/src/Users/Security/Voter/UserGroup/UpdateUserGroupVoter.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Security\Voter\UserGroup; +namespace App\Users\Security\Voter\UserGroup; -use App\Entity\Permissions\AbstractPermissions; -use App\Entity\User\User; -use App\Entity\UserGroup\UserGroup; -use App\Security\Enum\PermissionsEnum; +use App\Shared\Security\Enum\PermissionsEnum; +use App\Users\Entity\Permissions\AbstractPermissions; +use App\Users\Entity\User\User; +use App\Users\Entity\UserGroup\UserGroup; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Validator/User/UniqueUserSteamId.php b/src/Users/Validator/User/UniqueUserSteamId.php similarity index 95% rename from src/Validator/User/UniqueUserSteamId.php rename to src/Users/Validator/User/UniqueUserSteamId.php index a403edbb..f3479e48 100644 --- a/src/Validator/User/UniqueUserSteamId.php +++ b/src/Users/Validator/User/UniqueUserSteamId.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\User; +namespace App\Users\Validator\User; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/User/UniqueUserSteamIdValidator.php b/src/Users/Validator/User/UniqueUserSteamIdValidator.php similarity index 83% rename from src/Validator/User/UniqueUserSteamIdValidator.php rename to src/Users/Validator/User/UniqueUserSteamIdValidator.php index 0990f11c..2befc5ed 100644 --- a/src/Validator/User/UniqueUserSteamIdValidator.php +++ b/src/Users/Validator/User/UniqueUserSteamIdValidator.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Validator\User; +namespace App\Users\Validator\User; -use App\Entity\User\User; -use App\Form\ModList\Dto\ModListFormDto; -use App\Form\User\Dto\UserFormDto; -use App\Validator\AbstractValidator; +use App\Mods\Form\ModList\Dto\ModListFormDto; +use App\Shared\Validator\Common\AbstractValidator; +use App\Users\Entity\User\User; +use App\Users\Form\User\Dto\UserFormDto; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/src/Validator/UserGroup/UniqueUserGroupName.php b/src/Users/Validator/UserGroup/UniqueUserGroupName.php similarity index 95% rename from src/Validator/UserGroup/UniqueUserGroupName.php rename to src/Users/Validator/UserGroup/UniqueUserGroupName.php index a1d50114..6190c582 100644 --- a/src/Validator/UserGroup/UniqueUserGroupName.php +++ b/src/Users/Validator/UserGroup/UniqueUserGroupName.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Validator\UserGroup; +namespace App\Users\Validator\UserGroup; use Symfony\Component\Validator\Constraint; diff --git a/src/Validator/UserGroup/UniqueUserGroupNameValidator.php b/src/Users/Validator/UserGroup/UniqueUserGroupNameValidator.php similarity index 84% rename from src/Validator/UserGroup/UniqueUserGroupNameValidator.php rename to src/Users/Validator/UserGroup/UniqueUserGroupNameValidator.php index 418ba815..21f372ec 100644 --- a/src/Validator/UserGroup/UniqueUserGroupNameValidator.php +++ b/src/Users/Validator/UserGroup/UniqueUserGroupNameValidator.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Validator\UserGroup; +namespace App\Users\Validator\UserGroup; -use App\Entity\UserGroup\UserGroup; -use App\Form\UserGroup\Dto\UserGroupFormDto; -use App\Validator\AbstractValidator; +use App\Shared\Validator\Common\AbstractValidator; +use App\Users\Entity\UserGroup\UserGroup; +use App\Users\Form\UserGroup\Dto\UserGroupFormDto; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Exception\UnexpectedTypeException; diff --git a/templates/_partial/mod_tabs/_mod_tabs_content.html.twig b/templates/_partial/mod_tabs/_mod_tabs_content.html.twig deleted file mode 100644 index da07bcf3..00000000 --- a/templates/_partial/mod_tabs/_mod_tabs_content.html.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% import '_macro/tab_macro.html.twig' as tabMacro %} - -{% set active = active|default('') %} - -
- {% include '_partial/mod_tabs/_mod_tabs_table.html.twig' with { form: form, modTypeFilter: constant('\\App\\Entity\\Mod\\Enum\\ModTypeEnum::SERVER_SIDE') } %} -
-
- {% include '_partial/mod_tabs/_mod_tabs_table.html.twig' with { form: form, modTypeFilter: constant('\\App\\Entity\\Mod\\Enum\\ModTypeEnum::REQUIRED') } %} -
-
- {% include '_partial/mod_tabs/_mod_tabs_table.html.twig' with { form: form, modTypeFilter: constant('\\App\\Entity\\Mod\\Enum\\ModTypeEnum::OPTIONAL') } %} -
-
- {% include '_partial/mod_tabs/_mod_tabs_table.html.twig' with { form: form, modTypeFilter: constant('\\App\\Entity\\Mod\\Enum\\ModTypeEnum::CLIENT_SIDE') } %} -
diff --git a/templates/_partial/dlc_tabs/_dlc_tabs_content.html.twig b/templates/mods/_partial/dlc_tabs/_dlc_tabs_content.html.twig similarity index 51% rename from templates/_partial/dlc_tabs/_dlc_tabs_content.html.twig rename to templates/mods/_partial/dlc_tabs/_dlc_tabs_content.html.twig index 27e1c8e9..bc31296a 100644 --- a/templates/_partial/dlc_tabs/_dlc_tabs_content.html.twig +++ b/templates/mods/_partial/dlc_tabs/_dlc_tabs_content.html.twig @@ -1,7 +1,7 @@ -{% import '_macro/tab_macro.html.twig' as tabMacro %} +{% import 'shared/_macro/tab_macro.html.twig' as tabMacro %} {% set active = active|default('') %}
- {% include '_partial/dlc_tabs/_dlc_tabs_table.html.twig' %} + {% include 'mods/_partial/dlc_tabs/_dlc_tabs_table.html.twig' %}
diff --git a/templates/_partial/dlc_tabs/_dlc_tabs_nav.html.twig b/templates/mods/_partial/dlc_tabs/_dlc_tabs_nav.html.twig similarity index 77% rename from templates/_partial/dlc_tabs/_dlc_tabs_nav.html.twig rename to templates/mods/_partial/dlc_tabs/_dlc_tabs_nav.html.twig index 02f553a6..ab81c454 100644 --- a/templates/_partial/dlc_tabs/_dlc_tabs_nav.html.twig +++ b/templates/mods/_partial/dlc_tabs/_dlc_tabs_nav.html.twig @@ -1,4 +1,4 @@ -{% import '_macro/tab_macro.html.twig' as tabMacro %} +{% import 'shared/_macro/tab_macro.html.twig' as tabMacro %} {% set active = active|default('') %} diff --git a/templates/_partial/dlc_tabs/_dlc_tabs_table.html.twig b/templates/mods/_partial/dlc_tabs/_dlc_tabs_table.html.twig similarity index 85% rename from templates/_partial/dlc_tabs/_dlc_tabs_table.html.twig rename to templates/mods/_partial/dlc_tabs/_dlc_tabs_table.html.twig index df022d1c..a3fdc305 100644 --- a/templates/_partial/dlc_tabs/_dlc_tabs_table.html.twig +++ b/templates/mods/_partial/dlc_tabs/_dlc_tabs_table.html.twig @@ -1,5 +1,5 @@ -{% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} +{% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -11,7 +11,7 @@ {% block table_body %} {% set rowNo = 1 %} - {# @var dlc \App\Entity\Dlc\Dlc #} + {# @var dlc \App\Mods\Entity\Dlc\Dlc #} {% for child in form.children %} {% set dlc = form.vars.choices[loop.index0].data %} diff --git a/templates/_partial/mod_group_tabs/_mod_group_tabs_content.html.twig b/templates/mods/_partial/mod_group_tabs/_mod_group_tabs_content.html.twig similarity index 51% rename from templates/_partial/mod_group_tabs/_mod_group_tabs_content.html.twig rename to templates/mods/_partial/mod_group_tabs/_mod_group_tabs_content.html.twig index ea37ac43..19b77565 100644 --- a/templates/_partial/mod_group_tabs/_mod_group_tabs_content.html.twig +++ b/templates/mods/_partial/mod_group_tabs/_mod_group_tabs_content.html.twig @@ -1,7 +1,7 @@ -{% import '_macro/tab_macro.html.twig' as tabMacro %} +{% import 'shared/_macro/tab_macro.html.twig' as tabMacro %} {% set active = active|default('') %}
- {% include '_partial/mod_group_tabs/_mod_group_tabs_table.html.twig' %} + {% include 'mods/_partial/mod_group_tabs/_mod_group_tabs_table.html.twig' %}
diff --git a/templates/_partial/mod_group_tabs/_mod_group_tabs_nav.html.twig b/templates/mods/_partial/mod_group_tabs/_mod_group_tabs_nav.html.twig similarity index 79% rename from templates/_partial/mod_group_tabs/_mod_group_tabs_nav.html.twig rename to templates/mods/_partial/mod_group_tabs/_mod_group_tabs_nav.html.twig index 495917a3..2d293d0f 100644 --- a/templates/_partial/mod_group_tabs/_mod_group_tabs_nav.html.twig +++ b/templates/mods/_partial/mod_group_tabs/_mod_group_tabs_nav.html.twig @@ -1,4 +1,4 @@ -{% import '_macro/tab_macro.html.twig' as tabMacro %} +{% import 'shared/_macro/tab_macro.html.twig' as tabMacro %} {% set active = active|default('') %} diff --git a/templates/_partial/mod_group_tabs/_mod_group_tabs_table.html.twig b/templates/mods/_partial/mod_group_tabs/_mod_group_tabs_table.html.twig similarity index 84% rename from templates/_partial/mod_group_tabs/_mod_group_tabs_table.html.twig rename to templates/mods/_partial/mod_group_tabs/_mod_group_tabs_table.html.twig index a1d2bb84..2240c9e9 100644 --- a/templates/_partial/mod_group_tabs/_mod_group_tabs_table.html.twig +++ b/templates/mods/_partial/mod_group_tabs/_mod_group_tabs_table.html.twig @@ -1,5 +1,5 @@ -{% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} +{% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -11,7 +11,7 @@ {% block table_body %} {% set rowNo = 1 %} - {# @var modGroup \App\Entity\ModGroup\ModGroup #} + {# @var modGroup \App\Mods\Entity\ModGroup\ModGroup #} {% for child in form.children %} {% set modGroup = form.vars.choices[loop.index0].data %} diff --git a/templates/_partial/mod_tabs/_mod_tabs.html.twig b/templates/mods/_partial/mod_tabs/_mod_tabs.html.twig similarity index 65% rename from templates/_partial/mod_tabs/_mod_tabs.html.twig rename to templates/mods/_partial/mod_tabs/_mod_tabs.html.twig index 7afb7f69..7b0519cf 100644 --- a/templates/_partial/mod_tabs/_mod_tabs.html.twig +++ b/templates/mods/_partial/mod_tabs/_mod_tabs.html.twig @@ -2,12 +2,12 @@
    {% block nav %} - {% include '_partial/mod_tabs/_mod_tabs_nav.html.twig' %} + {% include 'mods/_partial/mod_tabs/_mod_tabs_nav.html.twig' %} {% endblock %}
{% block tab_content %} - {% include '_partial/mod_tabs/_mod_tabs_content.html.twig' %} + {% include 'mods/_partial/mod_tabs/_mod_tabs_content.html.twig' %} {% endblock %}
diff --git a/templates/mods/_partial/mod_tabs/_mod_tabs_content.html.twig b/templates/mods/_partial/mod_tabs/_mod_tabs_content.html.twig new file mode 100644 index 00000000..6b4e1363 --- /dev/null +++ b/templates/mods/_partial/mod_tabs/_mod_tabs_content.html.twig @@ -0,0 +1,16 @@ +{% import 'shared/_macro/tab_macro.html.twig' as tabMacro %} + +{% set active = active|default('') %} + +
+ {% include 'mods/_partial/mod_tabs/_mod_tabs_table.html.twig' with { form: form, modTypeFilter: constant('\\App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::SERVER_SIDE') } %} +
+
+ {% include 'mods/_partial/mod_tabs/_mod_tabs_table.html.twig' with { form: form, modTypeFilter: constant('\\App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::REQUIRED') } %} +
+
+ {% include 'mods/_partial/mod_tabs/_mod_tabs_table.html.twig' with { form: form, modTypeFilter: constant('\\App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::OPTIONAL') } %} +
+
+ {% include 'mods/_partial/mod_tabs/_mod_tabs_table.html.twig' with { form: form, modTypeFilter: constant('\\App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::CLIENT_SIDE') } %} +
diff --git a/templates/_partial/mod_tabs/_mod_tabs_nav.html.twig b/templates/mods/_partial/mod_tabs/_mod_tabs_nav.html.twig similarity index 93% rename from templates/_partial/mod_tabs/_mod_tabs_nav.html.twig rename to templates/mods/_partial/mod_tabs/_mod_tabs_nav.html.twig index 035f9c37..61f5e788 100644 --- a/templates/_partial/mod_tabs/_mod_tabs_nav.html.twig +++ b/templates/mods/_partial/mod_tabs/_mod_tabs_nav.html.twig @@ -1,4 +1,4 @@ -{% import '_macro/tab_macro.html.twig' as tabMacro %} +{% import 'shared/_macro/tab_macro.html.twig' as tabMacro %} {% set active = active|default('') %} diff --git a/templates/_partial/mod_tabs/_mod_tabs_table.html.twig b/templates/mods/_partial/mod_tabs/_mod_tabs_table.html.twig similarity index 73% rename from templates/_partial/mod_tabs/_mod_tabs_table.html.twig rename to templates/mods/_partial/mod_tabs/_mod_tabs_table.html.twig index 033ea881..ffadb943 100644 --- a/templates/_partial/mod_tabs/_mod_tabs_table.html.twig +++ b/templates/mods/_partial/mod_tabs/_mod_tabs_table.html.twig @@ -1,5 +1,5 @@ -{% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} +{% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -13,16 +13,16 @@ {% block table_body %} {% set rowNo = 1 %} - {# @var mod \App\Entity\Mod\AbstractMod #} + {# @var mod \App\Mods\Entity\Mod\AbstractMod #} {% for child in form.children %} {% set mod = form.vars.choices[loop.index0].data %} - {% if mod is instance_of('\\App\\Entity\\Mod\\SteamWorkshopMod') %} - {# @var mod \App\Entity\Mod\SteamWorkshopMod #} + {% if mod is instance_of('\\App\\Mods\\Entity\\Mod\\SteamWorkshopMod') %} + {# @var mod \App\Mods\Entity\Mod\SteamWorkshopMod #} {% set modType = mod.type %} - {% elseif mod is instance_of('\\App\\Entity\\Mod\\DirectoryMod') %} - {# @var mod \App\Entity\Mod\DirectoryMod #} + {% elseif mod is instance_of('\\App\\Mods\\Entity\\Mod\\DirectoryMod') %} + {# @var mod \App\Mods\Entity\Mod\DirectoryMod #} {# Treat Directory mods as Server side mods for BC #} - {% set modType = constant('App\\Entity\\Mod\\Enum\\ModTypeEnum::SERVER_SIDE') %} + {% set modType = constant('App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::SERVER_SIDE') %} {% endif %} {% if modType == modTypeFilter %} diff --git a/templates/dlc/form.html.twig b/templates/mods/dlc/form.html.twig similarity index 79% rename from templates/dlc/form.html.twig rename to templates/mods/dlc/form.html.twig index 06d800c2..859bee25 100644 --- a/templates/dlc/form.html.twig +++ b/templates/mods/dlc/form.html.twig @@ -1,12 +1,12 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% form_theme form _self %} {% block content %} - {# @var dlcFormDto \App\Form\Mod\Dto\DlcFormDto #} + {# @var dlcFormDto \App\Mods\Form\Dlc\Dto\DlcFormDto #} {% set dlcFormDto = form.vars.data %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ dlcFormDto.id ? 'Edit DLC'|trans : 'Create DLC'|trans }} {% endblock %} diff --git a/templates/dlc/list.html.twig b/templates/mods/dlc/list.html.twig similarity index 72% rename from templates/dlc/list.html.twig rename to templates/mods/dlc/list.html.twig index 41360fc8..a926c735 100644 --- a/templates/dlc/list.html.twig +++ b/templates/mods/dlc/list.html.twig @@ -1,19 +1,19 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% block content %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ 'DLCs'|trans }} {% endblock %} {% block page_actions %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::DLC_CREATE').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::DLC_CREATE').value) %} {{ 'Create DLC'|trans }} {% endif %} {% endblock %} {% endembed %} - {% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} + {% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -25,7 +25,7 @@ {% endblock %} {% block table_body %} - {# @var dlc \App\Entity\Dlc\Dlc #} + {# @var dlc \App\Mods\Entity\Dlc\Dlc #} {% for dlc in dlcs %} {{ loop.index }} @@ -33,11 +33,11 @@ {{ tableMacro.row_blamable(dlc.createdAt, dlc.createdBy) }} {{ tableMacro.row_blamable(dlc.lastUpdatedAt, dlc.lastUpdatedBy) }} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::DLC_UPDATE').value, dlc) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::DLC_UPDATE').value, dlc) %} {{ tableMacro.row_action_edit(path('app_dlc_update', { id: dlc.id }), 'Edit DLC'|trans) }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::DLC_DELETE').value, dlc) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::DLC_DELETE').value, dlc) %} {{ tableMacro.row_action_delete(path('app_dlc_delete', { id: dlc.id }), 'Are you sure you want to delete %name%?'|trans({ '%name%': dlc.name }), 'Delete DLC'|trans) }} {% endif %} diff --git a/templates/mod/form.html.twig b/templates/mods/mod/form.html.twig similarity index 81% rename from templates/mod/form.html.twig rename to templates/mods/mod/form.html.twig index 1d4d5eda..602f1062 100644 --- a/templates/mod/form.html.twig +++ b/templates/mods/mod/form.html.twig @@ -1,4 +1,4 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% block javascripts %} {{ parent() }} @@ -6,10 +6,10 @@ {% endblock %} {% block content %} - {# @var modFormDto \App\Form\Mod\Dto\ModFormDto #} + {# @var modFormDto \App\Mods\Form\Mod\Dto\ModFormDto #} {% set modFormDto = form.vars.data %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ modFormDto.id ? 'Edit mod'|trans : 'Create mod'|trans }} {% endblock %} diff --git a/templates/mod/list.html.twig b/templates/mods/mod/list.html.twig similarity index 75% rename from templates/mod/list.html.twig rename to templates/mods/mod/list.html.twig index 49876492..34a1d235 100644 --- a/templates/mod/list.html.twig +++ b/templates/mods/mod/list.html.twig @@ -1,19 +1,19 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% block content %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ 'Mods'|trans }} {% endblock %} {% block page_actions %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_CREATE').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_CREATE').value) %} {{ 'Create mod'|trans }} {% endif %} {% endblock %} {% endembed %} - {% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} + {% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -27,7 +27,7 @@ {% endblock %} {% block table_body %} - {# @var mod \App\Entity\Mod\AbstractMod #} + {# @var mod \App\Mods\Entity\Mod\AbstractMod #} {% for mod in mods %} {{ loop.index }} @@ -41,11 +41,11 @@ {{ tableMacro.row_blamable(mod.lastUpdatedAt, mod.lastUpdatedBy) }} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_UPDATE').value, mod) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_UPDATE').value, mod) %} {{ tableMacro.row_action_edit(path('app_mod_update', { id: mod.id }), 'Edit mod'|trans) }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_DELETE').value, mod) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_DELETE').value, mod) %} {{ tableMacro.row_action_delete(path('app_mod_delete', { id: mod.id }), 'Are you sure you want to delete %name%?'|trans({ '%name%': mod.name }), 'Delete mod'|trans) }} {% endif %} diff --git a/templates/mod_group/form.html.twig b/templates/mods/mod_group/form.html.twig similarity index 72% rename from templates/mod_group/form.html.twig rename to templates/mods/mod_group/form.html.twig index 8e1cf56d..bd4ddb29 100644 --- a/templates/mod_group/form.html.twig +++ b/templates/mods/mod_group/form.html.twig @@ -1,12 +1,12 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% form_theme form _self %} {% block content %} - {# @var modGroupFormDto \App\Form\Mod\Dto\ModGroupFormDto #} + {# @var modGroupFormDto \App\Mods\Form\ModGroup\Dto\ModGroupFormDto #} {% set modGroupFormDto = form.vars.data %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ modGroupFormDto.id ? 'Edit mod group'|trans : 'Create mod group'|trans }} {% endblock %} @@ -23,5 +23,5 @@ {% endblock %} {% block _mod_group_form_mods_row %} - {% include '_partial/mod_tabs/_mod_tabs.html.twig' with { active: 'server-side-mods' } %} + {% include 'mods/_partial/mod_tabs/_mod_tabs.html.twig' with { active: 'server-side-mods' } %} {% endblock %} diff --git a/templates/mod_group/list.html.twig b/templates/mods/mod_group/list.html.twig similarity index 72% rename from templates/mod_group/list.html.twig rename to templates/mods/mod_group/list.html.twig index f8087409..22c5e434 100644 --- a/templates/mod_group/list.html.twig +++ b/templates/mods/mod_group/list.html.twig @@ -1,19 +1,19 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% block content %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ 'Mod groups'|trans }} {% endblock %} {% block page_actions %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_GROUP_CREATE').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_GROUP_CREATE').value) %} {{ 'Create mod group'|trans }} {% endif %} {% endblock %} {% endembed %} - {% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} + {% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -25,7 +25,7 @@ {% endblock %} {% block table_body %} - {# @var modGroup \App\Entity\ModGroup\ModGroup #} + {# @var modGroup \App\Mods\Entity\ModGroup\ModGroup #} {% for modGroup in modGroups %} {{ loop.index }} @@ -33,11 +33,11 @@ {{ tableMacro.row_blamable(modGroup.createdAt, modGroup.createdBy) }} {{ tableMacro.row_blamable(modGroup.lastUpdatedAt, modGroup.lastUpdatedBy) }} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_GROUP_UPDATE').value, modGroup) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_GROUP_UPDATE').value, modGroup) %} {{ tableMacro.row_action_edit(path('app_mod_group_update', { name: modGroup.name }), 'Edit mod group'|trans) }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_GROUP_DELETE').value, modGroup) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_GROUP_DELETE').value, modGroup) %} {{ tableMacro.row_action_delete(path('app_mod_group_delete', { name: modGroup.name }), 'Are you sure you want to delete %name%?'|trans({ '%name%': modGroup.name }), 'Delete mod group'|trans) }} {% endif %} diff --git a/templates/mod_list/form.html.twig b/templates/mods/mod_list/form.html.twig similarity index 66% rename from templates/mod_list/form.html.twig rename to templates/mods/mod_list/form.html.twig index bc8558a0..15ff9a75 100644 --- a/templates/mod_list/form.html.twig +++ b/templates/mods/mod_list/form.html.twig @@ -1,12 +1,12 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% form_theme form _self %} {% block content %} - {# @var modListFormDto \App\Form\Mod\Dto\ModListFormDto #} + {# @var modListFormDto \App\Mods\Form\ModList\Dto\ModListFormDto #} {% set modListFormDto = form.vars.data %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ modListFormDto.id ? 'Edit mod list'|trans : 'Create mod list'|trans }} {% endblock %} @@ -26,10 +26,10 @@ {{ form_row(form.approved) }} {% endif %} - {% embed '_partial/mod_tabs/_mod_tabs.html.twig' %} + {% embed 'mods/_partial/mod_tabs/_mod_tabs.html.twig' %} {% block nav %} - {% include '_partial/mod_group_tabs/_mod_group_tabs_nav.html.twig' with { active: 'mod-groups' } %} - {% include '_partial/dlc_tabs/_dlc_tabs_nav.html.twig' %} + {% include 'mods/_partial/mod_group_tabs/_mod_group_tabs_nav.html.twig' with { active: 'mod-groups' } %} + {% include 'mods/_partial/dlc_tabs/_dlc_tabs_nav.html.twig' %} {{ parent() }} {% endblock %} @@ -48,13 +48,13 @@ {% endblock %} {% block _mod_list_form_modGroups_row %} - {% include '_partial/mod_group_tabs/_mod_group_tabs_content.html.twig' with { active: 'mod-groups' } %} + {% include 'mods/_partial/mod_group_tabs/_mod_group_tabs_content.html.twig' with { active: 'mod-groups' } %} {% endblock %} {% block _mod_list_form_dlcs_row %} - {% include '_partial/dlc_tabs/_dlc_tabs_content.html.twig' %} + {% include 'mods/_partial/dlc_tabs/_dlc_tabs_content.html.twig' %} {% endblock %} {% block _mod_list_form_mods_row %} - {% include '_partial/mod_tabs/_mod_tabs_content.html.twig' %} + {% include 'mods/_partial/mod_tabs/_mod_tabs_content.html.twig' %} {% endblock %} diff --git a/templates/mod_list/list.html.twig b/templates/mods/mod_list/list.html.twig similarity index 76% rename from templates/mod_list/list.html.twig rename to templates/mods/mod_list/list.html.twig index 295b4759..3d04b378 100644 --- a/templates/mod_list/list.html.twig +++ b/templates/mods/mod_list/list.html.twig @@ -1,20 +1,20 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% block content %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ 'Mod lists'|trans }} {% endblock %} {% block page_actions %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_LIST_CREATE').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_LIST_CREATE').value) %} {{ 'Create mod list'|trans }} {% endif %} {% endblock %} {% endembed %} - {% embed '_partial/_table.html.twig' %} - {% import '_macro/common_macro.html.twig' as commonMacro %} - {% import '_macro/table_macro.html.twig' as tableMacro %} + {% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/common_macro.html.twig' as commonMacro %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -29,7 +29,7 @@ {% endblock %} {% block table_body %} - {# @var modList \App\Entity\ModList\ModList #} + {# @var modList \App\Mods\Entity\ModList\ModList #} {% for modList in modLists %} {{ loop.index }} @@ -41,7 +41,7 @@ {{ tableMacro.row_name_with_description(modList.name, modList.description) }} - {# @var dlc \App\Entity\Dlc\Dlc #} + {# @var dlc \App\Mods\Entity\Dlc\Dlc #} {% for dlc in modList.dlcs %} {{ commonMacro.dlc_icon(dlc) }} {% endfor %} @@ -55,15 +55,15 @@ {{ tableMacro.row_action(path('app_mod_list_public_customize', { name: modList.name }), 'fas fa-download', 'Download mod list'|trans) }} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_LIST_UPDATE').value, modList) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_LIST_UPDATE').value, modList) %} {{ tableMacro.row_action_edit(path('app_mod_list_update', { name: modList.name }), 'Edit mod list'|trans) }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_LIST_COPY').value, modList) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_LIST_COPY').value, modList) %} {{ tableMacro.row_action(path('app_mod_list_copy', { name: modList.name }), 'fas fa-copy', 'Copy and edit mod list'|trans) }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_LIST_DELETE').value, modList) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_LIST_DELETE').value, modList) %} {{ tableMacro.row_action_delete(path('app_mod_list_delete', { name: modList.name }), 'Are you sure you want to delete %name%?'|trans({ '%name%': modList.name }), 'Delete mod list'|trans) }} {% endif %} diff --git a/templates/mod_list_public/_partial/_description.html.twig b/templates/mods/mod_list_public/_partial/_description.html.twig similarity index 100% rename from templates/mod_list_public/_partial/_description.html.twig rename to templates/mods/mod_list_public/_partial/_description.html.twig diff --git a/templates/mod_list_public/_partial/_optional_mods_tab.html.twig b/templates/mods/mod_list_public/_partial/_optional_mods_tab.html.twig similarity index 87% rename from templates/mod_list_public/_partial/_optional_mods_tab.html.twig rename to templates/mods/mod_list_public/_partial/_optional_mods_tab.html.twig index 5fdee2bb..9e9471bb 100644 --- a/templates/mod_list_public/_partial/_optional_mods_tab.html.twig +++ b/templates/mods/mod_list_public/_partial/_optional_mods_tab.html.twig @@ -1,6 +1,6 @@
- {% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} + {% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -15,9 +15,9 @@ {% block table_body %} {% set rowNo = 1 %} - {# @var mod \App\Entity\Mod\SteamWorkshopMod #} + {# @var mod \App\Mods\Entity\Mod\SteamWorkshopMod #} {% for mod in optionalMods %} - {% if mod.status is null or mod.status is not constant('App\\Entity\\Mod\\Enum\\ModStatusEnum::DISABLED') %} + {% if mod.status is null or mod.status is not constant('App\\Mods\\Entity\\Mod\\Enum\\ModStatusEnum::DISABLED') %} {{ rowNo }} {{ tableMacro.row_mod_status_icon(mod) }} diff --git a/templates/mod_list_public/_partial/_required_mods_tab.html.twig b/templates/mods/mod_list_public/_partial/_required_mods_tab.html.twig similarity index 80% rename from templates/mod_list_public/_partial/_required_mods_tab.html.twig rename to templates/mods/mod_list_public/_partial/_required_mods_tab.html.twig index 4f49f5cc..f85e3115 100644 --- a/templates/mod_list_public/_partial/_required_mods_tab.html.twig +++ b/templates/mods/mod_list_public/_partial/_required_mods_tab.html.twig @@ -1,6 +1,6 @@
- {% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} + {% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -13,9 +13,9 @@ {% block table_body %} {% set rowNo = 1 %} - {# @var mod \App\Entity\Mod\SteamWorkshopMod #} + {# @var mod \App\Mods\Entity\Mod\SteamWorkshopMod #} {% for mod in requiredMods %} - {% if mod.status is null or mod.status is not constant('App\\Entity\\Mod\\Enum\\ModStatusEnum::DISABLED') %} + {% if mod.status is null or mod.status is not constant('App\\Mods\\Entity\\Mod\\Enum\\ModStatusEnum::DISABLED') %} {{ rowNo }} {{ tableMacro.row_mod_status_icon(mod) }} diff --git a/templates/mod_list_public/customize.html.twig b/templates/mods/mod_list_public/customize.html.twig similarity index 81% rename from templates/mod_list_public/customize.html.twig rename to templates/mods/mod_list_public/customize.html.twig index 5d24d381..d74f2be3 100644 --- a/templates/mod_list_public/customize.html.twig +++ b/templates/mods/mod_list_public/customize.html.twig @@ -1,7 +1,7 @@ {% set title = modList.name %} -{%- set description = description ?? include('mod_list_public/_partial/_description.html.twig')|striptags -%} +{%- set description = description ?? include('mods/mod_list_public/_partial/_description.html.twig')|striptags -%} -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% block javascripts %} {{ parent() }} @@ -9,8 +9,8 @@ {% endblock %} {% block content %} - {% embed '_partial/_page_header.html.twig' %} - {% import '_macro/common_macro.html.twig' as commonMacro %} + {% embed 'shared/_partial/_page_header.html.twig' %} + {% import 'shared/_macro/common_macro.html.twig' as commonMacro %} {% block page_title %} {{ modList.name }} @@ -54,8 +54,8 @@
- {% include 'mod_list_public/_partial/_optional_mods_tab.html.twig' %} - {% include 'mod_list_public/_partial/_required_mods_tab.html.twig' %} + {% include 'mods/mod_list_public/_partial/_optional_mods_tab.html.twig' %} + {% include 'mods/mod_list_public/_partial/_required_mods_tab.html.twig' %}
diff --git a/templates/mod_list_public/launcher_preset_template.html.twig b/templates/mods/mod_list_public/launcher_preset_template.html.twig similarity index 89% rename from templates/mod_list_public/launcher_preset_template.html.twig rename to templates/mods/mod_list_public/launcher_preset_template.html.twig index 17a6a61c..f0d11bbe 100644 --- a/templates/mod_list_public/launcher_preset_template.html.twig +++ b/templates/mods/mod_list_public/launcher_preset_template.html.twig @@ -85,7 +85,7 @@

- {# @var dlc \App\Entity\Dlc\Dlc #} + {# @var dlc \App\Mods\Entity\Dlc\Dlc #} {% for dlc in modList.dlcs %} @@ -98,14 +98,14 @@
{{ dlc.name }}
- {# @var mod \App\Entity\Mod\SteamWorkshopMod #} + {# @var mod \App\Mods\Entity\Mod\SteamWorkshopMod #} {% for mod in mods %} {% set isModSelected = (mod.id.toString in optionalMods|keys and optionalMods[mod.id.toString] == true) %} - {% set isModStatusNotDisabled = (mod.status is null or mod.status is not constant('App\\Entity\\Mod\\Enum\\ModStatusEnum::DISABLED')) %} - {% set isModTypeRequired = mod.type is constant('App\\Entity\\Mod\\Enum\\ModTypeEnum::REQUIRED') %} + {% set isModStatusNotDisabled = (mod.status is null or mod.status is not constant('App\\Mods\\Entity\\Mod\\Enum\\ModStatusEnum::DISABLED')) %} + {% set isModTypeRequired = mod.type is constant('App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::REQUIRED') %} {% set isModUserSelectable = mod.type in [ - constant('\\App\\Entity\\Mod\\Enum\\ModTypeEnum::OPTIONAL'), - constant('\\App\\Entity\\Mod\\Enum\\ModTypeEnum::CLIENT_SIDE') + constant('\\App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::OPTIONAL'), + constant('\\App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::CLIENT_SIDE') ] %} {% if isModStatusNotDisabled and (isModTypeRequired or (isModUserSelectable and isModSelected)) %} diff --git a/templates/mod_list_public/select.html.twig b/templates/mods/mod_list_public/select.html.twig similarity index 83% rename from templates/mod_list_public/select.html.twig rename to templates/mods/mod_list_public/select.html.twig index 13426ad2..bb1a4554 100644 --- a/templates/mod_list_public/select.html.twig +++ b/templates/mods/mod_list_public/select.html.twig @@ -1,9 +1,9 @@ -{% extends 'container.html.twig' %} +{% extends 'shared/container.html.twig' %} {% block content %} {% if nextMission %}
- {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ 'Today\'s mission'|trans }}: {{ nextMission.title }} {% endblock %} @@ -26,15 +26,15 @@ {% endif %}
- {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ 'Mod lists'|trans }} {% endblock %} {% endembed %} - {% embed '_partial/_table.html.twig' %} - {% import '_macro/common_macro.html.twig' as commonMacro %} - {% import '_macro/table_macro.html.twig' as tableMacro %} + {% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/common_macro.html.twig' as commonMacro %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %}
@@ -46,7 +46,7 @@ {% endblock %} {% block table_body %} - {# @var modList \App\Entity\ModList\ModList #} + {# @var modList \App\Mods\Entity\ModList\ModList #} {% for modList in modLists %} @@ -58,7 +58,7 @@ @@ -22,7 +22,7 @@ {% endblock %} {% block table_body %} - {# @var user \App\Entity\User\User #} + {# @var user \App\Users\Entity\User\User #} {% for user in users %} @@ -38,11 +38,11 @@ diff --git a/templates/user_group/_partial/_users_table.html.twig b/templates/users/user_group/_partial/_users_table.html.twig similarity index 88% rename from templates/user_group/_partial/_users_table.html.twig rename to templates/users/user_group/_partial/_users_table.html.twig index 7492f96c..45ee57ca 100644 --- a/templates/user_group/_partial/_users_table.html.twig +++ b/templates/users/user_group/_partial/_users_table.html.twig @@ -1,5 +1,5 @@ -{% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} +{% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %} @@ -15,7 +15,7 @@ {% block table_body %} {% set rowNo = 1 %} - {# @var user \App\Entity\User\User #} + {# @var user \App\Users\Entity\User\User #} {% for child in form.children %} {% set user = form.vars.choices[loop.index0].data %} diff --git a/templates/user_group/_partial/combo_tabs/_combo_tabs.html.twig b/templates/users/user_group/_partial/combo_tabs/_combo_tabs.html.twig similarity index 61% rename from templates/user_group/_partial/combo_tabs/_combo_tabs.html.twig rename to templates/users/user_group/_partial/combo_tabs/_combo_tabs.html.twig index b4f1d698..3fff77b5 100644 --- a/templates/user_group/_partial/combo_tabs/_combo_tabs.html.twig +++ b/templates/users/user_group/_partial/combo_tabs/_combo_tabs.html.twig @@ -2,12 +2,12 @@
    {% block nav %} - {% include 'user_group/_partial/combo_tabs/_combo_tabs_nav.html.twig' %} + {% include 'users/user_group/_partial/combo_tabs/_combo_tabs_nav.html.twig' %} {% endblock %}
{% block tab_content %} - {% include 'user_group/_partial/combo_tabs/_combo_tabs_content.html.twig' %} + {% include 'users/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig' %} {% endblock %}
diff --git a/templates/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig b/templates/users/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig similarity index 60% rename from templates/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig rename to templates/users/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig index 2d5fb01a..b6eb78a6 100644 --- a/templates/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig +++ b/templates/users/user_group/_partial/combo_tabs/_combo_tabs_content.html.twig @@ -1,4 +1,4 @@ -{% import '_macro/tab_macro.html.twig' as tabMacro %} +{% import 'shared/_macro/tab_macro.html.twig' as tabMacro %} {% set active = active|default('') %} @@ -7,5 +7,5 @@
- {{ include ('_partial/permissions/form.html.twig', { form: form.permissions, title: 'User group permissions'|trans }) }} + {{ include ('users/_partial/permissions/form.html.twig', { form: form.permissions, title: 'User group permissions'|trans }) }}
diff --git a/templates/user_group/_partial/combo_tabs/_combo_tabs_nav.html.twig b/templates/users/user_group/_partial/combo_tabs/_combo_tabs_nav.html.twig similarity index 86% rename from templates/user_group/_partial/combo_tabs/_combo_tabs_nav.html.twig rename to templates/users/user_group/_partial/combo_tabs/_combo_tabs_nav.html.twig index 876a7eaa..dfed293e 100644 --- a/templates/user_group/_partial/combo_tabs/_combo_tabs_nav.html.twig +++ b/templates/users/user_group/_partial/combo_tabs/_combo_tabs_nav.html.twig @@ -1,4 +1,4 @@ -{% import '_macro/tab_macro.html.twig' as tabMacro %} +{% import 'shared/_macro/tab_macro.html.twig' as tabMacro %} {% set active = active|default('') %} diff --git a/templates/user_group/form.html.twig b/templates/users/user_group/form.html.twig similarity index 68% rename from templates/user_group/form.html.twig rename to templates/users/user_group/form.html.twig index c72d0918..e06afd42 100644 --- a/templates/user_group/form.html.twig +++ b/templates/users/user_group/form.html.twig @@ -1,12 +1,12 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% form_theme form _self %} {% block content %} - {# @var userGroupFormDto \App\Form\UserGroup\Dto\UserGroupFormDto #} + {# @var userGroupFormDto \App\Users\Form\UserGroup\Dto\UserGroupFormDto #} {% set userGroupFormDto = form.vars.data %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ userGroupFormDto.id ? 'Edit user group'|trans : 'Create user group'|trans }} {% endblock %} @@ -16,7 +16,7 @@ {{ form_row(form.name) }} {{ form_row(form.description) }} - {% include 'user_group/_partial/combo_tabs/_combo_tabs.html.twig' with { active: 'users' } %} + {% include 'users/user_group/_partial/combo_tabs/_combo_tabs.html.twig' with { active: 'users' } %}
@@ -26,5 +26,5 @@ {% endblock %} {% block _user_group_form_users_row %} - {% include 'user_group/_partial/_users_table.html.twig' %} + {% include 'users/user_group/_partial/_users_table.html.twig' %} {% endblock %} diff --git a/templates/user_group/list.html.twig b/templates/users/user_group/list.html.twig similarity index 72% rename from templates/user_group/list.html.twig rename to templates/users/user_group/list.html.twig index 26f2e612..091db59d 100644 --- a/templates/user_group/list.html.twig +++ b/templates/users/user_group/list.html.twig @@ -1,19 +1,19 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% block content %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ 'User groups'|trans }} {% endblock %} {% block page_actions %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::USER_GROUP_CREATE').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::USER_GROUP_CREATE').value) %} {{ 'Create user group'|trans }} {% endif %} {% endblock %} {% endembed %} - {% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} + {% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %}
@@ -25,7 +25,7 @@ {% endblock %} {% block table_body %} - {# @var userGroup \App\Entity\UserGroup\UserGroup #} + {# @var userGroup \App\Users\Entity\UserGroup\UserGroup #} {% for userGroup in userGroups %} @@ -33,11 +33,11 @@ diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php index a242d049..c0d9d9b8 100644 --- a/tests/_support/FunctionalTester.php +++ b/tests/_support/FunctionalTester.php @@ -4,7 +4,7 @@ namespace App\Tests; -use App\Test\Traits\TimeTrait; +use App\Shared\Test\Traits\TimeTrait; use App\Tests\Traits\CommonPageAssertsTrait; use App\Tests\Traits\DataTableAssertsTrait; use App\Tests\Traits\ResponseAssertTrait; diff --git a/tests/_support/Traits/ResponseAssertTrait.php b/tests/_support/Traits/ResponseAssertTrait.php index c52748d3..e25db36a 100644 --- a/tests/_support/Traits/ResponseAssertTrait.php +++ b/tests/_support/Traits/ResponseAssertTrait.php @@ -4,8 +4,8 @@ namespace App\Tests\Traits; -use App\Entity\Dlc\Dlc; -use App\Entity\Mod\SteamWorkshopMod; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Entity\Mod\SteamWorkshopMod; use Symfony\Component\DomCrawler\Crawler; trait ResponseAssertTrait diff --git a/tests/_support/Traits/SecurityAssertsTrait.php b/tests/_support/Traits/SecurityAssertsTrait.php index 42ab4866..d3cd5f51 100644 --- a/tests/_support/Traits/SecurityAssertsTrait.php +++ b/tests/_support/Traits/SecurityAssertsTrait.php @@ -4,7 +4,7 @@ namespace App\Tests\Traits; -use App\Entity\User\User; +use App\Users\Entity\User\User; trait SecurityAssertsTrait { diff --git a/tests/functional/Api/Attendance/CreateAttendanceCest.php b/tests/functional/Attendances/Api/Attendance/CreateAttendanceCest.php similarity index 96% rename from tests/functional/Api/Attendance/CreateAttendanceCest.php rename to tests/functional/Attendances/Api/Attendance/CreateAttendanceCest.php index a1a52bc1..bc89a642 100644 --- a/tests/functional/Api/Attendance/CreateAttendanceCest.php +++ b/tests/functional/Attendances/Api/Attendance/CreateAttendanceCest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Functional\Api\Attendance; +namespace App\Tests\Functional\Attendances\Api\Attendance; -use App\Entity\Attendance\Attendance; -use App\Service\IdentifierFactory\IdentifierFactoryStub; +use App\Attendances\Entity\Attendance\Attendance; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryStub; use App\Tests\FunctionalTester; use Codeception\Util\HttpCode; use Ramsey\Uuid\Uuid; diff --git a/tests/functional/Api/Attendance/ListAttendancesCest.php b/tests/functional/Attendances/Api/Attendance/ListAttendancesCest.php similarity index 98% rename from tests/functional/Api/Attendance/ListAttendancesCest.php rename to tests/functional/Attendances/Api/Attendance/ListAttendancesCest.php index a089bc44..064f4acd 100644 --- a/tests/functional/Api/Attendance/ListAttendancesCest.php +++ b/tests/functional/Attendances/Api/Attendance/ListAttendancesCest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Tests\Functional\Api\Attendance; +namespace App\Tests\Functional\Attendances\Api\Attendance; use App\Tests\FunctionalTester; use Codeception\Util\HttpCode; diff --git a/tests/functional/Api/ModList/GetModListsByIdCest.php b/tests/functional/Mods/Api/ModList/GetModListsByIdCest.php similarity index 99% rename from tests/functional/Api/ModList/GetModListsByIdCest.php rename to tests/functional/Mods/Api/ModList/GetModListsByIdCest.php index 634bf601..b4102971 100644 --- a/tests/functional/Api/ModList/GetModListsByIdCest.php +++ b/tests/functional/Mods/Api/ModList/GetModListsByIdCest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Functional\Api\ModList; +namespace App\Tests\Functional\Mods\Api\ModList; -use App\DataFixtures\ModList\DefaultModListFixture; +use App\Mods\DataFixtures\ModList\DefaultModListFixture; use App\Tests\FunctionalTester; use Codeception\Util\HttpCode; diff --git a/tests/functional/Api/ModList/GetModListsByNameCest.php b/tests/functional/Mods/Api/ModList/GetModListsByNameCest.php similarity index 99% rename from tests/functional/Api/ModList/GetModListsByNameCest.php rename to tests/functional/Mods/Api/ModList/GetModListsByNameCest.php index 3fd23115..9d64c5fd 100644 --- a/tests/functional/Api/ModList/GetModListsByNameCest.php +++ b/tests/functional/Mods/Api/ModList/GetModListsByNameCest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Functional\Api\ModList; +namespace App\Tests\Functional\Mods\Api\ModList; -use App\DataFixtures\ModList\DefaultModListFixture; +use App\Mods\DataFixtures\ModList\DefaultModListFixture; use App\Tests\FunctionalTester; use Codeception\Util\HttpCode; diff --git a/tests/functional/Api/ModList/ListModListsCest.php b/tests/functional/Mods/Api/ModList/ListModListsCest.php similarity index 98% rename from tests/functional/Api/ModList/ListModListsCest.php rename to tests/functional/Mods/Api/ModList/ListModListsCest.php index bc3c1ec2..b79a9cce 100644 --- a/tests/functional/Api/ModList/ListModListsCest.php +++ b/tests/functional/Mods/Api/ModList/ListModListsCest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace App\Tests\Functional\Api\ModList; +namespace App\Tests\Functional\Mods\Api\ModList; use App\Tests\FunctionalTester; use Codeception\Util\HttpCode; diff --git a/tests/functional/Web/Dlc/CreateDlcCest.php b/tests/functional/Mods/Web/Dlc/CreateDlcCest.php similarity index 97% rename from tests/functional/Web/Dlc/CreateDlcCest.php rename to tests/functional/Mods/Web/Dlc/CreateDlcCest.php index 134aacec..b063a3f6 100644 --- a/tests/functional/Web/Dlc/CreateDlcCest.php +++ b/tests/functional/Mods/Web/Dlc/CreateDlcCest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Dlc; +namespace App\Tests\Functional\Mods\Web\Dlc; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Dlc\Dlc; -use App\Entity\User\User; -use App\Service\IdentifierFactory\IdentifierFactoryStub; -use App\Service\SteamApiClient\Helper\SteamHelper; +use App\Mods\Entity\Dlc\Dlc; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryStub; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; use Ramsey\Uuid\Uuid; diff --git a/tests/functional/Web/Dlc/DeleteDlcCest.php b/tests/functional/Mods/Web/Dlc/DeleteDlcCest.php similarity index 89% rename from tests/functional/Web/Dlc/DeleteDlcCest.php rename to tests/functional/Mods/Web/Dlc/DeleteDlcCest.php index d9ad29c3..c8698c6d 100644 --- a/tests/functional/Web/Dlc/DeleteDlcCest.php +++ b/tests/functional/Mods/Web/Dlc/DeleteDlcCest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Dlc; +namespace App\Tests\Functional\Mods\Web\Dlc; -use App\DataFixtures\Dlc\SogPrairieFireDlcFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Dlc\Dlc; -use App\Entity\User\User; +use App\Mods\DataFixtures\Dlc\SogPrairieFireDlcFixture; +use App\Mods\Entity\Dlc\Dlc; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class DeleteDlcCest diff --git a/tests/functional/Web/Dlc/ListDlcsCest.php b/tests/functional/Mods/Web/Dlc/ListDlcsCest.php similarity index 95% rename from tests/functional/Web/Dlc/ListDlcsCest.php rename to tests/functional/Mods/Web/Dlc/ListDlcsCest.php index 736a50b9..200eec20 100644 --- a/tests/functional/Web/Dlc/ListDlcsCest.php +++ b/tests/functional/Mods/Web/Dlc/ListDlcsCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Dlc; +namespace App\Tests\Functional\Mods\Web\Dlc; -use App\DataFixtures\User\User1Fixture; -use App\Entity\User\User; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class ListDlcsCest diff --git a/tests/functional/Web/Dlc/UpdateDlcCest.php b/tests/functional/Mods/Web/Dlc/UpdateDlcCest.php similarity index 96% rename from tests/functional/Web/Dlc/UpdateDlcCest.php rename to tests/functional/Mods/Web/Dlc/UpdateDlcCest.php index b5e236ef..6812773a 100644 --- a/tests/functional/Web/Dlc/UpdateDlcCest.php +++ b/tests/functional/Mods/Web/Dlc/UpdateDlcCest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Dlc; - -use App\DataFixtures\Dlc\CslaIronCurtainDlcFixture; -use App\DataFixtures\Dlc\SogPrairieFireDlcFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Dlc\Dlc; -use App\Entity\User\User; -use App\Service\SteamApiClient\Helper\SteamHelper; +namespace App\Tests\Functional\Mods\Web\Dlc; + +use App\Mods\DataFixtures\Dlc\CslaIronCurtainDlcFixture; +use App\Mods\DataFixtures\Dlc\SogPrairieFireDlcFixture; +use App\Mods\Entity\Dlc\Dlc; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class UpdateDlcCest diff --git a/tests/functional/Web/Mod/CreateDirectoryModCest.php b/tests/functional/Mods/Web/Mod/CreateDirectoryModCest.php similarity index 95% rename from tests/functional/Web/Mod/CreateDirectoryModCest.php rename to tests/functional/Mods/Web/Mod/CreateDirectoryModCest.php index 858854de..c81d1198 100644 --- a/tests/functional/Web/Mod/CreateDirectoryModCest.php +++ b/tests/functional/Mods/Web/Mod/CreateDirectoryModCest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Mod; - -use App\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Mod\DirectoryMod; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\User\User; -use App\Service\IdentifierFactory\IdentifierFactoryStub; +namespace App\Tests\Functional\Mods\Web\Mod; + +use App\Mods\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; +use App\Mods\Entity\Mod\DirectoryMod; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryStub; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; use Ramsey\Uuid\Uuid; diff --git a/tests/functional/Web/Mod/CreateSteamWorkshopModCest.php b/tests/functional/Mods/Web/Mod/CreateSteamWorkshopModCest.php similarity index 95% rename from tests/functional/Web/Mod/CreateSteamWorkshopModCest.php rename to tests/functional/Mods/Web/Mod/CreateSteamWorkshopModCest.php index 9d336a77..dcb621a1 100644 --- a/tests/functional/Web/Mod/CreateSteamWorkshopModCest.php +++ b/tests/functional/Mods/Web/Mod/CreateSteamWorkshopModCest.php @@ -2,17 +2,17 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Mod; - -use App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Entity\User\User; -use App\Service\IdentifierFactory\IdentifierFactoryStub; -use App\Service\SteamApiClient\Helper\SteamHelper; +namespace App\Tests\Functional\Mods\Web\Mod; + +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryStub; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; use Ramsey\Uuid\Uuid; diff --git a/tests/functional/Web/Mod/DeleteModCest.php b/tests/functional/Mods/Web/Mod/DeleteModCest.php similarity index 88% rename from tests/functional/Web/Mod/DeleteModCest.php rename to tests/functional/Mods/Web/Mod/DeleteModCest.php index 5b3b954d..ac08d4df 100644 --- a/tests/functional/Web/Mod/DeleteModCest.php +++ b/tests/functional/Mods/Web/Mod/DeleteModCest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Mod; +namespace App\Tests\Functional\Mods\Web\Mod; -use App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Mod\AbstractMod; -use App\Entity\User\User; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; +use App\Mods\Entity\Mod\AbstractMod; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class DeleteModCest diff --git a/tests/functional/Web/Mod/ListModsCest.php b/tests/functional/Mods/Web/Mod/ListModsCest.php similarity index 95% rename from tests/functional/Web/Mod/ListModsCest.php rename to tests/functional/Mods/Web/Mod/ListModsCest.php index 4e4b1ff2..ef4c6bbd 100644 --- a/tests/functional/Web/Mod/ListModsCest.php +++ b/tests/functional/Mods/Web/Mod/ListModsCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Mod; +namespace App\Tests\Functional\Mods\Web\Mod; -use App\DataFixtures\User\User1Fixture; -use App\Entity\User\User; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class ListModsCest diff --git a/tests/functional/Web/Mod/UpdateDirectoryModCest.php b/tests/functional/Mods/Web/Mod/UpdateDirectoryModCest.php similarity index 95% rename from tests/functional/Web/Mod/UpdateDirectoryModCest.php rename to tests/functional/Mods/Web/Mod/UpdateDirectoryModCest.php index 12871803..fc9b8a15 100644 --- a/tests/functional/Web/Mod/UpdateDirectoryModCest.php +++ b/tests/functional/Mods/Web/Mod/UpdateDirectoryModCest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Mod; - -use App\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; -use App\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Mod\DirectoryMod; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\User\User; +namespace App\Tests\Functional\Mods\Web\Mod; + +use App\Mods\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; +use App\Mods\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; +use App\Mods\Entity\Mod\DirectoryMod; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class UpdateDirectoryModCest diff --git a/tests/functional/Web/Mod/UpdateSteamWorkshopModCest.php b/tests/functional/Mods/Web/Mod/UpdateSteamWorkshopModCest.php similarity index 95% rename from tests/functional/Web/Mod/UpdateSteamWorkshopModCest.php rename to tests/functional/Mods/Web/Mod/UpdateSteamWorkshopModCest.php index 116996ac..cb4c44f5 100644 --- a/tests/functional/Web/Mod/UpdateSteamWorkshopModCest.php +++ b/tests/functional/Mods/Web/Mod/UpdateSteamWorkshopModCest.php @@ -2,17 +2,17 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Mod; - -use App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Mod\Enum\ModStatusEnum; -use App\Entity\Mod\Enum\ModTypeEnum; -use App\Entity\Mod\SteamWorkshopMod; -use App\Entity\User\User; -use App\Service\SteamApiClient\Helper\SteamHelper; +namespace App\Tests\Functional\Mods\Web\Mod; + +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; +use App\Mods\Entity\Mod\Enum\ModStatusEnum; +use App\Mods\Entity\Mod\Enum\ModTypeEnum; +use App\Mods\Entity\Mod\SteamWorkshopMod; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class UpdateSteamWorkshopModCest diff --git a/tests/functional/Web/ModGroup/CreateModGroupCest.php b/tests/functional/Mods/Web/ModGroup/CreateModGroupCest.php similarity index 91% rename from tests/functional/Web/ModGroup/CreateModGroupCest.php rename to tests/functional/Mods/Web/ModGroup/CreateModGroupCest.php index 8c4a45b0..b5405248 100644 --- a/tests/functional/Web/ModGroup/CreateModGroupCest.php +++ b/tests/functional/Mods/Web/ModGroup/CreateModGroupCest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModGroup; - -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Mod\AbstractMod; -use App\Entity\ModGroup\ModGroup; -use App\Entity\User\User; -use App\Service\IdentifierFactory\IdentifierFactoryStub; +namespace App\Tests\Functional\Mods\Web\ModGroup; + +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryStub; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; use Ramsey\Uuid\Uuid; diff --git a/tests/functional/Web/ModGroup/DeleteModGroupCest.php b/tests/functional/Mods/Web/ModGroup/DeleteModGroupCest.php similarity index 88% rename from tests/functional/Web/ModGroup/DeleteModGroupCest.php rename to tests/functional/Mods/Web/ModGroup/DeleteModGroupCest.php index 1adc4938..4c003388 100644 --- a/tests/functional/Web/ModGroup/DeleteModGroupCest.php +++ b/tests/functional/Mods/Web/ModGroup/DeleteModGroupCest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModGroup; +namespace App\Tests\Functional\Mods\Web\ModGroup; -use App\DataFixtures\ModGroup\CupModGroupFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\ModGroup\ModGroup; -use App\Entity\User\User; +use App\Mods\DataFixtures\ModGroup\CupModGroupFixture; +use App\Mods\Entity\ModGroup\ModGroup; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class DeleteModGroupCest diff --git a/tests/functional/Web/ModGroup/ListModGroupsCest.php b/tests/functional/Mods/Web/ModGroup/ListModGroupsCest.php similarity index 95% rename from tests/functional/Web/ModGroup/ListModGroupsCest.php rename to tests/functional/Mods/Web/ModGroup/ListModGroupsCest.php index 15bbf8ed..50714476 100644 --- a/tests/functional/Web/ModGroup/ListModGroupsCest.php +++ b/tests/functional/Mods/Web/ModGroup/ListModGroupsCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModGroup; +namespace App\Tests\Functional\Mods\Web\ModGroup; -use App\DataFixtures\User\User1Fixture; -use App\Entity\User\User; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class ListModGroupsCest diff --git a/tests/functional/Web/ModGroup/UpdateModGroupCest.php b/tests/functional/Mods/Web/ModGroup/UpdateModGroupCest.php similarity index 89% rename from tests/functional/Web/ModGroup/UpdateModGroupCest.php rename to tests/functional/Mods/Web/ModGroup/UpdateModGroupCest.php index bc37bf9d..e9e98b83 100644 --- a/tests/functional/Web/ModGroup/UpdateModGroupCest.php +++ b/tests/functional/Mods/Web/ModGroup/UpdateModGroupCest.php @@ -2,19 +2,19 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModGroup; - -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsGrefModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsUsafModFixture; -use App\DataFixtures\ModGroup\RhsModGroupFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Mod\AbstractMod; -use App\Entity\ModGroup\ModGroup; -use App\Entity\User\User; +namespace App\Tests\Functional\Mods\Web\ModGroup; + +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsGrefModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsUsafModFixture; +use App\Mods\DataFixtures\ModGroup\RhsModGroupFixture; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\ModGroup\ModGroup; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class UpdateModGroupCest diff --git a/tests/functional/Web/ModList/CopyModListCest.php b/tests/functional/Mods/Web/ModList/CopyModListCest.php similarity index 91% rename from tests/functional/Web/ModList/CopyModListCest.php rename to tests/functional/Mods/Web/ModList/CopyModListCest.php index 66a97bb6..f057e7eb 100644 --- a/tests/functional/Web/ModList/CopyModListCest.php +++ b/tests/functional/Mods/Web/ModList/CopyModListCest.php @@ -2,30 +2,30 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModList; - -use App\DataFixtures\Dlc\CslaIronCurtainDlcFixture; -use App\DataFixtures\Dlc\SogPrairieFireDlcFixture; -use App\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; -use App\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; -use App\DataFixtures\ModGroup\CupModGroupFixture; -use App\DataFixtures\ModGroup\RhsModGroupFixture; -use App\DataFixtures\ModList\DefaultModListFixture; -use App\DataFixtures\ModList\RhsModListFixture; -use App\DataFixtures\User\User1Fixture; -use App\DataFixtures\User\User3Fixture; -use App\Entity\Dlc\Dlc; -use App\Entity\Mod\AbstractMod; -use App\Entity\ModGroup\ModGroup; -use App\Entity\ModList\ModList; -use App\Entity\User\User; -use App\Service\IdentifierFactory\IdentifierFactoryStub; +namespace App\Tests\Functional\Mods\Web\ModList; + +use App\Mods\DataFixtures\Dlc\CslaIronCurtainDlcFixture; +use App\Mods\DataFixtures\Dlc\SogPrairieFireDlcFixture; +use App\Mods\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; +use App\Mods\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; +use App\Mods\DataFixtures\ModGroup\CupModGroupFixture; +use App\Mods\DataFixtures\ModGroup\RhsModGroupFixture; +use App\Mods\DataFixtures\ModList\DefaultModListFixture; +use App\Mods\DataFixtures\ModList\RhsModListFixture; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryStub; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\DataFixtures\User\User3Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; use Ramsey\Uuid\Uuid; diff --git a/tests/functional/Web/ModList/CreateModListCest.php b/tests/functional/Mods/Web/ModList/CreateModListCest.php similarity index 94% rename from tests/functional/Web/ModList/CreateModListCest.php rename to tests/functional/Mods/Web/ModList/CreateModListCest.php index 312d802f..b220f79b 100644 --- a/tests/functional/Web/ModList/CreateModListCest.php +++ b/tests/functional/Mods/Web/ModList/CreateModListCest.php @@ -2,21 +2,21 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModList; - -use App\DataFixtures\Dlc\CslaIronCurtainDlcFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; -use App\DataFixtures\ModGroup\CupModGroupFixture; -use App\DataFixtures\ModList\DefaultModListFixture; -use App\DataFixtures\User\User1Fixture; -use App\DataFixtures\User\User2Fixture; -use App\Entity\Dlc\Dlc; -use App\Entity\Mod\AbstractMod; -use App\Entity\ModGroup\ModGroup; -use App\Entity\ModList\ModList; -use App\Entity\User\User; -use App\Service\IdentifierFactory\IdentifierFactoryStub; +namespace App\Tests\Functional\Mods\Web\ModList; + +use App\Mods\DataFixtures\Dlc\CslaIronCurtainDlcFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; +use App\Mods\DataFixtures\ModGroup\CupModGroupFixture; +use App\Mods\DataFixtures\ModList\DefaultModListFixture; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Entity\ModList\ModList; +use App\Shared\Service\IdentifierFactory\IdentifierFactoryStub; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\DataFixtures\User\User2Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; use Ramsey\Uuid\Uuid; diff --git a/tests/functional/Web/ModList/DeleteModListCest.php b/tests/functional/Mods/Web/ModList/DeleteModListCest.php similarity index 89% rename from tests/functional/Web/ModList/DeleteModListCest.php rename to tests/functional/Mods/Web/ModList/DeleteModListCest.php index 66890fd4..b8dbd8e3 100644 --- a/tests/functional/Web/ModList/DeleteModListCest.php +++ b/tests/functional/Mods/Web/ModList/DeleteModListCest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModList; +namespace App\Tests\Functional\Mods\Web\ModList; -use App\DataFixtures\ModList\CupModListFixture; -use App\DataFixtures\ModList\DefaultModListFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\ModList\ModList; -use App\Entity\User\User; +use App\Mods\DataFixtures\ModList\CupModListFixture; +use App\Mods\DataFixtures\ModList\DefaultModListFixture; +use App\Mods\Entity\ModList\ModList; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class DeleteModListCest diff --git a/tests/functional/Web/ModList/ListModListsCest.php b/tests/functional/Mods/Web/ModList/ListModListsCest.php similarity index 96% rename from tests/functional/Web/ModList/ListModListsCest.php rename to tests/functional/Mods/Web/ModList/ListModListsCest.php index a19fca96..21d5c825 100644 --- a/tests/functional/Web/ModList/ListModListsCest.php +++ b/tests/functional/Mods/Web/ModList/ListModListsCest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModList; +namespace App\Tests\Functional\Mods\Web\ModList; -use App\DataFixtures\ModList\CupModListFixture; -use App\DataFixtures\User\User3Fixture; -use App\Entity\User\User; +use App\Mods\DataFixtures\ModList\CupModListFixture; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User3Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class ListModListsCest diff --git a/tests/functional/Web/ModList/UpdateModListCest.php b/tests/functional/Mods/Web/ModList/UpdateModListCest.php similarity index 91% rename from tests/functional/Web/ModList/UpdateModListCest.php rename to tests/functional/Mods/Web/ModList/UpdateModListCest.php index de39c39f..394687af 100644 --- a/tests/functional/Web/ModList/UpdateModListCest.php +++ b/tests/functional/Mods/Web/ModList/UpdateModListCest.php @@ -2,30 +2,30 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModList; - -use App\DataFixtures\Dlc\CslaIronCurtainDlcFixture; -use App\DataFixtures\Dlc\SogPrairieFireDlcFixture; -use App\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; -use App\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; -use App\DataFixtures\ModGroup\CupModGroupFixture; -use App\DataFixtures\ModGroup\RhsModGroupFixture; -use App\DataFixtures\ModList\DefaultModListFixture; -use App\DataFixtures\ModList\RhsModListFixture; -use App\DataFixtures\User\User1Fixture; -use App\DataFixtures\User\User2Fixture; -use App\DataFixtures\User\User3Fixture; -use App\Entity\Dlc\Dlc; -use App\Entity\Mod\AbstractMod; -use App\Entity\ModGroup\ModGroup; -use App\Entity\ModList\ModList; -use App\Entity\User\User; +namespace App\Tests\Functional\Mods\Web\ModList; + +use App\Mods\DataFixtures\Dlc\CslaIronCurtainDlcFixture; +use App\Mods\DataFixtures\Dlc\SogPrairieFireDlcFixture; +use App\Mods\DataFixtures\Mod\Directory\ArmaScriptProfilerModFixture; +use App\Mods\DataFixtures\Mod\Directory\Deprecated\R3ModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Disabled\ArmaForcesJbadBuildingFixModFixture; +use App\Mods\DataFixtures\ModGroup\CupModGroupFixture; +use App\Mods\DataFixtures\ModGroup\RhsModGroupFixture; +use App\Mods\DataFixtures\ModList\DefaultModListFixture; +use App\Mods\DataFixtures\ModList\RhsModListFixture; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Entity\Mod\AbstractMod; +use App\Mods\Entity\ModGroup\ModGroup; +use App\Mods\Entity\ModList\ModList; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\DataFixtures\User\User2Fixture; +use App\Users\DataFixtures\User\User3Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class UpdateModListCest diff --git a/tests/functional/Web/ModListPublic/CustomizeModListCest.php b/tests/functional/Mods/Web/ModListPublic/CustomizeModListCest.php similarity index 86% rename from tests/functional/Web/ModListPublic/CustomizeModListCest.php rename to tests/functional/Mods/Web/ModListPublic/CustomizeModListCest.php index 95a84046..d53aba97 100644 --- a/tests/functional/Web/ModListPublic/CustomizeModListCest.php +++ b/tests/functional/Mods/Web/ModListPublic/CustomizeModListCest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModListPublic; +namespace App\Tests\Functional\Mods\Web\ModListPublic; -use App\DataFixtures\ModList\DefaultModListFixture; -use App\DataFixtures\ModList\RhsModListFixture; -use App\DataFixtures\User\User1Fixture; +use App\Mods\DataFixtures\ModList\DefaultModListFixture; +use App\Mods\DataFixtures\ModList\RhsModListFixture; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; use Codeception\Util\HttpCode; class CustomizeModListCest diff --git a/tests/functional/Web/ModListPublic/DownloadModListCest.php b/tests/functional/Mods/Web/ModListPublic/DownloadModListCest.php similarity index 76% rename from tests/functional/Web/ModListPublic/DownloadModListCest.php rename to tests/functional/Mods/Web/ModListPublic/DownloadModListCest.php index 226e4c34..7b79198d 100644 --- a/tests/functional/Web/ModListPublic/DownloadModListCest.php +++ b/tests/functional/Mods/Web/ModListPublic/DownloadModListCest.php @@ -2,30 +2,30 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModListPublic; +namespace App\Tests\Functional\Mods\Web\ModListPublic; -use App\DataFixtures\Dlc\CslaIronCurtainDlcFixture; -use App\DataFixtures\Dlc\GlobalMobilizationDlcFixture; -use App\DataFixtures\Dlc\SogPrairieFireDlcFixture; -use App\DataFixtures\Dlc\Spearhead1944DlcFixture; -use App\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupUnitsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupVehiclesModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\CupWeaponsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsGrefModFixture; -use App\DataFixtures\Mod\SteamWorkshop\Required\RhsUsafModFixture; -use App\DataFixtures\ModList\DefaultModListFixture; -use App\DataFixtures\ModList\RhsModListFixture; -use App\DataFixtures\User\User1Fixture; -use App\Entity\Dlc\Dlc; -use App\Entity\Mod\SteamWorkshopMod; +use App\Mods\DataFixtures\Dlc\CslaIronCurtainDlcFixture; +use App\Mods\DataFixtures\Dlc\GlobalMobilizationDlcFixture; +use App\Mods\DataFixtures\Dlc\SogPrairieFireDlcFixture; +use App\Mods\DataFixtures\Dlc\Spearhead1944DlcFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Optional\AceInteractionMenuExpansionModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\ArmaForcesMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Broken\ArmaForcesAceMedicalModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsCoreModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupTerrainsMapsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupUnitsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupVehiclesModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\CupWeaponsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\Deprecated\LegacyArmaForcesModsModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsAfrfModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsGrefModFixture; +use App\Mods\DataFixtures\Mod\SteamWorkshop\Required\RhsUsafModFixture; +use App\Mods\DataFixtures\ModList\DefaultModListFixture; +use App\Mods\DataFixtures\ModList\RhsModListFixture; +use App\Mods\Entity\Dlc\Dlc; +use App\Mods\Entity\Mod\SteamWorkshopMod; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; use Codeception\Util\HttpCode; class DownloadModListCest diff --git a/tests/functional/Web/ModListPublic/SelectModListCest.php b/tests/functional/Mods/Web/ModListPublic/SelectModListCest.php similarity index 73% rename from tests/functional/Web/ModListPublic/SelectModListCest.php rename to tests/functional/Mods/Web/ModListPublic/SelectModListCest.php index ac4944e9..bcf1df28 100644 --- a/tests/functional/Web/ModListPublic/SelectModListCest.php +++ b/tests/functional/Mods/Web/ModListPublic/SelectModListCest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\ModListPublic; +namespace App\Tests\Functional\Mods\Web\ModListPublic; -use App\DataFixtures\ModList\CupModListFixture; -use App\DataFixtures\ModList\DefaultModListFixture; -use App\DataFixtures\ModList\RhsModListFixture; -use App\DataFixtures\User\User1Fixture; +use App\Mods\DataFixtures\ModList\CupModListFixture; +use App\Mods\DataFixtures\ModList\DefaultModListFixture; +use App\Mods\DataFixtures\ModList\RhsModListFixture; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; class SelectModListCest { diff --git a/tests/functional/Web/Api/IndexCest.php b/tests/functional/Shared/Api/IndexCest.php similarity index 87% rename from tests/functional/Web/Api/IndexCest.php rename to tests/functional/Shared/Api/IndexCest.php index 5a3fddee..1a1ffae1 100644 --- a/tests/functional/Web/Api/IndexCest.php +++ b/tests/functional/Shared/Api/IndexCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Api; +namespace App\Tests\Functional\Shared\Api; -use App\DataFixtures\User\AdminFixture; -use App\DataFixtures\User\User1Fixture; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\AdminFixture; +use App\Users\DataFixtures\User\User1Fixture; class IndexCest { diff --git a/tests/functional/Web/Home/IndexCest.php b/tests/functional/Shared/Web/Home/IndexCest.php similarity index 91% rename from tests/functional/Web/Home/IndexCest.php rename to tests/functional/Shared/Web/Home/IndexCest.php index 7f785daf..dc6eec21 100644 --- a/tests/functional/Web/Home/IndexCest.php +++ b/tests/functional/Shared/Web/Home/IndexCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Home; +namespace App\Tests\Functional\Shared\Web\Home; -use App\DataFixtures\User\AdminFixture; -use App\DataFixtures\User\User1Fixture; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\AdminFixture; +use App\Users\DataFixtures\User\User1Fixture; use Codeception\Util\HttpCode; class IndexCest diff --git a/tests/functional/Web/Home/JoinUsCest.php b/tests/functional/Shared/Web/Home/JoinUsCest.php similarity index 93% rename from tests/functional/Web/Home/JoinUsCest.php rename to tests/functional/Shared/Web/Home/JoinUsCest.php index 30e0c9e6..1406b677 100644 --- a/tests/functional/Web/Home/JoinUsCest.php +++ b/tests/functional/Shared/Web/Home/JoinUsCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Home; +namespace App\Tests\Functional\Shared\Web\Home; -use App\DataFixtures\User\AdminFixture; -use App\DataFixtures\User\User1Fixture; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\AdminFixture; +use App\Users\DataFixtures\User\User1Fixture; use Codeception\Util\HttpCode; class JoinUsCest diff --git a/tests/functional/Web/Home/MissionsCest.php b/tests/functional/Shared/Web/Home/MissionsCest.php similarity index 89% rename from tests/functional/Web/Home/MissionsCest.php rename to tests/functional/Shared/Web/Home/MissionsCest.php index 68d9dafb..f7d0e4e1 100644 --- a/tests/functional/Web/Home/MissionsCest.php +++ b/tests/functional/Shared/Web/Home/MissionsCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Home; +namespace App\Tests\Functional\Shared\Web\Home; -use App\DataFixtures\User\AdminFixture; -use App\DataFixtures\User\User1Fixture; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\AdminFixture; +use App\Users\DataFixtures\User\User1Fixture; use Codeception\Util\HttpCode; class MissionsCest diff --git a/tests/functional/Web/Security/ConnectCest.php b/tests/functional/Shared/Web/Security/ConnectCest.php similarity index 86% rename from tests/functional/Web/Security/ConnectCest.php rename to tests/functional/Shared/Web/Security/ConnectCest.php index afdb17af..b41db754 100644 --- a/tests/functional/Web/Security/ConnectCest.php +++ b/tests/functional/Shared/Web/Security/ConnectCest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Security; +namespace App\Tests\Functional\Shared\Web\Security; -use App\DataFixtures\User\User1Fixture; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; class ConnectCest { diff --git a/tests/functional/Web/Security/LogoutCest.php b/tests/functional/Shared/Web/Security/LogoutCest.php similarity index 87% rename from tests/functional/Web/Security/LogoutCest.php rename to tests/functional/Shared/Web/Security/LogoutCest.php index 1ab5dc96..8a22fa25 100644 --- a/tests/functional/Web/Security/LogoutCest.php +++ b/tests/functional/Shared/Web/Security/LogoutCest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\Security; +namespace App\Tests\Functional\Shared\Web\Security; -use App\DataFixtures\User\User1Fixture; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; class LogoutCest { diff --git a/tests/functional/Web/User/DeleteUserCest.php b/tests/functional/Users/Web/User/DeleteUserCest.php similarity index 92% rename from tests/functional/Web/User/DeleteUserCest.php rename to tests/functional/Users/Web/User/DeleteUserCest.php index f47f4e82..97a9d169 100644 --- a/tests/functional/Web/User/DeleteUserCest.php +++ b/tests/functional/Users/Web/User/DeleteUserCest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\User; +namespace App\Tests\Functional\Users\Web\User; -use App\DataFixtures\User\User1Fixture; -use App\DataFixtures\User\User2Fixture; -use App\Entity\User\User; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\DataFixtures\User\User2Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class DeleteUserCest diff --git a/tests/functional/Web/User/ListUsersCest.php b/tests/functional/Users/Web/User/ListUsersCest.php similarity index 94% rename from tests/functional/Web/User/ListUsersCest.php rename to tests/functional/Users/Web/User/ListUsersCest.php index fdff9459..309c4ede 100644 --- a/tests/functional/Web/User/ListUsersCest.php +++ b/tests/functional/Users/Web/User/ListUsersCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\User; +namespace App\Tests\Functional\Users\Web\User; -use App\DataFixtures\User\User1Fixture; -use App\Entity\User\User; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class ListUsersCest diff --git a/tests/functional/Web/User/UpdateUserCest.php b/tests/functional/Users/Web/User/UpdateUserCest.php similarity index 98% rename from tests/functional/Web/User/UpdateUserCest.php rename to tests/functional/Users/Web/User/UpdateUserCest.php index 68fcc8ed..c778fe25 100644 --- a/tests/functional/Web/User/UpdateUserCest.php +++ b/tests/functional/Users/Web/User/UpdateUserCest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\User; +namespace App\Tests\Functional\Users\Web\User; -use App\DataFixtures\User\User1Fixture; -use App\DataFixtures\User\User2Fixture; -use App\DataFixtures\User\User3Fixture; -use App\Entity\User\User; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\DataFixtures\User\User2Fixture; +use App\Users\DataFixtures\User\User3Fixture; +use App\Users\Entity\User\User; use Codeception\Attribute\DataProvider; use Codeception\Example; use Codeception\Util\HttpCode; diff --git a/tests/functional/Web/UserGroup/CreateUserGroupCest.php b/tests/functional/Users/Web/UserGroup/CreateUserGroupCest.php similarity index 95% rename from tests/functional/Web/UserGroup/CreateUserGroupCest.php rename to tests/functional/Users/Web/UserGroup/CreateUserGroupCest.php index 9e7202cf..a2bac0e4 100644 --- a/tests/functional/Web/UserGroup/CreateUserGroupCest.php +++ b/tests/functional/Users/Web/UserGroup/CreateUserGroupCest.php @@ -2,18 +2,17 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\UserGroup; - -use App\DataFixtures\User\AdminFixture; -use App\DataFixtures\User\User1Fixture; -use App\DataFixtures\User\User2Fixture; -use App\DataFixtures\User\User3Fixture; -use App\DataFixtures\UserGroup\UsersGroupFixture; -use App\Entity\Permissions\UserGroupPermissions; -use App\Entity\User\User; -use App\Entity\UserGroup\UserGroup; -use App\Service\IdentifierFactory\IdentifierFactoryStub; +namespace App\Tests\Functional\Users\Web\UserGroup; + +use App\Shared\Service\IdentifierFactory\IdentifierFactoryStub; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\AdminFixture; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\DataFixtures\User\User2Fixture; +use App\Users\DataFixtures\User\User3Fixture; +use App\Users\DataFixtures\UserGroup\UsersGroupFixture; +use App\Users\Entity\User\User; +use App\Users\Entity\UserGroup\UserGroup; use Codeception\Util\HttpCode; use Ramsey\Uuid\Uuid; diff --git a/tests/functional/Web/UserGroup/DeleteUserGroupCest.php b/tests/functional/Users/Web/UserGroup/DeleteUserGroupCest.php similarity index 88% rename from tests/functional/Web/UserGroup/DeleteUserGroupCest.php rename to tests/functional/Users/Web/UserGroup/DeleteUserGroupCest.php index 30be0179..a6f816bc 100644 --- a/tests/functional/Web/UserGroup/DeleteUserGroupCest.php +++ b/tests/functional/Users/Web/UserGroup/DeleteUserGroupCest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\UserGroup; +namespace App\Tests\Functional\Users\Web\UserGroup; -use App\DataFixtures\User\User1Fixture; -use App\DataFixtures\UserGroup\UsersGroupFixture; -use App\Entity\User\User; -use App\Entity\UserGroup\UserGroup; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\DataFixtures\UserGroup\UsersGroupFixture; +use App\Users\Entity\User\User; +use App\Users\Entity\UserGroup\UserGroup; use Codeception\Util\HttpCode; class DeleteUserGroupCest diff --git a/tests/functional/Web/UserGroup/ListUserGroupsCest.php b/tests/functional/Users/Web/UserGroup/ListUserGroupsCest.php similarity index 95% rename from tests/functional/Web/UserGroup/ListUserGroupsCest.php rename to tests/functional/Users/Web/UserGroup/ListUserGroupsCest.php index 9c616053..d215a899 100644 --- a/tests/functional/Web/UserGroup/ListUserGroupsCest.php +++ b/tests/functional/Users/Web/UserGroup/ListUserGroupsCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\UserGroup; +namespace App\Tests\Functional\Users\Web\UserGroup; -use App\DataFixtures\User\User1Fixture; -use App\Entity\User\User; use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\Entity\User\User; use Codeception\Util\HttpCode; class ListUserGroupsCest diff --git a/tests/functional/Web/UserGroup/UpdateUserGroupCest.php b/tests/functional/Users/Web/UserGroup/UpdateUserGroupCest.php similarity index 94% rename from tests/functional/Web/UserGroup/UpdateUserGroupCest.php rename to tests/functional/Users/Web/UserGroup/UpdateUserGroupCest.php index 1be21ae2..8e5d6060 100644 --- a/tests/functional/Web/UserGroup/UpdateUserGroupCest.php +++ b/tests/functional/Users/Web/UserGroup/UpdateUserGroupCest.php @@ -2,17 +2,17 @@ declare(strict_types=1); -namespace App\Tests\Functional\Web\UserGroup; - -use App\DataFixtures\User\AdminFixture; -use App\DataFixtures\User\User1Fixture; -use App\DataFixtures\User\User2Fixture; -use App\DataFixtures\User\User3Fixture; -use App\DataFixtures\UserGroup\AdminsGroupFixture; -use App\DataFixtures\UserGroup\UsersGroupFixture; -use App\Entity\User\User; -use App\Entity\UserGroup\UserGroup; +namespace App\Tests\Functional\Users\Web\UserGroup; + use App\Tests\FunctionalTester; +use App\Users\DataFixtures\User\AdminFixture; +use App\Users\DataFixtures\User\User1Fixture; +use App\Users\DataFixtures\User\User2Fixture; +use App\Users\DataFixtures\User\User3Fixture; +use App\Users\DataFixtures\UserGroup\AdminsGroupFixture; +use App\Users\DataFixtures\UserGroup\UsersGroupFixture; +use App\Users\Entity\User\User; +use App\Users\Entity\UserGroup\UserGroup; use Codeception\Util\HttpCode; class UpdateUserGroupCest diff --git a/tests/integration/Service/SteamApiClient/SteamApiClientCest.php b/tests/integration/Shared/Service/SteamApiClient/SteamApiClientCest.php similarity index 87% rename from tests/integration/Service/SteamApiClient/SteamApiClientCest.php rename to tests/integration/Shared/Service/SteamApiClient/SteamApiClientCest.php index 0b0f0a7b..2fba2a7f 100644 --- a/tests/integration/Service/SteamApiClient/SteamApiClientCest.php +++ b/tests/integration/Shared/Service/SteamApiClient/SteamApiClientCest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Integration\Service\SteamApiClient; +namespace App\Tests\Integration\Shared\Service\SteamApiClient; -use App\Service\SteamApiClient\Exception\AppNotFoundException; -use App\Service\SteamApiClient\Exception\WorkshopItemNotFoundException; -use App\Service\SteamApiClient\SteamApiClientInterface; +use App\Shared\Service\SteamApiClient\Exception\AppNotFoundException; +use App\Shared\Service\SteamApiClient\Exception\WorkshopItemNotFoundException; +use App\Shared\Service\SteamApiClient\SteamApiClientInterface; use App\Tests\IntegrationTester; class SteamApiClientCest diff --git a/tests/integration/Service/Version/VersionProviderCest.php b/tests/integration/Shared/Service/Version/VersionProviderCest.php similarity index 90% rename from tests/integration/Service/Version/VersionProviderCest.php rename to tests/integration/Shared/Service/Version/VersionProviderCest.php index b68511e3..100a1fb6 100644 --- a/tests/integration/Service/Version/VersionProviderCest.php +++ b/tests/integration/Shared/Service/Version/VersionProviderCest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Integration\Service\Version; +namespace App\Tests\Integration\Shared\Service\Version; -use App\Service\Version\VersionProvider; +use App\Shared\Service\Version\VersionProvider; use App\Tests\IntegrationTester; final class VersionProviderCest diff --git a/tests/unit/EventSubscriber/Doctrine/EntityBlamableSubscriberTest.php b/tests/unit/Shared/EventSubscriber/Doctrine/EntityBlamableSubscriberTest.php similarity index 95% rename from tests/unit/EventSubscriber/Doctrine/EntityBlamableSubscriberTest.php rename to tests/unit/Shared/EventSubscriber/Doctrine/EntityBlamableSubscriberTest.php index 81690f08..770192c1 100644 --- a/tests/unit/EventSubscriber/Doctrine/EntityBlamableSubscriberTest.php +++ b/tests/unit/Shared/EventSubscriber/Doctrine/EntityBlamableSubscriberTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Unit\EventSubscriber\Doctrine; +namespace App\Tests\Unit\Shared\EventSubscriber\Doctrine; -use App\Entity\AbstractBlamableEntity; -use App\Entity\User\User; -use App\EventSubscriber\Doctrine\EntityBlamableSubscriber; +use App\Shared\Entity\Common\AbstractBlamableEntity; +use App\Shared\EventSubscriber\Doctrine\EntityBlamableSubscriber; +use App\Users\Entity\User\User; use Codeception\Attribute\DataProvider; use Codeception\Test\Unit; use Doctrine\ORM\EntityManagerInterface; diff --git a/tests/unit/Service/Discord/DiscordClientFactoryTest.php b/tests/unit/Shared/Service/Discord/DiscordClientFactoryTest.php similarity index 93% rename from tests/unit/Service/Discord/DiscordClientFactoryTest.php rename to tests/unit/Shared/Service/Discord/DiscordClientFactoryTest.php index 1e629811..fdec38cc 100644 --- a/tests/unit/Service/Discord/DiscordClientFactoryTest.php +++ b/tests/unit/Shared/Service/Discord/DiscordClientFactoryTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace App\Tests\Unit\Service\Discord; +namespace App\Tests\Unit\Shared\Service\Discord; -use App\Service\Discord\DiscordClientFactory; +use App\Shared\Service\Discord\DiscordClientFactory; use Codeception\Test\Unit; use Psr\Log\LoggerInterface; diff --git a/tests/unit/Service/Mission/MissionClientTest.php b/tests/unit/Shared/Service/Mission/MissionClientTest.php similarity index 96% rename from tests/unit/Service/Mission/MissionClientTest.php rename to tests/unit/Shared/Service/Mission/MissionClientTest.php index d5a5ce76..19a9ed7f 100644 --- a/tests/unit/Service/Mission/MissionClientTest.php +++ b/tests/unit/Shared/Service/Mission/MissionClientTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace App\Tests\Unit\Service\Mission; +namespace App\Tests\Unit\Shared\Service\Mission; -use App\Service\Mission\Enum\MissionStateEnum; -use App\Service\Mission\MissionClient; -use App\Service\Mission\MissionStore; +use App\Shared\Service\Mission\Enum\MissionStateEnum; +use App\Shared\Service\Mission\MissionClient; +use App\Shared\Service\Mission\MissionStore; use Codeception\Test\Unit; use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\ResponseInterface; diff --git a/tests/unit/Service/SteamApiClient/Helper/SteamHelperTest.php b/tests/unit/Shared/Service/SteamApiClient/Helper/SteamHelperTest.php similarity index 89% rename from tests/unit/Service/SteamApiClient/Helper/SteamHelperTest.php rename to tests/unit/Shared/Service/SteamApiClient/Helper/SteamHelperTest.php index 93f854fe..9b43c2f4 100644 --- a/tests/unit/Service/SteamApiClient/Helper/SteamHelperTest.php +++ b/tests/unit/Shared/Service/SteamApiClient/Helper/SteamHelperTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace App\Tests\Unit\Service\SteamApiClient\Helper; +namespace App\Tests\Unit\Shared\Service\SteamApiClient\Helper; -use App\Service\SteamApiClient\Helper\Exception\InvalidWorkshopItemUrlFormatException; -use App\Service\SteamApiClient\Helper\SteamHelper; +use App\Shared\Service\SteamApiClient\Helper\Exception\InvalidWorkshopItemUrlFormatException; +use App\Shared\Service\SteamApiClient\Helper\SteamHelper; use Codeception\Attribute\DataProvider; use Codeception\Test\Unit; diff --git a/webpack.config.js b/webpack.config.js index f62e1f4c..a6327c06 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -20,12 +20,12 @@ Encore * Each entry will result in one JavaScript file (e.g. app.js) * and one CSS file (e.g. app.css) if your JavaScript imports CSS. */ - .addEntry('app', './assets/app.js') - .addEntry('multiRowSelect', './assets/multiRowSelect.js') - .addEntry('landing', './assets/landing.js') - .addEntry('joinUs', './assets/joinUs.js') - .addEntry('modForm', './assets/mod/modForm.js') - .addEntry('modListCustomize', './assets/modListPublic/modListCustomize.js') + .addEntry('app', './assets/shared/app.js') + .addEntry('multiRowSelect', './assets/shared/multiRowSelect.js') + .addEntry('landing', './assets/shared/index/landing.js') + .addEntry('joinUs', './assets/shared/joinUs/joinUs.js') + .addEntry('modForm', './assets/mods/mod/modForm.js') + .addEntry('modListCustomize', './assets/mods/modListPublic/modListCustomize.js') // When enabled, Webpack "splits" your files into smaller pieces for greater optimization. .splitEntryChunks()
{{ loop.index }} {{ modList.name }} - {# @var dlc \App\Entity\Dlc\Dlc #} + {# @var dlc \App\Mods\Entity\Dlc\Dlc #} {% for dlc in modList.dlcs %} {{ commonMacro.dlc_icon(dlc) }} {% endfor %} diff --git a/templates/_macro/common_macro.html.twig b/templates/shared/_macro/common_macro.html.twig similarity index 100% rename from templates/_macro/common_macro.html.twig rename to templates/shared/_macro/common_macro.html.twig diff --git a/templates/_macro/tab_macro.html.twig b/templates/shared/_macro/tab_macro.html.twig similarity index 100% rename from templates/_macro/tab_macro.html.twig rename to templates/shared/_macro/tab_macro.html.twig diff --git a/templates/_macro/table_macro.html.twig b/templates/shared/_macro/table_macro.html.twig similarity index 64% rename from templates/_macro/table_macro.html.twig rename to templates/shared/_macro/table_macro.html.twig index a6c1d2b0..1e736829 100644 --- a/templates/_macro/table_macro.html.twig +++ b/templates/shared/_macro/table_macro.html.twig @@ -46,39 +46,39 @@ {% macro row_mod_status_icon(mod) %} {% if mod.status is null %} - {% elseif mod.status is constant('App\\Entity\\Mod\\Enum\\ModStatusEnum::DEPRECATED') %} + {% elseif mod.status is constant('App\\Mods\\Entity\\Mod\\Enum\\ModStatusEnum::DEPRECATED') %} {{ _self.icon('fas fa-skull text-warning', 'Deprecated'|trans) }} - {% elseif mod.status is constant('App\\Entity\\Mod\\Enum\\ModStatusEnum::BROKEN') %} + {% elseif mod.status is constant('App\\Mods\\Entity\\Mod\\Enum\\ModStatusEnum::BROKEN') %} {{ _self.icon('fas fa-exclamation-triangle text-warning', 'Broken'|trans) }} - {% elseif mod.status is constant('App\\Entity\\Mod\\Enum\\ModStatusEnum::DISABLED') %} + {% elseif mod.status is constant('App\\Mods\\Entity\\Mod\\Enum\\ModStatusEnum::DISABLED') %} {{ _self.icon('fas fa-times-circle text-danger', 'Disabled'|trans) }} {% endif %} {% endmacro %} {% macro row_mod_type_translation(mod) %} - {% if mod is instance_of('\\App\\Entity\\Mod\\SteamWorkshopMod') %} - {# @var mod \App\Entity\Mod\SteamWorkshopMod #} - {% if mod.type is constant('App\\Entity\\Mod\\Enum\\ModTypeEnum::SERVER_SIDE') %} + {% if mod is instance_of('\\App\\Mods\\Entity\\Mod\\SteamWorkshopMod') %} + {# @var mod \App\Mods\Entity\Mod\SteamWorkshopMod #} + {% if mod.type is constant('App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::SERVER_SIDE') %} {{ 'Server side mod'|trans }} - {% elseif mod.type is constant('App\\Entity\\Mod\\Enum\\ModTypeEnum::REQUIRED') %} + {% elseif mod.type is constant('App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::REQUIRED') %} {{ 'Required mod'|trans }} - {% elseif mod.type is constant('App\\Entity\\Mod\\Enum\\ModTypeEnum::OPTIONAL') %} + {% elseif mod.type is constant('App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::OPTIONAL') %} {{ 'Optional mod'|trans }} - {% elseif mod.type is constant('App\\Entity\\Mod\\Enum\\ModTypeEnum::CLIENT_SIDE') %} + {% elseif mod.type is constant('App\\Mods\\Entity\\Mod\\Enum\\ModTypeEnum::CLIENT_SIDE') %} {{ 'Client side mod'|trans }} {% endif %} - {% elseif mod is instance_of('\\App\\Entity\\Mod\\DirectoryMod') %} - {# @var mod \App\Entity\Mod\DirectoryMod #} + {% elseif mod is instance_of('\\App\\Mods\\Entity\\Mod\\DirectoryMod') %} + {# @var mod \App\Mods\Entity\Mod\DirectoryMod #} {{ 'Server side mod'|trans }} {% endif %} {% endmacro %} {% macro row_mod_source_url(mod) %} - {% if mod is instance_of('\\App\\Entity\\Mod\\SteamWorkshopMod') %} - {# @var mod \App\Entity\Mod\SteamWorkshopMod #} + {% if mod is instance_of('\\App\\Mods\\Entity\\Mod\\SteamWorkshopMod') %} + {# @var mod \App\Mods\Entity\Mod\SteamWorkshopMod #} {{ 'Steam Workshop'|trans }} - {% elseif mod is instance_of('\\App\\Entity\\Mod\\DirectoryMod') %} - {# @var mod \App\Entity\Mod\DirectoryMod #} + {% elseif mod is instance_of('\\App\\Mods\\Entity\\Mod\\DirectoryMod') %} + {# @var mod \App\Mods\Entity\Mod\DirectoryMod #} {{ 'Directory'|trans }} {% endif %} {% endmacro %} diff --git a/templates/_partial/_footer.html.twig b/templates/shared/_partial/_footer.html.twig similarity index 100% rename from templates/_partial/_footer.html.twig rename to templates/shared/_partial/_footer.html.twig diff --git a/templates/_partial/_mission_widget.html.twig b/templates/shared/_partial/_mission_widget.html.twig similarity index 94% rename from templates/_partial/_mission_widget.html.twig rename to templates/shared/_partial/_mission_widget.html.twig index 081118ba..d6392e9f 100644 --- a/templates/_partial/_mission_widget.html.twig +++ b/templates/shared/_partial/_mission_widget.html.twig @@ -17,7 +17,7 @@ {{ mission.title }}
- {% if mission.state == constant('App\\Service\\Mission\\Enum\\MissionStateEnum::ARCHIVED') %} + {% if mission.state == constant('App\\Shared\\Service\\Mission\\Enum\\MissionStateEnum::ARCHIVED') %}
{{ mission.date|date('Y-m-d H:i') }}
{% else %}
diff --git a/templates/_partial/_modal.html.twig b/templates/shared/_partial/_modal.html.twig similarity index 100% rename from templates/_partial/_modal.html.twig rename to templates/shared/_partial/_modal.html.twig diff --git a/templates/_partial/_page_header.html.twig b/templates/shared/_partial/_page_header.html.twig similarity index 100% rename from templates/_partial/_page_header.html.twig rename to templates/shared/_partial/_page_header.html.twig diff --git a/templates/_partial/_table.html.twig b/templates/shared/_partial/_table.html.twig similarity index 100% rename from templates/_partial/_table.html.twig rename to templates/shared/_partial/_table.html.twig diff --git a/templates/_partial/navbar/_navbar.html.twig b/templates/shared/_partial/navbar/_navbar.html.twig similarity index 81% rename from templates/_partial/navbar/_navbar.html.twig rename to templates/shared/_partial/navbar/_navbar.html.twig index 745ca9a9..d686457a 100644 --- a/templates/_partial/navbar/_navbar.html.twig +++ b/templates/shared/_partial/navbar/_navbar.html.twig @@ -14,8 +14,8 @@
diff --git a/templates/_partial/navbar/_navbar_icons.html.twig b/templates/shared/_partial/navbar/_navbar_icons.html.twig similarity index 100% rename from templates/_partial/navbar/_navbar_icons.html.twig rename to templates/shared/_partial/navbar/_navbar_icons.html.twig diff --git a/templates/_partial/navbar/_navbar_links.html.twig b/templates/shared/_partial/navbar/_navbar_links.html.twig similarity index 62% rename from templates/_partial/navbar/_navbar_links.html.twig rename to templates/shared/_partial/navbar/_navbar_links.html.twig index 5d7cdeb7..6c44fd33 100644 --- a/templates/_partial/navbar/_navbar_links.html.twig +++ b/templates/shared/_partial/navbar/_navbar_links.html.twig @@ -10,31 +10,31 @@ {{ 'Get mods'|trans }} {% if - is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_LIST').value) - or is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_GROUP_LIST').value) - or is_granted(constant('App\\Security\\Enum\\PermissionsEnum::DLC_LIST').value) - or is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_LIST_LIST').value) + is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_LIST').value) + or is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_GROUP_LIST').value) + or is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::DLC_LIST').value) + or is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_LIST_LIST').value) %}
  • {{ 'Manage mods'|trans }}
    - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_LIST').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_LIST').value) %} {{ 'Mods'|trans }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_GROUP_LIST').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_GROUP_LIST').value) %}
    {{ 'Mod groups'|trans }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::DLC_LIST').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::DLC_LIST').value) %}
    {{ 'DLCs'|trans }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::MOD_LIST_LIST').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::MOD_LIST_LIST').value) %}
    {{ 'Mod lists'|trans }} {% endif %} @@ -42,19 +42,19 @@
    • {% endif %} {% if - is_granted(constant('App\\Security\\Enum\\PermissionsEnum::USER_LIST').value) - or is_granted(constant('App\\Security\\Enum\\PermissionsEnum::USER_GROUP_LIST').value) + is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::USER_LIST').value) + or is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::USER_GROUP_LIST').value) %}
  • {{ 'Manage users'|trans }}
    - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::USER_LIST').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::USER_LIST').value) %} {{ 'Users'|trans }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::USER_GROUP_LIST').value) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::USER_GROUP_LIST').value) %}
    {{ 'User groups'|trans }} {% endif %} diff --git a/templates/app_theme.html.twig b/templates/shared/app_theme.html.twig similarity index 100% rename from templates/app_theme.html.twig rename to templates/shared/app_theme.html.twig diff --git a/templates/base.html.twig b/templates/shared/base.html.twig similarity index 96% rename from templates/base.html.twig rename to templates/shared/base.html.twig index f76f186b..e08b9985 100644 --- a/templates/base.html.twig +++ b/templates/shared/base.html.twig @@ -1,8 +1,8 @@ {%- set title = global.app.organization ~ ' - ' ~ title ?? 'Polish Arma 3 group'|trans -%} {%- set description = description ?? include([ - 'home/index/_partial/' ~ get_current_locale() ~ '/_about_us.html.twig', - 'home/index/_partial/pl/_about_us.html.twig' + 'shared/home/index/_partial/' ~ get_current_locale() ~ '/_about_us.html.twig', + 'shared/home/index/_partial/pl/_about_us.html.twig' ])|striptags -%} diff --git a/templates/bundles/TwigBundle/Exception/error.html.twig b/templates/shared/bundles/TwigBundle/Exception/error.html.twig similarity index 100% rename from templates/bundles/TwigBundle/Exception/error.html.twig rename to templates/shared/bundles/TwigBundle/Exception/error.html.twig diff --git a/templates/bundles/TwigBundle/Exception/error403.html.twig b/templates/shared/bundles/TwigBundle/Exception/error403.html.twig similarity index 100% rename from templates/bundles/TwigBundle/Exception/error403.html.twig rename to templates/shared/bundles/TwigBundle/Exception/error403.html.twig diff --git a/templates/bundles/TwigBundle/Exception/error404.html.twig b/templates/shared/bundles/TwigBundle/Exception/error404.html.twig similarity index 100% rename from templates/bundles/TwigBundle/Exception/error404.html.twig rename to templates/shared/bundles/TwigBundle/Exception/error404.html.twig diff --git a/templates/card.html.twig b/templates/shared/card.html.twig similarity index 85% rename from templates/card.html.twig rename to templates/shared/card.html.twig index 418c7da5..74e3cd7c 100644 --- a/templates/card.html.twig +++ b/templates/shared/card.html.twig @@ -1,4 +1,4 @@ -{% extends 'container.html.twig' %} +{% extends 'shared/container.html.twig' %} {% block container %} diff --git a/templates/container.html.twig b/templates/shared/container.html.twig similarity index 81% rename from templates/container.html.twig rename to templates/shared/container.html.twig index 06ea6b49..dd793660 100644 --- a/templates/container.html.twig +++ b/templates/shared/container.html.twig @@ -1,4 +1,4 @@ -{% extends 'default.html.twig' %} +{% extends 'shared/default.html.twig' %} {% block container %} diff --git a/templates/container_fluid.html.twig b/templates/shared/container_fluid.html.twig similarity index 82% rename from templates/container_fluid.html.twig rename to templates/shared/container_fluid.html.twig index cdd086ff..09f4249a 100644 --- a/templates/container_fluid.html.twig +++ b/templates/shared/container_fluid.html.twig @@ -1,4 +1,4 @@ -{% extends 'default.html.twig' %} +{% extends 'shared/default.html.twig' %} {% block container %} diff --git a/templates/default.html.twig b/templates/shared/default.html.twig similarity index 58% rename from templates/default.html.twig rename to templates/shared/default.html.twig index 86ae0e14..6c80bc30 100644 --- a/templates/default.html.twig +++ b/templates/shared/default.html.twig @@ -1,10 +1,10 @@ -{% extends 'base.html.twig' %} +{% extends 'shared/base.html.twig' %} {% block body %} @@ -12,10 +12,10 @@ {% block container %} {% endblock %} - {% include '_partial/_footer.html.twig' %} + {% include 'shared/_partial/_footer.html.twig' %} {% endblock %} {% block javascripts %} {{ parent() }} - {{ include('_partial/_modal.html.twig') }} + {{ include('shared/_partial/_modal.html.twig') }} {% endblock %} diff --git a/templates/home/index/_partial/_about.html.twig b/templates/shared/home/index/_partial/_about.html.twig similarity index 72% rename from templates/home/index/_partial/_about.html.twig rename to templates/shared/home/index/_partial/_about.html.twig index 5f00ce0e..e771fc49 100644 --- a/templates/home/index/_partial/_about.html.twig +++ b/templates/shared/home/index/_partial/_about.html.twig @@ -12,8 +12,8 @@

    {% include([ - 'home/index/_partial/' ~ get_current_locale() ~ '/_about_us.html.twig', - 'home/index/_partial/pl/_about_us.html.twig' + 'shared/home/index/_partial/' ~ get_current_locale() ~ '/_about_us.html.twig', + 'shared/home/index/_partial/pl/_about_us.html.twig' ]) %}

    @@ -30,8 +30,8 @@

    {{ 'Fun'|trans }}

    {% include([ - 'home/index/_partial/' ~ get_current_locale() ~ '/_fun.html.twig', - 'home/index/_partial/pl/_fun.html.twig' + 'shared/home/index/_partial/' ~ get_current_locale() ~ '/_fun.html.twig', + 'shared/home/index/_partial/pl/_fun.html.twig' ]) %}

    @@ -43,8 +43,8 @@

    {{ 'Gaming'|trans }}

    {% include([ - 'home/index/_partial/' ~ get_current_locale() ~ '/_gaming.html.twig', - 'home/index/_partial/pl/_gaming.html.twig' + 'shared/home/index/_partial/' ~ get_current_locale() ~ '/_gaming.html.twig', + 'shared/home/index/_partial/pl/_gaming.html.twig' ]) %}

    • @@ -56,8 +56,8 @@

    {{ 'Community'|trans }}

    {% include([ - 'home/index/_partial/' ~ get_current_locale() ~ '/_community.html.twig', - 'home/index/_partial/pl/_community.html.twig' + 'shared/home/index/_partial/' ~ get_current_locale() ~ '/_community.html.twig', + 'shared/home/index/_partial/pl/_community.html.twig' ]) %}

    diff --git a/templates/home/index/_partial/_missions.html.twig b/templates/shared/home/index/_partial/_missions.html.twig similarity index 60% rename from templates/home/index/_partial/_missions.html.twig rename to templates/shared/home/index/_partial/_missions.html.twig index ed3f7022..499ae727 100644 --- a/templates/home/index/_partial/_missions.html.twig +++ b/templates/shared/home/index/_partial/_missions.html.twig @@ -8,22 +8,22 @@

    {{ 'When do we play'|trans }}

    {% include([ - 'home/index/_partial/' ~ get_current_locale() ~ '/_games.html.twig', - 'home/index/_partial/pl/_games.html.twig' + 'shared/home/index/_partial/' ~ get_current_locale() ~ '/_games.html.twig', + 'shared/home/index/_partial/pl/_games.html.twig' ]) %}

    - {# @var nearestMission \App\Service\Mission\Dto\MissionDto #} + {# @var nearestMission \App\Shared\Service\Mission\Dto\MissionDto #} {% if nearestMission is not null %}

    - {{ nearestMission.state == constant('App\\Service\\Mission\\Enum\\MissionStateEnum::ARCHIVED') ? 'Last mission'|trans : 'Nearest mission'|trans }} + {{ nearestMission.state == constant('App\\Shared\\Service\\Mission\\Enum\\MissionStateEnum::ARCHIVED') ? 'Last mission'|trans : 'Nearest mission'|trans }}

    - {% include '_partial/_mission_widget.html.twig' with { 'mission': nearestMission } %} + {% include 'shared/_partial/_mission_widget.html.twig' with { 'mission': nearestMission } %}
    {% endif %} diff --git a/templates/home/index/_partial/pl/_about_us.html.twig b/templates/shared/home/index/_partial/pl/_about_us.html.twig similarity index 100% rename from templates/home/index/_partial/pl/_about_us.html.twig rename to templates/shared/home/index/_partial/pl/_about_us.html.twig diff --git a/templates/home/index/_partial/pl/_community.html.twig b/templates/shared/home/index/_partial/pl/_community.html.twig similarity index 100% rename from templates/home/index/_partial/pl/_community.html.twig rename to templates/shared/home/index/_partial/pl/_community.html.twig diff --git a/templates/home/index/_partial/pl/_fun.html.twig b/templates/shared/home/index/_partial/pl/_fun.html.twig similarity index 100% rename from templates/home/index/_partial/pl/_fun.html.twig rename to templates/shared/home/index/_partial/pl/_fun.html.twig diff --git a/templates/home/index/_partial/pl/_games.html.twig b/templates/shared/home/index/_partial/pl/_games.html.twig similarity index 100% rename from templates/home/index/_partial/pl/_games.html.twig rename to templates/shared/home/index/_partial/pl/_games.html.twig diff --git a/templates/home/index/_partial/pl/_gaming.html.twig b/templates/shared/home/index/_partial/pl/_gaming.html.twig similarity index 100% rename from templates/home/index/_partial/pl/_gaming.html.twig rename to templates/shared/home/index/_partial/pl/_gaming.html.twig diff --git a/templates/home/index/index.html.twig b/templates/shared/home/index/index.html.twig similarity index 85% rename from templates/home/index/index.html.twig rename to templates/shared/home/index/index.html.twig index 7f562c2d..e013e91e 100644 --- a/templates/home/index/index.html.twig +++ b/templates/shared/home/index/index.html.twig @@ -1,6 +1,6 @@ -{% extends 'container_fluid.html.twig' %} +{% extends 'shared/container_fluid.html.twig' %} -{% import '_macro/common_macro.html.twig' as commonMacro %} +{% import 'shared/_macro/common_macro.html.twig' as commonMacro %} {% block stylesheets %} {{ parent() }} @@ -17,7 +17,7 @@
    @@ -68,14 +68,14 @@
    - {% include 'home/index/_partial/_about.html.twig' %} + {% include 'shared/home/index/_partial/_about.html.twig' %}
    - {% include 'home/index/_partial/_missions.html.twig' %} + {% include 'shared/home/index/_partial/_missions.html.twig' %}
    - {% include '_partial/_footer.html.twig' %} + {% include 'shared/_partial/_footer.html.twig' %} {% endblock body %} diff --git a/templates/home/join_us/_partial/pl/join_steps.html.twig b/templates/shared/home/join_us/_partial/pl/join_steps.html.twig similarity index 100% rename from templates/home/join_us/_partial/pl/join_steps.html.twig rename to templates/shared/home/join_us/_partial/pl/join_steps.html.twig diff --git a/templates/home/join_us/join_us.html.twig b/templates/shared/home/join_us/join_us.html.twig similarity index 83% rename from templates/home/join_us/join_us.html.twig rename to templates/shared/home/join_us/join_us.html.twig index 72bf6beb..4a437b5e 100644 --- a/templates/home/join_us/join_us.html.twig +++ b/templates/shared/home/join_us/join_us.html.twig @@ -1,8 +1,8 @@ {% set title = 'Join polish Arma 3 clan'|trans %} -{% extends 'container_fluid.html.twig' %} +{% extends 'shared/container_fluid.html.twig' %} -{% import '_macro/common_macro.html.twig' as commonMacro %} +{% import 'shared/_macro/common_macro.html.twig' as commonMacro %} {% block stylesheets %} {{ parent() }} @@ -27,8 +27,8 @@
      {% include([ - 'home/join_us/_partial/' ~ get_current_locale() ~ '/join_steps.html.twig', - 'home/join_us/_partial/pl/join_steps.html.twig' + 'shared/home/join_us/_partial/' ~ get_current_locale() ~ '/join_steps.html.twig', + 'shared/home/join_us/_partial/pl/join_steps.html.twig' ]) %}
    diff --git a/templates/home/missions/missions.html.twig b/templates/shared/home/missions/missions.html.twig similarity index 81% rename from templates/home/missions/missions.html.twig rename to templates/shared/home/missions/missions.html.twig index f0a5e684..4050851a 100644 --- a/templates/home/missions/missions.html.twig +++ b/templates/shared/home/missions/missions.html.twig @@ -1,4 +1,4 @@ -{% extends 'container.html.twig' %} +{% extends 'shared/container.html.twig' %} {% block stylesheets %} {{ parent() }} @@ -25,10 +25,10 @@
    {% for mission in missionsRow %} - {# @var mission \App\Service\Mission\Dto\MissionDto #} + {# @var mission \App\Shared\Service\Mission\Dto\MissionDto #}
    - {% include '_partial/_mission_widget.html.twig' with { 'mission': mission } %} + {% include 'shared/_partial/_mission_widget.html.twig' with { 'mission': mission } %}
    {% endfor %} @@ -46,10 +46,10 @@
    {% for mission in missionsRow %} - {# @var mission \App\Service\Mission\Dto\MissionDto #} + {# @var mission \App\Shared\Service\Mission\Dto\MissionDto #}
    - {% include '_partial/_mission_widget.html.twig' with { 'mission': mission, 'lazy': true } %} + {% include 'shared/_partial/_mission_widget.html.twig' with { 'mission': mission, 'lazy': true } %}
    {% endfor %} diff --git a/templates/_partial/permissions/form.html.twig b/templates/users/_partial/permissions/form.html.twig similarity index 100% rename from templates/_partial/permissions/form.html.twig rename to templates/users/_partial/permissions/form.html.twig diff --git a/templates/user/form.html.twig b/templates/users/user/form.html.twig similarity index 67% rename from templates/user/form.html.twig rename to templates/users/user/form.html.twig index 62f78621..48f24644 100644 --- a/templates/user/form.html.twig +++ b/templates/users/user/form.html.twig @@ -1,10 +1,10 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% block content %} - {# @var userFormDto \App\Form\User\Dto\UserFormDto #} + {# @var userFormDto \App\Users\Form\User\Dto\UserFormDto #} {% set userFormDto = form.vars.data %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ 'Edit user'|trans }} - {{ user.username }} {% endblock %} @@ -15,7 +15,7 @@ {{ form_row(form.steamId) }} - {{ include ('_partial/permissions/form.html.twig', { form: form.permissions, title: 'User permissions'|trans }) }} + {{ include ('users/_partial/permissions/form.html.twig', { form: form.permissions, title: 'User permissions'|trans }) }} {{- form_rest(form) -}} diff --git a/templates/user/list.html.twig b/templates/users/user/list.html.twig similarity index 78% rename from templates/user/list.html.twig rename to templates/users/user/list.html.twig index dd418c29..f68da3ac 100644 --- a/templates/user/list.html.twig +++ b/templates/users/user/list.html.twig @@ -1,14 +1,14 @@ -{% extends 'card.html.twig' %} +{% extends 'shared/card.html.twig' %} {% block content %} - {% embed '_partial/_page_header.html.twig' %} + {% embed 'shared/_partial/_page_header.html.twig' %} {% block page_title %} {{ 'Users'|trans }} {% endblock %} {% endembed %} - {% embed '_partial/_table.html.twig' %} - {% import '_macro/table_macro.html.twig' as tableMacro %} + {% embed 'shared/_partial/_table.html.twig' %} + {% import 'shared/_macro/table_macro.html.twig' as tableMacro %} {% block table_head %}
    {{ loop.index }}{{ tableMacro.row_blamable(user.createdAt, user.createdBy) }} {{ tableMacro.row_blamable(user.lastUpdatedAt, user.lastUpdatedBy) }} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::USER_UPDATE').value, user) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::USER_UPDATE').value, user) %} {{ tableMacro.row_action_edit(path('app_user_update', { id: user.id }), 'Edit user'|trans) }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::USER_DELETE').value, user) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::USER_DELETE').value, user) %} {{ tableMacro.row_action_delete(path('app_user_delete', { id: user.id }), 'Are you sure you want to delete %name%?'|trans({ '%name%': user.username }), 'Delete user'|trans) }} {% endif %}
    {{ loop.index }}{{ tableMacro.row_blamable(userGroup.createdAt, userGroup.createdBy) }} {{ tableMacro.row_blamable(userGroup.lastUpdatedAt, userGroup.lastUpdatedBy) }} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::USER_GROUP_UPDATE').value, userGroup) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::USER_GROUP_UPDATE').value, userGroup) %} {{ tableMacro.row_action_edit(path('app_user_group_update', { name: userGroup.name }), 'Edit user group'|trans) }} {% endif %} - {% if is_granted(constant('App\\Security\\Enum\\PermissionsEnum::USER_GROUP_DELETE').value, userGroup) %} + {% if is_granted(constant('App\\Shared\\Security\\Enum\\PermissionsEnum::USER_GROUP_DELETE').value, userGroup) %} {{ tableMacro.row_action_delete(path('app_user_group_delete', { name: userGroup.name }), 'Are you sure you want to delete %name%?'|trans({ '%name%': userGroup.name }), 'Delete user group'|trans) }} {% endif %}