From 32d2bb002b9eed26f25dc2089f727f5576487de9 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 1 Oct 2025 18:38:41 +0200 Subject: [PATCH] Remove no longer used annotation use statements and replace with attribute use statements --- .../Controller/ActivityController.php | 2 +- .../DependencyInjection/Configuration.php | 2 +- .../ChillActivityBundle/Entity/Activity.php | 6 +- .../Entity/ActivityPresence.php | 2 +- .../Entity/ActivityReason.php | 4 -- .../Entity/ActivityReasonCategory.php | 4 -- .../Entity/ActivityType.php | 4 +- .../Form/ActivityReasonCategoryType.php | 3 - .../Form/ActivityReasonType.php | 3 - .../Test/PrepareActivityTrait.php | 4 +- .../ByActivityTypeAggregatorTest.php | 2 +- .../BySocialActionAggregatorTest.php | 2 +- .../BySocialIssueAggregatorTest.php | 2 +- .../ActivityPresenceAggregatorTest.php | 2 +- .../ActivityReasonAggregatorTest.php | 2 +- .../Aggregator/ActivityTypeAggregatorTest.php | 2 +- .../Aggregator/ActivityUserAggregatorTest.php | 2 +- .../Aggregator/ByThirdpartyAggregatorTest.php | 2 +- .../Aggregator/ByUserAggregatorTest.php | 2 +- .../Aggregator/CreatorJobAggregatorTest.php | 2 +- .../Aggregator/CreatorScopeAggregatorTest.php | 2 +- .../Export/Aggregator/DateAggregatorTest.php | 2 +- .../Aggregator/LocationTypeAggregatorTest.php | 2 +- .../PersonAggregatorTest.php | 2 +- .../Aggregator/PersonsAggregatorTest.php | 2 +- .../Filter/ACPFilters/ByCreatorFilterTest.php | 2 +- .../ACPFilters/BySocialIssueFilterTest.php | 2 +- .../Export/Filter/ActivityDateFilterTest.php | 2 +- .../Filter/ActivityPresenceFilterTest.php | 2 +- .../Filter/ActivityReasonFilterTest.php | 2 +- .../Export/Filter/ActivityTypeFilterTest.php | 2 +- .../Export/Filter/ByCreatorFilterTest.php | 2 +- .../Export/Filter/CreatorJobFilterTest.php | 2 +- .../Export/Filter/CreatorScopeFilterTest.php | 2 +- .../Export/Filter/EmergencyFilterTest.php | 2 +- .../Export/Filter/LocationTypeFilterTest.php | 2 +- .../ActivityReasonFilterTest.php | 2 +- ...sonHavingActivityBetweenDateFilterTest.php | 2 +- ...sonHavingActivityBetweenDateFilterTest.php | 2 +- .../Tests/Export/Filter/PersonsFilterTest.php | 2 +- .../Export/Filter/SentReceivedFilterTest.php | 2 +- .../Tests/Export/Filter/UserFilterTest.php | 2 +- .../Type/TranslatableActivityReasonTest.php | 7 +- .../Authorization/ActivityVoterTest.php | 1 - .../Timeline/TimelineActivityProvider.php | 2 +- .../src/Controller/AdminController.php | 1 - .../src/DependencyInjection/Configuration.php | 2 +- .../Controller/Admin/AdminController.php | 1 - .../Controller/ChargeController.php | 4 -- .../Controller/ElementController.php | 1 - .../Controller/ResourceController.php | 1 - .../DependencyInjection/Configuration.php | 2 +- .../ChillBudgetBundle/Entity/Charge.php | 2 - .../ChillBudgetBundle/Entity/Resource.php | 2 - .../Service/Summary/SummaryBudgetTest.php | 1 - .../migrations/Version20221207105407.php | 72 +++++++++---------- .../Controller/AdminController.php | 1 - .../Controller/CalendarAPIController.php | 1 - .../Controller/CalendarController.php | 1 - .../Controller/CalendarDocController.php | 1 - .../Controller/CalendarRangeAPIController.php | 1 - .../Controller/InviteApiController.php | 1 - .../RemoteCalendarConnectAzureController.php | 1 - .../RemoteCalendarMSGraphSyncController.php | 1 - .../RemoteCalendarProxyController.php | 1 - .../DependencyInjection/Configuration.php | 2 +- .../ChillCalendarBundle/Entity/Calendar.php | 2 +- .../Entity/CalendarRange.php | 2 +- .../ChillCalendarBundle/Entity/Invite.php | 2 +- .../CalendarRangeRemoveToRemoteHandler.php | 4 +- .../Handler/CalendarRangeToRemoteHandler.php | 4 +- .../Handler/CalendarRemoveHandler.php | 2 +- .../Handler/CalendarToRemoteHandler.php | 4 +- .../Messenger/Handler/InviteUpdateHandler.php | 2 +- .../MSGraphChangeNotificationHandler.php | 2 +- .../RemoteCalendar/Model/RemoteEvent.php | 2 +- .../Controller/CalendarControllerTest.php | 1 - ...emoteCalendarMSGraphSyncControllerTest.php | 1 - .../Export/Aggregator/AgentAggregatorTest.php | 2 +- .../Aggregator/CancelReasonAggregatorTest.php | 2 +- .../Export/Aggregator/JobAggregatorTest.php | 2 +- .../Aggregator/LocationAggregatorTest.php | 2 +- .../Aggregator/LocationTypeAggregatorTest.php | 2 +- .../Aggregator/MonthYearAggregatorTest.php | 2 +- .../Export/Aggregator/ScopeAggregatorTest.php | 2 +- .../Tests/Export/Filter/AgentFilterTest.php | 2 +- .../Export/Filter/BetweenDatesFilterTest.php | 2 +- .../Tests/Export/Filter/JobFilterTest.php | 2 +- .../Tests/Export/Filter/ScopeFilterTest.php | 2 +- .../Controller/AdminController.php | 1 - .../Controller/CustomFieldController.php | 1 - .../CustomFieldsGroupController.php | 1 - .../CustomFields/CustomFieldDate.php | 2 +- .../CustomFields/CustomFieldLongChoice.php | 2 +- .../CustomFields/CustomFieldNumber.php | 2 +- .../CustomFields/CustomFieldText.php | 2 +- .../CustomFields/CustomFieldTitle.php | 2 +- .../DependencyInjection/Configuration.php | 2 +- .../Entity/CustomField.php | 22 +----- .../Entity/CustomFieldLongChoice/Option.php | 28 +------- .../Entity/CustomFieldsDefaultGroup.php | 8 +-- .../Entity/CustomFieldsGroup.php | 11 +-- .../Form/CustomFieldType.php | 3 - .../Form/Type/LinkedCustomFieldsType.php | 2 - .../Service/CustomFieldsHelperException.php | 4 +- .../Tests/CustomFieldTestHelper.php | 4 +- .../AdminDocGeneratorTemplateController.php | 3 +- .../DocGeneratorTemplateController.php | 1 - .../Entity/DocGeneratorTemplate.php | 2 +- .../Normalizer/CollectionDocGenNormalizer.php | 1 + .../Messenger/RequestGenerationHandler.php | 4 +- .../Normalizer/DocGenObjectNormalizerTest.php | 2 +- .../AsyncUpload/SignedUrl.php | 2 +- .../AsyncUpload/SignedUrlPost.php | 2 +- .../Controller/AdminController.php | 6 -- .../Controller/AsyncUploadController.php | 1 - .../DocumentAccompanyingCourseController.php | 1 - ...tAccompanyingCourseDuplicateController.php | 1 - .../Controller/DocumentCategoryController.php | 1 - .../Controller/DocumentPersonController.php | 1 - ...ericDocForAccompanyingPeriodController.php | 1 - ...ForAccompanyingPeriodListApiController.php | 1 - .../Controller/GenericDocForPerson.php | 1 - .../Controller/SignatureRequestController.php | 1 - .../Controller/StoredObjectApiController.php | 6 +- ...dObjectContentToLocalStorageController.php | 1 - ...toredObjectRestoreVersionApiController.php | 1 - .../StoredObjectStatusApiController.php | 1 - .../StoredObjectVersionApiController.php | 1 - .../Controller/WebdavController.php | 1 - .../DependencyInjection/Configuration.php | 2 +- .../Entity/StoredObject.php | 2 +- .../JWTOnDavUrlAuthenticator.php | 4 +- .../Authorization/PersonDocumentVoter.php | 2 - .../BaseSigner/PdfSignedMessageHandler.php | 3 +- .../Service/Signature/PDFPage.php | 2 +- .../Service/Signature/PDFSignatureZone.php | 2 +- .../RemoveOldVersionMessageHandler.php | 2 + .../Controller/AdminController.php | 1 - .../Controller/EventController.php | 14 +--- .../Controller/EventListController.php | 1 - .../Controller/EventTypeController.php | 1 - .../Controller/ParticipationController.php | 11 +-- .../Controller/RoleController.php | 1 - .../Controller/StatusController.php | 1 - .../DependencyInjection/Configuration.php | 2 +- src/Bundle/ChillEventBundle/Entity/Event.php | 2 +- .../ChillEventBundle/Entity/EventType.php | 10 +-- .../ChillEventBundle/Entity/Participation.php | 11 +-- src/Bundle/ChillEventBundle/Entity/Role.php | 8 +-- src/Bundle/ChillEventBundle/Entity/Status.php | 8 +-- .../Form/ChoiceLoader/EventChoiceLoader.php | 2 - .../ChillEventBundle/Form/EventTypeType.php | 3 - src/Bundle/ChillEventBundle/Form/RoleType.php | 3 - .../ChillEventBundle/Form/StatusType.php | 3 - .../Export/filters/EventDateFilterTest.php | 2 +- .../Tests/Export/filters/RoleFilterTest.php | 2 +- .../Timeline/TimelineEventProvider.php | 2 +- .../src/Controller/RomeController.php | 1 - .../src/DependencyInjection/Configuration.php | 2 +- .../src/Controller/CSPersonController.php | 3 +- .../src/Controller/CSReportController.php | 1 - .../src/DependencyInjection/Configuration.php | 2 +- .../ChillJobBundle/src/Entity/CSPerson.php | 38 ---------- src/Bundle/ChillJobBundle/src/Entity/CV.php | 4 -- .../src/Entity/CV/Experience.php | 4 -- .../src/Entity/CV/Formation.php | 10 +-- .../ChillJobBundle/src/Entity/Immersion.php | 46 +++--------- .../src/Entity/ProjetProfessionnel.php | 16 ----- .../src/Entity/Rome/Appellation.php | 6 -- .../ChillJobBundle/src/Entity/Rome/Metier.php | 6 -- .../ChillJobBundle/src/Export/ListCV.php | 2 - .../ChillJobBundle/src/Export/ListFrein.php | 2 - .../src/Export/ListProjetProfessionnel.php | 2 - .../Authorization/ExportsJobVoter.php | 6 -- .../ArgumentResolver/EntityValueResolver.php | 9 +-- .../Controller/AbstractCRUDController.php | 2 +- .../CRUD/Controller/ApiController.php | 2 - .../CRUD/Controller/CRUDController.php | 34 ++++----- .../CRUD/Resolver/Resolver.php | 3 - .../CRUD/Templating/TwigCRUDResolver.php | 3 - .../Command/ChillImportUsersCommand.php | 2 +- .../Command/LoadCountriesCommand.php | 4 +- .../Command/LoadPostalCodeFR.php | 4 +- .../Controller/AbsenceController.php | 1 - .../Controller/AddressApiController.php | 3 - .../AddressReferenceAPIController.php | 1 - .../AddressToReferenceMatcherController.php | 5 +- .../Controller/AdminController.php | 1 - .../Controller/DashboardApiController.php | 2 - .../Controller/ExportController.php | 4 +- .../Controller/ExportGenerationController.php | 2 +- ...erationCreateFromSavedExportController.php | 2 +- .../Controller/ExportIndexController.php | 2 +- ...GeographicalUnitByAddressApiController.php | 1 - .../Controller/LocationApiController.php | 2 +- .../Controller/NewsItemApiController.php | 1 - .../Controller/NewsItemHistoryController.php | 1 - .../Controller/NotificationApiController.php | 5 +- .../Controller/NotificationController.php | 1 - .../Controller/PasswordController.php | 19 +---- .../Controller/PermissionApiController.php | 1 - .../Controller/PermissionsGroupController.php | 1 - .../Controller/PostalCodeAPIController.php | 1 - .../Controller/PostalCodeController.php | 1 - .../Controller/SavedExportController.php | 2 +- .../Controller/SavedExportIndexController.php | 2 +- .../Controller/ScopeController.php | 9 ++- .../Controller/TimelineCenterController.php | 1 - .../Controller/UserApiController.php | 1 - .../Controller/UserController.php | 2 - .../Controller/UserExportController.php | 1 - .../Controller/UserGroupController.php | 1 - .../UserJobScopeHistoriesController.php | 1 - .../Controller/UserProfileController.php | 1 - .../WorkflowAddSignatureController.php | 1 - .../Controller/WorkflowApiController.php | 1 - .../WorkflowAttachmentController.php | 1 - .../Controller/WorkflowController.php | 1 - .../Controller/WorkflowOnHoldController.php | 1 - ...WorkflowSignatureStateChangeController.php | 1 - .../WorkflowViewSendPublicController.php | 1 - .../DataFixtures/ORM/LoadCountries.php | 4 +- .../DataFixtures/ORM/LoadLanguages.php | 1 + .../DependencyInjection/Configuration.php | 2 +- .../Event/TrackCreateUpdateSubscriber.php | 1 - .../Doctrine/Model/TrackCreationTrait.php | 2 +- .../Doctrine/Model/TrackUpdateTrait.php | 2 +- src/Bundle/ChillMainBundle/Entity/Address.php | 10 +-- .../Entity/AddressReference.php | 2 +- src/Bundle/ChillMainBundle/Entity/Center.php | 5 +- .../ChillMainBundle/Entity/Civility.php | 2 +- src/Bundle/ChillMainBundle/Entity/Country.php | 5 +- .../Entity/DashboardConfigItem.php | 2 +- .../Entity/Embeddable/CommentEmbeddable.php | 3 - .../Entity/ExportGeneration.php | 2 +- src/Bundle/ChillMainBundle/Entity/Gender.php | 2 +- .../SimpleGeographicalUnitDTO.php | 2 +- .../Entity/GeographicalUnitLayer.php | 2 +- .../ChillMainBundle/Entity/Language.php | 4 +- .../ChillMainBundle/Entity/Location.php | 4 +- .../ChillMainBundle/Entity/LocationType.php | 4 +- .../ChillMainBundle/Entity/NewsItem.php | 2 +- .../ChillMainBundle/Entity/Notification.php | 2 +- .../Entity/PermissionsGroup.php | 6 -- .../ChillMainBundle/Entity/PostalCode.php | 14 +--- src/Bundle/ChillMainBundle/Entity/Scope.php | 7 +- src/Bundle/ChillMainBundle/Entity/User.php | 19 +---- .../ChillMainBundle/Entity/UserGroup.php | 2 +- src/Bundle/ChillMainBundle/Entity/UserJob.php | 2 +- .../Entity/Workflow/EntityWorkflow.php | 2 +- .../Export/Formatter/CSVFormatter.php | 2 +- .../Export/Formatter/SpreadSheetFormatter.php | 2 +- .../Formatter/SpreadsheetListFormatter.php | 2 +- .../ChoiceLoader/PostalCodeChoiceLoader.php | 2 - .../ChillMainBundle/Form/LocationFormType.php | 3 - .../ChillMainBundle/Form/NewsItemType.php | 3 - .../Form/PermissionsGroupType.php | 3 - src/Bundle/ChillMainBundle/Form/ScopeType.php | 3 - .../EntityToJsonTransformer.php | 1 + .../ChillMainBundle/Form/UserPasswordType.php | 3 - src/Bundle/ChillMainBundle/Form/UserType.php | 3 - .../Search/SearchApiResult.php | 2 +- .../ChillMainBundle/Search/SearchProvider.php | 2 - .../PasswordRecover/PasswordRecoverEvent.php | 3 - .../PasswordRecover/RecoverPasswordHelper.php | 2 - .../Resolver/ResolverTwigExtension.php | 3 - .../Serializer/CircularReferenceHandler.php | 10 +++ .../ShortMessage/ShortMessageHandler.php | 3 +- .../Templating/ChillTwigHelper.php | 2 - .../Templating/ChillTwigRoutingHelper.php | 4 -- .../Test/Export/AbstractAggregatorTest.php | 2 - .../ChillMainBundle/Test/PrepareUserTrait.php | 4 +- .../Event/TrackCreateUpdateSubscriberTest.php | 11 +++ .../Tests/Doctrine/Model/PointTest.php | 2 +- .../Tests/Form/Type/PickCenterTypeTest.php | 4 +- .../Tests/Pagination/PageTest.php | 4 +- .../Tests/Pagination/PaginatorTest.php | 4 +- .../Resolver/DefaultScopeResolverTest.php | 2 +- .../Resolver/ScopeResolverDispatcherTest.php | 2 +- .../Timeline/TimelineSingleQuery.php | 2 +- .../Attachment/AddAttachmentRequestDTO.php | 2 +- .../PostPublicViewMessageHandler.php | 3 +- .../PostSendExternalMessageHandler.php | 3 +- .../PostSignatureStateChangeHandler.php | 2 +- .../Validator/StepDestValidValidator.php | 2 - .../migrations/Version20250528124812.php | 7 ++ ...odSocialIssueConsistencyEntityListener.php | 2 - .../Controller/EntityPersonCRUDController.php | 5 -- .../AccompanyingCourseApiController.php | 14 ++-- .../AccompanyingCourseCommentController.php | 1 - .../AccompanyingCourseController.php | 3 +- .../AccompanyingCourseWorkApiController.php | 1 - .../AccompanyingCourseWorkController.php | 1 - ...CourseWorkEvaluationDocumentController.php | 1 - .../AccompanyingPeriodController.php | 2 +- ...mpanyingPeriodRegulationListController.php | 1 - ...ompanyingPeriodWorkDuplicateController.php | 2 +- ...nyingPeriodWorkEvaluationApiController.php | 1 - ...kEvaluationDocumentDuplicateController.php | 1 - .../Controller/AdminController.php | 4 -- .../Controller/ClosingMotiveController.php | 2 +- .../Controller/HouseholdApiController.php | 6 +- .../HouseholdCompositionController.php | 1 - .../Controller/HouseholdController.php | 1 - .../Controller/HouseholdMemberController.php | 12 ++-- .../Controller/PersonEditController.php | 2 +- .../Controller/PersonResourceController.php | 4 +- .../Controller/PersonSignatureController.php | 1 - .../ReassignAccompanyingPeriodController.php | 1 - .../ResidentialAddressController.php | 1 - .../SocialActionCSVExportController.php | 1 - .../SocialIssueCSVExportController.php | 1 - .../SocialWorkEvaluationApiController.php | 1 - .../SocialWorkSocialActionApiController.php | 2 +- .../UserAccompanyingPeriodController.php | 2 +- .../DependencyInjection/Configuration.php | 2 +- .../Entity/AccompanyingPeriod.php | 6 +- .../AccompanyingPeriodWork.php | 2 +- .../AccompanyingPeriodWorkEvaluation.php | 4 +- ...companyingPeriodWorkEvaluationDocument.php | 2 +- .../AccompanyingPeriodWorkGoal.php | 2 +- .../AccompanyingPeriod/ClosingMotive.php | 11 +-- .../Entity/AccompanyingPeriod/Comment.php | 4 +- .../Entity/AccompanyingPeriod/Origin.php | 2 +- .../Entity/AccompanyingPeriod/Resource.php | 4 +- .../AccompanyingPeriodParticipation.php | 4 +- .../Entity/AdministrativeStatus.php | 2 +- .../Entity/EmploymentStatus.php | 2 +- .../Entity/Household/Household.php | 2 +- .../Entity/Household/HouseholdComposition.php | 2 +- .../Household/HouseholdCompositionType.php | 2 +- .../Entity/Household/HouseholdMember.php | 2 +- .../Entity/Household/Position.php | 2 +- .../ChillPersonBundle/Entity/Person.php | 6 +- .../Entity/Person/AbstractPersonResource.php | 2 +- .../Entity/Person/PersonResource.php | 4 +- .../Entity/Person/PersonResourceKind.php | 2 +- .../Entity/Person/ResidentialAddress.php | 5 +- .../Entity/PersonAltName.php | 8 +-- .../Entity/PersonNotDuplicate.php | 6 +- .../Entity/Relationships/Relation.php | 4 +- .../Entity/Relationships/Relationship.php | 4 +- .../Entity/SocialWork/Evaluation.php | 2 +- .../Entity/SocialWork/Goal.php | 2 +- .../Entity/SocialWork/Result.php | 2 +- .../Entity/SocialWork/SocialAction.php | 2 +- .../Entity/SocialWork/SocialIssue.php | 4 +- .../Form/AccompanyingCourseCommentType.php | 6 -- .../Form/AccompanyingPeriodType.php | 3 - .../Form/ChoiceLoader/PersonChoiceLoader.php | 2 - .../Form/CreationPersonType.php | 3 - .../Form/PersonConfimDuplicateType.php | 3 - .../Form/PersonFindManuallyDuplicateType.php | 3 - .../Form/Type/ClosingMotivePickerType.php | 3 - .../Menu/PersonMenuBuilder.php | 2 - .../Privacy/PrivacyEvent.php | 8 +-- ...mpanyingPeriodWorkEvaluationNormalizer.php | 3 +- .../AccompanyingPeriodWorkNormalizer.php | 1 - .../Normalizer/SocialActionNormalizer.php | 1 - .../Normalizer/SocialIssueNormalizer.php | 1 - .../AdministrativeLocationAggregatorTest.php | 2 +- .../ClosingDateAggregatorTest.php | 2 +- .../ClosingMotiveAggregatorTest.php | 2 +- .../ConfidentialAggregatorTest.php | 2 +- .../DurationAggregatorTest.php | 2 +- .../EmergencyAggregatorTest.php | 2 +- .../EvaluationAggregatorTest.php | 2 +- .../GeographicalUnitStatAggregatorTest.php | 2 +- .../IntensityAggregatorTest.php | 2 +- .../OpeningDateAggregatorTest.php | 2 +- .../OriginAggregatorTest.php | 2 +- .../PersonParticipatingAggregatorTest.php | 2 +- .../ReferrerScopeAggregatorTest.php | 2 +- .../RequestorAggregatorTest.php | 2 +- .../ScopeAggregatorTest.php | 2 +- .../SocialActionAggregatorTest.php | 2 +- .../SocialIssueAggregatorTest.php | 2 +- .../StepAggregatorTest.php | 2 +- .../ByClosingMotiveAggregatorTest.php | 2 +- .../ByDateAggregatorTest.php | 2 +- .../ByStepAggregatorTest.php | 2 +- .../EvaluationTypeAggregatorTest.php | 2 +- .../ChildrenNumberAggregatorTest.php | 2 +- .../CompositionAggregatorTest.php | 2 +- .../PersonAggregators/AgeAggregatorTest.php | 2 +- .../CountryOfBirthAggregatorTest.php | 2 +- .../GenderAggregatorTest.php | 2 +- .../HouseholdPositionAggregatorTest.php | 2 +- .../MaritalStatusAggregatorTest.php | 2 +- .../NationalityAggregatorTest.php | 2 +- .../PostalCodeAggregatorTest.php | 2 +- .../ActionTypeAggregatorTest.php | 2 +- .../CreatorAggregatorTest.php | 2 +- .../CreatorJobAggregatorTest.php | 2 +- .../CreatorScopeAggregatorTest.php | 2 +- .../GoalAggregatorTest.php | 2 +- .../GoalResultAggregatorTest.php | 2 +- .../HandlingThirdPartyAggregatorTest.php | 2 +- .../JobAggregatorTest.php | 2 +- .../ReferrerAggregatorTest.php | 2 +- .../ResultAggregatorTest.php | 2 +- .../ScopeAggregatorTest.php | 2 +- .../Export/ListAccompanyingPeriodTest.php | 1 + .../ActiveOnDateFilterTest.php | 2 +- .../ActiveOneDayBetweenDatesFilterTest.php | 2 +- .../AdministrativeLocationFilterTest.php | 2 +- .../ClosingMotiveFilterTest.php | 2 +- .../ConfidentialFilterTest.php | 2 +- .../EmergencyFilterTest.php | 2 +- .../EvaluationFilterTest.php | 2 +- .../GeographicalUnitStatFilterTest.php | 2 +- .../HasTemporaryLocationFilterTest.php | 2 +- .../IntensityFilterTest.php | 2 +- ...ociatedWithAReferenceAddressFilterTest.php | 2 +- .../OpenBetweenDatesFilterTest.php | 2 +- .../OriginFilterTest.php | 2 +- .../ReferrerFilterBetweenDatesTest.php | 2 +- .../ReferrerFilterTest.php | 2 +- .../RequestorFilterTest.php | 2 +- .../SocialActionFilterTest.php | 2 +- .../SocialIssueFilterTest.php | 2 +- .../StepFilterOnDateTest.php | 2 +- .../UserJobFilterTest.php | 2 +- .../UserScopeFilterTest.php | 2 +- .../ByDateFilterTest.php | 2 +- .../ByStepFilterTest.php | 2 +- .../EvaluationTypeFilterTest.php | 2 +- .../EvaluationFilters/MaxDateFilterTest.php | 2 +- .../Filter/PersonFilters/AgeFilterTest.php | 2 +- .../PersonFilters/BirthdateFilterTest.php | 2 +- .../PersonFilters/DeadOrAliveFilterTest.php | 2 +- .../PersonFilters/DeathdateFilterTest.php | 2 +- .../Filter/PersonFilters/GenderFilterTest.php | 2 +- .../PersonFilters/MaritalStatusFilterTest.php | 2 +- .../PersonFilters/NationalityFilterTest.php | 2 +- ...sidentialAddressAtThirdpartyFilterTest.php | 2 +- .../ResidentialAddressAtUserFilterTest.php | 2 +- ...ithParticipationBetweenDatesFilterTest.php | 2 +- ...outParticipationBetweenDatesFilterTest.php | 2 +- .../SocialWorkFilters/CreatorFilterTest.php | 2 +- .../CreatorJobFilterTest.php | 2 +- .../CreatorScopeFilterTest.php | 2 +- .../HandlingThirdPartyFilterTest.php | 2 +- .../SocialWorkFilters/JobFilterTest.php | 2 +- .../SocialWorkFilters/ReferrerFilterTest.php | 2 +- .../SocialWorkFilters/ScopeFilterTest.php | 2 +- .../WithEvaluationBetweenDatesFilterTest.php | 2 +- .../Tests/Household/MembersEditorTest.php | 2 +- .../Authorization/PersonVoterTest.php | 4 +- .../LocationValidityValidatorTest.php | 2 +- ...eholdMembershipSequentialValidatorTest.php | 2 +- .../Household/MaxHolderValidatorTest.php | 2 +- .../Person/BirthdateValidatorTest.php | 2 +- .../Person/PersonHasCenterValidatorTest.php | 2 +- .../migrations/Version20250527122841.php | 7 ++ .../Controller/ReportController.php | 2 +- .../DependencyInjection/Configuration.php | 2 +- .../ChillReportBundle/Entity/Report.php | 20 ++---- .../ChillReportBundle/Form/ReportType.php | 3 - .../Controller/ReportControllerNextTest.php | 3 - .../Tests/Controller/ReportControllerTest.php | 6 +- .../Export/Filter/ReportDateFilterTest.php | 2 +- .../Authorization/ReportVoterTest.php | 4 +- .../Timeline/TimelineReportProvider.php | 2 +- .../Controller/SingleTaskController.php | 1 - .../Controller/TaskController.php | 4 -- .../DependencyInjection/Configuration.php | 2 +- .../ChillTaskBundle/Entity/AbstractTask.php | 2 +- .../ChillTaskBundle/Entity/RecurringTask.php | 8 --- .../ChillTaskBundle/Entity/SingleTask.php | 6 +- .../Entity/Task/AbstractTaskPlaceEvent.php | 2 - .../Entity/Task/SingleTaskPlaceEvent.php | 2 - .../Authorization/AuthorizationEvent.php | 2 +- ...TaskTaskLifeCycleEventTimelineProvider.php | 2 +- .../TaskLifeCycleEventTimelineProvider.php | 2 +- .../Controller/AdminController.php | 1 - .../ThirdpartyCSVExportController.php | 1 - .../ThirdpartyDuplicateController.php | 2 +- .../DependencyInjection/Configuration.php | 2 +- .../Entity/ThirdParty.php | 7 +- .../Entity/ThirdPartyCategory.php | 2 +- .../Entity/ThirdPartyProfession.php | 2 +- .../Security/Voter/ThirdPartyVoter.php | 4 +- .../migrations/Version20220302143821.php | 1 - .../src/DependencyInjection/Configuration.php | 2 +- 486 files changed, 495 insertions(+), 1063 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php index 9be3b7144..c45d3a451 100644 --- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php +++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php @@ -75,7 +75,7 @@ final class ActivityController extends AbstractController * Deletes a Activity entity. */ #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/activity/{id}/delete', name: 'chill_activity_activity_delete', methods: ['GET', 'POST', 'DELETE'])] - public function deleteAction(Request $request, mixed $id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response + public function deleteAction(Request $request, mixed $id): \Symfony\Component\HttpFoundation\RedirectResponse|Response { $view = null; diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php index b6d0d3f62..c6dde7d61 100644 --- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php @@ -22,7 +22,7 @@ use function is_int; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_activity'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillActivityBundle/Entity/Activity.php b/src/Bundle/ChillActivityBundle/Entity/Activity.php index 4701d2483..f52c8f69c 100644 --- a/src/Bundle/ChillActivityBundle/Entity/Activity.php +++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php @@ -34,9 +34,9 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; -use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Serializer\Annotation\SerializedName; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\Groups; +use Symfony\Component\Serializer\Attribute\SerializedName; use Symfony\Component\Validator\Constraints as Assert; /** diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php index 245d51b1d..2457e2311 100644 --- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php +++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; /** * Class ActivityPresence. diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php index cbbf9564c..31ccca67e 100644 --- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php +++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php @@ -37,8 +37,6 @@ class ActivityReason /** * Get active. - * - * @return bool */ public function getActive(): bool { @@ -55,8 +53,6 @@ class ActivityReason /** * Get id. - * - * @return int */ public function getId(): ?int { diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php index 7a1ca096e..b07a162c6 100644 --- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php +++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php @@ -58,8 +58,6 @@ class ActivityReasonCategory implements \Stringable /** * Get active. - * - * @return bool */ public function getActive(): bool { @@ -68,8 +66,6 @@ class ActivityReasonCategory implements \Stringable /** * Get id. - * - * @return int */ public function getId(): ?int { diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php index f8e871942..a03096cb4 100644 --- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php +++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php @@ -12,8 +12,8 @@ declare(strict_types=1); namespace Chill\ActivityBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute as Serializer; +use Symfony\Component\Serializer\Attribute\Groups; use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Context\ExecutionContextInterface; diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php index 7e0af8adc..4fcdaa025 100644 --- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php +++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php @@ -36,9 +36,6 @@ class ActivityReasonCategoryType extends AbstractType ]); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_activitybundle_activityreasoncategory'; diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php index 7a1d1477f..d3356ec0a 100644 --- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php +++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php @@ -36,9 +36,6 @@ class ActivityReasonType extends AbstractType ]); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_activitybundle_activityreason'; diff --git a/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php b/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php index f98e43074..e48cf1c45 100644 --- a/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php +++ b/src/Bundle/ChillActivityBundle/Test/PrepareActivityTrait.php @@ -22,10 +22,8 @@ trait PrepareActivityTrait { /** * Return an activity with a scope and a person inside. - * - * @return Activity */ - public function prepareActivity(Scope $scope, Person $person): \Chill\ActivityBundle\Entity\Activity + public function prepareActivity(Scope $scope, Person $person): Activity { return (new Activity()) ->setScope($scope) diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByActivityTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByActivityTypeAggregatorTest.php index b09b37bcb..b805329de 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByActivityTypeAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByActivityTypeAggregatorTest.php @@ -41,7 +41,7 @@ class ByActivityTypeAggregatorTest extends AbstractAggregatorTest $this->translatableStringHelper = self::getContainer()->get(TranslatableStringHelperInterface::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByActivityTypeAggregator + public function getAggregator(): ByActivityTypeAggregator { return new ByActivityTypeAggregator( $this->rollingDateConverter, diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php index 322ad9abb..ed5a6c0f3 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php @@ -32,7 +32,7 @@ final class BySocialActionAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.activity.export.bysocialaction_aggregator'); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregator + public function getAggregator(): BySocialActionAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php index f9e47dd0d..e042e40cb 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php @@ -32,7 +32,7 @@ final class BySocialIssueAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.activity.export.bysocialissue_aggregator'); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregator + public function getAggregator(): BySocialIssueAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityPresenceAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityPresenceAggregatorTest.php index c33f3c8c3..16b64721f 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityPresenceAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityPresenceAggregatorTest.php @@ -35,7 +35,7 @@ class ActivityPresenceAggregatorTest extends AbstractAggregatorTest $this->activityPresenceRepository = self::getContainer()->get(ActivityPresenceRepositoryInterface::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityPresenceAggregator + public function getAggregator(): ActivityPresenceAggregator { return new ActivityPresenceAggregator($this->activityPresenceRepository, $this->translatableStringHelper); } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php index 19f0bc00d..844f3e894 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php @@ -44,7 +44,7 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest ->push($request->reveal());*/ } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator + public function getAggregator(): ActivityReasonAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php index 961379289..cad83d383 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php @@ -45,7 +45,7 @@ final class ActivityTypeAggregatorTest extends AbstractAggregatorTest ->push($request->reveal()); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityTypeAggregator + public function getAggregator(): ActivityTypeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php index a932a9ce5..d144fe7a3 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php @@ -45,7 +45,7 @@ final class ActivityUserAggregatorTest extends AbstractAggregatorTest ->push($request->reveal()); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator + public function getAggregator(): ActivityUserAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php index 1231b6e91..80598ef28 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByThirdpartyAggregatorTest.php @@ -32,7 +32,7 @@ final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(ByThirdpartyAggregator::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ByThirdpartyAggregator + public function getAggregator(): ByThirdpartyAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php index fa2b10faf..a067dc8ce 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ByUserAggregatorTest.php @@ -32,7 +32,7 @@ final class ByUserAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(ByCreatorAggregator::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\ByCreatorAggregator + public function getAggregator(): ByCreatorAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorJobAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorJobAggregatorTest.php index 84f0763ec..947c3c3b6 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorJobAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorJobAggregatorTest.php @@ -32,7 +32,7 @@ final class CreatorJobAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(CreatorJobAggregator::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\CreatorJobAggregator + public function getAggregator(): CreatorJobAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php index 064878625..6d72053a8 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/CreatorScopeAggregatorTest.php @@ -32,7 +32,7 @@ final class CreatorScopeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(CreatorScopeAggregator::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\CreatorScopeAggregator + public function getAggregator(): CreatorScopeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php index 3a6d245bb..74dcb8a19 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/DateAggregatorTest.php @@ -32,7 +32,7 @@ final class DateAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(DateAggregator::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\DateAggregator + public function getAggregator(): DateAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php index 5ea9b03ad..5e28d62a6 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php @@ -32,7 +32,7 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(LocationTypeAggregator::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\LocationTypeAggregator + public function getAggregator(): LocationTypeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/PersonAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/PersonAggregatorTest.php index 0f004c997..e8c55531f 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/PersonAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/PersonAggregatorTest.php @@ -32,7 +32,7 @@ class PersonAggregatorTest extends AbstractAggregatorTest $this->labelPersonHelper = self::getContainer()->get(LabelPersonHelper::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\PersonAggregators\PersonAggregator + public function getAggregator(): PersonAggregator { return new PersonAggregator($this->labelPersonHelper); } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonsAggregatorTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonsAggregatorTest.php index 3c1183258..4c81f4820 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonsAggregatorTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonsAggregatorTest.php @@ -33,7 +33,7 @@ class PersonsAggregatorTest extends AbstractAggregatorTest $this->labelPersonHelper = self::getContainer()->get(LabelPersonHelper::class); } - public function getAggregator(): \Chill\ActivityBundle\Export\Aggregator\PersonsAggregator + public function getAggregator(): PersonsAggregator { return new PersonsAggregator($this->labelPersonHelper); } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php index e8c3badcf..e7f91f065 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByCreatorFilterTest.php @@ -33,7 +33,7 @@ final class ByCreatorFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(ByCreatorFilter::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\ByCreatorFilter + public function getFilter(): ByCreatorFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php index 1d514ab71..aaf0e4688 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php @@ -34,7 +34,7 @@ final class BySocialIssueFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(BySocialIssueFilter::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter + public function getFilter(): BySocialIssueFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php index 3d084fb09..26ee0d648 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php @@ -33,7 +33,7 @@ final class ActivityDateFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(ActivityDateFilter::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\ActivityDateFilter + public function getFilter(): ActivityDateFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityPresenceFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityPresenceFilterTest.php index 1a860e968..2612c1031 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityPresenceFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityPresenceFilterTest.php @@ -39,7 +39,7 @@ class ActivityPresenceFilterTest extends AbstractFilterTest $this->translatableStringHelper = self::getContainer()->get(TranslatableStringHelperInterface::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\ActivityPresenceFilter + public function getFilter(): ActivityPresenceFilter { return new ActivityPresenceFilter($this->translatableStringHelper, $this->translator); } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php index e857d032b..0d090ab82 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php @@ -44,7 +44,7 @@ final class ActivityReasonFilterTest extends AbstractFilterTest ->push($request->reveal()); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter + public function getFilter(): ActivityReasonFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php index e7dad8a47..547cc1c06 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php @@ -34,7 +34,7 @@ final class ActivityTypeFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.activity.export.type_filter'); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\ActivityTypeFilter + public function getFilter(): ActivityTypeFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php index 9fc76360b..173d28e97 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ByCreatorFilterTest.php @@ -33,7 +33,7 @@ final class ByCreatorFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(ByCreatorFilter::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\ByCreatorFilter + public function getFilter(): ByCreatorFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorJobFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorJobFilterTest.php index 40e56a65d..a93f0eff3 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorJobFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorJobFilterTest.php @@ -42,7 +42,7 @@ class CreatorJobFilterTest extends AbstractFilterTest $this->userJobRepository = self::getContainer()->get(UserJobRepositoryInterface::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\CreatorJobFilter + public function getFilter(): CreatorJobFilter { return new CreatorJobFilter( $this->translatableStringHelper, diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorScopeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorScopeFilterTest.php index 0762002f5..9e5f9ccd2 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorScopeFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/CreatorScopeFilterTest.php @@ -33,7 +33,7 @@ final class CreatorScopeFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(CreatorScopeFilter::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\CreatorScopeFilter + public function getFilter(): CreatorScopeFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php index 81347a38b..e9d88d6a2 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/EmergencyFilterTest.php @@ -32,7 +32,7 @@ final class EmergencyFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(EmergencyFilter::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\EmergencyFilter + public function getFilter(): EmergencyFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php index cff73b0d6..50d1c2d95 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/LocationTypeFilterTest.php @@ -33,7 +33,7 @@ final class LocationTypeFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(LocationTypeFilter::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\LocationTypeFilter + public function getFilter(): LocationTypeFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php index 6fe82bfd2..9b2b8ed1c 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php @@ -34,7 +34,7 @@ final class ActivityReasonFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.activity.export.reason_filter'); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter + public function getFilter(): ActivityReasonFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php index 400e90838..aaca43dc9 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php @@ -33,7 +33,7 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.activity.export.person_having_an_activity_between_date_filter'); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter + public function getFilter(): PersonHavingActivityBetweenDateFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php index a15c3e10d..b641989bd 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php @@ -43,7 +43,7 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest ->push($request->reveal()); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter + public function getFilter(): PersonHavingActivityBetweenDateFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonsFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonsFilterTest.php index 23ac15098..3c5b69b50 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonsFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonsFilterTest.php @@ -34,7 +34,7 @@ class PersonsFilterTest extends AbstractFilterTest $this->personRender = self::getContainer()->get(PersonRenderInterface::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\PersonsFilter + public function getFilter(): PersonsFilter { return new PersonsFilter($this->personRender); } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php index c1a833e9f..3b72850c4 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/SentReceivedFilterTest.php @@ -32,7 +32,7 @@ final class SentReceivedFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(SentReceivedFilter::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\SentReceivedFilter + public function getFilter(): SentReceivedFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php index 268ac3dab..a67d0d09d 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/UserFilterTest.php @@ -33,7 +33,7 @@ final class UserFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(UserFilter::class); } - public function getFilter(): \Chill\ActivityBundle\Export\Filter\UserFilter + public function getFilter(): UserFilter { return $this->filter; } diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php index 94103e039..b87acd506 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php @@ -47,9 +47,6 @@ final class TranslatableActivityReasonTest extends TypeTestCase $this->markTestSkipped('See issue 651'); } - /** - * @return \Symfony\Bridge\Doctrine\Form\Type\EntityType - */ protected function getEntityType(): \Symfony\Bridge\Doctrine\Form\Type\EntityType { $managerRegistry = (new \Prophecy\Prophet())->prophesize(); @@ -71,13 +68,11 @@ final class TranslatableActivityReasonTest extends TypeTestCase /** * @param string $locale * @param string $fallbackLocale - * - * @return TranslatableStringHelper */ protected function getTranslatableStringHelper( $locale = 'en', $fallbackLocale = 'en', - ): \Chill\MainBundle\Templating\TranslatableStringHelper { + ): TranslatableStringHelper { $prophet = new \Prophecy\Prophet(); $requestStack = $prophet->prophesize(); $request = $prophet->prophesize(); diff --git a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php index a346b0a1e..8f562d7ce 100644 --- a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php +++ b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php @@ -19,7 +19,6 @@ use Chill\MainBundle\Entity\User; use Chill\MainBundle\Test\PrepareCenterTrait; use Chill\MainBundle\Test\PrepareScopeTrait; use Chill\MainBundle\Test\PrepareUserTrait; -use Chill\PersonBundle\Security\Authorization\PersonVoter; use Chill\PersonBundle\Test\PreparePersonTrait; use Prophecy\Prophet; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; diff --git a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php index 543472ef1..80f0f8470 100644 --- a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php +++ b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php @@ -41,7 +41,7 @@ class TimelineActivityProvider implements TimelineProviderInterface $this->user = $storage->getToken()->getUser(); } - public function fetchQuery($context, array $args): \Chill\MainBundle\Timeline\TimelineSingleQuery + public function fetchQuery($context, array $args): TimelineSingleQuery { if ('center' === $context) { return TimelineSingleQuery::fromArray($this->aclAwareRepository diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php index 5f1ffd4cd..cadb43e7c 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Chill\AsideActivityBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\Routing\Annotation\Route; /** * Class AdminController. diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php index 431591a30..da2e9ec8e 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php @@ -16,7 +16,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_aside_activity'); diff --git a/src/Bundle/ChillBudgetBundle/Controller/Admin/AdminController.php b/src/Bundle/ChillBudgetBundle/Controller/Admin/AdminController.php index 5c900c069..df8cb657b 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/Admin/AdminController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/Admin/AdminController.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Chill\BudgetBundle\Controller\Admin; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\Routing\Annotation\Route; class AdminController extends AbstractController { diff --git a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php index c397d2798..6abe38472 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php @@ -17,7 +17,6 @@ use Chill\PersonBundle\Entity\Household\Household; use Chill\PersonBundle\Entity\Person; use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; class ChargeController extends AbstractElementController { @@ -71,9 +70,6 @@ class ChargeController extends AbstractElementController ); } - /** - * @return \Symfony\Component\HttpFoundation\Response - */ #[\Symfony\Component\Routing\Attribute\Route(path: '{_locale}/budget/charge/{id}/view', name: 'chill_budget_charge_view')] public function viewAction(#[MapEntity(id: 'id')] Charge $charge): \Symfony\Component\HttpFoundation\Response { diff --git a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php index 94d7b1ba2..93285ec4b 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php @@ -19,7 +19,6 @@ use Chill\PersonBundle\Entity\Household\Household; use Chill\PersonBundle\Entity\Person; use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\Routing\Annotation\Route; class ElementController extends AbstractController { diff --git a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php index dd9e53865..d897fbad5 100644 --- a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php +++ b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php @@ -18,7 +18,6 @@ use Chill\PersonBundle\Entity\Person; use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; class ResourceController extends AbstractElementController { diff --git a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php index 24efa96e5..16fb2de5b 100644 --- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php @@ -16,7 +16,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_budget'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillBudgetBundle/Entity/Charge.php b/src/Bundle/ChillBudgetBundle/Entity/Charge.php index 3ede15a26..540b7fdeb 100644 --- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php +++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php @@ -75,8 +75,6 @@ class Charge extends AbstractElement implements HasCentersInterface /** * Get id. - * - * @return int */ public function getId(): ?int { diff --git a/src/Bundle/ChillBudgetBundle/Entity/Resource.php b/src/Bundle/ChillBudgetBundle/Entity/Resource.php index 67ee82b55..9daf3cace 100644 --- a/src/Bundle/ChillBudgetBundle/Entity/Resource.php +++ b/src/Bundle/ChillBudgetBundle/Entity/Resource.php @@ -47,8 +47,6 @@ class Resource extends AbstractElement implements HasCentersInterface /** * Get id. - * - * @return int */ public function getId(): ?int { diff --git a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php index 67d9cf2a4..d29d4e9bb 100644 --- a/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php +++ b/src/Bundle/ChillBudgetBundle/Tests/Service/Summary/SummaryBudgetTest.php @@ -20,7 +20,6 @@ use Chill\MainBundle\Templating\TranslatableStringHelperInterface; use Chill\PersonBundle\Entity\Household\Household; use Chill\PersonBundle\Entity\Household\HouseholdMember; use Chill\PersonBundle\Entity\Person; -use Doctrine\ORM\AbstractQuery; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\NativeQuery; use Doctrine\ORM\Query; diff --git a/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php b/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php index 1149ad394..fd3e1258c 100644 --- a/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php +++ b/src/Bundle/ChillBudgetBundle/migrations/Version20221207105407.php @@ -30,43 +30,43 @@ final class Version20221207105407 extends AbstractMigration public function up(Schema $schema): void { -/* $resources = $this->container->getParameter('chill_budget.resources'); - $charges = $this->container->getParameter('chill_budget.charges'); + /* $resources = $this->container->getParameter('chill_budget.resources'); + $charges = $this->container->getParameter('chill_budget.charges'); - foreach ($resources as $value) { - $lang = $value['labels'][0]['lang']; - $label = $value['labels'][0]['label']; - $kind = $value['key']; - $this->addSql( - 'INSERT INTO chill_budget.resource_type (id, isActive, name, ordering, kind) VALUES ( - nextval(\'chill_budget.resource_type_id_seq\'), true, jsonb_build_object(:lang::text, :label::text), 0, :kind::text)', - ['lang' => $lang, 'label' => $label, 'kind' => $kind], - ['lang' => Types::STRING, 'label' => Types::STRING, 'kind' => Types::STRING] - ); - $this->addSql( - 'UPDATE chill_budget.resource SET resource_id = resource_type.id - FROM chill_budget.resource_type WHERE resource.type = :kind AND resource_type.kind = resource.type;', - ['kind' => $kind], - ['kind' => Types::STRING] - ); - } + foreach ($resources as $value) { + $lang = $value['labels'][0]['lang']; + $label = $value['labels'][0]['label']; + $kind = $value['key']; + $this->addSql( + 'INSERT INTO chill_budget.resource_type (id, isActive, name, ordering, kind) VALUES ( + nextval(\'chill_budget.resource_type_id_seq\'), true, jsonb_build_object(:lang::text, :label::text), 0, :kind::text)', + ['lang' => $lang, 'label' => $label, 'kind' => $kind], + ['lang' => Types::STRING, 'label' => Types::STRING, 'kind' => Types::STRING] + ); + $this->addSql( + 'UPDATE chill_budget.resource SET resource_id = resource_type.id + FROM chill_budget.resource_type WHERE resource.type = :kind AND resource_type.kind = resource.type;', + ['kind' => $kind], + ['kind' => Types::STRING] + ); + } - foreach ($charges as $value) { - $lang = $value['labels'][0]['lang']; - $label = $value['labels'][0]['label']; - $kind = $value['key']; - $this->addSql( - 'INSERT INTO chill_budget.charge_type VALUES (nextval(\'chill_budget.charge_type_id_seq\'), true, - jsonb_build_object(:lang::text, :label::text), 0, :kind::text);', - ['lang' => $lang, 'label' => $label, 'kind' => $kind], - ['lang' => Types::STRING, 'label' => Types::STRING, 'kind' => Types::STRING] - ); - $this->addSql( - 'UPDATE chill_budget.charge SET charge_id = charge_type.id - FROM chill_budget.charge_type WHERE charge.type = :kind AND charge_type.kind = charge.type;', - ['kind' => $kind], - ['kind' => Types::STRING] - ); - }*/ + foreach ($charges as $value) { + $lang = $value['labels'][0]['lang']; + $label = $value['labels'][0]['label']; + $kind = $value['key']; + $this->addSql( + 'INSERT INTO chill_budget.charge_type VALUES (nextval(\'chill_budget.charge_type_id_seq\'), true, + jsonb_build_object(:lang::text, :label::text), 0, :kind::text);', + ['lang' => $lang, 'label' => $label, 'kind' => $kind], + ['lang' => Types::STRING, 'label' => Types::STRING, 'kind' => Types::STRING] + ); + $this->addSql( + 'UPDATE chill_budget.charge SET charge_id = charge_type.id + FROM chill_budget.charge_type WHERE charge.type = :kind AND charge_type.kind = charge.type;', + ['kind' => $kind], + ['kind' => Types::STRING] + ); + }*/ } } diff --git a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php index 08f1190b3..81475d174 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Chill\CalendarBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\Routing\Annotation\Route; class AdminController extends AbstractController { diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php index baba553f4..41148e90b 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php @@ -19,7 +19,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; class CalendarAPIController extends ApiController { diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php index eb78826dc..abc0c0df2 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php @@ -40,7 +40,6 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\SerializerInterface; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php index cbd9eb705..cdde7cee6 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php @@ -23,7 +23,6 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Bundle\SecurityBundle\Security; diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php index 373f132db..dd6f913ba 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarRangeAPIController.php @@ -19,7 +19,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; class CalendarRangeAPIController extends ApiController { diff --git a/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php b/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php index ffc91534d..1cf893f94 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php @@ -29,7 +29,6 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; class InviteApiController diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php index 489a4a367..dc7b454e4 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php @@ -24,7 +24,6 @@ use League\OAuth2\Client\Provider\Exception\IdentityProviderException; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use TheNetworg\OAuth2\Client\Provider\Azure; use TheNetworg\OAuth2\Client\Token\AccessToken; diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php index 2e867787c..e620c0374 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php @@ -23,7 +23,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\Routing\Annotation\Route; class RemoteCalendarMSGraphSyncController { diff --git a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php index f9cd64055..2e65b2bf7 100644 --- a/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php +++ b/src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarProxyController.php @@ -26,7 +26,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\SerializerInterface; /** diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php index 2e322566a..f2617d841 100644 --- a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php @@ -21,7 +21,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_calendar'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php index 2690ec286..3f94cad67 100644 --- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php +++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php @@ -30,7 +30,7 @@ use Doctrine\Common\Collections\Criteria; use Doctrine\Common\Collections\ReadableCollection; use Doctrine\Common\Collections\Selectable; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\Range; diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php index 12f3ed7e7..eeca381cf 100644 --- a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php +++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php @@ -18,7 +18,7 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait; use Chill\MainBundle\Entity\Location; use Chill\MainBundle\Entity\User; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Groups; use Symfony\Component\Validator\Constraints as Assert; #[ORM\Entity] diff --git a/src/Bundle/ChillCalendarBundle/Entity/Invite.php b/src/Bundle/ChillCalendarBundle/Entity/Invite.php index 3c1b2477d..4b9429f71 100644 --- a/src/Bundle/ChillCalendarBundle/Entity/Invite.php +++ b/src/Bundle/ChillCalendarBundle/Entity/Invite.php @@ -17,7 +17,7 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait; use Chill\MainBundle\Entity\User; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; /** * An invitation for another user to a Calendar. diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php index 0aa392fbc..e1e6c8be8 100644 --- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php +++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeRemoveToRemoteHandler.php @@ -22,17 +22,17 @@ use Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage; use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface; use Chill\MainBundle\Repository\UserRepository; use Symfony\Component\Messenger\Attribute\AsMessageHandler; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; /** * Remove a calendar range when it is removed from local calendar. * * @AsMessageHandler */ -#[\Symfony\Component\Messenger\Attribute\AsMessageHandler] +#[AsMessageHandler] class CalendarRangeRemoveToRemoteHandler { public function __construct(private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector, private readonly UserRepository $userRepository) {} + public function __invoke(CalendarRangeRemovedMessage $calendarRangeRemovedMessage): void { $this->remoteCalendarConnector->removeCalendarRange( diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php index 7410e70a2..ef119faab 100644 --- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php +++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRangeToRemoteHandler.php @@ -23,17 +23,17 @@ use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterfa use Chill\CalendarBundle\Repository\CalendarRangeRepository; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Messenger\Attribute\AsMessageHandler; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; /** * Write calendar range creation / update to the remote calendar. * * @AsMessageHandler */ -#[\Symfony\Component\Messenger\Attribute\AsMessageHandler] +#[AsMessageHandler] class CalendarRangeToRemoteHandler { public function __construct(private readonly CalendarRangeRepository $calendarRangeRepository, private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector, private readonly EntityManagerInterface $entityManager) {} + public function __invoke(CalendarRangeMessage $calendarRangeMessage): void { $range = $this->calendarRangeRepository->find($calendarRangeMessage->getCalendarRangeId()); diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php index 8667aaa05..d48ac8645 100644 --- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php +++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php @@ -22,7 +22,6 @@ use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage; use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface; use Chill\CalendarBundle\Repository\CalendarRangeRepository; use Chill\MainBundle\Repository\UserRepositoryInterface; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; /** * Handle the deletion of calendar. @@ -33,6 +32,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface; class CalendarRemoveHandler { public function __construct(private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector, private readonly CalendarRangeRepository $calendarRangeRepository, private readonly UserRepositoryInterface $userRepository) {} + public function __invoke(CalendarRemovedMessage $message): void { if (null !== $message->getAssociatedCalendarRangeId()) { diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php index a9e12d246..2b9dc0a5e 100644 --- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php +++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php @@ -28,17 +28,17 @@ use Chill\CalendarBundle\Repository\InviteRepository; use Chill\MainBundle\Repository\UserRepository; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Messenger\Attribute\AsMessageHandler; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; /** * Write calendar creation / update to the remote calendar. * * @AsMessageHandler */ -#[\Symfony\Component\Messenger\Attribute\AsMessageHandler] +#[AsMessageHandler] class CalendarToRemoteHandler { public function __construct(private readonly CalendarRangeRepository $calendarRangeRepository, private readonly CalendarRepository $calendarRepository, private readonly EntityManagerInterface $entityManager, private readonly InviteRepository $inviteRepository, private readonly RemoteCalendarConnectorInterface $calendarConnector, private readonly UserRepository $userRepository) {} + public function __invoke(CalendarMessage $calendarMessage): void { $calendar = $this->calendarRepository->find($calendarMessage->getCalendarId()); diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php index b1483b087..0969556a6 100644 --- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php +++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/InviteUpdateHandler.php @@ -22,7 +22,6 @@ use Chill\CalendarBundle\Messenger\Message\InviteUpdateMessage; use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface; use Chill\CalendarBundle\Repository\InviteRepository; use Doctrine\ORM\EntityManagerInterface; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; /** * Sync the local invitation to the remote calendar. @@ -33,6 +32,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface; class InviteUpdateHandler { public function __construct(private readonly EntityManagerInterface $em, private readonly InviteRepository $inviteRepository, private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector) {} + public function __invoke(InviteUpdateMessage $inviteUpdateMessage): void { if (null === $invite = $this->inviteRepository->find($inviteUpdateMessage->getInviteId())) { diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php index 4aefc5323..4d7edca2a 100644 --- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php +++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/MSGraphChangeNotificationHandler.php @@ -27,7 +27,6 @@ use Chill\CalendarBundle\Repository\CalendarRepository; use Chill\MainBundle\Repository\UserRepository; use Doctrine\ORM\EntityManagerInterface; use Psr\Log\LoggerInterface; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; /** * Handle notification of changes made by users directly on Outlook calendar. @@ -38,6 +37,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface; class MSGraphChangeNotificationHandler { public function __construct(private readonly CalendarRangeRepository $calendarRangeRepository, private readonly CalendarRangeSyncer $calendarRangeSyncer, private readonly CalendarRepository $calendarRepository, private readonly CalendarSyncer $calendarSyncer, private readonly EntityManagerInterface $em, private readonly LoggerInterface $logger, private readonly MapCalendarToUser $mapCalendarToUser, private readonly UserRepository $userRepository) {} + public function __invoke(MSGraphChangeNotificationMessage $changeNotificationMessage): void { $user = $this->userRepository->find($changeNotificationMessage->getUserId()); diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php index 3d86da7f4..ed78ab460 100644 --- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Model/RemoteEvent.php @@ -18,7 +18,7 @@ declare(strict_types=1); namespace Chill\CalendarBundle\RemoteCalendar\Model; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; class RemoteEvent { diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php index e814573d2..2c6616e43 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php @@ -16,7 +16,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\KernelBrowser; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\HttpFoundation\Request; /** * @internal diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php index dad74cfd8..8227c8149 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/RemoteCalendarMSGraphSyncControllerTest.php @@ -19,7 +19,6 @@ declare(strict_types=1); namespace Chill\CalendarBundle\Tests\Controller; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\Messenger\Transport\InMemoryTransport; /** * @internal diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php index 8efe9203b..bfd0731ee 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/AgentAggregatorTest.php @@ -39,7 +39,7 @@ final class AgentAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.calendar.export.agent_aggregator'); } - public function getAggregator(): \Chill\CalendarBundle\Export\Aggregator\AgentAggregator + public function getAggregator(): AgentAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php index 9637ae9d7..7f688e28e 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/CancelReasonAggregatorTest.php @@ -39,7 +39,7 @@ final class CancelReasonAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.calendar.export.cancel_reason_aggregator'); } - public function getAggregator(): \Chill\CalendarBundle\Export\Aggregator\CancelReasonAggregator + public function getAggregator(): CancelReasonAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php index bc7ae8be3..1a937c1a2 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/JobAggregatorTest.php @@ -39,7 +39,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.calendar.export.job_aggregator'); } - public function getAggregator(): \Chill\CalendarBundle\Export\Aggregator\JobAggregator + public function getAggregator(): JobAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php index 04b398118..74b324b99 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationAggregatorTest.php @@ -39,7 +39,7 @@ final class LocationAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.calendar.export.location_aggregator'); } - public function getAggregator(): \Chill\CalendarBundle\Export\Aggregator\LocationAggregator + public function getAggregator(): LocationAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php index 2c101e72e..ca2ee36c4 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/LocationTypeAggregatorTest.php @@ -39,7 +39,7 @@ final class LocationTypeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.calendar.export.location_type_aggregator'); } - public function getAggregator(): \Chill\CalendarBundle\Export\Aggregator\LocationTypeAggregator + public function getAggregator(): LocationTypeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php index 2732b9c87..5cf828996 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/MonthYearAggregatorTest.php @@ -39,7 +39,7 @@ final class MonthYearAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.calendar.export.month_aggregator'); } - public function getAggregator(): \Chill\CalendarBundle\Export\Aggregator\MonthYearAggregator + public function getAggregator(): MonthYearAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php index d19764cec..27112cb85 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Aggregator/ScopeAggregatorTest.php @@ -39,7 +39,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.calendar.export.scope_aggregator'); } - public function getAggregator(): \Chill\CalendarBundle\Export\Aggregator\ScopeAggregator + public function getAggregator(): ScopeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php index f37fad367..7c3bd6b52 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php @@ -46,7 +46,7 @@ final class AgentFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.calendar.export.agent_filter'); } - public function getFilter(): \Chill\CalendarBundle\Export\Filter\AgentFilter + public function getFilter(): AgentFilter { return $this->filter; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php index 24fdbe138..d319f2d92 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/BetweenDatesFilterTest.php @@ -46,7 +46,7 @@ final class BetweenDatesFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.calendar.export.between_dates_filter'); } - public function getFilter(): \Chill\CalendarBundle\Export\Filter\BetweenDatesFilter + public function getFilter(): BetweenDatesFilter { return $this->filter; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php index e27df1f5f..ef56e40bf 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/JobFilterTest.php @@ -47,7 +47,7 @@ final class JobFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.calendar.export.job_filter'); } - public function getFilter(): \Chill\CalendarBundle\Export\Filter\JobFilter + public function getFilter(): JobFilter { return $this->filter; } diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php index 0052a8024..1ffc0259c 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/ScopeFilterTest.php @@ -47,7 +47,7 @@ final class ScopeFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.calendar.export.scope_filter'); } - public function getFilter(): \Chill\CalendarBundle\Export\Filter\ScopeFilter + public function getFilter(): ScopeFilter { return $this->filter; } diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php index e886055b3..dcbf9eaa2 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php +++ b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php @@ -13,7 +13,6 @@ namespace Chill\CustomFieldsBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; /** * Class AdminController diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php index 35dc4cfc9..6efe14318 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php +++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php @@ -18,7 +18,6 @@ use Doctrine\Persistence\ManagerRegistry; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Contracts\Translation\TranslatorInterface; /** diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php index e9db2264e..422851c2b 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php +++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php @@ -25,7 +25,6 @@ use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Contracts\Translation\TranslatorInterface; /** diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php index 49b0c618c..777538046 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php @@ -64,7 +64,7 @@ class CustomFieldDate extends AbstractCustomField ); } - public function buildOptionsForm(FormBuilderInterface $builder): \Symfony\Component\Form\FormBuilderInterface + public function buildOptionsForm(FormBuilderInterface $builder): FormBuilderInterface { $validatorFunction = static function ($value, ExecutionContextInterface $context) { try { diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php index 4fc2bc00b..e9ff3e9aa 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php @@ -63,7 +63,7 @@ class CustomFieldLongChoice extends AbstractCustomField ->addModelTransformer(new CustomFieldDataTransformer($this, $customField)); } - public function buildOptionsForm(FormBuilderInterface $builder): \Symfony\Component\Form\FormBuilderInterface + public function buildOptionsForm(FormBuilderInterface $builder): FormBuilderInterface { // create a selector between different keys $keys = $this->optionRepository->getKeys(); diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php index 12582105f..90b016f40 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php @@ -58,7 +58,7 @@ class CustomFieldNumber extends AbstractCustomField $builder->add($customField->getSlug(), $type, $fieldOptions); } - public function buildOptionsForm(FormBuilderInterface $builder): \Symfony\Component\Form\FormBuilderInterface + public function buildOptionsForm(FormBuilderInterface $builder): FormBuilderInterface { return $builder ->add(self::MIN, NumberType::class, [ diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php index 576272422..22cec135d 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php @@ -60,7 +60,7 @@ class CustomFieldText extends AbstractCustomField ]); } - public function buildOptionsForm(FormBuilderInterface $builder): \Symfony\Component\Form\FormBuilderInterface + public function buildOptionsForm(FormBuilderInterface $builder): FormBuilderInterface { return $builder ->add(self::MAX_LENGTH, IntegerType::class, ['empty_data' => 256]) diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php index ec1208d9a..17435747b 100644 --- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php +++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php @@ -46,7 +46,7 @@ class CustomFieldTitle extends AbstractCustomField ]); } - public function buildOptionsForm(FormBuilderInterface $builder): \Symfony\Component\Form\FormBuilderInterface + public function buildOptionsForm(FormBuilderInterface $builder): FormBuilderInterface { return $builder->add( self::TYPE, diff --git a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php index 39baff71d..262b99d78 100644 --- a/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php @@ -22,7 +22,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_custom_fields'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php index 5eb1d4fec..ac82503ce 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php @@ -59,18 +59,14 @@ class CustomField /** * Get customFieldGroup. - * - * @return CustomFieldsGroup */ - public function getCustomFieldsGroup(): ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup + public function getCustomFieldsGroup(): ?CustomFieldsGroup { return $this->customFieldGroup; } /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -103,9 +99,6 @@ class CustomField return $this->name; } - /** - * @return array - */ public function getOptions(): array { return $this->options; @@ -113,8 +106,6 @@ class CustomField /** * Get order. - * - * @return float */ public function getOrdering(): ?float { @@ -123,17 +114,12 @@ class CustomField /** * alias for isRequired. - * - * @return bool */ public function getRequired(): bool { return $this->isRequired(); } - /** - * @return string - */ public function getSlug(): ?string { return $this->slug; @@ -141,8 +127,6 @@ class CustomField /** * Get type. - * - * @return string */ public function getType(): ?string { @@ -151,8 +135,6 @@ class CustomField /** * Returns true if the custom field is active. - * - * @return bool */ public function isActive(): bool { @@ -161,8 +143,6 @@ class CustomField /** * return true if the field required. - * - * @return bool */ public function isRequired(): bool { diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php index 8ec51bce1..fb94db6bd 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php @@ -54,57 +54,36 @@ class Option $this->children = new ArrayCollection(); } - /** - * @return bool - */ public function getActive(): bool { return $this->isActive(); } - /** - * @return Collection - */ - public function getChildren(): \Doctrine\Common\Collections\Collection + public function getChildren(): Collection { return $this->children; } - /** - * @return int - */ public function getId(): ?int { return $this->id; } - /** - * @return string - */ public function getInternalKey(): string { return $this->internalKey; } - /** - * @return string - */ public function getKey(): ?string { return $this->key; } - /** - * @return Option - */ - public function getParent(): ?\Chill\CustomFieldsBundle\Entity\CustomFieldLongChoice\Option + public function getParent(): ?Option { return $this->parent; } - /** - * @return array - */ public function getText(): ?array { return $this->text; @@ -118,9 +97,6 @@ class Option return null === $this->parent ? false : true; } - /** - * @return bool - */ public function isActive(): bool { return $this->active; diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php index 8fad684d9..b91143fb3 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php @@ -34,18 +34,14 @@ class CustomFieldsDefaultGroup /** * Get customFieldsGroup. - * - * @return CustomFieldsGroup */ - public function getCustomFieldsGroup(): ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup + public function getCustomFieldsGroup(): ?CustomFieldsGroup { return $this->customFieldsGroup; } /** * Get entity. - * - * @return string */ public function getEntity(): ?string { @@ -54,8 +50,6 @@ class CustomFieldsDefaultGroup /** * Get id. - * - * @return int */ public function getId(): ?int { diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php index f5d3816a6..cd743c028 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php @@ -90,18 +90,13 @@ class CustomFieldsGroup return $this->activeCustomFields; } - /** - * @return Collection - */ - public function getCustomFields(): \Doctrine\Common\Collections\Collection + public function getCustomFields(): Collection { return $this->customFields; } /** * Get entity. - * - * @return string */ public function getEntity(): ?string { @@ -110,8 +105,6 @@ class CustomFieldsGroup /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -143,8 +136,6 @@ class CustomFieldsGroup /** * get options array. - * - * @return array */ public function getOptions(): array { diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php index afcc2a3d4..df7c3600c 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php +++ b/src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php @@ -103,9 +103,6 @@ class CustomFieldType extends AbstractType ->setDefault('group_widget', 'entity'); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'custom_field_choice'; diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php index 29d0b66bf..98f43b51a 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php +++ b/src/Bundle/ChillCustomFieldsBundle/Form/Type/LinkedCustomFieldsType.php @@ -49,8 +49,6 @@ class LinkedCustomFieldsType extends AbstractType * * Choices are extracted from custom_field_group (the data associated * with the root form) - * - * @return void */ public function appendChoice(FormEvent $event): void { diff --git a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php index a0bf5fa24..6b1dcbf61 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php +++ b/src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelperException.php @@ -13,12 +13,12 @@ namespace Chill\CustomFieldsBundle\Service; class CustomFieldsHelperException extends \Exception { - public static function customFieldsGroupNotFound($entity): \Chill\CustomFieldsBundle\Service\CustomFieldsHelperException + public static function customFieldsGroupNotFound($entity): CustomFieldsHelperException { return new CustomFieldsHelperException("The customFieldsGroups associated with {$entity} are not found"); } - public static function slugIsMissing(): \Chill\CustomFieldsBundle\Service\CustomFieldsHelperException + public static function slugIsMissing(): CustomFieldsHelperException { return new CustomFieldsHelperException('The slug is missing'); } diff --git a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php index c11aafd5e..1ed3ee410 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php +++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php @@ -26,10 +26,8 @@ trait CustomFieldTestHelper * rendering the customfield, using Type\CustomFieldType, to a simple form row * * @param type $locale - * - * @return Crawler */ - public function getCrawlerForField(CustomField $field, $locale = 'en'): \Symfony\Component\DomCrawler\Crawler + public function getCrawlerForField(CustomField $field, $locale = 'en'): Crawler { $kernel = static::$kernel; diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php index 14fb742f3..74de032a4 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php @@ -18,7 +18,6 @@ use Chill\MainBundle\Pagination\PaginatorInterface; use Doctrine\ORM\QueryBuilder; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; class AdminDocGeneratorTemplateController extends CRUDController { @@ -85,7 +84,7 @@ class AdminDocGeneratorTemplateController extends CRUDController * * @return QueryBuilder|mixed */ - protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator): \Doctrine\ORM\QueryBuilder + protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator): QueryBuilder { return $query->addSelect('JSON_EXTRACT(e.name, :lang) AS HIDDEN name_lang') ->setParameter('lang', $request->getLocale()) diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php index af032d70b..4d797ecb8 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php @@ -34,7 +34,6 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\NotNull; diff --git a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php index 868e18505..d6767dd5b 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php +++ b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php @@ -13,7 +13,7 @@ namespace Chill\DocGeneratorBundle\Entity; use Chill\DocStoreBundle\Entity\StoredObject; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['docgen_template' => DocGeneratorTemplate::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php index 1ddaf503b..b520cb657 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php +++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php @@ -62,6 +62,7 @@ class CollectionDocGenNormalizer implements NormalizerInterface, NormalizerAware if ('docgen' !== $format) { return []; } + return [ ReadableCollection::class => true, Collection::class => true, diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php index 87d849816..58cd6f5db 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php +++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php @@ -24,7 +24,6 @@ use Psr\Log\LoggerInterface; use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; use Symfony\Contracts\Translation\TranslatorInterface; /** @@ -35,6 +34,7 @@ class RequestGenerationHandler { final public const AUTHORIZED_TRIALS = 5; private const LOG_PREFIX = '[docgen message handler] '; + public function __construct( private readonly DocGeneratorTemplateRepositoryInterface $docGeneratorTemplateRepository, private readonly EntityManagerInterface $entityManager, @@ -46,6 +46,7 @@ class RequestGenerationHandler private readonly TranslatorInterface $translator, private readonly StoredObjectManagerInterface $storedObjectManager, ) {} + public function __invoke(RequestGenerationMessage $message): void { if (null === $template = $this->docGeneratorTemplateRepository->find($message->getTemplateId())) { @@ -117,6 +118,7 @@ class RequestGenerationHandler 'duration_int' => (new \DateTimeImmutable('now'))->getTimestamp() - $message->getCreatedAt()->getTimestamp(), ]); } + private function sendDataDump(StoredObject $destinationStoredObject, RequestGenerationMessage $message): void { // Get the content of the document diff --git a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php index 0b8691367..720cda10b 100644 --- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php +++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php @@ -18,7 +18,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ReadableCollection; use Doctrine\Common\Collections\Selectable; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrl.php b/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrl.php index ec0debca9..019354a5b 100644 --- a/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrl.php +++ b/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrl.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\DocStoreBundle\AsyncUpload; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; readonly class SignedUrl { diff --git a/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrlPost.php b/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrlPost.php index e9aecf6b2..80423b05d 100644 --- a/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrlPost.php +++ b/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrlPost.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\DocStoreBundle\AsyncUpload; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; readonly class SignedUrlPost extends SignedUrl { diff --git a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php index 8a73751cc..bf7a4d05b 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php @@ -18,18 +18,12 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; */ class AdminController extends AbstractController { - /** - * @return \Symfony\Component\HttpFoundation\Response - */ #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/document', name: 'chill_docstore_admin', options: [null])] public function indexAction(): \Symfony\Component\HttpFoundation\Response { return $this->render('@ChillDocStore/Admin/layout.html.twig'); } - /** - * @return \Symfony\Component\HttpFoundation\RedirectResponse - */ #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/document_redirect_to_main', name: 'chill_docstore_admin_redirect_to_admin_index', options: [null])] public function redirectToAdminIndexAction(): \Symfony\Component\HttpFoundation\RedirectResponse { diff --git a/src/Bundle/ChillDocStoreBundle/Controller/AsyncUploadController.php b/src/Bundle/ChillDocStoreBundle/Controller/AsyncUploadController.php index af5158b03..387fca4d4 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/AsyncUploadController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/AsyncUploadController.php @@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php index 7d77bfb5b..c2fca2530 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php @@ -22,7 +22,6 @@ use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Contracts\Translation\TranslatorInterface; #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/parcours/{course}/document')] diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseDuplicateController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseDuplicateController.php index 8ddac1dd0..9ee264477 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseDuplicateController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseDuplicateController.php @@ -20,7 +20,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Bundle\SecurityBundle\Security; diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php index 8edfe264d..468940dec 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php @@ -18,7 +18,6 @@ use Chill\DocStoreBundle\Form\DocumentCategoryType; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/document/category')] class DocumentCategoryController extends AbstractController diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php index ae732a604..9f541bb88 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php @@ -24,7 +24,6 @@ use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Contracts\Translation\TranslatorInterface; use Chill\DocStoreBundle\Service\Signature\PDFSignatureZoneParser; use Chill\DocStoreBundle\Service\StoredObjectManagerInterface; diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php index 808071df1..8963ecbd5 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodController.php @@ -18,7 +18,6 @@ use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; final readonly class GenericDocForAccompanyingPeriodController diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodListApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodListApiController.php index fdf631534..ef72065b7 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodListApiController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForAccompanyingPeriodListApiController.php @@ -18,7 +18,6 @@ use Chill\MainBundle\Serializer\Model\Collection; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php index 07ad032f0..050f83409 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/GenericDocForPerson.php @@ -18,7 +18,6 @@ use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory; use Chill\PersonBundle\Entity\Person; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; final readonly class GenericDocForPerson diff --git a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php index 1c1a3ff19..c2bec3611 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/SignatureRequestController.php @@ -28,7 +28,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php index aa1540444..e21b4dd05 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectApiController.php @@ -14,21 +14,17 @@ namespace Chill\DocStoreBundle\Controller; use Chill\DocStoreBundle\Entity\StoredObject; use Chill\MainBundle\CRUD\Controller\ApiController; use Doctrine\ORM\EntityManagerInterface; -use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; -use Symfony\Component\Serializer\SerializerInterface; class StoredObjectApiController extends ApiController { public function __construct( private readonly Security $security, private readonly EntityManagerInterface $entityManager, - ) { - } + ) {} /** * Creates a new stored object. diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectContentToLocalStorageController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectContentToLocalStorageController.php index 12d95fa97..be9c74c5f 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectContentToLocalStorageController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectContentToLocalStorageController.php @@ -19,7 +19,6 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; /** * Controller to deal with local storage operation. diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectRestoreVersionApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectRestoreVersionApiController.php index 699560b9a..b403aefd8 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectRestoreVersionApiController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectRestoreVersionApiController.php @@ -18,7 +18,6 @@ use Chill\DocStoreBundle\Service\StoredObjectRestoreInterface; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectStatusApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectStatusApiController.php index 1e72a4479..9de2b7bd5 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectStatusApiController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectStatusApiController.php @@ -15,7 +15,6 @@ use Chill\DocStoreBundle\Entity\StoredObject; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; class StoredObjectStatusApiController diff --git a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php index 19411effd..1e24f8adf 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php @@ -20,7 +20,6 @@ use Doctrine\Common\Collections\Criteria; use Doctrine\Common\Collections\Order; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php b/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php index 4407c4acb..af3e36364 100644 --- a/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php +++ b/src/Bundle/ChillDocStoreBundle/Controller/WebdavController.php @@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; /** diff --git a/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php index af5263c67..87f7d9db5 100644 --- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php @@ -22,7 +22,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_doc_store'); /** @var ArrayNodeDefinition $rootNode */ diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php index 005b29376..05dd39d53 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php @@ -25,7 +25,7 @@ use Doctrine\ORM\Mapping as ORM; use Ramsey\Uuid\Uuid; use Ramsey\Uuid\UuidInterface; use Random\RandomException; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; /** diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authenticator/JWTOnDavUrlAuthenticator.php b/src/Bundle/ChillDocStoreBundle/Security/Authenticator/JWTOnDavUrlAuthenticator.php index 6d9dbbea5..fb76ac5c5 100644 --- a/src/Bundle/ChillDocStoreBundle/Security/Authenticator/JWTOnDavUrlAuthenticator.php +++ b/src/Bundle/ChillDocStoreBundle/Security/Authenticator/JWTOnDavUrlAuthenticator.php @@ -11,7 +11,6 @@ declare(strict_types=1); namespace Chill\DocStoreBundle\Security\Authenticator; -use Chill\DocStoreBundle\Security\Authenticator\DavOnUrlTokenExtractor; use Lexik\Bundle\JWTAuthenticationBundle\Exception\InvalidTokenException; use Lexik\Bundle\JWTAuthenticationBundle\Exception\JWTDecodeFailureException; use Lexik\Bundle\JWTAuthenticationBundle\Exception\MissingTokenException; @@ -33,8 +32,7 @@ class JWTOnDavUrlAuthenticator extends AbstractAuthenticator public function __construct( private readonly JWTTokenManagerInterface $jwtManager, private readonly DavOnUrlTokenExtractor $davOnUrlTokenExtractor, - ) { - } + ) {} public function supports(Request $request): ?bool { diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php index 65ad0fdca..c2e314ce4 100644 --- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php +++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php @@ -78,8 +78,6 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera /** * @param string $attribute * @param PersonDocument $subject - * - * @return bool */ protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool { diff --git a/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessageHandler.php b/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessageHandler.php index 8e7c20c0e..85f14f527 100644 --- a/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessageHandler.php +++ b/src/Bundle/ChillDocStoreBundle/Service/Signature/Driver/BaseSigner/PdfSignedMessageHandler.php @@ -17,7 +17,6 @@ use Chill\MainBundle\Workflow\EntityWorkflowManager; use Chill\MainBundle\Workflow\SignatureStepStateChanger; use Doctrine\ORM\EntityManagerInterface; use Psr\Log\LoggerInterface; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; #[\Symfony\Component\Messenger\Attribute\AsMessageHandler] final readonly class PdfSignedMessageHandler @@ -26,6 +25,7 @@ final readonly class PdfSignedMessageHandler * log prefix. */ private const P = '[pdf signed message] '; + public function __construct( private LoggerInterface $logger, private EntityWorkflowManager $entityWorkflowManager, @@ -34,6 +34,7 @@ final readonly class PdfSignedMessageHandler private EntityManagerInterface $entityManager, private SignatureStepStateChanger $signatureStepStateChanger, ) {} + public function __invoke(PdfSignedMessage $message): void { $this->logger->info(self::P.'a message is received', ['signaturedId' => $message->signatureId]); diff --git a/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFPage.php b/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFPage.php index ffe6bbb17..df3ba3e88 100644 --- a/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFPage.php +++ b/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFPage.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\DocStoreBundle\Service\Signature; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Groups; final readonly class PDFPage { diff --git a/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZone.php b/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZone.php index 4c5db70f8..6b20f7bc4 100644 --- a/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZone.php +++ b/src/Bundle/ChillDocStoreBundle/Service/Signature/PDFSignatureZone.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\DocStoreBundle\Service\Signature; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Groups; final readonly class PDFSignatureZone { diff --git a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectCleaner/RemoveOldVersionMessageHandler.php b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectCleaner/RemoveOldVersionMessageHandler.php index 36b6ff0d3..b2d4cdf43 100644 --- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectCleaner/RemoveOldVersionMessageHandler.php +++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectCleaner/RemoveOldVersionMessageHandler.php @@ -34,6 +34,7 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface; final readonly class RemoveOldVersionMessageHandler { private const LOG_PREFIX = '[RemoveOldVersionMessageHandler] '; + public function __construct( private StoredObjectVersionRepository $storedObjectVersionRepository, private LoggerInterface $logger, @@ -41,6 +42,7 @@ final readonly class RemoveOldVersionMessageHandler private StoredObjectManagerInterface $storedObjectManager, private ClockInterface $clock, ) {} + /** * @throws StoredObjectManagerException */ diff --git a/src/Bundle/ChillEventBundle/Controller/AdminController.php b/src/Bundle/ChillEventBundle/Controller/AdminController.php index 9272a215d..925f89e90 100644 --- a/src/Bundle/ChillEventBundle/Controller/AdminController.php +++ b/src/Bundle/ChillEventBundle/Controller/AdminController.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Chill\EventBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\Routing\Annotation\Route; /** * Class AdminController diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php index 972124556..88788e9e4 100644 --- a/src/Bundle/ChillEventBundle/Controller/EventController.php +++ b/src/Bundle/ChillEventBundle/Controller/EventController.php @@ -338,8 +338,6 @@ final class EventController extends AbstractController /** * create a form to add a participation with an event. - * - * @return \Symfony\Component\Form\FormInterface */ protected function createAddEventParticipationByPersonForm(Person $person): \Symfony\Component\Form\FormInterface { @@ -385,8 +383,6 @@ final class EventController extends AbstractController /** * create a form to add a participation with a person. - * - * @return \Symfony\Component\Form\FormInterface */ protected function createAddParticipationByPersonForm(Event $event): \Symfony\Component\Form\FormInterface { @@ -416,9 +412,6 @@ final class EventController extends AbstractController return $builder->getForm(); } - /** - * @return \Symfony\Component\Form\FormInterface - */ protected function createExportByFormatForm(): \Symfony\Component\Form\FormInterface { $builder = $this->createFormBuilder(['format' => 'xlsx']) @@ -439,11 +432,9 @@ final class EventController extends AbstractController } /** - * @return Spreadsheet - * * @throws \PhpOffice\PhpSpreadsheet\Exception */ - protected function createExportSpreadsheet(Event $event): \PhpOffice\PhpSpreadsheet\Spreadsheet + protected function createExportSpreadsheet(Event $event): Spreadsheet { $spreadsheet = new Spreadsheet(); $sheet = $spreadsheet->getActiveSheet(); @@ -584,9 +575,6 @@ final class EventController extends AbstractController return $form; } - /** - * @return \Symfony\Component\Form\FormInterface - */ private function createDeleteForm($event_id): \Symfony\Component\Form\FormInterface { return $this->createFormBuilder() diff --git a/src/Bundle/ChillEventBundle/Controller/EventListController.php b/src/Bundle/ChillEventBundle/Controller/EventListController.php index 6507c5988..5b58c2fb4 100644 --- a/src/Bundle/ChillEventBundle/Controller/EventListController.php +++ b/src/Bundle/ChillEventBundle/Controller/EventListController.php @@ -29,7 +29,6 @@ use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Twig\Environment; diff --git a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php index 438916424..6a483b98f 100644 --- a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php +++ b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php @@ -16,7 +16,6 @@ use Chill\EventBundle\Form\EventTypeType; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; /** * Class EventTypeController. diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php index d7655f815..70148bddd 100644 --- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php +++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php @@ -453,7 +453,7 @@ final class ParticipationController extends AbstractController } #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/event/participation/{event_id}/update_multiple', name: 'chill_event_participation_update_multiple', methods: ['POST'])] - public function updateMultipleAction(mixed $event_id, Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response + public function updateMultipleAction(mixed $event_id, Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|Response { /** @var Event $event */ $event = $this->managerRegistry->getRepository(Event::class) @@ -686,10 +686,8 @@ final class ParticipationController extends AbstractController /** * Show a form with single participation. - * - * @return Response */ - protected function newSingle(Request $request): \Symfony\Component\HttpFoundation\Response + protected function newSingle(Request $request): Response { $returnPath = $request->query->has('return_path') ? $request->query->get('return_path') : null; @@ -744,10 +742,7 @@ final class ParticipationController extends AbstractController } } - /** - * @return FormInterface - */ - private function createDeleteForm($participation_id): \Symfony\Component\Form\FormInterface + private function createDeleteForm($participation_id): FormInterface { return $this->createFormBuilder() ->setAction($this->generateUrl('chill_event_participation_delete', [ diff --git a/src/Bundle/ChillEventBundle/Controller/RoleController.php b/src/Bundle/ChillEventBundle/Controller/RoleController.php index 424b44735..1c96d57ee 100644 --- a/src/Bundle/ChillEventBundle/Controller/RoleController.php +++ b/src/Bundle/ChillEventBundle/Controller/RoleController.php @@ -16,7 +16,6 @@ use Chill\EventBundle\Form\RoleType; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; /** * Class RoleController. diff --git a/src/Bundle/ChillEventBundle/Controller/StatusController.php b/src/Bundle/ChillEventBundle/Controller/StatusController.php index 3cc582ece..bb63b9b88 100644 --- a/src/Bundle/ChillEventBundle/Controller/StatusController.php +++ b/src/Bundle/ChillEventBundle/Controller/StatusController.php @@ -16,7 +16,6 @@ use Chill\EventBundle\Form\StatusType; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; /** * Class StatusController. diff --git a/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php index f37ae1557..780af33fc 100644 --- a/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php @@ -21,7 +21,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_event'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillEventBundle/Entity/Event.php b/src/Bundle/ChillEventBundle/Entity/Event.php index cbb2b1154..91a8fcba4 100644 --- a/src/Bundle/ChillEventBundle/Entity/Event.php +++ b/src/Bundle/ChillEventBundle/Entity/Event.php @@ -29,7 +29,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; /** * Class Event. diff --git a/src/Bundle/ChillEventBundle/Entity/EventType.php b/src/Bundle/ChillEventBundle/Entity/EventType.php index faf788503..27b302748 100644 --- a/src/Bundle/ChillEventBundle/Entity/EventType.php +++ b/src/Bundle/ChillEventBundle/Entity/EventType.php @@ -84,8 +84,6 @@ class EventType /** * Get active. - * - * @return bool */ public function getActive(): bool { @@ -94,8 +92,6 @@ class EventType /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -112,17 +108,15 @@ class EventType return $this->name; } - public function getRoles(): \Doctrine\Common\Collections\Collection + public function getRoles(): Collection { return $this->roles; } /** * Get statuses. - * - * @return Collection */ - public function getStatuses(): \Doctrine\Common\Collections\Collection + public function getStatuses(): Collection { return $this->statuses; } diff --git a/src/Bundle/ChillEventBundle/Entity/Participation.php b/src/Bundle/ChillEventBundle/Entity/Participation.php index 45b22c755..fd13ca38c 100644 --- a/src/Bundle/ChillEventBundle/Entity/Participation.php +++ b/src/Bundle/ChillEventBundle/Entity/Participation.php @@ -85,8 +85,6 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa /** * Get lastUpdate. - * - * @return \DateTimeInterface|null */ public function getLastUpdate(): ?\DateTimeInterface { @@ -95,10 +93,8 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa /** * Get person. - * - * @return Person */ - public function getPerson(): ?\Chill\PersonBundle\Entity\Person + public function getPerson(): ?Person { return $this->person; } @@ -111,10 +107,7 @@ class Participation implements \ArrayAccess, HasCenterInterface, HasScopeInterfa return $this->role; } - /** - * @return Scope - */ - public function getScope(): ?\Chill\MainBundle\Entity\Scope + public function getScope(): ?Scope { if (null === $this->getEvent()) { throw new \RuntimeException('The event is not linked with this instance. You should initialize the event with a valid center before.'); diff --git a/src/Bundle/ChillEventBundle/Entity/Role.php b/src/Bundle/ChillEventBundle/Entity/Role.php index 2180d3a0f..354ee5b34 100644 --- a/src/Bundle/ChillEventBundle/Entity/Role.php +++ b/src/Bundle/ChillEventBundle/Entity/Role.php @@ -40,8 +40,6 @@ class Role /** * Get active. - * - * @return bool */ public function getActive(): bool { @@ -50,8 +48,6 @@ class Role /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -70,10 +66,8 @@ class Role /** * Get type. - * - * @return EventType */ - public function getType(): ?\Chill\EventBundle\Entity\EventType + public function getType(): ?EventType { return $this->type; } diff --git a/src/Bundle/ChillEventBundle/Entity/Status.php b/src/Bundle/ChillEventBundle/Entity/Status.php index dfa0fdb5c..a6a752b50 100644 --- a/src/Bundle/ChillEventBundle/Entity/Status.php +++ b/src/Bundle/ChillEventBundle/Entity/Status.php @@ -42,8 +42,6 @@ class Status /** * Get active. - * - * @return bool */ public function getActive(): bool { @@ -52,8 +50,6 @@ class Status /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -72,10 +68,8 @@ class Status /** * Get type. - * - * @return EventType */ - public function getType(): ?\Chill\EventBundle\Entity\EventType + public function getType(): ?EventType { return $this->type; } diff --git a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php index de134e1cc..84868ccae 100644 --- a/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php +++ b/src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php @@ -60,8 +60,6 @@ class EventChoiceLoader implements ChoiceLoaderInterface /** * @param null $value - * - * @return array */ public function loadChoicesForValues(array $values, $value = null): array { diff --git a/src/Bundle/ChillEventBundle/Form/EventTypeType.php b/src/Bundle/ChillEventBundle/Form/EventTypeType.php index d64acc3d9..d4a2d45c3 100644 --- a/src/Bundle/ChillEventBundle/Form/EventTypeType.php +++ b/src/Bundle/ChillEventBundle/Form/EventTypeType.php @@ -24,9 +24,6 @@ class EventTypeType extends AbstractType ->add('active'); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_eventbundle_eventtype'; diff --git a/src/Bundle/ChillEventBundle/Form/RoleType.php b/src/Bundle/ChillEventBundle/Form/RoleType.php index eac7c16ca..fda2c8298 100644 --- a/src/Bundle/ChillEventBundle/Form/RoleType.php +++ b/src/Bundle/ChillEventBundle/Form/RoleType.php @@ -33,9 +33,6 @@ final class RoleType extends AbstractType ]); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_eventbundle_role'; diff --git a/src/Bundle/ChillEventBundle/Form/StatusType.php b/src/Bundle/ChillEventBundle/Form/StatusType.php index e8a3c0d7d..5ec8effb7 100644 --- a/src/Bundle/ChillEventBundle/Form/StatusType.php +++ b/src/Bundle/ChillEventBundle/Form/StatusType.php @@ -26,9 +26,6 @@ class StatusType extends AbstractType ->add('type', PickEventTypeType::class); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_eventbundle_status'; diff --git a/src/Bundle/ChillEventBundle/Tests/Export/filters/EventDateFilterTest.php b/src/Bundle/ChillEventBundle/Tests/Export/filters/EventDateFilterTest.php index 9b9ccb1bf..89b92cde3 100644 --- a/src/Bundle/ChillEventBundle/Tests/Export/filters/EventDateFilterTest.php +++ b/src/Bundle/ChillEventBundle/Tests/Export/filters/EventDateFilterTest.php @@ -35,7 +35,7 @@ class EventDateFilterTest extends AbstractFilterTest $this->rollingDateConverter = self::getContainer()->get(RollingDateConverterInterface::class); } - public function getFilter(): \Chill\EventBundle\Export\Filter\EventDateFilter + public function getFilter(): EventDateFilter { return new EventDateFilter($this->rollingDateConverter); } diff --git a/src/Bundle/ChillEventBundle/Tests/Export/filters/RoleFilterTest.php b/src/Bundle/ChillEventBundle/Tests/Export/filters/RoleFilterTest.php index 7e3acce99..1b4ca26e9 100644 --- a/src/Bundle/ChillEventBundle/Tests/Export/filters/RoleFilterTest.php +++ b/src/Bundle/ChillEventBundle/Tests/Export/filters/RoleFilterTest.php @@ -35,7 +35,7 @@ class RoleFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(RoleFilter::class); } - public function getFilter(): \Chill\EventBundle\Export\Filter\RoleFilter + public function getFilter(): RoleFilter { return $this->filter; } diff --git a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php index 7df0d51f5..6567d222f 100644 --- a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php +++ b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php @@ -66,7 +66,7 @@ class TimelineEventProvider implements TimelineProviderInterface * * @throws \Doctrine\ORM\Mapping\MappingException */ - public function fetchQuery($context, array $args): \Chill\MainBundle\Timeline\TimelineSingleQuery + public function fetchQuery($context, array $args): TimelineSingleQuery { $this->checkContext($context); diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php b/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php index 64234bc6d..c56d8adb5 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php @@ -15,7 +15,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation; use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\Routing\Annotation\Route; class RomeController extends AbstractController { diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php index ef3b36428..b4396848b 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php @@ -21,7 +21,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_france_travail_api'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php b/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php index 5010fdc76..b589121f2 100644 --- a/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php +++ b/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php @@ -18,7 +18,6 @@ use Symfony\Component\HttpFoundation\Request; use Chill\JobBundle\Form\CSPersonPersonalSituationType; use Chill\JobBundle\Form\CSPersonDispositifsType; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; class CSPersonController extends OneToOneEntityPersonCRUDController { @@ -34,7 +33,7 @@ class CSPersonController extends OneToOneEntityPersonCRUDController } #[\Symfony\Component\Routing\Attribute\Route(path: '{_locale}/person/job/dispositifs/{id}/edit', name: 'chill_crud_job_dispositifs_edit')] - public function dispositifsEdit(Request $request, $id): \Symfony\Component\HttpFoundation\Response + public function dispositifsEdit(Request $request, $id): Response { return $this->formEditAction( 'dispositifs_edit', diff --git a/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php b/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php index 513a98e13..adb028bd4 100644 --- a/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php +++ b/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php @@ -11,7 +11,6 @@ declare(strict_types=1); namespace Chill\JobBundle\Controller; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Chill\PersonBundle\Entity\Person; use Symfony\Component\HttpFoundation\Response; diff --git a/src/Bundle/ChillJobBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillJobBundle/src/DependencyInjection/Configuration.php index b7ee2b51d..939a052ca 100644 --- a/src/Bundle/ChillJobBundle/src/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillJobBundle/src/DependencyInjection/Configuration.php @@ -21,7 +21,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_job'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillJobBundle/src/Entity/CSPerson.php b/src/Bundle/ChillJobBundle/src/Entity/CSPerson.php index 84d304146..c2d59ff13 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/CSPerson.php +++ b/src/Bundle/ChillJobBundle/src/Entity/CSPerson.php @@ -296,8 +296,6 @@ class CSPerson /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -318,8 +316,6 @@ class CSPerson /** * Get situationLogement. - * - * @return string|null */ public function getSituationLogement(): ?string { @@ -340,8 +336,6 @@ class CSPerson /** * Get enfantACharge. - * - * @return int|null */ public function getEnfantACharge(): ?int { @@ -409,8 +403,6 @@ class CSPerson /** * Get vehiculePersonnel. - * - * @return bool */ public function getVehiculePersonnel(): ?bool { @@ -451,8 +443,6 @@ class CSPerson /** * Get situationProfessionnelle. - * - * @return string */ public function getSituationProfessionnelle(): ?string { @@ -475,8 +465,6 @@ class CSPerson /** * Get dateFinDernierEmploi. - * - * @return \DateTimeInterface */ public function getDateFinDernierEmploi(): ?\DateTimeInterface { @@ -537,8 +525,6 @@ class CSPerson /** * Get ressourcesComment. - * - * @return string */ public function getRessourcesComment(): ?string { @@ -561,8 +547,6 @@ class CSPerson /** * Get ressourceDate1Versement. - * - * @return \DateTimeInterface */ public function getRessourceDate1Versement(): ?\DateTimeInterface { @@ -617,8 +601,6 @@ class CSPerson /** * Get accompagnementRQTHDate. - * - * @return \DateTimeInterface */ public function getAccompagnementRQTHDate(): ?\DateTimeInterface { @@ -639,8 +621,6 @@ class CSPerson /** * Get accompagnementComment. - * - * @return string */ public function getAccompagnementComment(): ?string { @@ -661,8 +641,6 @@ class CSPerson /** * Get poleEmploiId. - * - * @return string */ public function getPoleEmploiId(): ?string { @@ -685,8 +663,6 @@ class CSPerson /** * Get poleEmploiInscriptionDate. - * - * @return \DateTimeInterface */ public function getPoleEmploiInscriptionDate(): ?\DateTimeInterface { @@ -707,8 +683,6 @@ class CSPerson /** * Get cafId. - * - * @return string */ public function getCafId(): ?string { @@ -731,8 +705,6 @@ class CSPerson /** * Get cafInscriptionDate. - * - * @return \DateTimeInterface */ public function getCafInscriptionDate(): ?\DateTimeInterface { @@ -755,8 +727,6 @@ class CSPerson /** * Get cERInscriptionDate. - * - * @return \DateTimeInterface */ public function getCERInscriptionDate(): ?\DateTimeInterface { @@ -779,8 +749,6 @@ class CSPerson /** * Get pPAEInscriptionDate. - * - * @return \DateTimeInterface */ public function getPPAEInscriptionDate(): ?\DateTimeInterface { @@ -821,8 +789,6 @@ class CSPerson /** * Get nEETEligibilite. - * - * @return bool */ public function getNEETEligibilite(): ?bool { @@ -845,8 +811,6 @@ class CSPerson /** * Get nEETCommissionDate. - * - * @return \DateTimeInterface */ public function getNEETCommissionDate(): ?\DateTimeInterface { @@ -867,8 +831,6 @@ class CSPerson /** * Get fSEMaDemarcheCode. - * - * @return string */ public function getFSEMaDemarcheCode(): ?string { diff --git a/src/Bundle/ChillJobBundle/src/Entity/CV.php b/src/Bundle/ChillJobBundle/src/Entity/CV.php index 9554d2d9c..415c4be20 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/CV.php +++ b/src/Bundle/ChillJobBundle/src/Entity/CV.php @@ -94,8 +94,6 @@ class CV implements \Stringable /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -132,8 +130,6 @@ class CV implements \Stringable /** * Get formationLevel. - * - * @return string|null */ public function getFormationLevel(): ?string { diff --git a/src/Bundle/ChillJobBundle/src/Entity/CV/Experience.php b/src/Bundle/ChillJobBundle/src/Entity/CV/Experience.php index 6aa19160e..a8f23c5e2 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/CV/Experience.php +++ b/src/Bundle/ChillJobBundle/src/Entity/CV/Experience.php @@ -123,8 +123,6 @@ class Experience /** * Get startDate. - * - * @return \DateTimeInterface */ public function getStartDate(): ?\DateTimeInterface { @@ -145,8 +143,6 @@ class Experience /** * Get endDate. - * - * @return \DateTimeInterface */ public function getEndDate(): ?\DateTimeInterface { diff --git a/src/Bundle/ChillJobBundle/src/Entity/CV/Formation.php b/src/Bundle/ChillJobBundle/src/Entity/CV/Formation.php index c5876fd57..1e53130c4 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/CV/Formation.php +++ b/src/Bundle/ChillJobBundle/src/Entity/CV/Formation.php @@ -27,7 +27,7 @@ class Formation #[ORM\GeneratedValue(strategy: 'AUTO')] private ?int $id = null; - + #[ORM\Column(name: 'title', type: \Doctrine\DBAL\Types\Types::TEXT)] #[Assert\Length(min: 3)] #[Assert\NotNull] @@ -62,8 +62,6 @@ class Formation /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -84,8 +82,6 @@ class Formation /** * Get title. - * - * @return string */ public function getTitle(): ?string { @@ -108,8 +104,6 @@ class Formation /** * Get startDate. - * - * @return \DateTimeInterface */ public function getStartDate(): ?\DateTimeInterface { @@ -132,8 +126,6 @@ class Formation /** * Get endDate. - * - * @return \DateTimeInterface */ public function getEndDate(): ?\DateTimeInterface { diff --git a/src/Bundle/ChillJobBundle/src/Entity/Immersion.php b/src/Bundle/ChillJobBundle/src/Entity/Immersion.php index b4ea5be18..6d856b1e9 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/Immersion.php +++ b/src/Bundle/ChillJobBundle/src/Entity/Immersion.php @@ -43,7 +43,7 @@ class Immersion implements \Stringable #[Assert\NotNull] private ?Person $person = null; - + #[ORM\ManyToOne(targetEntity: ThirdParty::class)] #[Assert\NotNull] #[Assert\Length(min: 2)] @@ -52,25 +52,25 @@ class Immersion implements \Stringable #[ORM\ManyToOne(targetEntity: User::class)] private ?User $referent = null; - + #[ORM\Column(name: 'domaineActivite', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)] #[Assert\NotNull] #[Assert\Length(min: 2)] private ?string $domaineActivite = null; - + #[ORM\Column(name: 'tuteurName', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)] #[Assert\NotNull] #[Assert\Length(min: 2)] private ?string $tuteurName = null; - + #[ORM\Column(name: 'tuteurFonction', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)] #[Assert\NotNull] #[Assert\Length(min: 2)] private ?string $tuteurFonction = null; - + #[ORM\Column(name: 'tuteurPhoneNumber', type: 'phone_number', nullable: true)] #[PhonenumberConstraint(type: 'any')] #[Assert\NotNull] @@ -93,13 +93,13 @@ class Immersion implements \Stringable #[ORM\Column(name: 'posteDescriptif', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)] private ?string $posteDescriptif = null; - + #[ORM\Column(name: 'posteTitle', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)] #[Assert\NotNull] #[Assert\Length(min: 2)] private ?string $posteTitle = null; - + #[ORM\Column(name: 'posteLieu', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)] #[Assert\NotNull] #[Assert\Length(min: 2)] @@ -116,7 +116,7 @@ class Immersion implements \Stringable #[Assert\NotNull] private $duration; - + #[ORM\Column(name: 'horaire', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)] #[Assert\NotNull] #[Assert\Length(min: 2)] @@ -262,8 +262,6 @@ class Immersion implements \Stringable /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -284,8 +282,6 @@ class Immersion implements \Stringable /** * Get domaineActivite. - * - * @return string|null */ public function getDomaineActivite(): ?string { @@ -306,8 +302,6 @@ class Immersion implements \Stringable /** * Get tuteurName. - * - * @return string|null */ public function getTuteurName(): ?string { @@ -328,8 +322,6 @@ class Immersion implements \Stringable /** * Get tuteurFonction. - * - * @return string|null */ public function getTuteurFonction(): ?string { @@ -370,8 +362,6 @@ class Immersion implements \Stringable /** * Get structureAccName. - * - * @return string|null */ public function getStructureAccName(): ?string { @@ -412,8 +402,6 @@ class Immersion implements \Stringable /** * Get posteDescriptif. - * - * @return string|null */ public function getPosteDescriptif(): ?string { @@ -434,8 +422,6 @@ class Immersion implements \Stringable /** * Get posteTitle. - * - * @return string|null */ public function getPosteTitle(): ?string { @@ -456,8 +442,6 @@ class Immersion implements \Stringable /** * Get posteLieu. - * - * @return string|null */ public function getPosteLieu(): ?string { @@ -478,8 +462,6 @@ class Immersion implements \Stringable /** * Get debutDate. - * - * @return \DateTime */ public function getDebutDate(): ?\DateTime { @@ -529,8 +511,6 @@ class Immersion implements \Stringable /** * Get horaire. - * - * @return string|null */ public function getHoraire(): ?string { @@ -611,8 +591,6 @@ class Immersion implements \Stringable /** * Get note. - * - * @return string */ public function getNoteImmersion(): ?string { @@ -633,8 +611,6 @@ class Immersion implements \Stringable /** * Get principalesActivites. - * - * @return string|null */ public function getPrincipalesActivites(): ?string { @@ -655,8 +631,6 @@ class Immersion implements \Stringable /** * Get competencesAcquises. - * - * @return string|null */ public function getCompetencesAcquises(): ?string { @@ -677,8 +651,6 @@ class Immersion implements \Stringable /** * Get competencesADevelopper. - * - * @return string|null */ public function getCompetencesADevelopper(): ?string { @@ -699,8 +671,6 @@ class Immersion implements \Stringable /** * Get noteBilan. - * - * @return string|null */ public function getNoteBilan(): ?string { diff --git a/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php b/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php index 2b541bf67..bd94b0752 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php +++ b/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php @@ -111,8 +111,6 @@ class ProjetProfessionnel implements \Stringable /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -135,8 +133,6 @@ class ProjetProfessionnel implements \Stringable /** * Get reportDate. - * - * @return \DateTimeInterface */ public function getReportDate(): ?\DateTimeInterface { @@ -179,8 +175,6 @@ class ProjetProfessionnel implements \Stringable /** * Get typeContratNotes. - * - * @return string|null */ public function getTypeContratNotes(): ?string { @@ -223,8 +217,6 @@ class ProjetProfessionnel implements \Stringable /** * Get volumeHoraireNotes. - * - * @return string|null */ public function getVolumeHoraireNotes(): ?string { @@ -245,8 +237,6 @@ class ProjetProfessionnel implements \Stringable /** * Get idee. - * - * @return string|null */ public function getIdee(): ?string { @@ -267,8 +257,6 @@ class ProjetProfessionnel implements \Stringable /** * Get enCoursConstruction. - * - * @return string|null */ public function getEnCoursConstruction(): ?string { @@ -289,8 +277,6 @@ class ProjetProfessionnel implements \Stringable /** * Get valideNotes. - * - * @return string|null */ public function getValideNotes(): ?string { @@ -311,8 +297,6 @@ class ProjetProfessionnel implements \Stringable /** * Get projetProfessionnelNote. - * - * @return string|null */ public function getProjetProfessionnelNote(): ?string { diff --git a/src/Bundle/ChillJobBundle/src/Entity/Rome/Appellation.php b/src/Bundle/ChillJobBundle/src/Entity/Rome/Appellation.php index d08cf3da6..d4e30d87a 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/Rome/Appellation.php +++ b/src/Bundle/ChillJobBundle/src/Entity/Rome/Appellation.php @@ -36,8 +36,6 @@ class Appellation implements \Stringable /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -58,8 +56,6 @@ class Appellation implements \Stringable /** * Get code. - * - * @return string */ public function getCode(): ?string { @@ -80,8 +76,6 @@ class Appellation implements \Stringable /** * Get libelle. - * - * @return string */ public function getLibelle(): ?string { diff --git a/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php b/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php index 2628b2f5f..00c79cab0 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php +++ b/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php @@ -46,8 +46,6 @@ class Metier /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -68,8 +66,6 @@ class Metier /** * Get libelle. - * - * @return string */ public function getLibelle(): ?string { @@ -90,8 +86,6 @@ class Metier /** * Get code. - * - * @return string */ public function getCode(): ?string { diff --git a/src/Bundle/ChillJobBundle/src/Export/ListCV.php b/src/Bundle/ChillJobBundle/src/Export/ListCV.php index 274f4128f..431f475e3 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListCV.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListCV.php @@ -222,8 +222,6 @@ class ListCV implements ListInterface, ExportElementValidatedInterface /** * Return array FIELDS keys only. - * - * @return array */ private function getFields(): array { diff --git a/src/Bundle/ChillJobBundle/src/Export/ListFrein.php b/src/Bundle/ChillJobBundle/src/Export/ListFrein.php index 874bbd975..4e443715f 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListFrein.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListFrein.php @@ -221,8 +221,6 @@ class ListFrein implements ListInterface, ExportElementValidatedInterface /** * Return array FIELDS keys only. - * - * @return array */ private function getFields(): array { diff --git a/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php b/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php index e2170c332..1e2e81411 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php @@ -227,8 +227,6 @@ class ListProjetProfessionnel implements ListInterface, ExportElementValidatedIn /** * Return array FIELDS keys only. - * - * @return array */ private function getFields(): array { diff --git a/src/Bundle/ChillJobBundle/src/Security/Authorization/ExportsJobVoter.php b/src/Bundle/ChillJobBundle/src/Security/Authorization/ExportsJobVoter.php index 0df2a2d13..6feb5842b 100644 --- a/src/Bundle/ChillJobBundle/src/Security/Authorization/ExportsJobVoter.php +++ b/src/Bundle/ChillJobBundle/src/Security/Authorization/ExportsJobVoter.php @@ -42,9 +42,6 @@ class ExportsJobVoter extends AbstractChillVoter implements ProvideRoleHierarchy $this->authorizationHelper = $authorizationHelper; } - /** - * @return bool - */ protected function supports($attribute, $subject): bool { if ($subject instanceof Center) { @@ -57,9 +54,6 @@ class ExportsJobVoter extends AbstractChillVoter implements ProvideRoleHierarchy return false; } - /** - * @return bool - */ protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool { $user = $token->getUser(); diff --git a/src/Bundle/ChillMainBundle/ArgumentResolver/EntityValueResolver.php b/src/Bundle/ChillMainBundle/ArgumentResolver/EntityValueResolver.php index 403820fa6..b430e97cc 100644 --- a/src/Bundle/ChillMainBundle/ArgumentResolver/EntityValueResolver.php +++ b/src/Bundle/ChillMainBundle/ArgumentResolver/EntityValueResolver.php @@ -71,10 +71,10 @@ class EntityValueResolver implements ValueResolverInterface { // Common parameter naming patterns $possibleNames = [ - $name . 'Id', - $name . '_id', - $this->getShortClassName($type) . '_id', - $this->getShortClassName($type) . 'Id', + $name.'Id', + $name.'_id', + $this->getShortClassName($type).'_id', + $this->getShortClassName($type).'Id', 'id', ]; @@ -111,6 +111,7 @@ class EntityValueResolver implements ValueResolverInterface private function getShortClassName(string $class): string { $parts = explode('\\', $class); + return end($parts); } diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php index 1e3a1b1a9..40d24b76d 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php +++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php @@ -55,7 +55,7 @@ abstract class AbstractCRUDController extends AbstractController $this->managerRegistry = $managerRegistry; } -// public function __construct(protected readonly SerializerInterface $serializer, protected readonly ManagerRegistry $managerRegistry) {} + // public function __construct(protected readonly SerializerInterface $serializer, protected readonly ManagerRegistry $managerRegistry) {} /** * get the role given from the config. diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php index d09162820..136435a10 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php +++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php @@ -13,13 +13,11 @@ namespace Chill\MainBundle\CRUD\Controller; use Chill\MainBundle\Pagination\PaginatorInterface; use Chill\MainBundle\Serializer\Model\Collection; -use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\Serializer\Exception\NotEncodableValueException; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; -use Symfony\Component\Serializer\SerializerInterface; use Symfony\Component\Validator\ConstraintViolationListInterface; class ApiController extends AbstractCRUDController diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php index c1dc0b2ce..2a7bf6035 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php +++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php @@ -102,7 +102,7 @@ class CRUDController extends AbstractController $this->managerRegistry = $managerRegistry; } -// public function __construct(private readonly ManagerRegistry $managerRegistry) {} + // public function __construct(private readonly ManagerRegistry $managerRegistry) {} public function CRUD(?string $parameter): Response { @@ -635,10 +635,10 @@ class CRUDController extends AbstractController return $this->crudConfig['actions'][$action]; } -/* protected function getAuthorizationHelper(): AuthorizationHelper - { - return $this->container->get(AuthorizationHelper::class); - }*/ + /* protected function getAuthorizationHelper(): AuthorizationHelper + { + return $this->container->get(AuthorizationHelper::class); + }*/ /** * @return string the crud name @@ -648,10 +648,10 @@ class CRUDController extends AbstractController return $this->crudConfig['name']; } -/* protected function getCrudResolver(): Resolver - { - return $this->get(Resolver::class); - }*/ + /* protected function getCrudResolver(): Resolver + { + return $this->get(Resolver::class); + }*/ protected function getDefaultDeleteFormClass($action) { @@ -678,15 +678,15 @@ class CRUDController extends AbstractController return $this->crudConfig['class']; } -/* protected function getEventDispatcher(): EventDispatcherInterface - { - return $this->get(EventDispatcherInterface::class); - }*/ + /* protected function getEventDispatcher(): EventDispatcherInterface + { + return $this->get(EventDispatcherInterface::class); + }*/ -/* protected function getFilterOrderHelperFactory(): FilterOrderHelperFactoryInterface - { - return $this->get(FilterOrderHelperFactoryInterface::class); - }*/ + /* protected function getFilterOrderHelperFactory(): FilterOrderHelperFactoryInterface + { + return $this->get(FilterOrderHelperFactoryInterface::class); + }*/ /** * get the default form class from config. diff --git a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php index 029402ef3..26cd8fe96 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php +++ b/src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php @@ -91,9 +91,6 @@ class Resolver } } - /** - * @return bool - */ public function hasAction($crudName, $action): bool { return \array_key_exists( diff --git a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php index 9cc2621b3..ab5a305a0 100644 --- a/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php +++ b/src/Bundle/ChillMainBundle/CRUD/Templating/TwigCRUDResolver.php @@ -63,9 +63,6 @@ class TwigCRUDResolver extends AbstractExtension ]; } - /** - * @return bool - */ public function hasAction($crudName, $action): bool { return $this->resolver->hasAction($crudName, $action); diff --git a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php index 0aef871fe..238d5a0f1 100644 --- a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php +++ b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php @@ -123,7 +123,7 @@ class ChillImportUsersCommand extends Command return $groupCenter; } - protected function createUser($offset, $data): \Chill\MainBundle\Entity\User + protected function createUser($offset, $data): User { $user = new User(); $user diff --git a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php index bb3d28806..c8cc69a39 100644 --- a/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php +++ b/src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php @@ -54,9 +54,7 @@ class LoadCountriesCommand extends Command * * @see \Symfony\Component\Console\Command\Command::configure() */ - protected function configure() - { - } + protected function configure() {} /** * (non-PHPdoc). diff --git a/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php b/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php index 1cacb49cf..9e71eef61 100644 --- a/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php +++ b/src/Bundle/ChillMainBundle/Command/LoadPostalCodeFR.php @@ -26,9 +26,7 @@ class LoadPostalCodeFR extends Command parent::__construct(); } - public function configure(): void - { - } + public function configure(): void {} public function execute(InputInterface $input, OutputInterface $output): int { diff --git a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php index 378869aa9..a18177df6 100644 --- a/src/Bundle/ChillMainBundle/Controller/AbsenceController.php +++ b/src/Bundle/ChillMainBundle/Controller/AbsenceController.php @@ -15,7 +15,6 @@ use Chill\MainBundle\Form\AbsenceType; use Chill\MainBundle\Security\ChillSecurity; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; class AbsenceController extends AbstractController { diff --git a/src/Bundle/ChillMainBundle/Controller/AddressApiController.php b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php index 19660f66c..da3fcb828 100644 --- a/src/Bundle/ChillMainBundle/Controller/AddressApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/AddressApiController.php @@ -13,13 +13,10 @@ namespace Chill\MainBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Entity\Address; -use Doctrine\Persistence\ManagerRegistry; use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; -use Symfony\Component\Serializer\SerializerInterface; class AddressApiController extends ApiController { diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php index 7875e856d..2580e138e 100644 --- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php +++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php @@ -22,7 +22,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; final class AddressReferenceAPIController extends ApiController diff --git a/src/Bundle/ChillMainBundle/Controller/AddressToReferenceMatcherController.php b/src/Bundle/ChillMainBundle/Controller/AddressToReferenceMatcherController.php index fbba472db..d02a43e4f 100644 --- a/src/Bundle/ChillMainBundle/Controller/AddressToReferenceMatcherController.php +++ b/src/Bundle/ChillMainBundle/Controller/AddressToReferenceMatcherController.php @@ -17,14 +17,13 @@ use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; -class AddressToReferenceMatcherController +readonly class AddressToReferenceMatcherController { - public function __construct(private readonly Security $security, private readonly EntityManagerInterface $entityManager, private readonly SerializerInterface $serializer) {} + public function __construct(private Security $security, private EntityManagerInterface $entityManager, private SerializerInterface $serializer) {} #[\Symfony\Component\Routing\Attribute\Route(path: '/api/1.0/main/address/reference-match/{id}/set/reviewed', methods: ['POST'])] public function markAddressAsReviewed(#[MapEntity(id: 'id')] Address $address): JsonResponse diff --git a/src/Bundle/ChillMainBundle/Controller/AdminController.php b/src/Bundle/ChillMainBundle/Controller/AdminController.php index 229a04f99..25d4730be 100644 --- a/src/Bundle/ChillMainBundle/Controller/AdminController.php +++ b/src/Bundle/ChillMainBundle/Controller/AdminController.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\Routing\Annotation\Route; class AdminController extends AbstractController { diff --git a/src/Bundle/ChillMainBundle/Controller/DashboardApiController.php b/src/Bundle/ChillMainBundle/Controller/DashboardApiController.php index b92bc4f4f..9f0782f0c 100644 --- a/src/Bundle/ChillMainBundle/Controller/DashboardApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/DashboardApiController.php @@ -11,10 +11,8 @@ declare(strict_types=1); namespace Chill\MainBundle\Controller; -use Chill\MainBundle\Entity\User; use Chill\MainBundle\Repository\NewsItemRepository; use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\Routing\Annotation\Route; final readonly class DashboardApiController { diff --git a/src/Bundle/ChillMainBundle/Controller/ExportController.php b/src/Bundle/ChillMainBundle/Controller/ExportController.php index daa1a06e1..81afc0f21 100644 --- a/src/Bundle/ChillMainBundle/Controller/ExportController.php +++ b/src/Bundle/ChillMainBundle/Controller/ExportController.php @@ -42,7 +42,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Bundle\SecurityBundle\Security; /** @@ -391,7 +391,7 @@ class ExportController extends AbstractController * * @return Response */ - private function selectCentersStep(Request $request, DirectExportInterface|ExportInterface $export, $alias, ExportGeneration|SavedExport|null $savedExport = null): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response + private function selectCentersStep(Request $request, DirectExportInterface|ExportInterface $export, $alias, ExportGeneration|SavedExport|null $savedExport = null): \Symfony\Component\HttpFoundation\RedirectResponse|Response { if (!$this->filterStatsByCenters) { return $this->redirectToRoute('chill_main_export_new', [ diff --git a/src/Bundle/ChillMainBundle/Controller/ExportGenerationController.php b/src/Bundle/ChillMainBundle/Controller/ExportGenerationController.php index 90b95f7ed..a45f95ba8 100644 --- a/src/Bundle/ChillMainBundle/Controller/ExportGenerationController.php +++ b/src/Bundle/ChillMainBundle/Controller/ExportGenerationController.php @@ -16,7 +16,7 @@ use Chill\MainBundle\Export\ExportManager; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/ExportGenerationCreateFromSavedExportController.php b/src/Bundle/ChillMainBundle/Controller/ExportGenerationCreateFromSavedExportController.php index e91ea6b78..10da8e337 100644 --- a/src/Bundle/ChillMainBundle/Controller/ExportGenerationCreateFromSavedExportController.php +++ b/src/Bundle/ChillMainBundle/Controller/ExportGenerationCreateFromSavedExportController.php @@ -21,7 +21,7 @@ use Symfony\Component\Clock\ClockInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/ExportIndexController.php b/src/Bundle/ChillMainBundle/Controller/ExportIndexController.php index 4ca285385..868836402 100644 --- a/src/Bundle/ChillMainBundle/Controller/ExportIndexController.php +++ b/src/Bundle/ChillMainBundle/Controller/ExportIndexController.php @@ -18,7 +18,7 @@ use Chill\MainBundle\Security\Authorization\ChillExportVoter; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Twig\Environment; final readonly class ExportIndexController diff --git a/src/Bundle/ChillMainBundle/Controller/GeographicalUnitByAddressApiController.php b/src/Bundle/ChillMainBundle/Controller/GeographicalUnitByAddressApiController.php index 7af7267d6..597559a48 100644 --- a/src/Bundle/ChillMainBundle/Controller/GeographicalUnitByAddressApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/GeographicalUnitByAddressApiController.php @@ -18,7 +18,6 @@ use Chill\MainBundle\Serializer\Model\Collection; use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php index fc2415026..4eae399d2 100644 --- a/src/Bundle/ChillMainBundle/Controller/LocationApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/LocationApiController.php @@ -37,7 +37,7 @@ class LocationApiController extends ApiController /** * @param QueryBuilder $query */ - protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format): \Doctrine\ORM\QueryBuilder + protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format): QueryBuilder { return $query ->addOrderBy('e.name', 'ASC'); diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php index d27ea898c..421867fb6 100644 --- a/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/NewsItemApiController.php @@ -15,7 +15,6 @@ use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Repository\NewsItemRepository; use Chill\MainBundle\Serializer\Model\Collection; use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php index 89963ef24..b3bd9aace 100644 --- a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php +++ b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php @@ -19,7 +19,6 @@ use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface; use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Twig\Environment; use Twig\Error\LoaderError; use Twig\Error\RuntimeError; diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php index c98e2b46f..2007c1b85 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationApiController.php @@ -22,15 +22,14 @@ use Doctrine\ORM\EntityManagerInterface; use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\SerializerInterface; #[\Symfony\Component\Routing\Attribute\Route(path: '/api/1.0/main/notification')] -class NotificationApiController +readonly class NotificationApiController { - public function __construct(private readonly EntityManagerInterface $entityManager, private readonly NotificationRepository $notificationRepository, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly SerializerInterface $serializer) {} + public function __construct(private EntityManagerInterface $entityManager, private NotificationRepository $notificationRepository, private PaginatorFactory $paginatorFactory, private Security $security, private SerializerInterface $serializer) {} #[\Symfony\Component\Routing\Attribute\Route(path: '/{id}/mark/read', name: 'chill_api_main_notification_mark_read', methods: ['POST'])] public function markAsRead(#[MapEntity(id: 'id')] Notification $notification): JsonResponse diff --git a/src/Bundle/ChillMainBundle/Controller/NotificationController.php b/src/Bundle/ChillMainBundle/Controller/NotificationController.php index 9e0e1d09e..55a0f20e3 100644 --- a/src/Bundle/ChillMainBundle/Controller/NotificationController.php +++ b/src/Bundle/ChillMainBundle/Controller/NotificationController.php @@ -33,7 +33,6 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Contracts\Translation\TranslatorInterface; use function in_array; diff --git a/src/Bundle/ChillMainBundle/Controller/PasswordController.php b/src/Bundle/ChillMainBundle/Controller/PasswordController.php index a5b0f9ae0..368bc2bc8 100644 --- a/src/Bundle/ChillMainBundle/Controller/PasswordController.php +++ b/src/Bundle/ChillMainBundle/Controller/PasswordController.php @@ -26,7 +26,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Validator\Constraints\Callback; use Symfony\Component\Validator\Context\ExecutionContextInterface; use Symfony\Contracts\Translation\TranslatorInterface; @@ -41,11 +40,8 @@ final class PasswordController extends AbstractController */ public function __construct(private readonly LoggerInterface $chillLogger, private readonly \Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface $passwordEncoder, private readonly RecoverPasswordHelper $recoverPasswordHelper, private readonly TokenManager $tokenManager, private readonly TranslatorInterface $translator, private readonly EventDispatcherInterface $eventDispatcher, private readonly ChillSecurity $security, private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {} - /** - * @return Response - */ #[\Symfony\Component\Routing\Attribute\Route(path: '/public/{_locale}/password/request-changed', name: 'password_request_recover_changed')] - public function changeConfirmedAction(): \Symfony\Component\HttpFoundation\Response + public function changeConfirmedAction(): Response { return $this->render('@ChillMain/Password/recover_password_changed.html.twig'); } @@ -186,11 +182,8 @@ final class PasswordController extends AbstractController ]); } - /** - * @return Response - */ #[\Symfony\Component\Routing\Attribute\Route(path: '/public/{_locale}/password/request-confirm', name: 'password_request_recover_confirm')] - public function requestRecoverConfirmAction(): \Symfony\Component\HttpFoundation\Response + public function requestRecoverConfirmAction(): Response { return $this->render('@ChillMain/Password/request_recover_password_confirm.html.twig'); } @@ -199,7 +192,7 @@ final class PasswordController extends AbstractController * @return Response */ #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/my/password', name: 'change_my_password')] - public function UserPasswordAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response + public function UserPasswordAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|Response { if (!$this->security->isGranted('ROLE_USER')) { throw new AccessDeniedHttpException(); @@ -243,9 +236,6 @@ final class PasswordController extends AbstractController ]); } - /** - * @return \Symfony\Component\Form\FormInterface - */ protected function requestRecoverForm(): \Symfony\Component\Form\FormInterface { $builder = $this->createFormBuilder(); @@ -277,9 +267,6 @@ final class PasswordController extends AbstractController return $builder->getForm(); } - /** - * @return \Symfony\Component\Form\FormInterface - */ private function passwordForm(User $user): \Symfony\Component\Form\FormInterface { return $this diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php index 1639a46c3..441ed854a 100644 --- a/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/PermissionApiController.php @@ -15,7 +15,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php index 68a89e8f5..82428943d 100644 --- a/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php +++ b/src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php @@ -26,7 +26,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Role\RoleHierarchyInterface; use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php index d282957e6..5e9c64a9f 100644 --- a/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php +++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php @@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; final class PostalCodeAPIController extends ApiController diff --git a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php index 731b0b44c..d604ab3b5 100644 --- a/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php +++ b/src/Bundle/ChillMainBundle/Controller/PostalCodeController.php @@ -17,7 +17,6 @@ use Doctrine\ORM\Query; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; /** * Class PostalCodeController. diff --git a/src/Bundle/ChillMainBundle/Controller/SavedExportController.php b/src/Bundle/ChillMainBundle/Controller/SavedExportController.php index cdaea5daf..d2ba225ed 100644 --- a/src/Bundle/ChillMainBundle/Controller/SavedExportController.php +++ b/src/Bundle/ChillMainBundle/Controller/SavedExportController.php @@ -29,7 +29,7 @@ use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Translation\TranslatableMessage; diff --git a/src/Bundle/ChillMainBundle/Controller/SavedExportIndexController.php b/src/Bundle/ChillMainBundle/Controller/SavedExportIndexController.php index 1e0c99457..1e1de1d05 100644 --- a/src/Bundle/ChillMainBundle/Controller/SavedExportIndexController.php +++ b/src/Bundle/ChillMainBundle/Controller/SavedExportIndexController.php @@ -24,7 +24,7 @@ use Chill\MainBundle\Templating\Listing\FilterOrderHelper; use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/ScopeController.php b/src/Bundle/ChillMainBundle/Controller/ScopeController.php index be61c6d5f..0227c9730 100644 --- a/src/Bundle/ChillMainBundle/Controller/ScopeController.php +++ b/src/Bundle/ChillMainBundle/Controller/ScopeController.php @@ -20,7 +20,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; /** * Class ScopeController. @@ -36,7 +35,7 @@ class ScopeController extends AbstractController * Creates a new Scope entity. */ #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/scope/create', name: 'admin_scope_create', methods: ['POST'])] - public function createAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response + public function createAction(Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|Response { $scope = new Scope(); $form = $this->createCreateForm($scope); @@ -81,7 +80,7 @@ class ScopeController extends AbstractController * Lists all Scope entities. */ #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/scope/', name: 'admin_scope')] - public function indexAction(): \Symfony\Component\HttpFoundation\Response + public function indexAction(): Response { $em = $this->managerRegistry->getManager(); @@ -96,7 +95,7 @@ class ScopeController extends AbstractController * Displays a form to create a new Scope entity. */ #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/scope/new', name: 'admin_scope_new')] - public function newAction(): \Symfony\Component\HttpFoundation\Response + public function newAction(): Response { $scope = new Scope(); $form = $this->createCreateForm($scope); @@ -110,7 +109,7 @@ class ScopeController extends AbstractController /** * Finds and displays a Scope entity. */ - public function showAction(mixed $id): \Symfony\Component\HttpFoundation\Response + public function showAction(mixed $id): Response { $em = $this->managerRegistry->getManager(); diff --git a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php index e1afab222..f650b9abb 100644 --- a/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php +++ b/src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php @@ -15,7 +15,6 @@ use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Timeline\TimelineBuilder; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; class TimelineCenterController extends AbstractController diff --git a/src/Bundle/ChillMainBundle/Controller/UserApiController.php b/src/Bundle/ChillMainBundle/Controller/UserApiController.php index 67d153d2f..216d69df8 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserApiController.php @@ -18,7 +18,6 @@ use Doctrine\ORM\QueryBuilder; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; class UserApiController extends ApiController { diff --git a/src/Bundle/ChillMainBundle/Controller/UserController.php b/src/Bundle/ChillMainBundle/Controller/UserController.php index d7e2642ad..a5144f4e2 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserController.php @@ -24,7 +24,6 @@ use Chill\MainBundle\Pagination\PaginatorInterface; use Chill\MainBundle\Repository\UserRepository; use Chill\MainBundle\Security\ChillSecurity; use Chill\MainBundle\Templating\Listing\FilterOrderHelper; -use Doctrine\Persistence\ManagerRegistry; use Psr\Log\LoggerInterface; use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; @@ -34,7 +33,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/UserExportController.php b/src/Bundle/ChillMainBundle/Controller/UserExportController.php index 9ce130823..2dc2556eb 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserExportController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserExportController.php @@ -17,7 +17,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/UserGroupController.php b/src/Bundle/ChillMainBundle/Controller/UserGroupController.php index 7b974727f..62bad08f2 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserGroupController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserGroupController.php @@ -29,7 +29,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Translation\TranslatableMessage; use Twig\Environment; diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php b/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php index 444d62c12..d798a2142 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserJobScopeHistoriesController.php @@ -15,7 +15,6 @@ use Chill\MainBundle\Entity\User; use Symfony\Bridge\Doctrine\Attribute\MapEntity; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Twig\Environment; class UserJobScopeHistoriesController extends AbstractController diff --git a/src/Bundle/ChillMainBundle/Controller/UserProfileController.php b/src/Bundle/ChillMainBundle/Controller/UserProfileController.php index 9a3e5dfa4..5221dbe58 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserProfileController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserProfileController.php @@ -17,7 +17,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Contracts\Translation\TranslatorInterface; -use Symfony\Component\Routing\Annotation\Route; final class UserProfileController extends AbstractController { diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowAddSignatureController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowAddSignatureController.php index 6a724c3ec..5f62f3729 100644 --- a/src/Bundle/ChillMainBundle/Controller/WorkflowAddSignatureController.php +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowAddSignatureController.php @@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php index 8638488ac..8f960b412 100644 --- a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php @@ -23,7 +23,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowAttachmentController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowAttachmentController.php index b2a73fec9..0ddc80f89 100644 --- a/src/Bundle/ChillMainBundle/Controller/WorkflowAttachmentController.php +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowAttachmentController.php @@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php index c27bfcff9..f8c6af2c6 100644 --- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php @@ -35,7 +35,6 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Component\Workflow\Registry; use Symfony\Component\Workflow\TransitionBlocker; diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowOnHoldController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowOnHoldController.php index 56f6b0e15..341a6abd6 100644 --- a/src/Bundle/ChillMainBundle/Controller/WorkflowOnHoldController.php +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowOnHoldController.php @@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Workflow\Registry; diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php index b05914c01..b342612ec 100644 --- a/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php @@ -22,7 +22,6 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Twig\Environment; diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowViewSendPublicController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowViewSendPublicController.php index 24eb7674d..52dc3ac74 100644 --- a/src/Bundle/ChillMainBundle/Controller/WorkflowViewSendPublicController.php +++ b/src/Bundle/ChillMainBundle/Controller/WorkflowViewSendPublicController.php @@ -24,7 +24,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\Routing\Annotation\Route; use Twig\Environment; final readonly class WorkflowViewSendPublicController diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php index 9d8e39aef..bbf79c55d 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php @@ -13,22 +13,22 @@ namespace Chill\MainBundle\DataFixtures\ORM; use Chill\MainBundle\Command\LoadCountriesCommand; use Doctrine\Bundle\FixturesBundle\Fixture; -use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; - /** * Load countries into database. */ class LoadCountries extends Fixture implements OrderedFixtureInterface { private array $availableLanguages; + public function __construct(private readonly ParameterBagInterface $parameterBag) { $this->availableLanguages = $this->parameterBag->get('chill_main.available_languages'); } + public function getOrder(): int { return 20; diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php index 69f042f55..5182843d3 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php @@ -31,6 +31,7 @@ class LoadLanguages extends Fixture implements OrderedFixtureInterface private array $regionalVersionToInclude = ['ro_MD']; private array $availableLanguages; + public function __construct(private readonly ParameterBagInterface $parameterBag) { $this->availableLanguages = $this->parameterBag->get('chill_main.available_languages'); diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php index fc4fbb7c3..8d4a31735 100644 --- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php @@ -31,7 +31,7 @@ class Configuration implements ConfigurationInterface $this->setWidgetFactories($widgetFactories); } - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_main'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php index 423f0050a..366e7941e 100644 --- a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php +++ b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php @@ -18,7 +18,6 @@ use Doctrine\Common\EventSubscriber; use Doctrine\ORM\Event\PrePersistEventArgs; use Doctrine\ORM\Event\PreUpdateEventArgs; use Doctrine\ORM\Events; -use Doctrine\Persistence\Event\LifecycleEventArgs; use Symfony\Bundle\SecurityBundle\Security; class TrackCreateUpdateSubscriber implements EventSubscriber diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php index 3286390f7..26c136c92 100644 --- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php +++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php @@ -13,7 +13,7 @@ namespace Chill\MainBundle\Doctrine\Model; use Chill\MainBundle\Entity\User; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; trait TrackCreationTrait { diff --git a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php index 551b5a50f..6cc5b800d 100644 --- a/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php +++ b/src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php @@ -13,7 +13,7 @@ namespace Chill\MainBundle\Doctrine\Model; use Chill\MainBundle\Entity\User; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; trait TrackUpdateTrait { diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php index cc0726c70..2a29b8651 100644 --- a/src/Bundle/ChillMainBundle/Entity/Address.php +++ b/src/Bundle/ChillMainBundle/Entity/Address.php @@ -20,7 +20,7 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Groups; use Symfony\Component\Validator\Context\ExecutionContextInterface; /** @@ -271,8 +271,6 @@ class Address implements TrackCreationInterface, TrackUpdateInterface /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -289,7 +287,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface return $this->isNoAddress; } - public function getLinkedToThirdParty(): ?\Chill\ThirdPartyBundle\Entity\ThirdParty + public function getLinkedToThirdParty(): ?ThirdParty { return $this->linkedToThirdParty; } @@ -330,8 +328,6 @@ class Address implements TrackCreationInterface, TrackUpdateInterface /** * Get streetAddress1 (legacy function). * - * @return string - * * @deprecated */ public function getStreetAddress1(): string @@ -342,8 +338,6 @@ class Address implements TrackCreationInterface, TrackUpdateInterface /** * Get streetAddress2 (legacy function). * - * @return string - * * @deprecated */ public function getStreetAddress2(): string diff --git a/src/Bundle/ChillMainBundle/Entity/AddressReference.php b/src/Bundle/ChillMainBundle/Entity/AddressReference.php index b512162bf..135825c2a 100644 --- a/src/Bundle/ChillMainBundle/Entity/AddressReference.php +++ b/src/Bundle/ChillMainBundle/Entity/AddressReference.php @@ -13,7 +13,7 @@ namespace Chill\MainBundle\Entity; use Chill\MainBundle\Doctrine\Model\Point; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Groups; #[ORM\Entity] #[ORM\HasLifecycleCallbacks] diff --git a/src/Bundle/ChillMainBundle/Entity/Center.php b/src/Bundle/ChillMainBundle/Entity/Center.php index 8d4a4a4c8..19347e0a6 100644 --- a/src/Bundle/ChillMainBundle/Entity/Center.php +++ b/src/Bundle/ChillMainBundle/Entity/Center.php @@ -14,7 +14,7 @@ namespace Chill\MainBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[ORM\Entity] #[ORM\Table(name: 'centers')] @@ -87,9 +87,6 @@ class Center implements HasCenterInterface, \Stringable return $this->id; } - /** - * @return string - */ public function getName(): string { return $this->name; diff --git a/src/Bundle/ChillMainBundle/Entity/Civility.php b/src/Bundle/ChillMainBundle/Entity/Civility.php index 2105c8b87..1f07c2aee 100644 --- a/src/Bundle/ChillMainBundle/Entity/Civility.php +++ b/src/Bundle/ChillMainBundle/Entity/Civility.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['chill_main_civility' => Civility::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillMainBundle/Entity/Country.php b/src/Bundle/ChillMainBundle/Entity/Country.php index c5433d46c..178871dd0 100644 --- a/src/Bundle/ChillMainBundle/Entity/Country.php +++ b/src/Bundle/ChillMainBundle/Entity/Country.php @@ -12,8 +12,9 @@ declare(strict_types=1); namespace Chill\MainBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Context; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Context; + +use Symfony\Component\Serializer\Attribute\Groups; /** * Country. diff --git a/src/Bundle/ChillMainBundle/Entity/DashboardConfigItem.php b/src/Bundle/ChillMainBundle/Entity/DashboardConfigItem.php index d94e93742..df5105015 100644 --- a/src/Bundle/ChillMainBundle/Entity/DashboardConfigItem.php +++ b/src/Bundle/ChillMainBundle/Entity/DashboardConfigItem.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; #[ORM\Entity] diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php index df19c941e..e71ff1ae9 100644 --- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php +++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php @@ -33,9 +33,6 @@ class CommentEmbeddable return $this->comment; } - /** - * @return \DateTime - */ public function getDate(): ?\DateTime { return $this->date; diff --git a/src/Bundle/ChillMainBundle/Entity/ExportGeneration.php b/src/Bundle/ChillMainBundle/Entity/ExportGeneration.php index 4cfbda0f6..926792cc0 100644 --- a/src/Bundle/ChillMainBundle/Entity/ExportGeneration.php +++ b/src/Bundle/ChillMainBundle/Entity/ExportGeneration.php @@ -17,7 +17,7 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait; use Doctrine\ORM\Mapping as ORM; use Ramsey\Uuid\Uuid; use Ramsey\Uuid\UuidInterface; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; /** * Contains the single execution of an export. diff --git a/src/Bundle/ChillMainBundle/Entity/Gender.php b/src/Bundle/ChillMainBundle/Entity/Gender.php index d1baad400..482c46e14 100644 --- a/src/Bundle/ChillMainBundle/Entity/Gender.php +++ b/src/Bundle/ChillMainBundle/Entity/Gender.php @@ -13,7 +13,7 @@ namespace Chill\MainBundle\Entity; use Chill\MainBundle\Repository\GenderRepository; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['chill_main_gender' => Gender::class])] diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php index 2d7028d21..dd0959627 100644 --- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php +++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnit/SimpleGeographicalUnitDTO.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Entity\GeographicalUnit; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; /** * Simple GeographialUnit Data Transfer Object. diff --git a/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php b/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php index 5b311b465..d679c43c6 100644 --- a/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php +++ b/src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php @@ -14,7 +14,7 @@ namespace Chill\MainBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[ORM\Entity] #[ORM\Table(name: 'chill_main_geographical_unit_layer')] diff --git a/src/Bundle/ChillMainBundle/Entity/Language.php b/src/Bundle/ChillMainBundle/Entity/Language.php index 2dba6548f..74310b726 100644 --- a/src/Bundle/ChillMainBundle/Entity/Language.php +++ b/src/Bundle/ChillMainBundle/Entity/Language.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; /** * Language. @@ -38,8 +38,6 @@ class Language /** * Get id. - * - * @return string */ public function getId(): ?string { diff --git a/src/Bundle/ChillMainBundle/Entity/Location.php b/src/Bundle/ChillMainBundle/Entity/Location.php index 5705e6a1a..d1ce6c8c1 100644 --- a/src/Bundle/ChillMainBundle/Entity/Location.php +++ b/src/Bundle/ChillMainBundle/Entity/Location.php @@ -17,8 +17,8 @@ use Chill\MainBundle\Repository\LocationRepository; use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint; use Doctrine\ORM\Mapping as ORM; use libphonenumber\PhoneNumber; -use Symfony\Component\Serializer\Annotation as Serializer; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute as Serializer; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; #[DiscriminatorMap(typeProperty: 'type', mapping: ['location' => Location::class])] #[ORM\Entity(repositoryClass: LocationRepository::class)] diff --git a/src/Bundle/ChillMainBundle/Entity/LocationType.php b/src/Bundle/ChillMainBundle/Entity/LocationType.php index 16bca82e9..08a4a536f 100644 --- a/src/Bundle/ChillMainBundle/Entity/LocationType.php +++ b/src/Bundle/ChillMainBundle/Entity/LocationType.php @@ -14,8 +14,8 @@ namespace Chill\MainBundle\Entity; use Chill\MainBundle\Repository\LocationTypeRepository; use Doctrine\ORM\Mapping as ORM; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; -use Symfony\Component\Serializer\Annotation as Serializer; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute as Serializer; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; #[DiscriminatorMap(typeProperty: 'type', mapping: ['location-type' => LocationType::class])] #[UniqueEntity(['defaultFor'])] diff --git a/src/Bundle/ChillMainBundle/Entity/NewsItem.php b/src/Bundle/ChillMainBundle/Entity/NewsItem.php index cc1c77bac..be3e802a8 100644 --- a/src/Bundle/ChillMainBundle/Entity/NewsItem.php +++ b/src/Bundle/ChillMainBundle/Entity/NewsItem.php @@ -16,7 +16,7 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait; use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Groups; use Symfony\Component\Validator\Constraints as Assert; #[ORM\Entity] diff --git a/src/Bundle/ChillMainBundle/Entity/Notification.php b/src/Bundle/ChillMainBundle/Entity/Notification.php index afc93d798..69fad7c11 100644 --- a/src/Bundle/ChillMainBundle/Entity/Notification.php +++ b/src/Bundle/ChillMainBundle/Entity/Notification.php @@ -28,7 +28,7 @@ class Notification implements TrackUpdateInterface { use TrackUpdateTrait; - #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false)] + #[ORM\Column(type: Types::TEXT, nullable: false)] private string $accessKey; private array $addedAddresses = []; diff --git a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php index 359e324d1..27d9c608c 100644 --- a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php +++ b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php @@ -70,17 +70,11 @@ class PermissionsGroup return $this->flags; } - /** - * @return int - */ public function getId(): ?int { return $this->id; } - /** - * @return string - */ public function getName(): string { return $this->name; diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php index cbfad7938..7ebe2c02e 100644 --- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php +++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php @@ -17,7 +17,7 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait; use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Groups; /** * PostalCode. @@ -89,8 +89,6 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface /** * Get code. - * - * @return string */ public function getCode(): ?string { @@ -99,18 +97,14 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface /** * Get country. - * - * @return Country */ - public function getCountry(): ?\Chill\MainBundle\Entity\Country + public function getCountry(): ?Country { return $this->country; } /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -119,8 +113,6 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface /** * Get name. - * - * @return string */ public function getName(): ?string { @@ -129,8 +121,6 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface /** * Get origin. - * - * @return int */ public function getOrigin(): int { diff --git a/src/Bundle/ChillMainBundle/Entity/Scope.php b/src/Bundle/ChillMainBundle/Entity/Scope.php index dd04f8a47..af6aadb45 100644 --- a/src/Bundle/ChillMainBundle/Entity/Scope.php +++ b/src/Bundle/ChillMainBundle/Entity/Scope.php @@ -14,9 +14,10 @@ namespace Chill\MainBundle\Entity; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Context; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Context; + +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\Groups; #[DiscriminatorMap(typeProperty: 'type', mapping: ['scope' => Scope::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php index 7189ab82d..024d27988 100644 --- a/src/Bundle/ChillMainBundle/Entity/User.php +++ b/src/Bundle/ChillMainBundle/Entity/User.php @@ -21,7 +21,7 @@ use Doctrine\ORM\Mapping as ORM; use libphonenumber\PhoneNumber; use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; use Symfony\Component\Security\Core\User\UserInterface; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Context\ExecutionContextInterface; use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint; use Symfony\Component\Validator\Constraints as Assert; @@ -167,8 +167,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter /** * Get attributes. - * - * @return array */ public function getAttributes(): array { @@ -194,9 +192,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter return $this->email; } - /** - * @return string - */ public function getEmailCanonical(): ?string { return $this->emailCanonical; @@ -321,9 +316,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter return new ArrayCollection($sortedJobHistories); } - /** - * @return string - */ public function getUsername(): string { return $this->username; @@ -334,9 +326,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter return $this->username; } - /** - * @return string - */ public function getUsernameCanonical(): ?string { return $this->usernameCanonical; @@ -361,9 +350,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter return true; } - /** - * @return bool - */ public function isAccountNonLocked(): bool { return $this->locked; @@ -377,9 +363,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter return true; } - /** - * @return bool - */ public function isEnabled(): bool { return $this->enabled; diff --git a/src/Bundle/ChillMainBundle/Entity/UserGroup.php b/src/Bundle/ChillMainBundle/Entity/UserGroup.php index 39df04b31..dde0fe5ca 100644 --- a/src/Bundle/ChillMainBundle/Entity/UserGroup.php +++ b/src/Bundle/ChillMainBundle/Entity/UserGroup.php @@ -18,7 +18,7 @@ use Doctrine\Common\Collections\Order; use Doctrine\Common\Collections\ReadableCollection; use Doctrine\Common\Collections\Selectable; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; use Symfony\Component\Validator\Constraints as Assert; /** diff --git a/src/Bundle/ChillMainBundle/Entity/UserJob.php b/src/Bundle/ChillMainBundle/Entity/UserJob.php index 2efb85e34..8cbb972d0 100644 --- a/src/Bundle/ChillMainBundle/Entity/UserJob.php +++ b/src/Bundle/ChillMainBundle/Entity/UserJob.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['user_job' => UserJob::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php index ad5fa9e95..88e645332 100644 --- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php +++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php @@ -22,7 +22,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Selectable; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['entity_workflow' => EntityWorkflow::class])] diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php index 52210fe84..887eacca8 100644 --- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php +++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php @@ -119,7 +119,7 @@ class CSVFormatter implements FormatterInterface array $exportData, array $filtersData, array $aggregatorsData, - ): \Symfony\Component\HttpFoundation\Response { + ): Response { $this->result = $result; $this->orderingHeaders($formatterData); $this->export = $this->exportManager->getExport($exportAlias); diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php index 1c3f61f88..a249061d2 100644 --- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php +++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php @@ -101,7 +101,7 @@ final class SpreadSheetFormatter implements FormatterInterface, ExportManagerAwa array $filtersData, array $aggregatorsData, ExportGenerationContext $context, - ): \Chill\MainBundle\Export\FormattedExportGeneration { + ): FormattedExportGeneration { // Initialize local variables instead of class properties /** @var ExportInterface $export */ $export = $this->getExportManager()->getExport($exportAlias); diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php index 3b0a2d469..79f8fccd0 100644 --- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php +++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php @@ -195,7 +195,7 @@ class SpreadsheetListFormatter implements FormatterInterface, ExportManagerAware array $filtersData, array $aggregatorsData, ExportGenerationContext $context, - ): \Symfony\Component\HttpFoundation\BinaryFileResponse { + ): BinaryFileResponse { $generated = $this->generate($result, $formatterData, $exportAlias, $exportData, $filtersData, $aggregatorsData, $context); $response = new BinaryFileResponse($generated->content); diff --git a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php index fe8da5b1c..5b305cae6 100644 --- a/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php +++ b/src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php @@ -52,8 +52,6 @@ class PostalCodeChoiceLoader implements ChoiceLoaderInterface /** * @param null $value - * - * @return array */ public function loadChoicesForValues(array $values, $value = null): array { diff --git a/src/Bundle/ChillMainBundle/Form/LocationFormType.php b/src/Bundle/ChillMainBundle/Form/LocationFormType.php index ee2c5214a..a1a4a328b 100644 --- a/src/Bundle/ChillMainBundle/Form/LocationFormType.php +++ b/src/Bundle/ChillMainBundle/Form/LocationFormType.php @@ -70,9 +70,6 @@ final class LocationFormType extends AbstractType ]); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_mainbundle_location'; diff --git a/src/Bundle/ChillMainBundle/Form/NewsItemType.php b/src/Bundle/ChillMainBundle/Form/NewsItemType.php index 02fe55d0d..4795822bb 100644 --- a/src/Bundle/ChillMainBundle/Form/NewsItemType.php +++ b/src/Bundle/ChillMainBundle/Form/NewsItemType.php @@ -47,9 +47,6 @@ class NewsItemType extends AbstractType ]); } - /** - * @return void - */ public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefault('data_class', NewsItem::class); diff --git a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php index 037a88749..0fec1b5cb 100644 --- a/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php +++ b/src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php @@ -60,9 +60,6 @@ class PermissionsGroupType extends AbstractType ]); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_mainbundle_permissionsgroup'; diff --git a/src/Bundle/ChillMainBundle/Form/ScopeType.php b/src/Bundle/ChillMainBundle/Form/ScopeType.php index 894a23a88..38838c7b9 100644 --- a/src/Bundle/ChillMainBundle/Form/ScopeType.php +++ b/src/Bundle/ChillMainBundle/Form/ScopeType.php @@ -40,9 +40,6 @@ class ScopeType extends AbstractType ]); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_mainbundle_scope'; diff --git a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php index 5e7c8280e..beab821c3 100644 --- a/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php +++ b/src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php @@ -55,6 +55,7 @@ class EntityToJsonTransformer implements DataTransformerInterface /** * @param User|User[] $value + * * @throws ExceptionInterface */ public function transform(mixed $value): mixed diff --git a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php index 933b55790..239f36c41 100644 --- a/src/Bundle/ChillMainBundle/Form/UserPasswordType.php +++ b/src/Bundle/ChillMainBundle/Form/UserPasswordType.php @@ -100,9 +100,6 @@ class UserPasswordType extends AbstractType ->setAllowedTypes('user', \Chill\MainBundle\Entity\User::class); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_mainbundle_user_password'; diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php index 58f412ac9..14f8fcf96 100644 --- a/src/Bundle/ChillMainBundle/Form/UserType.php +++ b/src/Bundle/ChillMainBundle/Form/UserType.php @@ -169,9 +169,6 @@ class UserType extends AbstractType ->addAllowedValues('is_creation', [true, false]); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_mainbundle_user'; diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiResult.php b/src/Bundle/ChillMainBundle/Search/SearchApiResult.php index 9d6a0f948..4083b4ede 100644 --- a/src/Bundle/ChillMainBundle/Search/SearchApiResult.php +++ b/src/Bundle/ChillMainBundle/Search/SearchApiResult.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Search; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; class SearchApiResult { diff --git a/src/Bundle/ChillMainBundle/Search/SearchProvider.php b/src/Bundle/ChillMainBundle/Search/SearchProvider.php index 7c74ea566..0f528756e 100644 --- a/src/Bundle/ChillMainBundle/Search/SearchProvider.php +++ b/src/Bundle/ChillMainBundle/Search/SearchProvider.php @@ -211,8 +211,6 @@ class SearchProvider * extract default (residual) arguments. * * @param string $subject - * - * @return string */ private function extractDefault($subject): string { diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php index 180e6dbda..175e4dfc6 100644 --- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php +++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php @@ -37,9 +37,6 @@ class PasswordRecoverEvent extends \Symfony\Contracts\EventDispatcher\Event return $this->ip; } - /** - * @return string - */ public function getToken(): ?string { return $this->token; diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php index 1fb83b2ba..6d9678191 100644 --- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php +++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php @@ -25,8 +25,6 @@ class RecoverPasswordHelper /** * @param bool $absolute * @param array $parameters additional parameters to url - * - * @return string */ public function generateUrl(User $user, \DateTimeInterface $expiration, $absolute = true, array $parameters = []): string { diff --git a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php index 0ac92c11a..e4e80a79d 100644 --- a/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php +++ b/src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php @@ -26,9 +26,6 @@ final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension ]; } - /** - * @return bool - */ public function isScopeConcerned($entity, ?array $options = []): bool { return $this->scopeResolverDispatcher->isConcerned($entity, $options); diff --git a/src/Bundle/ChillMainBundle/Serializer/CircularReferenceHandler.php b/src/Bundle/ChillMainBundle/Serializer/CircularReferenceHandler.php index a1ce8e80d..3c6061e95 100644 --- a/src/Bundle/ChillMainBundle/Serializer/CircularReferenceHandler.php +++ b/src/Bundle/ChillMainBundle/Serializer/CircularReferenceHandler.php @@ -1,4 +1,14 @@ phoneNumberUtil = PhoneNumberUtil::getInstance(); } + public function __invoke(ShortMessage $message): void { trigger_deprecation('Chill-project/chill-bundles', '3.7.0', 'Send message using Notifier component'); diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php index d5112482a..60a38902a 100644 --- a/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php +++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php @@ -47,8 +47,6 @@ class ChillTwigHelper extends AbstractExtension * @param string $value Default to 'No value'. Fallback to default if null * @param string $message * @param string $template - * - * @return string */ public function printOrMessage( Environment $twig, diff --git a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php index 9c1ad3a30..7404dc3be 100644 --- a/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php +++ b/src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php @@ -96,8 +96,6 @@ class ChillTwigRoutingHelper extends AbstractExtension * @param array $parameters * @param bool $relative * @param mixed|null $label - * - * @return string */ public function getPathAddReturnPath($name, $parameters = [], $relative = false, $label = null): string { @@ -118,8 +116,6 @@ class ChillTwigRoutingHelper extends AbstractExtension * @param string $name * @param array $parameters * @param bool $relative - * - * @return string */ public function getPathForwardReturnPath($name, $parameters = [], $relative = false): string { diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php index 0ca22c322..c011faa41 100644 --- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php +++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php @@ -83,8 +83,6 @@ abstract class AbstractAggregatorTest extends KernelTestCase * Compare aliases array before and after that aggregator alter query. * * @dataProvider dataProviderAliasDidNotDisappears - * - * @return void */ public function testAliasDidNotDisappears(QueryBuilder $qb, array $data): void { diff --git a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php index 2432bb5e3..408877a48 100644 --- a/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php +++ b/src/Bundle/ChillMainBundle/Test/PrepareUserTrait.php @@ -46,11 +46,9 @@ trait PrepareUserTrait * * @param array $permissions an array of permissions, with key 'center' for the center and key 'attrs' for an array of ['role' => (string), 'scope' => (int)] * - * @return User - * * @throws \LogicException if the trait is not set up */ - protected static function prepareUser(array $permissions): \Chill\MainBundle\Entity\User + protected static function prepareUser(array $permissions): User { $user = new User(); diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/Event/TrackCreateUpdateSubscriberTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/Event/TrackCreateUpdateSubscriberTest.php index babd28670..f8c335069 100644 --- a/src/Bundle/ChillMainBundle/Tests/Doctrine/Event/TrackCreateUpdateSubscriberTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/Event/TrackCreateUpdateSubscriberTest.php @@ -23,6 +23,11 @@ use PHPUnit\Framework\TestCase; use Prophecy\PhpUnit\ProphecyTrait; use Symfony\Bundle\SecurityBundle\Security; +/** + * @internal + * + * @coversNothing + */ final class TrackCreateUpdateSubscriberTest extends TestCase { use ProphecyTrait; @@ -126,6 +131,7 @@ class TestTrackCreationEntity implements TrackCreationInterface, TrackUpdateInte public function setCreatedAt(\DateTimeInterface $datetime): self { $this->createdAt = $datetime instanceof \DateTime ? \DateTimeImmutable::createFromMutable($datetime) : $datetime; + return $this; } @@ -137,6 +143,7 @@ class TestTrackCreationEntity implements TrackCreationInterface, TrackUpdateInte public function setCreatedBy(User $user): self { $this->createdBy = $user; + return $this; } @@ -148,6 +155,7 @@ class TestTrackCreationEntity implements TrackCreationInterface, TrackUpdateInte public function setUpdatedAt(\DateTimeInterface $datetime): self { $this->updatedAt = $datetime instanceof \DateTime ? \DateTimeImmutable::createFromMutable($datetime) : $datetime; + return $this; } @@ -159,6 +167,7 @@ class TestTrackCreationEntity implements TrackCreationInterface, TrackUpdateInte public function setUpdatedBy(User $user): self { $this->updatedBy = $user; + return $this; } } @@ -176,6 +185,7 @@ class TestTrackUpdateEntity implements TrackUpdateInterface public function setUpdatedAt(\DateTimeInterface $datetime): self { $this->updatedAt = $datetime instanceof \DateTime ? \DateTimeImmutable::createFromMutable($datetime) : $datetime; + return $this; } @@ -187,6 +197,7 @@ class TestTrackUpdateEntity implements TrackUpdateInterface public function setUpdatedBy(User $user): self { $this->updatedBy = $user; + return $this; } } diff --git a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php index 65658a368..62e7eb567 100644 --- a/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Doctrine/Model/PointTest.php @@ -121,7 +121,7 @@ final class PointTest extends KernelTestCase $this->assertEquals($point->toWKT(), 'SRID=4326;POINT(4.8634 50.47382)'); } - private function preparePoint($lon, $lat): \Chill\MainBundle\Doctrine\Model\Point + private function preparePoint($lon, $lat): Point { return Point::fromLonLat($lon, $lat); } diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php index b20fa0857..dc6d234ef 100644 --- a/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php @@ -113,10 +113,8 @@ final class PickCenterTypeTest extends TypeTestCase * prepare the type with mocked center transformer and token storage. * * @param User $user the user for wich the form will be prepared - * - * @return CenterType */ - private function prepareType(User $user): \Chill\MainBundle\Form\CenterType + private function prepareType(User $user): CenterType { $prophet = new \Prophecy\Prophet(); diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php index 3a931db3c..7bc49a4c7 100644 --- a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php @@ -113,8 +113,6 @@ final class PageTest extends KernelTestCase /** * @param int $itemPerPage * @param string $route - * - * @return Page */ protected function generatePage( mixed $number = 1, @@ -122,7 +120,7 @@ final class PageTest extends KernelTestCase $route = 'route', array $routeParameters = [], mixed $totalItems = 100, - ): \Chill\MainBundle\Pagination\Page { + ): Page { $urlGenerator = $this->prophet->prophesize(); $urlGenerator->willImplement(UrlGeneratorInterface::class); diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php index 5c0ab9b3b..f1434a166 100644 --- a/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php @@ -219,8 +219,6 @@ final class PaginatorTest extends KernelTestCase /** * @param int $itemPerPage * @param string $route - * - * @return Paginator */ protected function generatePaginator( mixed $totalItems, @@ -228,7 +226,7 @@ final class PaginatorTest extends KernelTestCase mixed $currentPageNumber = 1, $route = '', array $routeParameters = [], - ): \Chill\MainBundle\Pagination\Paginator { + ): Paginator { $urlGenerator = $this->prophet->prophesize(); $urlGenerator->willImplement(UrlGeneratorInterface::class); diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php index 2b243b010..3541233db 100644 --- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php @@ -37,7 +37,7 @@ final class DefaultScopeResolverTest extends TestCase $entity = new class ($scope) implements HasScopeInterface { public function __construct(private readonly Scope $scope) {} - public function getScope(): \Chill\MainBundle\Entity\Scope + public function getScope(): Scope { return $this->scope; } diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php index 175e24a8e..d1da25b67 100644 --- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php @@ -38,7 +38,7 @@ final class ScopeResolverDispatcherTest extends TestCase $entity = new class ($scope) implements HasScopeInterface { public function __construct(private readonly Scope $scope) {} - public function getScope(): \Chill\MainBundle\Entity\Scope + public function getScope(): Scope { return $this->scope; } diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php index abe1ffb3f..c856880f8 100644 --- a/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php +++ b/src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php @@ -38,7 +38,7 @@ class TimelineSingleQuery ); } - public static function fromArray(array $a): \Chill\MainBundle\Timeline\TimelineSingleQuery + public static function fromArray(array $a): TimelineSingleQuery { return new TimelineSingleQuery( $a['id'] ?? null, diff --git a/src/Bundle/ChillMainBundle/Workflow/Attachment/AddAttachmentRequestDTO.php b/src/Bundle/ChillMainBundle/Workflow/Attachment/AddAttachmentRequestDTO.php index 3d93d2f52..169e0dfff 100644 --- a/src/Bundle/ChillMainBundle/Workflow/Attachment/AddAttachmentRequestDTO.php +++ b/src/Bundle/ChillMainBundle/Workflow/Attachment/AddAttachmentRequestDTO.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\MainBundle\Workflow\Attachment; use Chill\MainBundle\Entity\Workflow\EntityWorkflow; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; final class AddAttachmentRequestDTO diff --git a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostPublicViewMessageHandler.php b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostPublicViewMessageHandler.php index f58003837..3130cf89e 100644 --- a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostPublicViewMessageHandler.php +++ b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostPublicViewMessageHandler.php @@ -15,7 +15,6 @@ use Chill\MainBundle\Repository\EntityWorkflowSendViewRepository; use Chill\MainBundle\Workflow\WorkflowTransitionContextDTO; use Doctrine\ORM\EntityManagerInterface; use Psr\Log\LoggerInterface; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; use Symfony\Component\Workflow\Registry; /** @@ -28,12 +27,14 @@ final readonly class PostPublicViewMessageHandler { private const LOG_PREFIX = '[PostPublicViewMessageHandler] '; private const TRANSITION_ON_VIEW = 'onExternalView'; + public function __construct( private EntityWorkflowSendViewRepository $sendViewRepository, private Registry $registry, private LoggerInterface $logger, private EntityManagerInterface $entityManager, ) {} + public function __invoke(PostPublicViewMessage $message): void { $view = $this->sendViewRepository->find($message->entityWorkflowSendViewId); diff --git a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php index 209bef3d0..de7815c38 100644 --- a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php +++ b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSendExternalMessageHandler.php @@ -17,7 +17,6 @@ use Chill\MainBundle\Workflow\EntityWorkflowManager; use Symfony\Bridge\Twig\Mime\TemplatedEmail; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; #[\Symfony\Component\Messenger\Attribute\AsMessageHandler] final readonly class PostSendExternalMessageHandler @@ -27,6 +26,7 @@ final readonly class PostSendExternalMessageHandler private MailerInterface $mailer, private EntityWorkflowManager $workflowManager, ) {} + public function __invoke(PostSendExternalMessage $message): void { $entityWorkflow = $this->entityWorkflowRepository->find($message->entityWorkflowId); @@ -39,6 +39,7 @@ final readonly class PostSendExternalMessageHandler $this->sendEmailToDestinee($send, $message); } } + private function sendEmailToDestinee(EntityWorkflowSend $send, PostSendExternalMessage $message): void { $entityWorkflow = $send->getEntityWorkflowStep()->getEntityWorkflow(); diff --git a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSignatureStateChangeHandler.php b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSignatureStateChangeHandler.php index 7dc98c47b..20a5c2a4d 100644 --- a/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSignatureStateChangeHandler.php +++ b/src/Bundle/ChillMainBundle/Workflow/Messenger/PostSignatureStateChangeHandler.php @@ -15,7 +15,6 @@ use Chill\MainBundle\Repository\Workflow\EntityWorkflowStepSignatureRepository; use Chill\MainBundle\Workflow\SignatureStepStateChanger; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; #[\Symfony\Component\Messenger\Attribute\AsMessageHandler] final readonly class PostSignatureStateChangeHandler @@ -25,6 +24,7 @@ final readonly class PostSignatureStateChangeHandler private SignatureStepStateChanger $signatureStepStateChanger, private EntityManagerInterface $entityManager, ) {} + public function __invoke(PostSignatureStateChangeMessage $message): void { $signature = $this->entityWorkflowStepSignatureRepository->find($message->signatureId); diff --git a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php index 94edbf08f..0baab4abd 100644 --- a/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php +++ b/src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php @@ -21,8 +21,6 @@ class StepDestValidValidator extends ConstraintValidator { /** * @param EntityWorkflowStep $value - * - * @return void */ public function validate($value, Constraint $constraint): void { diff --git a/src/Bundle/ChillMainBundle/migrations/Version20250528124812.php b/src/Bundle/ChillMainBundle/migrations/Version20250528124812.php index 2202187bf..5d7125865 100644 --- a/src/Bundle/ChillMainBundle/migrations/Version20250528124812.php +++ b/src/Bundle/ChillMainBundle/migrations/Version20250528124812.php @@ -2,6 +2,13 @@ declare(strict_types=1); +/* + * Chill is a software for social workers + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Chill\Migrations\Main; use Doctrine\DBAL\Schema\Schema; diff --git a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php index e1c4e65de..90c791a89 100644 --- a/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php +++ b/src/Bundle/ChillPersonBundle/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListener.php @@ -13,8 +13,6 @@ namespace Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\SocialWork\SocialIssue; -use Doctrine\ORM\Event\PrePersistEventArgs; -use Doctrine\ORM\Event\PreUpdateEventArgs; /** * This service listens for preUpdate and prePersist events on some entities diff --git a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php index b54578595..40b3ea52f 100644 --- a/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php +++ b/src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php @@ -59,11 +59,6 @@ class EntityPersonCRUDController extends CRUDController /** * Add a where clause to the buildQuery. - * - * @param string $action - * @param QueryBuilder $qb - * @param Request $request - * @return QueryBuilder */ protected function filterQueryEntitiesByPerson(string $action, QueryBuilder $qb, Request $request): QueryBuilder { diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php index 4182ad4dd..fc8e76a83 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php @@ -30,17 +30,14 @@ use Chill\PersonBundle\Repository\AccompanyingPeriodRepository; use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter; use Chill\ThirdPartyBundle\Entity\ThirdParty; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; -use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\Serializer\Exception\RuntimeException; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; -use Symfony\Component\Serializer\SerializerInterface; use Symfony\Component\Validator\ConstraintViolationList; use Symfony\Component\Validator\ConstraintViolationListInterface; use Symfony\Component\Validator\Validator\ValidatorInterface; @@ -55,8 +52,7 @@ final class AccompanyingCourseApiController extends ApiController private readonly Registry $registry, private readonly ValidatorInterface $validator, private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository, - ) { - } + ) {} public function commentApi($id, Request $request, string $_format): Response { @@ -141,7 +137,7 @@ final class AccompanyingCourseApiController extends ApiController /** * @ParamConverter("person", options={"id": "person_id"}) */ - public function getAccompanyingPeriodsByPerson(Person $person): \Symfony\Component\HttpFoundation\JsonResponse + public function getAccompanyingPeriodsByPerson(Person $person): JsonResponse { $accompanyingPeriods = $person->getCurrentAccompanyingPeriods(); $accompanyingPeriodsChecked = array_filter( @@ -152,7 +148,7 @@ final class AccompanyingCourseApiController extends ApiController return $this->json(\array_values($accompanyingPeriodsChecked), Response::HTTP_OK, [], ['groups' => ['read']]); } - public function participationApi($id, Request $request, $_format): \Symfony\Component\HttpFoundation\JsonResponse + public function participationApi($id, Request $request, $_format): JsonResponse { /** @var AccompanyingPeriod $accompanyingPeriod */ $accompanyingPeriod = $this->getEntity('participation', $id, $request); @@ -285,7 +281,7 @@ final class AccompanyingCourseApiController extends ApiController * @ParamConverter("accompanyingCourse", options={"id": "id"}) */ #[\Symfony\Component\Routing\Attribute\Route(path: '/api/1.0/person/accompanying-course/{id}/confidential.json', name: 'chill_api_person_accompanying_period_confidential')] - public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, mixed $id, Request $request): \Symfony\Component\HttpFoundation\JsonResponse + public function toggleConfidentialApi(AccompanyingPeriod $accompanyingCourse, mixed $id, Request $request): JsonResponse { if ('POST' === $request->getMethod()) { $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_CONFIDENTIAL, $accompanyingCourse); @@ -302,7 +298,7 @@ final class AccompanyingCourseApiController extends ApiController * @ParamConverter("accompanyingCourse", options={"id": "id"}) */ #[\Symfony\Component\Routing\Attribute\Route(path: '/api/1.0/person/accompanying-course/{id}/intensity.json', name: 'chill_api_person_accompanying_period_intensity')] - public function toggleIntensityApi(AccompanyingPeriod $accompanyingCourse, Request $request): \Symfony\Component\HttpFoundation\JsonResponse + public function toggleIntensityApi(AccompanyingPeriod $accompanyingCourse, Request $request): JsonResponse { if ('POST' === $request->getMethod()) { $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::TOGGLE_INTENSITY, $accompanyingCourse); diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php index 43c722607..fa42b2165 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseCommentController.php @@ -26,7 +26,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Contracts\Translation\TranslatorInterface; class AccompanyingCourseCommentController extends AbstractController diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php index 0d3cedde3..a01aee610 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php @@ -25,7 +25,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Validator\ConstraintViolationInterface; use Symfony\Component\Validator\ConstraintViolationListInterface; @@ -98,7 +97,7 @@ final class AccompanyingCourseController extends \Symfony\Bundle\FrameworkBundle * @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"}) */ #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/parcours/{accompanying_period_id}/delete', name: 'chill_person_accompanying_course_delete')] - public function deleteAction(Request $request, AccompanyingPeriod $accompanyingCourse): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response + public function deleteAction(Request $request, AccompanyingPeriod $accompanyingCourse): \Symfony\Component\HttpFoundation\RedirectResponse|Response { $em = $this->managerRegistry->getManager(); diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php index 863a64699..3b26c7718 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkApiController.php @@ -19,7 +19,6 @@ use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepos use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; class AccompanyingCourseWorkApiController extends ApiController diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php index d7865455d..346b92334 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php @@ -27,7 +27,6 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\SerializerInterface; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php index 1c2a4248a..a5af724e7 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkEvaluationDocumentController.php @@ -15,7 +15,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluatio use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkVoter; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; class AccompanyingCourseWorkEvaluationDocumentController extends AbstractController diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php index 78b4fbede..37d72c61b 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php @@ -41,7 +41,7 @@ class AccompanyingPeriodController extends AbstractController private readonly ValidatorInterface $validator, private readonly TranslatorInterface $translator, private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry, - private readonly RequestStack $requestStack + private readonly RequestStack $requestStack, ) {} /** diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php index d3979a53d..fe600da1b 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodRegulationListController.php @@ -26,7 +26,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; class AccompanyingPeriodRegulationListController diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php index 5f21a3c3b..eb4b67163 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php @@ -19,7 +19,7 @@ use Chill\PersonBundle\Service\AccompanyingPeriodWork\AccompanyingPeriodWorkMerg use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Session\Session; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Translation\TranslatableMessage; use Symfony\Contracts\Translation\TranslatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php index 0b9a92f52..c2d947400 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php @@ -22,7 +22,6 @@ use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvalu use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentDuplicateController.php index 5a0b33bc5..a04e6ee66 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentDuplicateController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationDocumentDuplicateController.php @@ -20,7 +20,6 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php index aab00aa0e..53831956e 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Chill\PersonBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\Routing\Annotation\Route; /** * Class AdminController. @@ -43,9 +42,6 @@ class AdminController extends AbstractController return $this->render('@ChillPerson/Admin/indexSocialWork.html.twig'); } - /** - * @return \Symfony\Component\HttpFoundation\RedirectResponse - */ #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/admin/person_redirect_to_main', name: 'chill_person_admin_redirect_to_admin_index', options: [null])] public function redirectToAdminIndexAction(): \Symfony\Component\HttpFoundation\RedirectResponse { diff --git a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php index 87cd9fda8..4851d88bb 100644 --- a/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php +++ b/src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php @@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Request; */ class ClosingMotiveController extends CRUDController { -// public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {} + // public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {} /** * @param string $action diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php index 8499aa2b3..99ba36c5d 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php @@ -22,13 +22,10 @@ use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent; use Chill\PersonBundle\Repository\Household\HouseholdACLAwareRepositoryInterface; use Chill\PersonBundle\Repository\Household\HouseholdRepository; use Chill\PersonBundle\Security\Authorization\HouseholdVoter; -use Doctrine\Persistence\ManagerRegistry; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; -use Symfony\Component\Serializer\SerializerInterface; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; class HouseholdApiController extends ApiController @@ -37,8 +34,7 @@ class HouseholdApiController extends ApiController private readonly EventDispatcherInterface $eventDispatcher, private readonly HouseholdRepository $householdRepository, private readonly HouseholdACLAwareRepositoryInterface $householdACLAwareRepository, - ) { - } + ) {} /** * @return \Symfony\Component\HttpFoundation\JsonResponse diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php index bc8fb8364..b55e0180c 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php @@ -26,7 +26,6 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Bundle\SecurityBundle\Security; diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php index 4c550aded..6bb936193 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdController.php @@ -23,7 +23,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php index e6d1ccb76..7087fbcb2 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php @@ -21,19 +21,17 @@ use Chill\PersonBundle\Repository\Household\PositionRepository; use Chill\PersonBundle\Repository\PersonRepository; use Chill\PersonBundle\Security\Authorization\HouseholdVoter; use Chill\PersonBundle\Security\Authorization\PersonVoter; -use Doctrine\Persistence\ManagerRegistry; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Serializer\Exception; -use Symfony\Component\Serializer\SerializerInterface; use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; +use Symfony\Component\Routing\Attribute\Route; class HouseholdMemberController extends ApiController { @@ -52,7 +50,7 @@ class HouseholdMemberController extends ApiController $this->household_fields_visibility = $parameterBag->get('chill_person.household_fields'); } - #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/household/member/{id}/edit', name: 'chill_person_household_member_edit')] + #[Route(path: '/{_locale}/person/household/member/{id}/edit', name: 'chill_person_household_member_edit')] public function editMembership(Request $request, HouseholdMember $member): Response { // TODO ACL @@ -91,8 +89,8 @@ class HouseholdMemberController extends ApiController * * allow_leave_without_household: if present, the editor will allow * to leave household without joining another */ - #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/household/members/editor', name: 'chill_person_household_members_editor')] - public function editor(Request $request): \Symfony\Component\HttpFoundation\Response + #[Route(path: '/{_locale}/person/household/members/editor', name: 'chill_person_household_members_editor')] + public function editor(Request $request): Response { $ids = $request->query->all('persons'); @@ -170,7 +168,7 @@ class HouseholdMemberController extends ApiController ]); } - #[\Symfony\Component\Routing\Attribute\Route(path: '/api/1.0/person/household/members/move.{_format}', name: 'chill_api_person_household_members_move')] + #[Route(path: '/api/1.0/person/household/members/move.{_format}', name: 'chill_api_person_household_members_move')] public function move(Request $request, mixed $_format): Response { try { diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonEditController.php b/src/Bundle/ChillPersonBundle/Controller/PersonEditController.php index a0a558a1c..bf62c285a 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonEditController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonEditController.php @@ -24,7 +24,7 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Translation\TranslatableMessage; use Twig\Environment; diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php index 7837d5d6a..24aa23e55 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php @@ -109,7 +109,7 @@ final class PersonResourceController extends AbstractController } #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/{person_id}/resources/list', name: 'chill_person_resource_list')] - public function listAction(Request $request, mixed $person_id): \Symfony\Component\HttpFoundation\Response + public function listAction(Request $request, mixed $person_id): Response { $personOwner = $this->personRepository->find($person_id); $this->denyAccessUnlessGranted(PersonVoter::SEE, $personOwner); @@ -127,7 +127,7 @@ final class PersonResourceController extends AbstractController } #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/{person_id}/resources/new', name: 'chill_person_resource_new')] - public function newAction(Request $request, mixed $person_id): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response + public function newAction(Request $request, mixed $person_id): \Symfony\Component\HttpFoundation\RedirectResponse|Response { $personOwner = $this->personRepository->find($person_id); $personResource = new PersonResource(); diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonSignatureController.php b/src/Bundle/ChillPersonBundle/Controller/PersonSignatureController.php index 2ad541a58..138e3e866 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonSignatureController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonSignatureController.php @@ -17,7 +17,6 @@ use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Security\Authorization\PersonVoter; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; class PersonSignatureController extends AbstractController { diff --git a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php index 2013feafa..7c4e6f443 100644 --- a/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php +++ b/src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php @@ -32,7 +32,6 @@ use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Component\Validator\Constraints\NotIdenticalTo; use Symfony\Component\Validator\Constraints\NotNull; diff --git a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php index ae3ebc080..cc84131ee 100644 --- a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php +++ b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php @@ -21,7 +21,6 @@ use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialActionCSVExportController.php b/src/Bundle/ChillPersonBundle/Controller/SocialActionCSVExportController.php index 7bd4db927..fdb8ab959 100644 --- a/src/Bundle/ChillPersonBundle/Controller/SocialActionCSVExportController.php +++ b/src/Bundle/ChillPersonBundle/Controller/SocialActionCSVExportController.php @@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; class SocialActionCSVExportController extends AbstractController diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialIssueCSVExportController.php b/src/Bundle/ChillPersonBundle/Controller/SocialIssueCSVExportController.php index b7d644fe4..2973550e0 100644 --- a/src/Bundle/ChillPersonBundle/Controller/SocialIssueCSVExportController.php +++ b/src/Bundle/ChillPersonBundle/Controller/SocialIssueCSVExportController.php @@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; class SocialIssueCSVExportController extends AbstractController diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php index 99b9922ba..11c9fd83b 100644 --- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php @@ -18,7 +18,6 @@ use Chill\PersonBundle\Entity\SocialWork\SocialAction; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; class SocialWorkEvaluationApiController extends AbstractController { diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php index ba563ef66..6e5c7c2a2 100644 --- a/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php @@ -28,7 +28,7 @@ final class SocialWorkSocialActionApiController extends ApiController private readonly ClockInterface $clock, ) {} - public function listBySocialIssueApi($id, Request $request): \Symfony\Component\HttpFoundation\JsonResponse + public function listBySocialIssueApi($id, Request $request): JsonResponse { $socialIssue = $this->socialIssueRepository ->find($id); diff --git a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php index 66ecdf705..7b61b96d6 100644 --- a/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php +++ b/src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php @@ -105,7 +105,7 @@ class UserAccompanyingPeriodController extends AbstractController ]); } - #[\Symfony\Component\Routing\Attribute\Route(path: '/{_locale}/person/accompanying-periods/my/drafts', name: 'chill_person_accompanying_period_draft_user')] + #[Route(path: '/{_locale}/person/accompanying-periods/my/drafts', name: 'chill_person_accompanying_period_draft_user')] public function listDraftsAction(): Response { $total = $this->accompanyingPeriodRepository->countBy(['user' => $this->getUser(), 'step' => 'DRAFT']); diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php index 2fd0541c4..3cab77fea 100644 --- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php @@ -25,7 +25,7 @@ class Configuration implements ConfigurationInterface .' any birthdate is not allowed. The birthdate is expressed as ISO8601 : ' .'https://en.wikipedia.org/wiki/ISO_8601#Durations'; - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('cl_chill_person'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index 9dc87b92f..d1ee52690 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -44,8 +44,8 @@ use Doctrine\Common\Collections\Order; use Doctrine\Common\Collections\ReadableCollection; use Doctrine\Common\Collections\Selectable; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\Groups; use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Context\ExecutionContextInterface; use Symfony\Component\Validator\GroupSequenceProviderInterface; @@ -631,7 +631,7 @@ class AccompanyingPeriod implements return $this->getOpenParticipations(); } - public function getGroupSequence(): \Symfony\Component\Validator\Constraints\GroupSequence|array + public function getGroupSequence(): Assert\GroupSequence|array { if (self::STEP_DRAFT === $this->getStep()) { return [[self::STEP_DRAFT]]; diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php index 69f2c1216..1a03fabac 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php @@ -28,7 +28,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ReadableCollection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_work' => AccompanyingPeriodWork::class])] diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php index ba90357ea..110ea3803 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php @@ -18,7 +18,7 @@ use Chill\PersonBundle\Entity\SocialWork\Evaluation; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_work_evaluation' => AccompanyingPeriodWorkEvaluation::class])] #[ORM\Entity] @@ -140,7 +140,7 @@ class AccompanyingPeriodWorkEvaluation implements TrackCreationInterface, TrackU /** * @return Collection */ - public function getDocuments(): \Doctrine\Common\Collections\Collection + public function getDocuments(): Collection { return $this->documents; } diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php index 01c3ed69d..4c61e49fc 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php @@ -16,7 +16,7 @@ use Chill\DocStoreBundle\Entity\StoredObject; use Chill\MainBundle\Doctrine\Model\TrackCreationTrait; use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_work_evaluation_document' => AccompanyingPeriodWorkEvaluationDocument::class])] diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php index f308c219b..9bbca6a9e 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php @@ -16,7 +16,7 @@ use Chill\PersonBundle\Entity\SocialWork\Result; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_work_goal' => AccompanyingPeriodWorkGoal::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php index 2f2b629ee..803c369c5 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php @@ -14,7 +14,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; /** * ClosingMotive give an explanation why we closed the Accompanying period. @@ -81,8 +81,6 @@ class ClosingMotive /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -91,8 +89,6 @@ class ClosingMotive /** * Get name. - * - * @return array */ public function getName(): array { @@ -104,10 +100,7 @@ class ClosingMotive return $this->ordering; } - /** - * @return ClosingMotive - */ - public function getParent(): ?\Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive + public function getParent(): ?ClosingMotive { return $this->parent; } diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php index 4d976396d..21a810a8f 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php @@ -16,8 +16,8 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\Groups; use Symfony\Component\Validator\Constraints as Assert; #[DiscriminatorMap(typeProperty: 'type', mapping: ['accompanying_period_comment' => Comment::class])] diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php index a551b8b75..4478705af 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Entity\AccompanyingPeriod; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['origin' => Origin::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php index ddaecacd1..9b3d70a3d 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php @@ -15,8 +15,8 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\Person; use Chill\ThirdPartyBundle\Entity\ThirdParty; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\Groups; /** * **About denormalization**: this operation is operated by @see{AccompanyingPeriodResourdeNormalizer}. diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php index 9da591d49..010fafc69 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php @@ -12,8 +12,8 @@ declare(strict_types=1); namespace Chill\PersonBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\Groups; /** * AccompanyingPeriodParticipation Class. diff --git a/src/Bundle/ChillPersonBundle/Entity/AdministrativeStatus.php b/src/Bundle/ChillPersonBundle/Entity/AdministrativeStatus.php index 23d451f48..7b25d2ef3 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AdministrativeStatus.php +++ b/src/Bundle/ChillPersonBundle/Entity/AdministrativeStatus.php @@ -13,7 +13,7 @@ namespace Chill\PersonBundle\Entity; use Chill\PersonBundle\Repository\AdministrativeStatusRepository; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['chill_person_administrative_status' => AdministrativeStatus::class])] #[ORM\Entity(repositoryClass: AdministrativeStatusRepository::class)] diff --git a/src/Bundle/ChillPersonBundle/Entity/EmploymentStatus.php b/src/Bundle/ChillPersonBundle/Entity/EmploymentStatus.php index 83b3c65f5..0409b7f43 100644 --- a/src/Bundle/ChillPersonBundle/Entity/EmploymentStatus.php +++ b/src/Bundle/ChillPersonBundle/Entity/EmploymentStatus.php @@ -13,7 +13,7 @@ namespace Chill\PersonBundle\Entity; use Chill\PersonBundle\Repository\EmploymentStatusRepository; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['chill_person_employment_status' => EmploymentStatus::class])] #[ORM\Entity(repositoryClass: EmploymentStatusRepository::class)] diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php index 7d39b0f35..ba41d77cb 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php @@ -23,7 +23,7 @@ use Doctrine\Common\Collections\ReadableCollection; use Doctrine\Common\Collections\Selectable; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Context\ExecutionContextInterface; diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php index 10d63e19d..62f763a59 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdComposition.php @@ -17,7 +17,7 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait; use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['household_composition_type' => HouseholdCompositionType::class])] diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php index 9d172f5be..97b246e8d 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdCompositionType.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Entity\Household; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['household_composition_type' => HouseholdCompositionType::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php index 76d9f0236..8a5bf0972 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/HouseholdMember.php @@ -13,7 +13,7 @@ namespace Chill\PersonBundle\Entity\Household; use Chill\PersonBundle\Entity\Person; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php index f35858636..91f5ef7c3 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/Position.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/Position.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Entity\Household; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['household_position' => Position::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index 1c847bd68..bcd531d52 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -47,7 +47,7 @@ use Doctrine\Common\Collections\ReadableCollection; use Doctrine\Common\Collections\Selectable; use Doctrine\ORM\Mapping as ORM; use libphonenumber\PhoneNumber; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Validator\Context\ExecutionContextInterface; @@ -1175,7 +1175,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI * * @throws \Exception */ - public function getLastAddress(?\DateTime $from = null): ?\Chill\MainBundle\Entity\Address + public function getLastAddress(?\DateTime $from = null): ?Address { return $this->getCurrentHouseholdAddress( null !== $from ? \DateTimeImmutable::createFromMutable($from) : null @@ -1288,7 +1288,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI * * @return Collection */ - public function getSpokenLanguages(): \Doctrine\Common\Collections\Collection + public function getSpokenLanguages(): Collection { return $this->spokenLanguages; } diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/AbstractPersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/AbstractPersonResource.php index 1d2a769e9..db44003ca 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person/AbstractPersonResource.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person/AbstractPersonResource.php @@ -20,7 +20,7 @@ use Chill\PersonBundle\Entity\Person; use Chill\ThirdPartyBundle\Entity\ThirdParty; use Symfony\Component\Validator\Context\ExecutionContextInterface; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Groups; use Symfony\Component\Validator\Constraints as Assert; #[ORM\MappedSuperclass] diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php index 4c86f8c4c..e75e05292 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php @@ -14,8 +14,8 @@ namespace Chill\PersonBundle\Entity\Person; use Chill\MainBundle\Doctrine\Model\TrackCreationInterface; use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute as Serializer; +use Symfony\Component\Serializer\Attribute\Groups; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['personResource' => PersonResource::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php index b0ce8f136..be485a322 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person/PersonResourceKind.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Entity\Person; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[ORM\Entity] #[ORM\Table(name: 'chill_person_resource_kind')] diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php index d1379530f..a440c0918 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php @@ -17,8 +17,9 @@ use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Repository\ResidentialAddressRepository; use Chill\ThirdPartyBundle\Entity\ThirdParty; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Context; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Context; + +use Symfony\Component\Serializer\Attribute\Groups; #[ORM\Entity(repositoryClass: ResidentialAddressRepository::class)] #[ORM\Table(name: 'chill_person_residential_address')] diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php index ba2187f1b..256f09da3 100644 --- a/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php +++ b/src/Bundle/ChillPersonBundle/Entity/PersonAltName.php @@ -12,7 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Groups; /** * PersonAltName. @@ -39,8 +39,6 @@ class PersonAltName /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -49,8 +47,6 @@ class PersonAltName /** * Get key. - * - * @return string */ public function getKey(): string { @@ -59,8 +55,6 @@ class PersonAltName /** * Get label. - * - * @return string */ public function getLabel(): string { diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php index 48817c41c..53d1652a6 100644 --- a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php +++ b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php @@ -56,17 +56,17 @@ class PersonNotDuplicate return $this->id; } - public function getPerson1(): ?\Chill\PersonBundle\Entity\Person + public function getPerson1(): ?Person { return $this->person1; } - public function getPerson2(): ?\Chill\PersonBundle\Entity\Person + public function getPerson2(): ?Person { return $this->person2; } - public function getUser(): ?\Chill\MainBundle\Entity\User + public function getUser(): ?User { return $this->user; } diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php index 2c4999616..70470055a 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php +++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relation.php @@ -12,8 +12,8 @@ declare(strict_types=1); namespace Chill\PersonBundle\Entity\Relationships; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute as Serializer; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; #[DiscriminatorMap(typeProperty: 'type', mapping: ['relation' => Relation::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php index 2325f4221..56a49c3d8 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php +++ b/src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php @@ -20,8 +20,8 @@ use Chill\PersonBundle\Validator\Constraints\Relationship\RelationshipNoDuplicat use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping\DiscriminatorColumn; use RuntimeException; -use Symfony\Component\Serializer\Annotation as Serializer; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute as Serializer; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; use Symfony\Component\Validator\Constraints as Assert; #[DiscriminatorMap(typeProperty: 'type', mapping: ['relationship' => Relationship::class])] diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php index 757dd9354..41b6e58f2 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php @@ -14,7 +14,7 @@ namespace Chill\PersonBundle\Entity\SocialWork; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['social_work_evaluation' => Evaluation::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php index 2d297607e..363acc603 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php @@ -14,7 +14,7 @@ namespace Chill\PersonBundle\Entity\SocialWork; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['social_work_goal' => Goal::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php index f5b8aaa92..daa2d8b9f 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php @@ -16,7 +16,7 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['social_work_result' => Result::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php index 0d0a59c87..127b80974 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php @@ -15,7 +15,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ReadableCollection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['social_work_social_action' => SocialAction::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php index 02c38a60a..d7d78ac77 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php @@ -15,8 +15,8 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\Groups; #[DiscriminatorMap(typeProperty: 'type', mapping: ['social_issue' => SocialIssue::class])] #[ORM\Entity] diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php index ac7f5342e..f5bf7cac0 100644 --- a/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php +++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php @@ -19,9 +19,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver; class AccompanyingCourseCommentType extends AbstractType { - /** - * @return void - */ public function buildForm(FormBuilderInterface $builder, array $options): void { $builder->add('content', ChillTextareaType::class, [ @@ -30,9 +27,6 @@ class AccompanyingCourseCommentType extends AbstractType ]); } - /** - * @return void - */ public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefault('class', Comment::class); diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php index e2764ad6f..af502038b 100644 --- a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php +++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php @@ -108,9 +108,6 @@ class AccompanyingPeriodType extends AbstractType ->setAllowedTypes('center', Center::class); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_personbundle_accompanyingperiod'; diff --git a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php index 7f7d20a31..431993dc1 100644 --- a/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php +++ b/src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php @@ -47,8 +47,6 @@ class PersonChoiceLoader implements ChoiceLoaderInterface /** * @param null $value - * - * @return array */ public function loadChoicesForValues(array $values, $value = null): array { diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php index a8b3046f6..a84abbbc2 100644 --- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php +++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php @@ -119,9 +119,6 @@ final class CreationPersonType extends AbstractType ]); } - /** - * @return string - */ public function getBlockPrefix(): string { return self::NAME; diff --git a/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php b/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php index da714a9d8..2b4ee18c6 100644 --- a/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php +++ b/src/Bundle/ChillPersonBundle/Form/PersonConfimDuplicateType.php @@ -26,9 +26,6 @@ class PersonConfimDuplicateType extends AbstractType ]); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_personbundle_person_confirm_duplicate'; diff --git a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php index d29e903f3..8ad480c85 100644 --- a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php +++ b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php @@ -30,9 +30,6 @@ class PersonFindManuallyDuplicateType extends AbstractType ]); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_personbundle_person_find_manually_duplicate'; diff --git a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php index 0c6a969a0..4740e99aa 100644 --- a/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php +++ b/src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php @@ -70,9 +70,6 @@ class ClosingMotivePickerType extends AbstractType ->getActiveClosingMotive($options['only_leaf'])); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'closing_motive'; diff --git a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php index 210c34f16..9bac511f2 100644 --- a/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php +++ b/src/Bundle/ChillPersonBundle/Menu/PersonMenuBuilder.php @@ -51,8 +51,6 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface /** * @param array{person: Person} $parameters - * - * @return void */ public function buildMenu($menuId, MenuItem $menu, array $parameters): void { diff --git a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php index 18038f337..d9ac74f56 100644 --- a/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php +++ b/src/Bundle/ChillPersonBundle/Privacy/PrivacyEvent.php @@ -57,18 +57,12 @@ class PrivacyEvent extends \Symfony\Contracts\EventDispatcher\Event return $this; } - /** - * @return array - */ public function getArgs(): array { return $this->args; } - /** - * @return Person - */ - public function getPerson(): \Chill\PersonBundle\Entity\Person + public function getPerson(): Person { return $this->person; } diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php index ee50f9b5c..e51995f35 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php @@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; use Symfony\Component\Workflow\Registry; -class AccompanyingPeriodWorkEvaluationNormalizer implements \Symfony\Component\Serializer\Normalizer\NormalizerInterface, NormalizerAwareInterface +class AccompanyingPeriodWorkEvaluationNormalizer implements NormalizerInterface, NormalizerAwareInterface { use NormalizerAwareTrait; @@ -71,4 +71,3 @@ class AccompanyingPeriodWorkEvaluationNormalizer implements \Symfony\Component\S return 'json' === $format ? [AccompanyingPeriodWorkEvaluation::class => true] : []; } } - diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php index dce9961b9..bf83d9ce8 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php @@ -142,4 +142,3 @@ class AccompanyingPeriodWorkNormalizer implements \Symfony\Component\Serializer\ }; } } - diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php index 1b8a2b590..4902756fb 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php @@ -103,4 +103,3 @@ class SocialActionNormalizer implements NormalizerAwareInterface, NormalizerInte return []; } } - diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php index 30524b8d3..4f9c8baf0 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php @@ -84,4 +84,3 @@ class SocialIssueNormalizer implements NormalizerInterface, NormalizerAwareInter return []; } } - diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php index a564abf6c..c7fab6720 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php @@ -32,7 +32,7 @@ final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_administrative_location'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\AdministrativeLocationAggregator + public function getAggregator(): AdministrativeLocationAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingDateAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingDateAggregatorTest.php index a72a5bfce..c9a5918dc 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingDateAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingDateAggregatorTest.php @@ -36,7 +36,7 @@ class ClosingDateAggregatorTest extends AbstractAggregatorTest self::$entityManager = self::getContainer()->get(EntityManagerInterface::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingDateAggregator + public function getAggregator(): ClosingDateAggregator { return self::$closingDateAggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php index 7e553dcf1..5ccfaa145 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php @@ -32,7 +32,7 @@ final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_closingmotive'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingMotiveAggregator + public function getAggregator(): ClosingMotiveAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php index 210845d06..f2e7fcf7e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php @@ -32,7 +32,7 @@ final class ConfidentialAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_confidential'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ConfidentialAggregator + public function getAggregator(): ConfidentialAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php index bd8d661c0..951c75ba8 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php @@ -32,7 +32,7 @@ final class DurationAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_duration'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\DurationAggregator + public function getAggregator(): DurationAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php index 29282f67f..f64dbe0f4 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php @@ -32,7 +32,7 @@ final class EmergencyAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_emergency'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EmergencyAggregator + public function getAggregator(): EmergencyAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php index 62de9e298..bea69d44b 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php @@ -32,7 +32,7 @@ final class EvaluationAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_evaluation'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EvaluationAggregator + public function getAggregator(): EvaluationAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php index 54bc1583c..b5374da16 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php @@ -34,7 +34,7 @@ final class GeographicalUnitStatAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_geographicalunitstat'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\GeographicalUnitStatAggregator + public function getAggregator(): GeographicalUnitStatAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php index f19648a92..4b3f0a154 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php @@ -32,7 +32,7 @@ final class IntensityAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_intensity'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\IntensityAggregator + public function getAggregator(): IntensityAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OpeningDateAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OpeningDateAggregatorTest.php index 034d5f253..59d3528a0 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OpeningDateAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OpeningDateAggregatorTest.php @@ -36,7 +36,7 @@ class OpeningDateAggregatorTest extends AbstractAggregatorTest self::$entityManager = self::getContainer()->get(EntityManagerInterface::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\OpeningDateAggregator + public function getAggregator(): OpeningDateAggregator { return self::$openingDateAggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php index 68bb286e0..e76f1610a 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php @@ -32,7 +32,7 @@ final class OriginAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_origin'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\OriginAggregator + public function getAggregator(): OriginAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/PersonParticipatingAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/PersonParticipatingAggregatorTest.php index aa69739ba..61f9d25ff 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/PersonParticipatingAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/PersonParticipatingAggregatorTest.php @@ -32,7 +32,7 @@ final class PersonParticipatingAggregatorTest extends AbstractAggregatorTest $this->labelPersonHelper = self::getContainer()->get(LabelPersonHelper::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\PersonParticipatingAggregator + public function getAggregator(): PersonParticipatingAggregator { return new PersonParticipatingAggregator($this->labelPersonHelper); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php index 8255cf467..7ac2b1708 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php @@ -34,7 +34,7 @@ final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest { use ProphecyTrait; - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerScopeAggregator + public function getAggregator(): ReferrerScopeAggregator { $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class); $translatableStringHelper->localize(Argument::type('array'))->willReturn('localized'); diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php index ccf00d3c2..6b3f90261 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php @@ -32,7 +32,7 @@ final class RequestorAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_requestor'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\RequestorAggregator + public function getAggregator(): RequestorAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php index 0af909963..142c05010 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php @@ -32,7 +32,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_referrer_scope'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeAggregator + public function getAggregator(): ScopeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php index 70f24e389..dd97943b1 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php @@ -32,7 +32,7 @@ final class SocialActionAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_socialaction'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialActionAggregator + public function getAggregator(): SocialActionAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php index 6abed858b..0e66f0cb5 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php @@ -32,7 +32,7 @@ final class SocialIssueAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_socialissue'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialIssueAggregator + public function getAggregator(): SocialIssueAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php index 10cf35e5b..d5e489472 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php @@ -33,7 +33,7 @@ final class StepAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_step'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\StepAggregator + public function getAggregator(): StepAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByClosingMotiveAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByClosingMotiveAggregatorTest.php index a1d349b16..1a3458ca8 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByClosingMotiveAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByClosingMotiveAggregatorTest.php @@ -36,7 +36,7 @@ class ByClosingMotiveAggregatorTest extends AbstractAggregatorTest $this->closingMotiveRepository = self::getContainer()->get(ClosingMotiveRepositoryInterface::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByClosingMotiveAggregator + public function getAggregator(): ByClosingMotiveAggregator { return new ByClosingMotiveAggregator( $this->closingMotiveRepository, diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByDateAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByDateAggregatorTest.php index aa4569dba..6c8cc616a 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByDateAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByDateAggregatorTest.php @@ -24,7 +24,7 @@ use Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregator */ class ByDateAggregatorTest extends AbstractAggregatorTest { - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByDateAggregator + public function getAggregator(): ByDateAggregator { return new ByDateAggregator(); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByStepAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByStepAggregatorTest.php index 12a8b24b7..57416ffef 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByStepAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByStepAggregatorTest.php @@ -24,7 +24,7 @@ use Symfony\Contracts\Translation\TranslatorInterface; */ class ByStepAggregatorTest extends AbstractAggregatorTest { - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\AccompanyingPeriodStepHistoryAggregators\ByStepAggregator + public function getAggregator(): ByStepAggregator { $translator = new class () implements TranslatorInterface { public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php index d591aed0a..4d1f7e6c5 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php @@ -32,7 +32,7 @@ final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_evaluationtype'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\EvaluationAggregators\EvaluationTypeAggregator + public function getAggregator(): EvaluationTypeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php index 82b120776..c6d40b5c4 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php @@ -33,7 +33,7 @@ final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_household_childrennumber'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\ChildrenNumberAggregator + public function getAggregator(): ChildrenNumberAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php index 4482551a9..9410cd605 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php @@ -33,7 +33,7 @@ final class CompositionAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_household_composition'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\CompositionAggregator + public function getAggregator(): CompositionAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php index df15d8245..79d0efd17 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php @@ -33,7 +33,7 @@ final class AgeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_age'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\PersonAggregators\AgeAggregator + public function getAggregator(): AgeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php index 0813d5b80..2312dc336 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/CountryOfBirthAggregatorTest.php @@ -32,7 +32,7 @@ final class CountryOfBirthAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_country_of_birth'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\PersonAggregators\CountryOfBirthAggregator + public function getAggregator(): CountryOfBirthAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php index ca9855fe6..1b50be5a1 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php @@ -32,7 +32,7 @@ final class GenderAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_gender'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\PersonAggregators\GenderAggregator + public function getAggregator(): GenderAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php index 076453704..8357268b9 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/HouseholdPositionAggregatorTest.php @@ -35,7 +35,7 @@ final class HouseholdPositionAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_household_position'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\PersonAggregators\HouseholdPositionAggregator + public function getAggregator(): HouseholdPositionAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php index 03360b1e2..12d37a5d2 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/MaritalStatusAggregatorTest.php @@ -32,7 +32,7 @@ final class MaritalStatusAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_marital_status'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\PersonAggregators\MaritalStatusAggregator + public function getAggregator(): MaritalStatusAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php index 05b03e369..dc6797562 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php @@ -32,7 +32,7 @@ final class NationalityAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_nationality'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\PersonAggregators\NationalityAggregator + public function getAggregator(): NationalityAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/PostalCodeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/PostalCodeAggregatorTest.php index dd310d2f9..126ec1cba 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/PostalCodeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/PostalCodeAggregatorTest.php @@ -33,7 +33,7 @@ class PostalCodeAggregatorTest extends AbstractAggregatorTest $this->rollingDateConverter = self::getContainer()->get(RollingDateConverterInterface::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\PersonAggregators\PostalCodeAggregator + public function getAggregator(): PostalCodeAggregator { return new PostalCodeAggregator($this->rollingDateConverter); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php index 64a153419..770628462 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php @@ -32,7 +32,7 @@ final class ActionTypeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_action_type'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ActionTypeAggregator + public function getAggregator(): ActionTypeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorAggregatorTest.php index 670a5242e..05cc932d3 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorAggregatorTest.php @@ -32,7 +32,7 @@ class CreatorAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(CreatorAggregator::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CreatorAggregator + public function getAggregator(): CreatorAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorJobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorJobAggregatorTest.php index 0fa8bc923..20e223f45 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorJobAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorJobAggregatorTest.php @@ -32,7 +32,7 @@ class CreatorJobAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(CreatorJobAggregator::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CreatorJobAggregator + public function getAggregator(): CreatorJobAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorScopeAggregatorTest.php index 91ba02de9..a36092e37 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorScopeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/CreatorScopeAggregatorTest.php @@ -32,7 +32,7 @@ class CreatorScopeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(CreatorScopeAggregator::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CreatorScopeAggregator + public function getAggregator(): CreatorScopeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php index 4effa6d29..960520b2d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php @@ -32,7 +32,7 @@ final class GoalAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_goal'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalAggregator + public function getAggregator(): GoalAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php index 18ecc9aab..1bba9cc9e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalResultAggregatorTest.php @@ -32,7 +32,7 @@ final class GoalResultAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_goalresult'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\GoalResultAggregator + public function getAggregator(): GoalResultAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/HandlingThirdPartyAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/HandlingThirdPartyAggregatorTest.php index c442dc55b..8940c946f 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/HandlingThirdPartyAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/HandlingThirdPartyAggregatorTest.php @@ -32,7 +32,7 @@ class HandlingThirdPartyAggregatorTest extends AbstractAggregatorTest self::$handlingThirdPartyAggregator = self::getContainer()->get(HandlingThirdPartyAggregator::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\HandlingThirdPartyAggregator + public function getAggregator(): HandlingThirdPartyAggregator { return self::$handlingThirdPartyAggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php index e7a3e729f..8fb60eb51 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/JobAggregatorTest.php @@ -32,7 +32,7 @@ final class JobAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_treatingagent_job'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\JobAggregator + public function getAggregator(): JobAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php index fae1cbc5e..a08b8b582 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php @@ -33,7 +33,7 @@ final class ReferrerAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get(ReferrerAggregator::class); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ReferrerAggregator + public function getAggregator(): ReferrerAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php index c82102760..78b05a2fe 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php @@ -32,7 +32,7 @@ final class ResultAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_result'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ResultAggregator + public function getAggregator(): ResultAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php index 7f6418709..4f38bda63 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ScopeAggregatorTest.php @@ -32,7 +32,7 @@ final class ScopeAggregatorTest extends AbstractAggregatorTest $this->aggregator = self::getContainer()->get('chill.person.export.aggregator_treatingagent_scope'); } - public function getAggregator(): \Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\ScopeAggregator + public function getAggregator(): ScopeAggregator { return $this->aggregator; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php index 72c727e80..181d24548 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/ListAccompanyingPeriodTest.php @@ -27,6 +27,7 @@ use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter; use Doctrine\ORM\EntityManagerInterface; use Prophecy\Argument; use Prophecy\PhpUnit\ProphecyTrait; + /** * @internal * diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php index e8e085107..924280519 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php @@ -33,7 +33,7 @@ final class ActiveOnDateFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_activeondate'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOnDateFilter + public function getFilter(): ActiveOnDateFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php index 991a125b4..d6251da6d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php @@ -33,7 +33,7 @@ final class ActiveOneDayBetweenDatesFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_activeonedaybetweendates'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ActiveOneDayBetweenDatesFilter + public function getFilter(): ActiveOneDayBetweenDatesFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php index b9868f444..3136d6e62 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php @@ -32,7 +32,7 @@ final class AdministrativeLocationFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_administrative_location'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\AdministrativeLocationFilter + public function getFilter(): AdministrativeLocationFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php index 4e76dae59..efc11d6c8 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php @@ -33,7 +33,7 @@ final class ClosingMotiveFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_closingmotive'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ClosingMotiveFilter + public function getFilter(): ClosingMotiveFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php index 7bbd28f7b..6f94d9571 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php @@ -31,7 +31,7 @@ final class ConfidentialFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_confidential'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ConfidentialFilter + public function getFilter(): ConfidentialFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php index 3a67d4b42..cbc296f62 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php @@ -31,7 +31,7 @@ final class EmergencyFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_emergency'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\EmergencyFilter + public function getFilter(): EmergencyFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php index dcfa1cdd7..b4ea79e00 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php @@ -32,7 +32,7 @@ final class EvaluationFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_evaluation'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\EvaluationFilter + public function getFilter(): EvaluationFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php index dda1d1cf2..b6bcbcd53 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php @@ -34,7 +34,7 @@ final class GeographicalUnitStatFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_geographicalunitstat'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\GeographicalUnitStatFilter + public function getFilter(): GeographicalUnitStatFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilterTest.php index 17a6cb8b9..179c1cbb4 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilterTest.php @@ -33,7 +33,7 @@ class HasTemporaryLocationFilterTest extends AbstractFilterTest $this->rollingDateConverter = self::getContainer()->get(RollingDateConverterInterface::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\HasTemporaryLocationFilter + public function getFilter(): HasTemporaryLocationFilter { return new HasTemporaryLocationFilter($this->rollingDateConverter); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php index 8b0ff75a4..7daffc6c0 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php @@ -32,7 +32,7 @@ final class IntensityFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_intensity'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\IntensityFilter + public function getFilter(): IntensityFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilterTest.php index a2218600f..17223d3c0 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/NotAssociatedWithAReferenceAddressFilterTest.php @@ -28,7 +28,7 @@ class NotAssociatedWithAReferenceAddressFilterTest extends AbstractFilterTest { use ProphecyTrait; - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\NotAssociatedWithAReferenceAddressFilter + public function getFilter(): NotAssociatedWithAReferenceAddressFilter { $dateConverter = new class () implements RollingDateConverterInterface { public function convert(?RollingDate $rollingDate): ?\DateTimeImmutable diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php index 4fcae7ed0..6bab1a4e0 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php @@ -33,7 +33,7 @@ final class OpenBetweenDatesFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_openbetweendates'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OpenBetweenDatesFilter + public function getFilter(): OpenBetweenDatesFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php index a83720119..d7219c191 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php @@ -33,7 +33,7 @@ final class OriginFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_origin'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\OriginFilter + public function getFilter(): OriginFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDatesTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDatesTest.php index cc5d63626..29bebad6e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDatesTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterBetweenDatesTest.php @@ -42,7 +42,7 @@ class ReferrerFilterBetweenDatesTest extends AbstractFilterTest $this->userRepository = self::getContainer()->get(UserRepositoryInterface::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilterBetweenDates + public function getFilter(): ReferrerFilterBetweenDates { return new ReferrerFilterBetweenDates($this->rollingDateConverter, $this->userRender, $this->userRepository); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php index 1af99ca7a..63f443c6f 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php @@ -34,7 +34,7 @@ final class ReferrerFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(ReferrerFilter::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\ReferrerFilter + public function getFilter(): ReferrerFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php index b160ba6e6..8dd471ee5 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php @@ -32,7 +32,7 @@ final class RequestorFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_requestor'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\RequestorFilter + public function getFilter(): RequestorFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php index 7be5381a3..3c83230ef 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php @@ -34,7 +34,7 @@ final class SocialActionFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_socialaction'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialActionFilter + public function getFilter(): SocialActionFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php index 4e8a4431b..c7d5a0405 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php @@ -34,7 +34,7 @@ final class SocialIssueFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_socialissue'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\SocialIssueFilter + public function getFilter(): SocialIssueFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterOnDateTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterOnDateTest.php index 69fe0a849..ede34ceec 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterOnDateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterOnDateTest.php @@ -33,7 +33,7 @@ final class StepFilterOnDateTest extends AbstractFilterTest $this->filter = self::getContainer()->get(StepFilterOnDate::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\StepFilterOnDate + public function getFilter(): StepFilterOnDate { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php index 8ccda77ac..28e2bf9a5 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserJobFilterTest.php @@ -35,7 +35,7 @@ final class UserJobFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(UserJobFilter::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\UserJobFilter + public function getFilter(): UserJobFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php index 2a73a2ce6..2c10be1af 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/UserScopeFilterTest.php @@ -35,7 +35,7 @@ final class UserScopeFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(UserScopeFilter::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\UserScopeFilter + public function getFilter(): UserScopeFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilterTest.php index 73f02ac1f..c0a22becf 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByDateFilterTest.php @@ -35,7 +35,7 @@ class ByDateFilterTest extends AbstractFilterTest $this->rollingDateConverter = self::getContainer()->get(RollingDateConverterInterface::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingPeriodStepHistoryFilters\ByDateFilter + public function getFilter(): ByDateFilter { return new ByDateFilter($this->rollingDateConverter); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php index 30bb908fc..caba79ba3 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php @@ -25,7 +25,7 @@ use Symfony\Contracts\Translation\TranslatorInterface; */ class ByStepFilterTest extends AbstractFilterTest { - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingPeriodStepHistoryFilters\ByStepFilter + public function getFilter(): ByStepFilter { $translator = new class () implements TranslatorInterface { public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php index 610fd4e3b..2fee4cb22 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/EvaluationTypeFilterTest.php @@ -33,7 +33,7 @@ final class EvaluationTypeFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_evaluationtype'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\EvaluationFilters\EvaluationTypeFilter + public function getFilter(): EvaluationTypeFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php index b081ef91a..5c93d6f93 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/EvaluationFilters/MaxDateFilterTest.php @@ -32,7 +32,7 @@ final class MaxDateFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_maxdate'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\EvaluationFilters\MaxDateFilter + public function getFilter(): MaxDateFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php index 799aa57a3..3021a1573 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AgeFilterTest.php @@ -33,7 +33,7 @@ final class AgeFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_age'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\AgeFilter + public function getFilter(): AgeFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php index 6e678f53d..a88989d9b 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php @@ -33,7 +33,7 @@ final class BirthdateFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_birthdate'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\BirthdateFilter + public function getFilter(): BirthdateFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php index ac6df894d..f5e26a7b8 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeadOrAliveFilterTest.php @@ -33,7 +33,7 @@ final class DeadOrAliveFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_dead_or_alive'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\DeadOrAliveFilter + public function getFilter(): DeadOrAliveFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php index 28c8dba73..3f99bcac8 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/DeathdateFilterTest.php @@ -33,7 +33,7 @@ final class DeathdateFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_deathdate'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\DeathdateFilter + public function getFilter(): DeathdateFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php index 78c574ac3..a847f4d83 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php @@ -32,7 +32,7 @@ final class GenderFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_gender'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\GenderFilter + public function getFilter(): GenderFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php index fd8ed7d07..0a22f696d 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/MaritalStatusFilterTest.php @@ -33,7 +33,7 @@ final class MaritalStatusFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_marital_status'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\MaritalStatusFilter + public function getFilter(): MaritalStatusFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php index 08a19af91..060fdb5e8 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/NationalityFilterTest.php @@ -33,7 +33,7 @@ final class NationalityFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_nationality'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\NationalityFilter + public function getFilter(): NationalityFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php index dd769cb7e..d96ccd93c 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilterTest.php @@ -36,7 +36,7 @@ final class ResidentialAddressAtThirdpartyFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_residential_address_at_thirdparty'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\ResidentialAddressAtThirdpartyFilter + public function getFilter(): ResidentialAddressAtThirdpartyFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php index 48e3c9817..3a711320e 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/ResidentialAddressAtUserFilterTest.php @@ -34,7 +34,7 @@ final class ResidentialAddressAtUserFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_residential_address_at_user'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\ResidentialAddressAtUserFilter + public function getFilter(): ResidentialAddressAtUserFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilterTest.php index 7d351bbd4..6a4517b54 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithParticipationBetweenDatesFilterTest.php @@ -33,7 +33,7 @@ final class WithParticipationBetweenDatesFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(WithParticipationBetweenDatesFilter::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\WithParticipationBetweenDatesFilter + public function getFilter(): WithParticipationBetweenDatesFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithoutParticipationBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithoutParticipationBetweenDatesFilterTest.php index abaf4b65e..2a460d5ac 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithoutParticipationBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/WithoutParticipationBetweenDatesFilterTest.php @@ -33,7 +33,7 @@ final class WithoutParticipationBetweenDatesFilterTest extends AbstractFilterTes $this->filter = self::getContainer()->get(WithoutParticipationBetweenDatesFilter::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\PersonFilters\WithoutParticipationBetweenDatesFilter + public function getFilter(): WithoutParticipationBetweenDatesFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorFilterTest.php index 87da7927e..1b204febc 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorFilterTest.php @@ -33,7 +33,7 @@ class CreatorFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(CreatorFilter::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\SocialWorkFilters\CreatorFilter + public function getFilter(): CreatorFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorJobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorJobFilterTest.php index 69c80b15d..fb5c8098f 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorJobFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorJobFilterTest.php @@ -34,7 +34,7 @@ class CreatorJobFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(CreatorJobFilter::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\SocialWorkFilters\CreatorJobFilter + public function getFilter(): CreatorJobFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorScopeFilterTest.php index 3ded3f3b8..c353c561b 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorScopeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/CreatorScopeFilterTest.php @@ -33,7 +33,7 @@ class CreatorScopeFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(CreatorScopeFilter::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\SocialWorkFilters\CreatorScopeFilter + public function getFilter(): CreatorScopeFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/HandlingThirdPartyFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/HandlingThirdPartyFilterTest.php index 8fde7ef0d..faf60403a 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/HandlingThirdPartyFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/HandlingThirdPartyFilterTest.php @@ -38,7 +38,7 @@ class HandlingThirdPartyFilterTest extends AbstractFilterTest $this->thirdPartyRepository = self::getContainer()->get(ThirdPartyRepository::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters\HandlingThirdPartyFilter + public function getFilter(): HandlingThirdPartyFilter { return new HandlingThirdPartyFilter($this->thirdPartyRender, $this->thirdPartyRepository); } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php index f9cbdc4a8..c9dcda6c1 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php @@ -34,7 +34,7 @@ final class JobFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_job'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\SocialWorkFilters\JobFilter + public function getFilter(): JobFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php index 144348334..fa93d2849 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ReferrerFilterTest.php @@ -34,7 +34,7 @@ final class ReferrerFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_treatingagent'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\SocialWorkFilters\ReferrerFilter + public function getFilter(): ReferrerFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php index 48ce583ac..83cd07747 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php @@ -33,7 +33,7 @@ final class ScopeFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get('chill.person.export.filter_scope'); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\SocialWorkFilters\ScopeFilter + public function getFilter(): ScopeFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/WithEvaluationBetweenDatesFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/WithEvaluationBetweenDatesFilterTest.php index 6e1465b68..a98db65e7 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/WithEvaluationBetweenDatesFilterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/WithEvaluationBetweenDatesFilterTest.php @@ -33,7 +33,7 @@ final class WithEvaluationBetweenDatesFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter::class); } - public function getFilter(): \Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter + public function getFilter(): AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter { return $this->filter; } diff --git a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php index f15ab06d4..b06172915 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php @@ -563,7 +563,7 @@ final class MembersEditorTest extends TestCase private function buildMembersEditorFactory( ?EventDispatcherInterface $eventDispatcher = null, ?ValidatorInterface $validator = null, - ): \Chill\PersonBundle\Household\MembersEditorFactory { + ): MembersEditorFactory { if (null === $eventDispatcher) { $double = $this->getProphet()->prophesize(); $double->willImplement(EventDispatcherInterface::class); diff --git a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php index 154a80cea..5cc7de843 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php @@ -137,10 +137,8 @@ final class PersonVoterTest extends KernelTestCase * prepare a person. * * The only properties set is the center, others properties are ignored. - * - * @return Person */ - protected function preparePerson(Center $center): \Chill\PersonBundle\Entity\Person + protected function preparePerson(Center $center): Person { return (new Person()) ->setCenter($center); diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php index 992802cca..a4818aa46 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Validator/AccompanyingPeriod/LocationValidityValidatorTest.php @@ -120,7 +120,7 @@ final class LocationValidityValidatorTest extends ConstraintValidatorTestCase return new LocationValidityValidator($render); } - protected function getConstraint(): \Chill\PersonBundle\Validator\Constraints\AccompanyingPeriod\LocationValidity + protected function getConstraint(): LocationValidity { return new LocationValidity([ 'messagePersonLocatedMustBeAssociated' => 'messagePersonLocatedMustBeAssociated', diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php index 6bdda5fb9..37769f3a5 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/HouseholdMembershipSequentialValidatorTest.php @@ -97,7 +97,7 @@ final class HouseholdMembershipSequentialValidatorTest extends ConstraintValidat return new HouseholdMembershipSequentialValidator($render); } - protected function getConstraint(): \Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential + protected function getConstraint(): HouseholdMembershipSequential { return new HouseholdMembershipSequential([ 'message' => 'msg', diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php index b66366587..e9841dbf0 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Household/MaxHolderValidatorTest.php @@ -78,7 +78,7 @@ final class MaxHolderValidatorTest extends ConstraintValidatorTestCase return new MaxHolderValidator(); } - protected function getConstraint(): \Chill\PersonBundle\Validator\Constraints\Household\MaxHolder + protected function getConstraint(): MaxHolder { return new MaxHolder([ 'message' => 'msg', diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php index 5a2e7d49e..55e4056ae 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/BirthdateValidatorTest.php @@ -72,7 +72,7 @@ final class BirthdateValidatorTest extends ConstraintValidatorTestCase ); } - private function createConstraint(): \Chill\PersonBundle\Validator\Constraints\Person\Birthdate + private function createConstraint(): Birthdate { return new Birthdate([ 'message' => 'msg', diff --git a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php index 438fe9057..3e47af0f7 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php @@ -72,7 +72,7 @@ final class PersonHasCenterValidatorTest extends ConstraintValidatorTestCase return new PersonHasCenterValidator($parameterBag, $prophecy->reveal()); } - protected function getConstraint(): \Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter + protected function getConstraint(): PersonHasCenter { return new PersonHasCenter([ 'message' => 'msg', diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20250527122841.php b/src/Bundle/ChillPersonBundle/migrations/Version20250527122841.php index d9c285e00..5be02e65d 100644 --- a/src/Bundle/ChillPersonBundle/migrations/Version20250527122841.php +++ b/src/Bundle/ChillPersonBundle/migrations/Version20250527122841.php @@ -2,6 +2,13 @@ declare(strict_types=1); +/* + * Chill is a software for social workers + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Chill\Migrations\Person; use Doctrine\DBAL\Schema\Schema; diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php index ea8c4788a..71f874abe 100644 --- a/src/Bundle/ChillReportBundle/Controller/ReportController.php +++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php @@ -39,7 +39,7 @@ class ReportController extends AbstractController private readonly PaginatorFactory $paginator, private readonly TranslatorInterface $translator, private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry, - private readonly RequestStack $requestStack + private readonly RequestStack $requestStack, ) {} /** diff --git a/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php index 557283056..713793422 100644 --- a/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php @@ -21,7 +21,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_report'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillReportBundle/Entity/Report.php b/src/Bundle/ChillReportBundle/Entity/Report.php index 1022f22d2..0b9017b78 100644 --- a/src/Bundle/ChillReportBundle/Entity/Report.php +++ b/src/Bundle/ChillReportBundle/Entity/Report.php @@ -61,8 +61,6 @@ class Report implements HasCenterInterface, HasScopeInterface /** * Get cFData. - * - * @return array */ public function getCFData(): ?array { @@ -71,10 +69,8 @@ class Report implements HasCenterInterface, HasScopeInterface /** * Get cFGroup. - * - * @return CustomFieldsGroup */ - public function getCFGroup(): ?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup + public function getCFGroup(): ?CustomFieldsGroup { return $this->cFGroup; } @@ -89,8 +85,6 @@ class Report implements HasCenterInterface, HasScopeInterface /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -99,30 +93,24 @@ class Report implements HasCenterInterface, HasScopeInterface /** * Get person. - * - * @return Person */ - public function getPerson(): ?\Chill\PersonBundle\Entity\Person + public function getPerson(): ?Person { return $this->person; } /** * Get scope. - * - * @return Scope */ - public function getScope(): ?\Chill\MainBundle\Entity\Scope + public function getScope(): ?Scope { return $this->scope; } /** * Get user. - * - * @return User */ - public function getUser(): ?\Chill\MainBundle\Entity\User + public function getUser(): ?User { return $this->user; } diff --git a/src/Bundle/ChillReportBundle/Form/ReportType.php b/src/Bundle/ChillReportBundle/Form/ReportType.php index 0e2c43d73..40546d10c 100644 --- a/src/Bundle/ChillReportBundle/Form/ReportType.php +++ b/src/Bundle/ChillReportBundle/Form/ReportType.php @@ -82,9 +82,6 @@ final class ReportType extends AbstractType $this->appendScopeChoicesOptions($resolver); } - /** - * @return string - */ public function getBlockPrefix(): string { return 'chill_reportbundle_report'; diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php index 86e11ccb1..788014a39 100644 --- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php @@ -166,9 +166,6 @@ final class ReportControllerNextTest extends WebTestCase ]); } - /** - * @return \Symfony\Component\DomCrawler\Form - */ protected function getReportForm(Person $person, CustomFieldsGroup $group, \Symfony\Component\BrowserKit\AbstractBrowser $client): \Symfony\Component\DomCrawler\Form { $url = sprintf( diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php index ad6fc696a..12eec4198 100644 --- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php @@ -114,7 +114,7 @@ final class ReportControllerTest extends WebTestCase * * @depends testMenu */ - public function testChooseReportModelPage(Link $link): \Symfony\Component\DomCrawler\Crawler + public function testChooseReportModelPage(Link $link): Crawler { // When I click on "add a report" link in menu $client = $this->getAuthenticatedClient(); @@ -405,14 +405,12 @@ final class ReportControllerTest extends WebTestCase * get a form for report new. * * @param \Chill\ReportBundle\Tests\Controller\Person $person - * - * @return Form */ protected function getReportForm( Person $person, CustomFieldsGroup $group, \Symfony\Component\BrowserKit\AbstractBrowser $client, - ): \Symfony\Component\DomCrawler\Form { + ): Form { $url = sprintf( 'fr/person/%d/report/cfgroup/%d/new', $person->getId(), diff --git a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php index f951c16df..7b7b61755 100644 --- a/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Export/Filter/ReportDateFilterTest.php @@ -33,7 +33,7 @@ final class ReportDateFilterTest extends AbstractFilterTest $this->filter = self::getContainer()->get(ReportDateFilter::class); } - public function getFilter(): \Chill\ReportBundle\Export\Filter\ReportDateFilter + public function getFilter(): ReportDateFilter { return $this->filter; } diff --git a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php index 0f13cb352..7889847ae 100644 --- a/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php @@ -143,10 +143,8 @@ final class ReportVoterTest extends KernelTestCase * prepare a person. * * The only properties set is the center, others properties are ignored. - * - * @return Person */ - protected function preparePerson(Center $center): \Chill\PersonBundle\Entity\Person + protected function preparePerson(Center $center): Person { return (new Person()) ->setCenter($center); diff --git a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php index 4da134a5b..c45abf20a 100644 --- a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php +++ b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php @@ -27,7 +27,7 @@ class TimelineReportProvider implements TimelineProviderInterface { public function __construct(protected EntityManager $em, protected AuthorizationHelper $helper, private readonly Security $security, protected CustomFieldsHelper $customFieldsHelper, protected $showEmptyValues) {} - public function fetchQuery($context, array $args): \Chill\MainBundle\Timeline\TimelineSingleQuery + public function fetchQuery($context, array $args): TimelineSingleQuery { $this->checkContext($context); diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php index 705b4b297..280779d3b 100644 --- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php +++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php @@ -42,7 +42,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillTaskBundle/Controller/TaskController.php b/src/Bundle/ChillTaskBundle/Controller/TaskController.php index 8948824b9..72f34e475 100644 --- a/src/Bundle/ChillTaskBundle/Controller/TaskController.php +++ b/src/Bundle/ChillTaskBundle/Controller/TaskController.php @@ -21,7 +21,6 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Workflow\Registry; use Symfony\Component\Workflow\Transition; use Symfony\Contracts\Translation\TranslatorInterface; @@ -129,9 +128,6 @@ class TaskController extends AbstractController ]); } - /** - * @return \Symfony\Component\Form\FormInterface - */ protected function createTransitionForm(AbstractTask $task): \Symfony\Component\Form\FormInterface { $builder = $this->createFormBuilder($task); diff --git a/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php index cb70d4fd8..9aff86d58 100644 --- a/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php @@ -21,7 +21,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_task'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php index 073079eb7..7d5a47a1b 100644 --- a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php +++ b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php @@ -18,7 +18,7 @@ use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\Person; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; /** diff --git a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php index 33d35a2e2..6050a9777 100644 --- a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php +++ b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php @@ -55,8 +55,6 @@ class RecurringTask extends AbstractTask /** * Get firstOccurenceEndDate. - * - * @return \DateTime */ public function getFirstOccurenceEndDate(): ?\DateTime { @@ -65,8 +63,6 @@ class RecurringTask extends AbstractTask /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -75,8 +71,6 @@ class RecurringTask extends AbstractTask /** * Get lastOccurenceEndDate. - * - * @return \DateTime */ public function getLastOccurenceEndDate(): ?\DateTime { @@ -85,8 +79,6 @@ class RecurringTask extends AbstractTask /** * Get occurenceFrequency. - * - * @return string */ public function getOccurenceFrequency(): ?string { diff --git a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php index 080d51282..e1218b877 100644 --- a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php +++ b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php @@ -16,7 +16,7 @@ use Chill\TaskBundle\Repository\SingleTaskRepository; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; use Symfony\Component\Validator\Constraints as Assert; /** @@ -74,8 +74,6 @@ class SingleTask extends AbstractTask /** * Get id. - * - * @return int */ public function getId(): ?int { @@ -89,8 +87,6 @@ class SingleTask extends AbstractTask /** * Get startDate. - * - * @return \DateTime */ public function getStartDate(): ?\DateTime { diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php index d39d5d51c..05eab0d63 100644 --- a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php +++ b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php @@ -63,8 +63,6 @@ class AbstractTaskPlaceEvent /** * Get transition. - * - * @return string */ public function getTransition(): string { diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php index 2d9a4c0b5..03c1d8048 100644 --- a/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php +++ b/src/Bundle/ChillTaskBundle/Entity/Task/SingleTaskPlaceEvent.php @@ -42,8 +42,6 @@ class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent /** * Get id. - * - * @return int */ public function getId(): ?int { diff --git a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php index 917e19bdd..a6398d0e5 100644 --- a/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php +++ b/src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php @@ -36,7 +36,7 @@ class AuthorizationEvent extends \Symfony\Contracts\EventDispatcher\Event return $this->attribute; } - public function getSubject(): \Chill\TaskBundle\Entity\AbstractTask|\Chill\PersonBundle\Entity\AccompanyingPeriod|\Chill\PersonBundle\Entity\Person|null + public function getSubject(): AbstractTask|AccompanyingPeriod|Person|null { return $this->subject; } diff --git a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php index a07a8c9e3..babdd5ce2 100644 --- a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php +++ b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php @@ -42,7 +42,7 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn $this->registry = $registry; } - public function fetchQuery($context, $args): \Chill\MainBundle\Timeline\TimelineSingleQuery + public function fetchQuery($context, $args): TimelineSingleQuery { if ('task' !== $context) { throw new \LogicException(sprintf('%s is not able to render context %s', self::class, $context)); diff --git a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php index 221a2056e..7eb4ea649 100644 --- a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php +++ b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php @@ -32,7 +32,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface public function __construct(protected EntityManagerInterface $em, protected Registry $registry, protected AuthorizationHelper $authorizationHelper, protected Security $security) {} - public function fetchQuery($context, $args): \Chill\MainBundle\Timeline\TimelineSingleQuery + public function fetchQuery($context, $args): TimelineSingleQuery { $metadata = $this->em ->getClassMetadata(SingleTaskPlaceEvent::class); diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php index 7c3916cee..d643f624a 100644 --- a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php +++ b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php @@ -12,7 +12,6 @@ declare(strict_types=1); namespace Chill\ThirdPartyBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\Routing\Annotation\Route; class AdminController extends AbstractController { diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyCSVExportController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyCSVExportController.php index 8f16eea98..0ddc931a5 100644 --- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyCSVExportController.php +++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyCSVExportController.php @@ -21,7 +21,6 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\StreamedResponse; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\Routing\Annotation\Route; use Symfony\Bundle\SecurityBundle\Security; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyDuplicateController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyDuplicateController.php index ab42b5656..6057f86fc 100644 --- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyDuplicateController.php +++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyDuplicateController.php @@ -18,7 +18,7 @@ use Chill\ThirdPartyBundle\Service\ThirdpartyMergeService; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Session\Session; -use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Attribute\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\Translation\TranslatableMessage; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php index f3623c0e4..341a3628b 100644 --- a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php @@ -21,7 +21,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_third_party'); $rootNode = $treeBuilder->getRootNode(); diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php index 4c6038623..2e08672e4 100644 --- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php +++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php @@ -23,9 +23,10 @@ use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ReadableCollection; use Doctrine\ORM\Mapping as ORM; use libphonenumber\PhoneNumber; -use Symfony\Component\Serializer\Annotation\Context; -use Symfony\Component\Serializer\Annotation\DiscriminatorMap; -use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Attribute\Context; + +use Symfony\Component\Serializer\Attribute\DiscriminatorMap; +use Symfony\Component\Serializer\Attribute\Groups; use Symfony\Component\Validator\Constraints as Assert; /** diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php index 916a87188..dd96a6c23 100644 --- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php +++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyCategory.php @@ -13,7 +13,7 @@ namespace Chill\ThirdPartyBundle\Entity; use Chill\ThirdPartyBundle\Repository\ThirdPartyCategoryRepository; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[ORM\Entity(repositoryClass: ThirdPartyCategoryRepository::class)] #[ORM\Table(name: 'chill_3party.party_category')] diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php index 4c2bc2208..9954b3aac 100644 --- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php +++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdPartyProfession.php @@ -13,7 +13,7 @@ namespace Chill\ThirdPartyBundle\Entity; use Chill\ThirdPartyBundle\Repository\ThirdPartyProfessionRepository; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Serializer\Annotation as Serializer; +use Symfony\Component\Serializer\Attribute as Serializer; #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['third_party_profession' => ThirdPartyProfession::class])] #[ORM\Entity(repositoryClass: ThirdPartyProfessionRepository::class)] diff --git a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php index 1d4dd4040..7daaeb00e 100644 --- a/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php +++ b/src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php @@ -29,9 +29,7 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy final public const UPDATE = 'CHILL_3PARTY_3PARTY_UPDATE'; - public function __construct(protected AuthorizationHelper $authorizationHelper) - { - } + public function __construct(protected AuthorizationHelper $authorizationHelper) {} public function getRoles(): array { diff --git a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php index ab11d696a..e49dcfba7 100644 --- a/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php +++ b/src/Bundle/ChillThirdPartyBundle/migrations/Version20220302143821.php @@ -17,7 +17,6 @@ use libphonenumber\PhoneNumberUtil; final class Version20220302143821 extends AbstractMigration { - public function down(Schema $schema): void { $this->addSql('ALTER TABLE chill_3party.third_party ALTER telephone TYPE VARCHAR(64)'); diff --git a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php index 55acfb5e7..63a47c6fe 100644 --- a/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillWopiBundle/src/DependencyInjection/Configuration.php @@ -16,7 +16,7 @@ use Symfony\Component\Config\Definition\ConfigurationInterface; final class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder(): \Symfony\Component\Config\Definition\Builder\TreeBuilder + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('chill_wopi'); $rootNode = $treeBuilder->getRootNode();