From 9d457fdb8d4bac53e7d484021c3d952979b12109 Mon Sep 17 00:00:00 2001 From: JoshuaLicense Date: Fri, 1 Dec 2023 11:59:16 +0000 Subject: [PATCH 1/4] feat!: migrate to GitHub (#2) * feat!: add workflows * feat!: decouple `olcs-laminas` & `olcs-devtools` * feat!: add unit test support * feat!: add static analysis Release-As: 5.0.0.alpha1 --- .editorconfig | 17 ++++ .gitattributes | 2 + .github/workflows/cd.yaml | 24 ++++++ .github/workflows/ci.yaml | 25 ++++++ .gitignore | 8 ++ composer.json | 81 +++++++++---------- phpcs.xml.dist | 9 +++ phpstan.neon.dist | 5 ++ phpunit.xml.dist | 24 ++++++ psalm.xml.dist | 13 +++ sonar-project.properties | 12 --- .../Auth/ChangeExpiredPasswordResultTest.php | 0 .../Auth/ChangePasswordResultTest.php | 0 .../Result => }/Auth/DeleteUserResultTest.php | 0 test/Bootstrap.php | 4 - test/{src => }/Command/AbstractPeopleTest.php | 0 .../AbstractSaveBusinessDetailsTest.php | 0 .../Application/CreateApplicationTest.php | 0 .../CreateCompanySubsidiaryTest.php | 0 .../Application/CreateOperatingCentreTest.php | 0 .../Command/Application/GrantTest.php | 0 .../Command/Application/OverviewTest.php | 0 .../Application/SubmitApplicationTest.php | 0 .../Application/UpdateBusinessDetailsTest.php | 0 .../UpdateCompanySubsidiaryTest.php | 0 .../Application/UpdateDeclarationTest.php | 0 .../UpdateFinancialEvidenceTest.php | 0 .../Command/Application/UpdateInterimTest.php | 0 .../Command/Application/UpdatePeopleTest.php | 0 .../Application/UpdateTypeOfLicenceTest.php | 0 .../Application/UploadEvidenceTest.php | 0 .../ApplicationOperatingCentre/UpdateTest.php | 0 .../Command/Audit/ReadIrhpApplicationTest.php | 0 .../Command/Auth/ChangePasswordTest.php | 0 .../Command/Auth/ForgotPasswordTest.php | 0 .../Command/Auth/RefreshTokensTest.php | 0 .../Command/Auth/ResetPasswordTest.php | 0 .../Command/Bus/CreateNoticePeriodTest.php | 0 .../Command/Cases/Pi/CreateHearingTest.php | 0 .../Command/Cases/Pi/UpdateHearingTest.php | 0 .../CreateProposeToRevokeTest.php | 0 .../UpdateProposeToRevokeSlaTest.php | 0 .../UpdateProposeToRevokeTest.php | 0 .../Cases/Statement/CreateStatementTest.php | 0 .../Cases/Statement/UpdateStatementTest.php | 0 .../CreateChangeOfEntityTest.php | 0 .../DeleteChangeOfEntityTest.php | 0 .../UpdateChangeOfEntityTest.php | 0 test/{src => }/Command/CommandTest.php | 0 .../Command/CommunityLic/AnnulTest.php | 0 .../CommunityLic/EditSuspensionTest.php | 0 .../Command/CommunityLic/ReprintTest.php | 0 .../ConditionUndertaking/CreateTest.php | 0 .../UpdateConditionUndertakingTest.php | 0 .../ConditionUndertaking/UpdateTest.php | 0 .../ContactDetail/CountrySelectListTest.php | 0 .../ContactDetail/PhoneContact/CreateTest.php | 0 .../ContactDetail/PhoneContact/DeleteTest.php | 0 .../ContactDetail/PhoneContact/UpdateTest.php | 0 .../ContinuationDetail/UpdateFinancesTest.php | 0 .../Command/Disqualification/DeleteTest.php | 0 .../Command/Document/CreateLetterTest.php | 0 .../Command/Document/PrintLetterTest.php | 0 .../Command/Document/PrintLettersTest.php | 0 .../{src => }/Command/Document/UploadTest.php | 0 .../Command/Fee/ApproveWaiveTest.php | 0 test/{src => }/Command/Fee/CreateFeeTest.php | 0 .../Command/Fee/RecommendWaiveTest.php | 0 test/{src => }/Command/Fee/RefundFeeTest.php | 0 .../{src => }/Command/Fee/RejectWaiveTest.php | 0 .../ProcessSignatureResponseCommandTest.php | 0 .../ProcessSignatureResponseTest.php | 0 .../Command/IrhpApplication/CreateTest.php | 0 ...esetToNotYetSubmittedFromCancelledTest.php | 0 .../ResetToNotYetSubmittedFromValidTest.php | 0 .../ReviveFromUnsuccessfulTest.php | 0 .../ReviveFromWithdrawnTest.php | 0 .../Command/IrhpApplication/TerminateTest.php | 0 .../UpdateCandidatePermitSelectionTest.php | 0 .../UpdateCheckAnswersTest.php | 0 .../IrhpApplication/UpdateCountriesTest.php | 0 .../IrhpApplication/UpdateFullTest.php | 0 .../IrhpApplication/UpdatePeriodTest.php | 0 .../Command/IrhpApplication/WithdrawTest.php | 0 .../IrhpCandidatePermit/CreateTest.php | 0 .../IrhpCandidatePermit/DeleteTest.php | 0 .../IrhpCandidatePermit/UpdateTest.php | 0 .../Command/IrhpPermit/TerminateTest.php | 0 .../IrhpPermitJurisdiction/UpdateTest.php | 0 .../Command/IrhpPermitRange/CreateTest.php | 0 .../Command/IrhpPermitRange/UpdateTest.php | 0 .../Command/IrhpPermitSector/UpdateTest.php | 0 .../Command/IrhpPermitStock/CreateTest.php | 0 .../Command/IrhpPermitStock/UpdateTest.php | 0 .../Command/IrhpPermitWindow/CreateTest.php | 0 .../Command/IrhpPermitWindow/UpdateTest.php | 0 .../Licence/CreateCompanySubsidiaryTest.php | 0 .../Licence/CreateOperatingCentreTest.php | 0 .../Command/Licence/OverviewTest.php | 0 .../Command/Licence/PrintLicenceTest.php | 0 .../Command/Licence/ProposeToRevokeTest.php | 0 .../Licence/UpdateCompanySubsidiaryTest.php | 0 .../Command/Licence/UpdatePeopleTest.php | 0 .../LicenceOperatingCentre/UpdateTest.php | 0 ...teUnlicensedOperatorLicenceVehicleTest.php | 0 ...teUnlicensedOperatorLicenceVehicleTest.php | 0 .../AbstractDeleteCompanySubsidiaryTest.php | 0 .../AbstractUpdateCompanySubsidiaryTest.php | 0 .../Command/Operator/CreateUnlicensedTest.php | 0 .../Command/Operator/UpdateUnlicensedTest.php | 0 .../Command/Organisation/TransferToTest.php | 0 .../Organisation/UpdateBusinessTypeTest.php | 0 .../Partial/ApplicationTrackingTest.php | 0 .../Partial/OperatingCentreEvidenceTest.php | 0 .../Partial/OperatorContactDetailsTest.php | 0 .../Command/Permits/QueueReportTest.php | 0 .../Command/Processing/Note/CreateTest.php | 0 .../Command/Replacement/CreateTest.php | 0 .../Command/Replacement/UpdateTest.php | 0 test/{src => }/Command/Report/UploadTest.php | 0 .../Submission/AssignSubmissionTest.php | 0 .../StoreSubmissionSnapshotTest.php | 0 .../Command/Surrender/ApproveTest.php | 0 .../Command/Surrender/CreateTest.php | 0 .../Command/Surrender/SubmitFormTest.php | 0 .../Command/Surrender/UpdateTest.php | 0 .../Command/Surrender/WithdrawTest.php | 0 .../CreateFinancialStandingRateTest.php | 0 .../Command/System/InfoMessage/CreateTest.php | 0 .../System/PublicHoliday/CreateTest.php | 0 .../UpdateFinancialStandingRateTest.php | 0 .../CreateSystemParameterTest.php | 0 .../UpdateSystemParameterTest.php | 0 .../{src => }/Command/Task/CreateTaskTest.php | 0 .../Template/UpdateTemplateSourceTest.php | 0 .../Command/TmQualification/CreateTest.php | 0 .../Command/TmQualification/UpdateTest.php | 0 .../Command/Trailer/CreateTrailerTest.php | 0 .../Command/Trailer/UpdateTrailerTest.php | 0 .../Transaction/CompleteTransactionTest.php | 0 .../Transaction/PayOutstandingFeesTest.php | 0 .../Transaction/ReverseTransactionTest.php | 0 .../Command/TranslationKey/CreateTest.php | 0 .../Command/TranslationKey/DeleteTest.php | 0 .../Command/TranslationKey/UpdateTest.php | 0 .../Command/TranslationKeyText/DeleteTest.php | 0 .../OperatorSignedTest.php | 0 .../SendAmendTmApplicationTest.php | 0 .../SendTmApplicationTest.php | 0 .../SubmitTest.php | 0 .../UpdateDetailsTest.php | 0 .../UpdateForResponsibilitiesTest.php | 0 .../TransportManagerLicence/DeleteTest.php | 0 .../UpdateForResponsibilitiesTest.php | 0 .../{src => }/Command/User/CreateUserTest.php | 0 .../User/UpdateUserLastLoginAtTest.php | 0 .../{src => }/Command/User/UpdateUserTest.php | 0 .../Command/Variation/UpdateInterimTest.php | 0 .../Variation/UpdateTypeOfLicenceTest.php | 0 .../VariationOperatingCentre/UpdateTest.php | 0 .../Vehicle/UpdateGoodsVehicleTest.php | 0 test/{src => }/DtoTest.php | 0 .../DtoWithoutFieldTransformationsTest.php | 0 test/{src => }/DtoWithoutInvalidFieldTest.php | 0 .../DtoWithoutOptionalFieldsTest.php | 0 test/{src => }/Filter/PostcodeTest.php | 0 test/{src => }/Filter/VrmTest.php | 0 .../Query/Application/ApplicationTest.php | 0 .../Query/Application/DeclarationTest.php | 0 .../Application/FinancialEvidenceTest.php | 0 .../Query/Application/GetListTest.php | 0 .../Query/Application/OverviewTest.php | 0 .../Query/Audit/ReadIrhpApplicationTest.php | 0 .../BusRegSearchViewListTest.php | 0 test/{src => }/Query/Cache/ByIdTest.php | 0 .../Query/Cases/Report/OpenListTest.php | 0 test/{src => }/Query/Category/GetListTest.php | 0 .../CommunityLic/CommunityLicenceTest.php | 0 .../CommunityLic/CommunityLicencesTest.php | 0 .../Query/CompaniesHouse/AlertListTest.php | 0 .../Query/CompaniesHouse/ByNumberTest.php | 0 .../InsolvencyPractitionerTest.php | 0 .../PhoneContact/GetListTest.php | 0 .../ContactDetail/PhoneContact/GetTest.php | 0 .../Correspondence/CorrespondencesTest.php | 0 .../Query/Cpms/StoredCardListTest.php | 0 .../DataRetention/GetProcessedListTest.php | 0 .../Query/DataRetention/RecordsTest.php | 0 .../Query/DocTemplate/FullListTest.php | 0 .../Query/Document/AbstractDownloadTest.php | 0 .../Query/Document/DocumentListTest.php | 0 .../Query/Document/DownloadGuideTest.php | 0 .../{src => }/Query/Document/DownloadTest.php | 0 .../Query/Document/PrintLetterTest.php | 0 .../Query/DvlaSearch/VehicleTest.php | 0 test/{src => }/Query/Fee/FeeListTest.php | 0 test/{src => }/Query/Fee/FeeTypeListTest.php | 0 .../Query/Fee/InterimRefundsTest.php | 0 .../IrhpApplication/AnswersSummaryTest.php | 0 .../BilateralCountryAccessibleTest.php | 0 .../IrhpApplication/BilateralMetadataTest.php | 0 .../Query/IrhpApplication/ByIdTest.php | 0 .../Query/IrhpApplication/DocumentsTest.php | 0 .../InternalApplicationsSummaryTest.php | 0 .../IrhpApplication/QuestionAnswerTest.php | 0 .../SelfserveApplicationsSummaryTest.php | 0 .../SelfserveIssuedPermitsSummaryTest.php | 0 .../Query/IrhpCandidatePermit/ByIdTest.php | 0 .../GetListByIrhpApplicationTest.php | 0 test/{src => }/Query/IrhpPermit/ByIdTest.php | 0 .../Query/IrhpPermit/GetListByLicenceTest.php | 0 .../Query/IrhpPermit/GetListTest.php | 0 .../UniqueCountriesByLicenceTest.php | 0 .../AvailableCountriesTest.php | 0 .../Query/Licence/GoodsDiscCountTest.php | 0 .../Query/Licence/GoodsVehiclesTest.php | 0 test/{src => }/Query/Licence/LicenceTest.php | 0 .../Query/Licence/PsvDiscCountTest.php | 0 .../Query/Licence/PsvVehiclesExportTest.php | 0 .../Query/Licence/TypeOfLicenceTest.php | 0 test/{src => }/Query/Licence/VehiclesTest.php | 0 .../LicenceVehiclesByIdTest.php | 0 .../Query/Lva/AbstractGoodsVehiclesTest.php | 0 .../Query/Organisation/DashboardTest.php | 0 .../Query/Organisation/OrganisationTest.php | 0 .../Organisation/OutstandingFeesTest.php | 0 test/{src => }/Query/PagedTraitTest.php | 0 .../Query/Permits/AvailableStocksTest.php | 0 .../Query/Permits/AvailableYearsTest.php | 0 .../Query/Permits/EmissionsByYearTest.php | 0 ...xPermittedReachedByStockAndLicenceTest.php | 0 ...mittedReachedByTypeAndOrganisationTest.php | 0 .../Query/Permits/OpenWindowsTest.php | 0 .../Query/Permits/PostScoringReportTest.php | 0 .../Query/Permits/ReadyToPrintConfirmTest.php | 0 .../Query/Permits/ReadyToPrintCountryTest.php | 0 .../Permits/ReadyToPrintRangeTypeTest.php | 0 .../Query/Permits/ReadyToPrintStockTest.php | 0 .../Query/Permits/ReadyToPrintTest.php | 0 .../Query/Permits/ReadyToPrintTypeTest.php | 0 .../Permits/StockAlignmentReportTest.php | 0 .../Query/Processing/HistoryTest.php | 0 .../Query/Publication/PublishedListTest.php | 0 test/{src => }/Query/QueryContainerTest.php | 0 test/{src => }/Query/QueryTest.php | 0 .../Query/SubCategory/GetListTest.php | 0 .../Query/Surrender/ByLicenceTest.php | 0 .../Query/Surrender/GetStatusTest.php | 0 .../Query/Surrender/OpenBusRegTest.php | 0 .../Query/Surrender/OpenCasesTest.php | 0 .../Surrender/PreviousLicenceStatusTest.php | 0 .../System/InfoMessage/GetListActiveTest.php | 0 test/{src => }/Query/Task/TaskListTest.php | 0 .../Query/Template/AvailableTemplatesTest.php | 0 .../Template/PreviewTemplateSourceTest.php | 0 .../Query/Template/TemplateSourceTest.php | 0 .../TransactionByReferenceTest.php | 0 .../Query/Transaction/TransactionTest.php | 0 .../Query/TranslationKey/ByIdTest.php | 0 .../Query/TranslationKey/GetListTest.php | 0 .../GetListTest.php | 0 .../Query/User/UserListInternalTest.php | 0 test/{src => }/Query/User/UserListTest.php | 0 .../Query/Variation/TypeOfLicenceTest.php | 0 .../Query/Variation/VariationTest.php | 0 test/{src => }/Router/CommandConfigTest.php | 0 test/{src => }/Router/QueryConfigTest.php | 0 test/{src => }/Router/RouteConfigTest.php | 0 .../Service/CacheEncryptionFactoryTest.php | 0 .../{src => }/Service/CacheEncryptionTest.php | 0 .../Util/Annotation/ContinueIfEmptyTest.php | 0 .../Util/Annotation/DoNotExchangeTest.php | 0 .../Util/ChildRoutesGeneratorTest.php | 0 test/{src => }/Util/DtoTest.php | 0 test/{src => }/Util/Stub/CommandDtoStub.php | 0 test/{src => }/Util/Stub/PartialStub.php | 0 .../test/single/test_route.php | 0 .../Validators/ApplicationStatusTest.php | 0 .../ContinuationDetailStatusTest.php | 0 test/{src => }/Validators/DateCompareTest.php | 0 .../{src => }/Validators/DateInFutureTest.php | 0 .../Validators/DateNotInFutureTest.php | 0 .../Validators/EbsrSubmissionStatusTest.php | 0 .../{src => }/Validators/EmailAddressTest.php | 0 .../Validators/FhAdditionalInfoTest.php | 0 .../{src => }/Validators/InArrayExtraTest.php | 0 .../Validators/LicenceStatusTest.php | 0 test/{src => }/Validators/MoneyTest.php | 0 test/{src => }/Validators/OrderTest.php | 0 test/{src => }/Validators/PostcodeTest.php | 0 test/{src => }/Validators/SortTest.php | 0 test/{src => }/Validators/TitleTest.php | 0 test/{src => }/Validators/TrafficAreaTest.php | 0 .../Validators/TrailerRegNumberTest.php | 0 .../Validators/UploadEvidenceTest.php | 0 .../Validators/UsernameCreateTest.php | 0 test/{src => }/Validators/UsernameTest.php | 0 .../{src => }/Validators/ValidateEachTest.php | 0 test/{src => }/Validators/VrmTest.php | 0 test/{src => }/Validators/XmlFactoryTest.php | 0 test/{src => }/Validators/XmlTest.php | 0 test/{src => }/Validators/YesNoTest.php | 0 test/phpunit.xml | 30 ------- vendor-bin/phpcs/composer.json | 6 ++ vendor-bin/phpstan/composer.json | 5 ++ vendor-bin/psalm/composer.json | 5 ++ 306 files changed, 182 insertions(+), 88 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .github/workflows/cd.yaml create mode 100644 .github/workflows/ci.yaml create mode 100644 phpcs.xml.dist create mode 100644 phpstan.neon.dist create mode 100644 phpunit.xml.dist create mode 100644 psalm.xml.dist delete mode 100644 sonar-project.properties rename test/{src/Result => }/Auth/ChangeExpiredPasswordResultTest.php (100%) rename test/{src/Result => }/Auth/ChangePasswordResultTest.php (100%) rename test/{src/Result => }/Auth/DeleteUserResultTest.php (100%) rename test/{src => }/Command/AbstractPeopleTest.php (100%) rename test/{src => }/Command/AbstractSaveBusinessDetailsTest.php (100%) rename test/{src => }/Command/Application/CreateApplicationTest.php (100%) rename test/{src => }/Command/Application/CreateCompanySubsidiaryTest.php (100%) rename test/{src => }/Command/Application/CreateOperatingCentreTest.php (100%) rename test/{src => }/Command/Application/GrantTest.php (100%) rename test/{src => }/Command/Application/OverviewTest.php (100%) rename test/{src => }/Command/Application/SubmitApplicationTest.php (100%) rename test/{src => }/Command/Application/UpdateBusinessDetailsTest.php (100%) rename test/{src => }/Command/Application/UpdateCompanySubsidiaryTest.php (100%) rename test/{src => }/Command/Application/UpdateDeclarationTest.php (100%) rename test/{src => }/Command/Application/UpdateFinancialEvidenceTest.php (100%) rename test/{src => }/Command/Application/UpdateInterimTest.php (100%) rename test/{src => }/Command/Application/UpdatePeopleTest.php (100%) rename test/{src => }/Command/Application/UpdateTypeOfLicenceTest.php (100%) rename test/{src => }/Command/Application/UploadEvidenceTest.php (100%) rename test/{src => }/Command/ApplicationOperatingCentre/UpdateTest.php (100%) rename test/{src => }/Command/Audit/ReadIrhpApplicationTest.php (100%) rename test/{src => }/Command/Auth/ChangePasswordTest.php (100%) rename test/{src => }/Command/Auth/ForgotPasswordTest.php (100%) rename test/{src => }/Command/Auth/RefreshTokensTest.php (100%) rename test/{src => }/Command/Auth/ResetPasswordTest.php (100%) rename test/{src => }/Command/Bus/CreateNoticePeriodTest.php (100%) rename test/{src => }/Command/Cases/Pi/CreateHearingTest.php (100%) rename test/{src => }/Command/Cases/Pi/UpdateHearingTest.php (100%) rename test/{src => }/Command/Cases/ProposeToRevoke/CreateProposeToRevokeTest.php (100%) rename test/{src => }/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeSlaTest.php (100%) rename test/{src => }/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeTest.php (100%) rename test/{src => }/Command/Cases/Statement/CreateStatementTest.php (100%) rename test/{src => }/Command/Cases/Statement/UpdateStatementTest.php (100%) rename test/{src => }/Command/ChangeOfEntity/CreateChangeOfEntityTest.php (100%) rename test/{src => }/Command/ChangeOfEntity/DeleteChangeOfEntityTest.php (100%) rename test/{src => }/Command/ChangeOfEntity/UpdateChangeOfEntityTest.php (100%) rename test/{src => }/Command/CommandTest.php (100%) rename test/{src => }/Command/CommunityLic/AnnulTest.php (100%) rename test/{src => }/Command/CommunityLic/EditSuspensionTest.php (100%) rename test/{src => }/Command/CommunityLic/ReprintTest.php (100%) rename test/{src => }/Command/ConditionUndertaking/CreateTest.php (100%) rename test/{src => }/Command/ConditionUndertaking/UpdateConditionUndertakingTest.php (100%) rename test/{src => }/Command/ConditionUndertaking/UpdateTest.php (100%) rename test/{src => }/Command/ContactDetail/CountrySelectListTest.php (100%) rename test/{src => }/Command/ContactDetail/PhoneContact/CreateTest.php (100%) rename test/{src => }/Command/ContactDetail/PhoneContact/DeleteTest.php (100%) rename test/{src => }/Command/ContactDetail/PhoneContact/UpdateTest.php (100%) rename test/{src => }/Command/ContinuationDetail/UpdateFinancesTest.php (100%) rename test/{src => }/Command/Disqualification/DeleteTest.php (100%) rename test/{src => }/Command/Document/CreateLetterTest.php (100%) rename test/{src => }/Command/Document/PrintLetterTest.php (100%) rename test/{src => }/Command/Document/PrintLettersTest.php (100%) rename test/{src => }/Command/Document/UploadTest.php (100%) rename test/{src => }/Command/Fee/ApproveWaiveTest.php (100%) rename test/{src => }/Command/Fee/CreateFeeTest.php (100%) rename test/{src => }/Command/Fee/RecommendWaiveTest.php (100%) rename test/{src => }/Command/Fee/RefundFeeTest.php (100%) rename test/{src => }/Command/Fee/RejectWaiveTest.php (100%) rename test/{src => }/Command/GdsVerify/ProcessSignatureResponseCommandTest.php (100%) rename test/{src => }/Command/GdsVerify/ProcessSignatureResponseTest.php (100%) rename test/{src => }/Command/IrhpApplication/CreateTest.php (100%) rename test/{src => }/Command/IrhpApplication/ResetToNotYetSubmittedFromCancelledTest.php (100%) rename test/{src => }/Command/IrhpApplication/ResetToNotYetSubmittedFromValidTest.php (100%) rename test/{src => }/Command/IrhpApplication/ReviveFromUnsuccessfulTest.php (100%) rename test/{src => }/Command/IrhpApplication/ReviveFromWithdrawnTest.php (100%) rename test/{src => }/Command/IrhpApplication/TerminateTest.php (100%) rename test/{src => }/Command/IrhpApplication/UpdateCandidatePermitSelectionTest.php (100%) rename test/{src => }/Command/IrhpApplication/UpdateCheckAnswersTest.php (100%) rename test/{src => }/Command/IrhpApplication/UpdateCountriesTest.php (100%) rename test/{src => }/Command/IrhpApplication/UpdateFullTest.php (100%) rename test/{src => }/Command/IrhpApplication/UpdatePeriodTest.php (100%) rename test/{src => }/Command/IrhpApplication/WithdrawTest.php (100%) rename test/{src => }/Command/IrhpCandidatePermit/CreateTest.php (100%) rename test/{src => }/Command/IrhpCandidatePermit/DeleteTest.php (100%) rename test/{src => }/Command/IrhpCandidatePermit/UpdateTest.php (100%) rename test/{src => }/Command/IrhpPermit/TerminateTest.php (100%) rename test/{src => }/Command/IrhpPermitJurisdiction/UpdateTest.php (100%) rename test/{src => }/Command/IrhpPermitRange/CreateTest.php (100%) rename test/{src => }/Command/IrhpPermitRange/UpdateTest.php (100%) rename test/{src => }/Command/IrhpPermitSector/UpdateTest.php (100%) rename test/{src => }/Command/IrhpPermitStock/CreateTest.php (100%) rename test/{src => }/Command/IrhpPermitStock/UpdateTest.php (100%) rename test/{src => }/Command/IrhpPermitWindow/CreateTest.php (100%) rename test/{src => }/Command/IrhpPermitWindow/UpdateTest.php (100%) rename test/{src => }/Command/Licence/CreateCompanySubsidiaryTest.php (100%) rename test/{src => }/Command/Licence/CreateOperatingCentreTest.php (100%) rename test/{src => }/Command/Licence/OverviewTest.php (100%) rename test/{src => }/Command/Licence/PrintLicenceTest.php (100%) rename test/{src => }/Command/Licence/ProposeToRevokeTest.php (100%) rename test/{src => }/Command/Licence/UpdateCompanySubsidiaryTest.php (100%) rename test/{src => }/Command/Licence/UpdatePeopleTest.php (100%) rename test/{src => }/Command/LicenceOperatingCentre/UpdateTest.php (100%) rename test/{src => }/Command/LicenceVehicle/CreateUnlicensedOperatorLicenceVehicleTest.php (100%) rename test/{src => }/Command/LicenceVehicle/UpdateUnlicensedOperatorLicenceVehicleTest.php (100%) rename test/{src => }/Command/Lva/AbstractDeleteCompanySubsidiaryTest.php (100%) rename test/{src => }/Command/Lva/AbstractUpdateCompanySubsidiaryTest.php (100%) rename test/{src => }/Command/Operator/CreateUnlicensedTest.php (100%) rename test/{src => }/Command/Operator/UpdateUnlicensedTest.php (100%) rename test/{src => }/Command/Organisation/TransferToTest.php (100%) rename test/{src => }/Command/Organisation/UpdateBusinessTypeTest.php (100%) rename test/{src => }/Command/Partial/ApplicationTrackingTest.php (100%) rename test/{src => }/Command/Partial/OperatingCentreEvidenceTest.php (100%) rename test/{src => }/Command/Partial/OperatorContactDetailsTest.php (100%) rename test/{src => }/Command/Permits/QueueReportTest.php (100%) rename test/{src => }/Command/Processing/Note/CreateTest.php (100%) rename test/{src => }/Command/Replacement/CreateTest.php (100%) rename test/{src => }/Command/Replacement/UpdateTest.php (100%) rename test/{src => }/Command/Report/UploadTest.php (100%) rename test/{src => }/Command/Submission/AssignSubmissionTest.php (100%) rename test/{src => }/Command/Submission/StoreSubmissionSnapshotTest.php (100%) rename test/{src => }/Command/Surrender/ApproveTest.php (100%) rename test/{src => }/Command/Surrender/CreateTest.php (100%) rename test/{src => }/Command/Surrender/SubmitFormTest.php (100%) rename test/{src => }/Command/Surrender/UpdateTest.php (100%) rename test/{src => }/Command/Surrender/WithdrawTest.php (100%) rename test/{src => }/Command/System/CreateFinancialStandingRateTest.php (100%) rename test/{src => }/Command/System/InfoMessage/CreateTest.php (100%) rename test/{src => }/Command/System/PublicHoliday/CreateTest.php (100%) rename test/{src => }/Command/System/UpdateFinancialStandingRateTest.php (100%) rename test/{src => }/Command/SystemParameter/CreateSystemParameterTest.php (100%) rename test/{src => }/Command/SystemParameter/UpdateSystemParameterTest.php (100%) rename test/{src => }/Command/Task/CreateTaskTest.php (100%) rename test/{src => }/Command/Template/UpdateTemplateSourceTest.php (100%) rename test/{src => }/Command/TmQualification/CreateTest.php (100%) rename test/{src => }/Command/TmQualification/UpdateTest.php (100%) rename test/{src => }/Command/Trailer/CreateTrailerTest.php (100%) rename test/{src => }/Command/Trailer/UpdateTrailerTest.php (100%) rename test/{src => }/Command/Transaction/CompleteTransactionTest.php (100%) rename test/{src => }/Command/Transaction/PayOutstandingFeesTest.php (100%) rename test/{src => }/Command/Transaction/ReverseTransactionTest.php (100%) rename test/{src => }/Command/TranslationKey/CreateTest.php (100%) rename test/{src => }/Command/TranslationKey/DeleteTest.php (100%) rename test/{src => }/Command/TranslationKey/UpdateTest.php (100%) rename test/{src => }/Command/TranslationKeyText/DeleteTest.php (100%) rename test/{src => }/Command/TransportManagerApplication/OperatorSignedTest.php (100%) rename test/{src => }/Command/TransportManagerApplication/SendAmendTmApplicationTest.php (100%) rename test/{src => }/Command/TransportManagerApplication/SendTmApplicationTest.php (100%) rename test/{src => }/Command/TransportManagerApplication/SubmitTest.php (100%) rename test/{src => }/Command/TransportManagerApplication/UpdateDetailsTest.php (100%) rename test/{src => }/Command/TransportManagerApplication/UpdateForResponsibilitiesTest.php (100%) rename test/{src => }/Command/TransportManagerLicence/DeleteTest.php (100%) rename test/{src => }/Command/TransportManagerLicence/UpdateForResponsibilitiesTest.php (100%) rename test/{src => }/Command/User/CreateUserTest.php (100%) rename test/{src => }/Command/User/UpdateUserLastLoginAtTest.php (100%) rename test/{src => }/Command/User/UpdateUserTest.php (100%) rename test/{src => }/Command/Variation/UpdateInterimTest.php (100%) rename test/{src => }/Command/Variation/UpdateTypeOfLicenceTest.php (100%) rename test/{src => }/Command/VariationOperatingCentre/UpdateTest.php (100%) rename test/{src => }/Command/Vehicle/UpdateGoodsVehicleTest.php (100%) rename test/{src => }/DtoTest.php (100%) rename test/{src => }/DtoWithoutFieldTransformationsTest.php (100%) rename test/{src => }/DtoWithoutInvalidFieldTest.php (100%) rename test/{src => }/DtoWithoutOptionalFieldsTest.php (100%) rename test/{src => }/Filter/PostcodeTest.php (100%) rename test/{src => }/Filter/VrmTest.php (100%) rename test/{src => }/Query/Application/ApplicationTest.php (100%) rename test/{src => }/Query/Application/DeclarationTest.php (100%) rename test/{src => }/Query/Application/FinancialEvidenceTest.php (100%) rename test/{src => }/Query/Application/GetListTest.php (100%) rename test/{src => }/Query/Application/OverviewTest.php (100%) rename test/{src => }/Query/Audit/ReadIrhpApplicationTest.php (100%) rename test/{src => }/Query/BusRegSearchView/BusRegSearchViewListTest.php (100%) rename test/{src => }/Query/Cache/ByIdTest.php (100%) rename test/{src => }/Query/Cases/Report/OpenListTest.php (100%) rename test/{src => }/Query/Category/GetListTest.php (100%) rename test/{src => }/Query/CommunityLic/CommunityLicenceTest.php (100%) rename test/{src => }/Query/CommunityLic/CommunityLicencesTest.php (100%) rename test/{src => }/Query/CompaniesHouse/AlertListTest.php (100%) rename test/{src => }/Query/CompaniesHouse/ByNumberTest.php (100%) rename test/{src => }/Query/CompaniesHouse/InsolvencyPractitionerTest.php (100%) rename test/{src => }/Query/ContactDetail/PhoneContact/GetListTest.php (100%) rename test/{src => }/Query/ContactDetail/PhoneContact/GetTest.php (100%) rename test/{src => }/Query/Correspondence/CorrespondencesTest.php (100%) rename test/{src => }/Query/Cpms/StoredCardListTest.php (100%) rename test/{src => }/Query/DataRetention/GetProcessedListTest.php (100%) rename test/{src => }/Query/DataRetention/RecordsTest.php (100%) rename test/{src => }/Query/DocTemplate/FullListTest.php (100%) rename test/{src => }/Query/Document/AbstractDownloadTest.php (100%) rename test/{src => }/Query/Document/DocumentListTest.php (100%) rename test/{src => }/Query/Document/DownloadGuideTest.php (100%) rename test/{src => }/Query/Document/DownloadTest.php (100%) rename test/{src => }/Query/Document/PrintLetterTest.php (100%) rename test/{src => }/Query/DvlaSearch/VehicleTest.php (100%) rename test/{src => }/Query/Fee/FeeListTest.php (100%) rename test/{src => }/Query/Fee/FeeTypeListTest.php (100%) rename test/{src => }/Query/Fee/InterimRefundsTest.php (100%) rename test/{src => }/Query/IrhpApplication/AnswersSummaryTest.php (100%) rename test/{src => }/Query/IrhpApplication/BilateralCountryAccessibleTest.php (100%) rename test/{src => }/Query/IrhpApplication/BilateralMetadataTest.php (100%) rename test/{src => }/Query/IrhpApplication/ByIdTest.php (100%) rename test/{src => }/Query/IrhpApplication/DocumentsTest.php (100%) rename test/{src => }/Query/IrhpApplication/InternalApplicationsSummaryTest.php (100%) rename test/{src => }/Query/IrhpApplication/QuestionAnswerTest.php (100%) rename test/{src => }/Query/IrhpApplication/SelfserveApplicationsSummaryTest.php (100%) rename test/{src => }/Query/IrhpApplication/SelfserveIssuedPermitsSummaryTest.php (100%) rename test/{src => }/Query/IrhpCandidatePermit/ByIdTest.php (100%) rename test/{src => }/Query/IrhpCandidatePermit/GetListByIrhpApplicationTest.php (100%) rename test/{src => }/Query/IrhpPermit/ByIdTest.php (100%) rename test/{src => }/Query/IrhpPermit/GetListByLicenceTest.php (100%) rename test/{src => }/Query/IrhpPermit/GetListTest.php (100%) rename test/{src => }/Query/IrhpPermit/UniqueCountriesByLicenceTest.php (100%) rename test/{src => }/Query/IrhpPermitStock/AvailableCountriesTest.php (100%) rename test/{src => }/Query/Licence/GoodsDiscCountTest.php (100%) rename test/{src => }/Query/Licence/GoodsVehiclesTest.php (100%) rename test/{src => }/Query/Licence/LicenceTest.php (100%) rename test/{src => }/Query/Licence/PsvDiscCountTest.php (100%) rename test/{src => }/Query/Licence/PsvVehiclesExportTest.php (100%) rename test/{src => }/Query/Licence/TypeOfLicenceTest.php (100%) rename test/{src => }/Query/Licence/VehiclesTest.php (100%) rename test/{src => }/Query/LicenceVehicle/LicenceVehiclesByIdTest.php (100%) rename test/{src => }/Query/Lva/AbstractGoodsVehiclesTest.php (100%) rename test/{src => }/Query/Organisation/DashboardTest.php (100%) rename test/{src => }/Query/Organisation/OrganisationTest.php (100%) rename test/{src => }/Query/Organisation/OutstandingFeesTest.php (100%) rename test/{src => }/Query/PagedTraitTest.php (100%) rename test/{src => }/Query/Permits/AvailableStocksTest.php (100%) rename test/{src => }/Query/Permits/AvailableYearsTest.php (100%) rename test/{src => }/Query/Permits/EmissionsByYearTest.php (100%) rename test/{src => }/Query/Permits/MaxPermittedReachedByStockAndLicenceTest.php (100%) rename test/{src => }/Query/Permits/MaxPermittedReachedByTypeAndOrganisationTest.php (100%) rename test/{src => }/Query/Permits/OpenWindowsTest.php (100%) rename test/{src => }/Query/Permits/PostScoringReportTest.php (100%) rename test/{src => }/Query/Permits/ReadyToPrintConfirmTest.php (100%) rename test/{src => }/Query/Permits/ReadyToPrintCountryTest.php (100%) rename test/{src => }/Query/Permits/ReadyToPrintRangeTypeTest.php (100%) rename test/{src => }/Query/Permits/ReadyToPrintStockTest.php (100%) rename test/{src => }/Query/Permits/ReadyToPrintTest.php (100%) rename test/{src => }/Query/Permits/ReadyToPrintTypeTest.php (100%) rename test/{src => }/Query/Permits/StockAlignmentReportTest.php (100%) rename test/{src => }/Query/Processing/HistoryTest.php (100%) rename test/{src => }/Query/Publication/PublishedListTest.php (100%) rename test/{src => }/Query/QueryContainerTest.php (100%) rename test/{src => }/Query/QueryTest.php (100%) rename test/{src => }/Query/SubCategory/GetListTest.php (100%) rename test/{src => }/Query/Surrender/ByLicenceTest.php (100%) rename test/{src => }/Query/Surrender/GetStatusTest.php (100%) rename test/{src => }/Query/Surrender/OpenBusRegTest.php (100%) rename test/{src => }/Query/Surrender/OpenCasesTest.php (100%) rename test/{src => }/Query/Surrender/PreviousLicenceStatusTest.php (100%) rename test/{src => }/Query/System/InfoMessage/GetListActiveTest.php (100%) rename test/{src => }/Query/Task/TaskListTest.php (100%) rename test/{src => }/Query/Template/AvailableTemplatesTest.php (100%) rename test/{src => }/Query/Template/PreviewTemplateSourceTest.php (100%) rename test/{src => }/Query/Template/TemplateSourceTest.php (100%) rename test/{src => }/Query/Transaction/TransactionByReferenceTest.php (100%) rename test/{src => }/Query/Transaction/TransactionTest.php (100%) rename test/{src => }/Query/TranslationKey/ByIdTest.php (100%) rename test/{src => }/Query/TranslationKey/GetListTest.php (100%) rename test/{src => }/Query/TransportManagerApplication/GetListTest.php (100%) rename test/{src => }/Query/User/UserListInternalTest.php (100%) rename test/{src => }/Query/User/UserListTest.php (100%) rename test/{src => }/Query/Variation/TypeOfLicenceTest.php (100%) rename test/{src => }/Query/Variation/VariationTest.php (100%) rename test/{src => }/Router/CommandConfigTest.php (100%) rename test/{src => }/Router/QueryConfigTest.php (100%) rename test/{src => }/Router/RouteConfigTest.php (100%) rename test/{src => }/Service/CacheEncryptionFactoryTest.php (100%) rename test/{src => }/Service/CacheEncryptionTest.php (100%) rename test/{src => }/Util/Annotation/ContinueIfEmptyTest.php (100%) rename test/{src => }/Util/Annotation/DoNotExchangeTest.php (100%) rename test/{src => }/Util/ChildRoutesGeneratorTest.php (100%) rename test/{src => }/Util/DtoTest.php (100%) rename test/{src => }/Util/Stub/CommandDtoStub.php (100%) rename test/{src => }/Util/Stub/PartialStub.php (100%) rename test/{src => }/Util/child-routes-stub/test/single/test_route.php (100%) rename test/{src => }/Validators/ApplicationStatusTest.php (100%) rename test/{src => }/Validators/ContinuationDetailStatusTest.php (100%) rename test/{src => }/Validators/DateCompareTest.php (100%) rename test/{src => }/Validators/DateInFutureTest.php (100%) rename test/{src => }/Validators/DateNotInFutureTest.php (100%) rename test/{src => }/Validators/EbsrSubmissionStatusTest.php (100%) rename test/{src => }/Validators/EmailAddressTest.php (100%) rename test/{src => }/Validators/FhAdditionalInfoTest.php (100%) rename test/{src => }/Validators/InArrayExtraTest.php (100%) rename test/{src => }/Validators/LicenceStatusTest.php (100%) rename test/{src => }/Validators/MoneyTest.php (100%) rename test/{src => }/Validators/OrderTest.php (100%) rename test/{src => }/Validators/PostcodeTest.php (100%) rename test/{src => }/Validators/SortTest.php (100%) rename test/{src => }/Validators/TitleTest.php (100%) rename test/{src => }/Validators/TrafficAreaTest.php (100%) rename test/{src => }/Validators/TrailerRegNumberTest.php (100%) rename test/{src => }/Validators/UploadEvidenceTest.php (100%) rename test/{src => }/Validators/UsernameCreateTest.php (100%) rename test/{src => }/Validators/UsernameTest.php (100%) rename test/{src => }/Validators/ValidateEachTest.php (100%) rename test/{src => }/Validators/VrmTest.php (100%) rename test/{src => }/Validators/XmlFactoryTest.php (100%) rename test/{src => }/Validators/XmlTest.php (100%) rename test/{src => }/Validators/YesNoTest.php (100%) delete mode 100644 test/phpunit.xml create mode 100644 vendor-bin/phpcs/composer.json create mode 100644 vendor-bin/phpstan/composer.json create mode 100644 vendor-bin/psalm/composer.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..4dddcaa4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,17 @@ +# http://editorconfig.org + +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false + +[*.php] +indent_size = 4 \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..dfe07704 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml new file mode 100644 index 00000000..94157335 --- /dev/null +++ b/.github/workflows/cd.yaml @@ -0,0 +1,24 @@ +name: CD + +on: + push: + branches: + - main + +jobs: + release-please: + name: Release + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + outputs: + tag_name: ${{ steps.release.outputs.tag_name }} + release_created: ${{ steps.release.outputs.release_created }} + sha: ${{ steps.release.outputs.sha }} + steps: + - uses: google-github-actions/release-please-action@v3 + id: release + with: + release-type: php + package-name: olcs-transfer diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 00000000..b971c50b --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,25 @@ +name: CI + +on: + pull_request: + schedule: + - cron: '0 0 * * 1' + +jobs: + security: + uses: dvsa/.github/.github/workflows/php-library-security.yml@main + with: + php-versions: "[\"7.4\"]" + secrets: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + + static-analysis: + uses: dvsa/.github/.github/workflows/php-library-static.yml@main + with: + php-version: '7.4' + + tests: + uses: dvsa/.github/.github/workflows/php-library-tests.yml@main + with: + php-versions: "[\"7.4\"]" + fail-fast: false diff --git a/.gitignore b/.gitignore index 3acd30a5..08f03c84 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,11 @@ test/review test/coverage/ .scannerwork/ composer.lock +.phpunit.result.cache + +# Non-dist files for the static analysis. +# This allows developers to set a different (more strict) static analysis locally. +phpcs.xml +phpstan.neon +phpunit.xml +psalm.xml diff --git a/composer.json b/composer.json index 50f094e9..d826c337 100644 --- a/composer.json +++ b/composer.json @@ -1,60 +1,57 @@ { "name": "olcs/olcs-transfer", "description": "OLCS Transfer", - "repositories": [ - { - "packagist": false - }, - { - "url": "https://nexus.olcs.dev-dvsacloud.uk/repository/OLCS", - "type": "composer" - }, - { - "url": "https://nexus.olcs.dev-dvsacloud.uk/repository/Packagist-Proxy", - "type": "composer" - } - ], "require": { - "php": ">=7.4", + "php": "^7.4", "ext-openssl": "*", - "olcs/olcs-laminas": "~2.5.0 || ~3.0.0" + "laminas/laminas-stdlib": "^2.7.9|^3.0", + "laminas/laminas-filter": "^2.9.4", + "laminas/laminas-validator": "^2.11.1", + "laminas/laminas-servicemanager": "^2.7.11|^3.0", + "laminas/laminas-inputfilter": "^2.10.1", + "laminas/laminas-form": "^2.13.0|^3.0", + "laminas/laminas-crypt": "^3.4.0", + "laminas/laminas-xml": "^1.4.0" }, "require-dev": { - "olcs/olcs-devtools": "~4.206.0", - "doctrine/annotations": "^1.14.2", - "phpunit/phpunit": "^9.6" - }, - "config": { - "preferred-install": "dist", - "secure-http": false, - "allow-plugins": { - "phpstan/extension-installer": true, - "laminas/laminas-component-installer": true, - "laminas/laminas-dependency-plugin": true, - "elendev/composer-push": true - } + "phpunit/phpunit": "^9.6", + "mockery/mockery": "^1.6", + "johnkary/phpunit-speedtrap": "^4.0", + "bamarni/composer-bin-plugin": "^1.8", + "doctrine/annotations": "^1.14.2" }, "autoload": { "psr-4": { "Dvsa\\Olcs\\Transfer\\": "src/" } }, + "autoload-dev": { + "psr-4": { + "Dvsa\\OlcsTest\\Transfer\\": "test/" + } + }, "scripts": { - "ut": "vendor/bin/phpunit -c test/phpunit.xml --stop-on-failure", - "review": "vendor/bin/review", - "cs": "vendor/bin/phpcs --severity=1 --standard=vendor/dvsa/coding-standards/src/Profiles/DVSA/CS/ruleset.xml", - "coverage": "vendor/bin/phpunit -c test/phpunit.xml --coverage-html ./test/coverage/html", - "sonar": "vendor/bin/phpunit -c test/phpunit.xml --coverage-clover ./test/coverage/coverage-report.clover --log-junit ./test/coverage/log.junit", - "update-syms": "vendor/bin/composer-update-syms" + "bin": "echo 'bin not installed'", + "test": "phpunit", + "phpcs": "phpcs", + "psalm": "psalm", + "phpstan": "phpstan", + "all": [ + "@test", + "@phpcs", + "@psalm", + "@phpstan" + ] }, "extra": { - "nexus-push": { - "url": "https://nexus.olcs.dev-dvsacloud.uk/repository/olcs-transfer", - "ignore": [ - "test/", - "sonar-project.properties", - "build.xml" - ] - } + "bamarni-bin": { + "bin-links": true, + "forward-command": true + } + }, + "config": { + "allow-plugins": { + "bamarni/composer-bin-plugin": true + } } } diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 00000000..2f8df82f --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,9 @@ + + + ./src + ./test + + */vendor/* + + + diff --git a/phpstan.neon.dist b/phpstan.neon.dist new file mode 100644 index 00000000..0e974a15 --- /dev/null +++ b/phpstan.neon.dist @@ -0,0 +1,5 @@ +parameters: + level: 1 + paths: + - src + - test diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 00000000..80504f16 --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,24 @@ + + + + + + + + + test + + + + + + + diff --git a/psalm.xml.dist b/psalm.xml.dist new file mode 100644 index 00000000..584d6ccb --- /dev/null +++ b/psalm.xml.dist @@ -0,0 +1,13 @@ + + + + + + diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index 9a67b31c..00000000 --- a/sonar-project.properties +++ /dev/null @@ -1,12 +0,0 @@ -# must be unique in a given SonarQube instance -sonar.projectKey=OLCS:olcs-transfer -# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. -sonar.projectName=olcs-transfer -#sonar.projectVersion=1.0 - -# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. -# This property is optional if sonar.modules is set. -sonar.sources=./src - -sonar.php.tests.reportPath=./test/coverage/log.junit -sonar.php.coverage.reportPaths=./test/coverage/coverage-report.clover diff --git a/test/src/Result/Auth/ChangeExpiredPasswordResultTest.php b/test/Auth/ChangeExpiredPasswordResultTest.php similarity index 100% rename from test/src/Result/Auth/ChangeExpiredPasswordResultTest.php rename to test/Auth/ChangeExpiredPasswordResultTest.php diff --git a/test/src/Result/Auth/ChangePasswordResultTest.php b/test/Auth/ChangePasswordResultTest.php similarity index 100% rename from test/src/Result/Auth/ChangePasswordResultTest.php rename to test/Auth/ChangePasswordResultTest.php diff --git a/test/src/Result/Auth/DeleteUserResultTest.php b/test/Auth/DeleteUserResultTest.php similarity index 100% rename from test/src/Result/Auth/DeleteUserResultTest.php rename to test/Auth/DeleteUserResultTest.php diff --git a/test/Bootstrap.php b/test/Bootstrap.php index 4dd101ed..4080a72a 100644 --- a/test/Bootstrap.php +++ b/test/Bootstrap.php @@ -19,10 +19,6 @@ class Bootstrap public static function init() { ini_set('memory_limit', '1500M'); - // Setup the autoloader - $loader = static::initAutoloader(); - $loader->addPsr4('Dvsa\\OlcsTest\\Transfer\\', __DIR__ . '/src'); - // Grab the application config $config = array( 'modules' => array( diff --git a/test/src/Command/AbstractPeopleTest.php b/test/Command/AbstractPeopleTest.php similarity index 100% rename from test/src/Command/AbstractPeopleTest.php rename to test/Command/AbstractPeopleTest.php diff --git a/test/src/Command/AbstractSaveBusinessDetailsTest.php b/test/Command/AbstractSaveBusinessDetailsTest.php similarity index 100% rename from test/src/Command/AbstractSaveBusinessDetailsTest.php rename to test/Command/AbstractSaveBusinessDetailsTest.php diff --git a/test/src/Command/Application/CreateApplicationTest.php b/test/Command/Application/CreateApplicationTest.php similarity index 100% rename from test/src/Command/Application/CreateApplicationTest.php rename to test/Command/Application/CreateApplicationTest.php diff --git a/test/src/Command/Application/CreateCompanySubsidiaryTest.php b/test/Command/Application/CreateCompanySubsidiaryTest.php similarity index 100% rename from test/src/Command/Application/CreateCompanySubsidiaryTest.php rename to test/Command/Application/CreateCompanySubsidiaryTest.php diff --git a/test/src/Command/Application/CreateOperatingCentreTest.php b/test/Command/Application/CreateOperatingCentreTest.php similarity index 100% rename from test/src/Command/Application/CreateOperatingCentreTest.php rename to test/Command/Application/CreateOperatingCentreTest.php diff --git a/test/src/Command/Application/GrantTest.php b/test/Command/Application/GrantTest.php similarity index 100% rename from test/src/Command/Application/GrantTest.php rename to test/Command/Application/GrantTest.php diff --git a/test/src/Command/Application/OverviewTest.php b/test/Command/Application/OverviewTest.php similarity index 100% rename from test/src/Command/Application/OverviewTest.php rename to test/Command/Application/OverviewTest.php diff --git a/test/src/Command/Application/SubmitApplicationTest.php b/test/Command/Application/SubmitApplicationTest.php similarity index 100% rename from test/src/Command/Application/SubmitApplicationTest.php rename to test/Command/Application/SubmitApplicationTest.php diff --git a/test/src/Command/Application/UpdateBusinessDetailsTest.php b/test/Command/Application/UpdateBusinessDetailsTest.php similarity index 100% rename from test/src/Command/Application/UpdateBusinessDetailsTest.php rename to test/Command/Application/UpdateBusinessDetailsTest.php diff --git a/test/src/Command/Application/UpdateCompanySubsidiaryTest.php b/test/Command/Application/UpdateCompanySubsidiaryTest.php similarity index 100% rename from test/src/Command/Application/UpdateCompanySubsidiaryTest.php rename to test/Command/Application/UpdateCompanySubsidiaryTest.php diff --git a/test/src/Command/Application/UpdateDeclarationTest.php b/test/Command/Application/UpdateDeclarationTest.php similarity index 100% rename from test/src/Command/Application/UpdateDeclarationTest.php rename to test/Command/Application/UpdateDeclarationTest.php diff --git a/test/src/Command/Application/UpdateFinancialEvidenceTest.php b/test/Command/Application/UpdateFinancialEvidenceTest.php similarity index 100% rename from test/src/Command/Application/UpdateFinancialEvidenceTest.php rename to test/Command/Application/UpdateFinancialEvidenceTest.php diff --git a/test/src/Command/Application/UpdateInterimTest.php b/test/Command/Application/UpdateInterimTest.php similarity index 100% rename from test/src/Command/Application/UpdateInterimTest.php rename to test/Command/Application/UpdateInterimTest.php diff --git a/test/src/Command/Application/UpdatePeopleTest.php b/test/Command/Application/UpdatePeopleTest.php similarity index 100% rename from test/src/Command/Application/UpdatePeopleTest.php rename to test/Command/Application/UpdatePeopleTest.php diff --git a/test/src/Command/Application/UpdateTypeOfLicenceTest.php b/test/Command/Application/UpdateTypeOfLicenceTest.php similarity index 100% rename from test/src/Command/Application/UpdateTypeOfLicenceTest.php rename to test/Command/Application/UpdateTypeOfLicenceTest.php diff --git a/test/src/Command/Application/UploadEvidenceTest.php b/test/Command/Application/UploadEvidenceTest.php similarity index 100% rename from test/src/Command/Application/UploadEvidenceTest.php rename to test/Command/Application/UploadEvidenceTest.php diff --git a/test/src/Command/ApplicationOperatingCentre/UpdateTest.php b/test/Command/ApplicationOperatingCentre/UpdateTest.php similarity index 100% rename from test/src/Command/ApplicationOperatingCentre/UpdateTest.php rename to test/Command/ApplicationOperatingCentre/UpdateTest.php diff --git a/test/src/Command/Audit/ReadIrhpApplicationTest.php b/test/Command/Audit/ReadIrhpApplicationTest.php similarity index 100% rename from test/src/Command/Audit/ReadIrhpApplicationTest.php rename to test/Command/Audit/ReadIrhpApplicationTest.php diff --git a/test/src/Command/Auth/ChangePasswordTest.php b/test/Command/Auth/ChangePasswordTest.php similarity index 100% rename from test/src/Command/Auth/ChangePasswordTest.php rename to test/Command/Auth/ChangePasswordTest.php diff --git a/test/src/Command/Auth/ForgotPasswordTest.php b/test/Command/Auth/ForgotPasswordTest.php similarity index 100% rename from test/src/Command/Auth/ForgotPasswordTest.php rename to test/Command/Auth/ForgotPasswordTest.php diff --git a/test/src/Command/Auth/RefreshTokensTest.php b/test/Command/Auth/RefreshTokensTest.php similarity index 100% rename from test/src/Command/Auth/RefreshTokensTest.php rename to test/Command/Auth/RefreshTokensTest.php diff --git a/test/src/Command/Auth/ResetPasswordTest.php b/test/Command/Auth/ResetPasswordTest.php similarity index 100% rename from test/src/Command/Auth/ResetPasswordTest.php rename to test/Command/Auth/ResetPasswordTest.php diff --git a/test/src/Command/Bus/CreateNoticePeriodTest.php b/test/Command/Bus/CreateNoticePeriodTest.php similarity index 100% rename from test/src/Command/Bus/CreateNoticePeriodTest.php rename to test/Command/Bus/CreateNoticePeriodTest.php diff --git a/test/src/Command/Cases/Pi/CreateHearingTest.php b/test/Command/Cases/Pi/CreateHearingTest.php similarity index 100% rename from test/src/Command/Cases/Pi/CreateHearingTest.php rename to test/Command/Cases/Pi/CreateHearingTest.php diff --git a/test/src/Command/Cases/Pi/UpdateHearingTest.php b/test/Command/Cases/Pi/UpdateHearingTest.php similarity index 100% rename from test/src/Command/Cases/Pi/UpdateHearingTest.php rename to test/Command/Cases/Pi/UpdateHearingTest.php diff --git a/test/src/Command/Cases/ProposeToRevoke/CreateProposeToRevokeTest.php b/test/Command/Cases/ProposeToRevoke/CreateProposeToRevokeTest.php similarity index 100% rename from test/src/Command/Cases/ProposeToRevoke/CreateProposeToRevokeTest.php rename to test/Command/Cases/ProposeToRevoke/CreateProposeToRevokeTest.php diff --git a/test/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeSlaTest.php b/test/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeSlaTest.php similarity index 100% rename from test/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeSlaTest.php rename to test/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeSlaTest.php diff --git a/test/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeTest.php b/test/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeTest.php similarity index 100% rename from test/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeTest.php rename to test/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeTest.php diff --git a/test/src/Command/Cases/Statement/CreateStatementTest.php b/test/Command/Cases/Statement/CreateStatementTest.php similarity index 100% rename from test/src/Command/Cases/Statement/CreateStatementTest.php rename to test/Command/Cases/Statement/CreateStatementTest.php diff --git a/test/src/Command/Cases/Statement/UpdateStatementTest.php b/test/Command/Cases/Statement/UpdateStatementTest.php similarity index 100% rename from test/src/Command/Cases/Statement/UpdateStatementTest.php rename to test/Command/Cases/Statement/UpdateStatementTest.php diff --git a/test/src/Command/ChangeOfEntity/CreateChangeOfEntityTest.php b/test/Command/ChangeOfEntity/CreateChangeOfEntityTest.php similarity index 100% rename from test/src/Command/ChangeOfEntity/CreateChangeOfEntityTest.php rename to test/Command/ChangeOfEntity/CreateChangeOfEntityTest.php diff --git a/test/src/Command/ChangeOfEntity/DeleteChangeOfEntityTest.php b/test/Command/ChangeOfEntity/DeleteChangeOfEntityTest.php similarity index 100% rename from test/src/Command/ChangeOfEntity/DeleteChangeOfEntityTest.php rename to test/Command/ChangeOfEntity/DeleteChangeOfEntityTest.php diff --git a/test/src/Command/ChangeOfEntity/UpdateChangeOfEntityTest.php b/test/Command/ChangeOfEntity/UpdateChangeOfEntityTest.php similarity index 100% rename from test/src/Command/ChangeOfEntity/UpdateChangeOfEntityTest.php rename to test/Command/ChangeOfEntity/UpdateChangeOfEntityTest.php diff --git a/test/src/Command/CommandTest.php b/test/Command/CommandTest.php similarity index 100% rename from test/src/Command/CommandTest.php rename to test/Command/CommandTest.php diff --git a/test/src/Command/CommunityLic/AnnulTest.php b/test/Command/CommunityLic/AnnulTest.php similarity index 100% rename from test/src/Command/CommunityLic/AnnulTest.php rename to test/Command/CommunityLic/AnnulTest.php diff --git a/test/src/Command/CommunityLic/EditSuspensionTest.php b/test/Command/CommunityLic/EditSuspensionTest.php similarity index 100% rename from test/src/Command/CommunityLic/EditSuspensionTest.php rename to test/Command/CommunityLic/EditSuspensionTest.php diff --git a/test/src/Command/CommunityLic/ReprintTest.php b/test/Command/CommunityLic/ReprintTest.php similarity index 100% rename from test/src/Command/CommunityLic/ReprintTest.php rename to test/Command/CommunityLic/ReprintTest.php diff --git a/test/src/Command/ConditionUndertaking/CreateTest.php b/test/Command/ConditionUndertaking/CreateTest.php similarity index 100% rename from test/src/Command/ConditionUndertaking/CreateTest.php rename to test/Command/ConditionUndertaking/CreateTest.php diff --git a/test/src/Command/ConditionUndertaking/UpdateConditionUndertakingTest.php b/test/Command/ConditionUndertaking/UpdateConditionUndertakingTest.php similarity index 100% rename from test/src/Command/ConditionUndertaking/UpdateConditionUndertakingTest.php rename to test/Command/ConditionUndertaking/UpdateConditionUndertakingTest.php diff --git a/test/src/Command/ConditionUndertaking/UpdateTest.php b/test/Command/ConditionUndertaking/UpdateTest.php similarity index 100% rename from test/src/Command/ConditionUndertaking/UpdateTest.php rename to test/Command/ConditionUndertaking/UpdateTest.php diff --git a/test/src/Command/ContactDetail/CountrySelectListTest.php b/test/Command/ContactDetail/CountrySelectListTest.php similarity index 100% rename from test/src/Command/ContactDetail/CountrySelectListTest.php rename to test/Command/ContactDetail/CountrySelectListTest.php diff --git a/test/src/Command/ContactDetail/PhoneContact/CreateTest.php b/test/Command/ContactDetail/PhoneContact/CreateTest.php similarity index 100% rename from test/src/Command/ContactDetail/PhoneContact/CreateTest.php rename to test/Command/ContactDetail/PhoneContact/CreateTest.php diff --git a/test/src/Command/ContactDetail/PhoneContact/DeleteTest.php b/test/Command/ContactDetail/PhoneContact/DeleteTest.php similarity index 100% rename from test/src/Command/ContactDetail/PhoneContact/DeleteTest.php rename to test/Command/ContactDetail/PhoneContact/DeleteTest.php diff --git a/test/src/Command/ContactDetail/PhoneContact/UpdateTest.php b/test/Command/ContactDetail/PhoneContact/UpdateTest.php similarity index 100% rename from test/src/Command/ContactDetail/PhoneContact/UpdateTest.php rename to test/Command/ContactDetail/PhoneContact/UpdateTest.php diff --git a/test/src/Command/ContinuationDetail/UpdateFinancesTest.php b/test/Command/ContinuationDetail/UpdateFinancesTest.php similarity index 100% rename from test/src/Command/ContinuationDetail/UpdateFinancesTest.php rename to test/Command/ContinuationDetail/UpdateFinancesTest.php diff --git a/test/src/Command/Disqualification/DeleteTest.php b/test/Command/Disqualification/DeleteTest.php similarity index 100% rename from test/src/Command/Disqualification/DeleteTest.php rename to test/Command/Disqualification/DeleteTest.php diff --git a/test/src/Command/Document/CreateLetterTest.php b/test/Command/Document/CreateLetterTest.php similarity index 100% rename from test/src/Command/Document/CreateLetterTest.php rename to test/Command/Document/CreateLetterTest.php diff --git a/test/src/Command/Document/PrintLetterTest.php b/test/Command/Document/PrintLetterTest.php similarity index 100% rename from test/src/Command/Document/PrintLetterTest.php rename to test/Command/Document/PrintLetterTest.php diff --git a/test/src/Command/Document/PrintLettersTest.php b/test/Command/Document/PrintLettersTest.php similarity index 100% rename from test/src/Command/Document/PrintLettersTest.php rename to test/Command/Document/PrintLettersTest.php diff --git a/test/src/Command/Document/UploadTest.php b/test/Command/Document/UploadTest.php similarity index 100% rename from test/src/Command/Document/UploadTest.php rename to test/Command/Document/UploadTest.php diff --git a/test/src/Command/Fee/ApproveWaiveTest.php b/test/Command/Fee/ApproveWaiveTest.php similarity index 100% rename from test/src/Command/Fee/ApproveWaiveTest.php rename to test/Command/Fee/ApproveWaiveTest.php diff --git a/test/src/Command/Fee/CreateFeeTest.php b/test/Command/Fee/CreateFeeTest.php similarity index 100% rename from test/src/Command/Fee/CreateFeeTest.php rename to test/Command/Fee/CreateFeeTest.php diff --git a/test/src/Command/Fee/RecommendWaiveTest.php b/test/Command/Fee/RecommendWaiveTest.php similarity index 100% rename from test/src/Command/Fee/RecommendWaiveTest.php rename to test/Command/Fee/RecommendWaiveTest.php diff --git a/test/src/Command/Fee/RefundFeeTest.php b/test/Command/Fee/RefundFeeTest.php similarity index 100% rename from test/src/Command/Fee/RefundFeeTest.php rename to test/Command/Fee/RefundFeeTest.php diff --git a/test/src/Command/Fee/RejectWaiveTest.php b/test/Command/Fee/RejectWaiveTest.php similarity index 100% rename from test/src/Command/Fee/RejectWaiveTest.php rename to test/Command/Fee/RejectWaiveTest.php diff --git a/test/src/Command/GdsVerify/ProcessSignatureResponseCommandTest.php b/test/Command/GdsVerify/ProcessSignatureResponseCommandTest.php similarity index 100% rename from test/src/Command/GdsVerify/ProcessSignatureResponseCommandTest.php rename to test/Command/GdsVerify/ProcessSignatureResponseCommandTest.php diff --git a/test/src/Command/GdsVerify/ProcessSignatureResponseTest.php b/test/Command/GdsVerify/ProcessSignatureResponseTest.php similarity index 100% rename from test/src/Command/GdsVerify/ProcessSignatureResponseTest.php rename to test/Command/GdsVerify/ProcessSignatureResponseTest.php diff --git a/test/src/Command/IrhpApplication/CreateTest.php b/test/Command/IrhpApplication/CreateTest.php similarity index 100% rename from test/src/Command/IrhpApplication/CreateTest.php rename to test/Command/IrhpApplication/CreateTest.php diff --git a/test/src/Command/IrhpApplication/ResetToNotYetSubmittedFromCancelledTest.php b/test/Command/IrhpApplication/ResetToNotYetSubmittedFromCancelledTest.php similarity index 100% rename from test/src/Command/IrhpApplication/ResetToNotYetSubmittedFromCancelledTest.php rename to test/Command/IrhpApplication/ResetToNotYetSubmittedFromCancelledTest.php diff --git a/test/src/Command/IrhpApplication/ResetToNotYetSubmittedFromValidTest.php b/test/Command/IrhpApplication/ResetToNotYetSubmittedFromValidTest.php similarity index 100% rename from test/src/Command/IrhpApplication/ResetToNotYetSubmittedFromValidTest.php rename to test/Command/IrhpApplication/ResetToNotYetSubmittedFromValidTest.php diff --git a/test/src/Command/IrhpApplication/ReviveFromUnsuccessfulTest.php b/test/Command/IrhpApplication/ReviveFromUnsuccessfulTest.php similarity index 100% rename from test/src/Command/IrhpApplication/ReviveFromUnsuccessfulTest.php rename to test/Command/IrhpApplication/ReviveFromUnsuccessfulTest.php diff --git a/test/src/Command/IrhpApplication/ReviveFromWithdrawnTest.php b/test/Command/IrhpApplication/ReviveFromWithdrawnTest.php similarity index 100% rename from test/src/Command/IrhpApplication/ReviveFromWithdrawnTest.php rename to test/Command/IrhpApplication/ReviveFromWithdrawnTest.php diff --git a/test/src/Command/IrhpApplication/TerminateTest.php b/test/Command/IrhpApplication/TerminateTest.php similarity index 100% rename from test/src/Command/IrhpApplication/TerminateTest.php rename to test/Command/IrhpApplication/TerminateTest.php diff --git a/test/src/Command/IrhpApplication/UpdateCandidatePermitSelectionTest.php b/test/Command/IrhpApplication/UpdateCandidatePermitSelectionTest.php similarity index 100% rename from test/src/Command/IrhpApplication/UpdateCandidatePermitSelectionTest.php rename to test/Command/IrhpApplication/UpdateCandidatePermitSelectionTest.php diff --git a/test/src/Command/IrhpApplication/UpdateCheckAnswersTest.php b/test/Command/IrhpApplication/UpdateCheckAnswersTest.php similarity index 100% rename from test/src/Command/IrhpApplication/UpdateCheckAnswersTest.php rename to test/Command/IrhpApplication/UpdateCheckAnswersTest.php diff --git a/test/src/Command/IrhpApplication/UpdateCountriesTest.php b/test/Command/IrhpApplication/UpdateCountriesTest.php similarity index 100% rename from test/src/Command/IrhpApplication/UpdateCountriesTest.php rename to test/Command/IrhpApplication/UpdateCountriesTest.php diff --git a/test/src/Command/IrhpApplication/UpdateFullTest.php b/test/Command/IrhpApplication/UpdateFullTest.php similarity index 100% rename from test/src/Command/IrhpApplication/UpdateFullTest.php rename to test/Command/IrhpApplication/UpdateFullTest.php diff --git a/test/src/Command/IrhpApplication/UpdatePeriodTest.php b/test/Command/IrhpApplication/UpdatePeriodTest.php similarity index 100% rename from test/src/Command/IrhpApplication/UpdatePeriodTest.php rename to test/Command/IrhpApplication/UpdatePeriodTest.php diff --git a/test/src/Command/IrhpApplication/WithdrawTest.php b/test/Command/IrhpApplication/WithdrawTest.php similarity index 100% rename from test/src/Command/IrhpApplication/WithdrawTest.php rename to test/Command/IrhpApplication/WithdrawTest.php diff --git a/test/src/Command/IrhpCandidatePermit/CreateTest.php b/test/Command/IrhpCandidatePermit/CreateTest.php similarity index 100% rename from test/src/Command/IrhpCandidatePermit/CreateTest.php rename to test/Command/IrhpCandidatePermit/CreateTest.php diff --git a/test/src/Command/IrhpCandidatePermit/DeleteTest.php b/test/Command/IrhpCandidatePermit/DeleteTest.php similarity index 100% rename from test/src/Command/IrhpCandidatePermit/DeleteTest.php rename to test/Command/IrhpCandidatePermit/DeleteTest.php diff --git a/test/src/Command/IrhpCandidatePermit/UpdateTest.php b/test/Command/IrhpCandidatePermit/UpdateTest.php similarity index 100% rename from test/src/Command/IrhpCandidatePermit/UpdateTest.php rename to test/Command/IrhpCandidatePermit/UpdateTest.php diff --git a/test/src/Command/IrhpPermit/TerminateTest.php b/test/Command/IrhpPermit/TerminateTest.php similarity index 100% rename from test/src/Command/IrhpPermit/TerminateTest.php rename to test/Command/IrhpPermit/TerminateTest.php diff --git a/test/src/Command/IrhpPermitJurisdiction/UpdateTest.php b/test/Command/IrhpPermitJurisdiction/UpdateTest.php similarity index 100% rename from test/src/Command/IrhpPermitJurisdiction/UpdateTest.php rename to test/Command/IrhpPermitJurisdiction/UpdateTest.php diff --git a/test/src/Command/IrhpPermitRange/CreateTest.php b/test/Command/IrhpPermitRange/CreateTest.php similarity index 100% rename from test/src/Command/IrhpPermitRange/CreateTest.php rename to test/Command/IrhpPermitRange/CreateTest.php diff --git a/test/src/Command/IrhpPermitRange/UpdateTest.php b/test/Command/IrhpPermitRange/UpdateTest.php similarity index 100% rename from test/src/Command/IrhpPermitRange/UpdateTest.php rename to test/Command/IrhpPermitRange/UpdateTest.php diff --git a/test/src/Command/IrhpPermitSector/UpdateTest.php b/test/Command/IrhpPermitSector/UpdateTest.php similarity index 100% rename from test/src/Command/IrhpPermitSector/UpdateTest.php rename to test/Command/IrhpPermitSector/UpdateTest.php diff --git a/test/src/Command/IrhpPermitStock/CreateTest.php b/test/Command/IrhpPermitStock/CreateTest.php similarity index 100% rename from test/src/Command/IrhpPermitStock/CreateTest.php rename to test/Command/IrhpPermitStock/CreateTest.php diff --git a/test/src/Command/IrhpPermitStock/UpdateTest.php b/test/Command/IrhpPermitStock/UpdateTest.php similarity index 100% rename from test/src/Command/IrhpPermitStock/UpdateTest.php rename to test/Command/IrhpPermitStock/UpdateTest.php diff --git a/test/src/Command/IrhpPermitWindow/CreateTest.php b/test/Command/IrhpPermitWindow/CreateTest.php similarity index 100% rename from test/src/Command/IrhpPermitWindow/CreateTest.php rename to test/Command/IrhpPermitWindow/CreateTest.php diff --git a/test/src/Command/IrhpPermitWindow/UpdateTest.php b/test/Command/IrhpPermitWindow/UpdateTest.php similarity index 100% rename from test/src/Command/IrhpPermitWindow/UpdateTest.php rename to test/Command/IrhpPermitWindow/UpdateTest.php diff --git a/test/src/Command/Licence/CreateCompanySubsidiaryTest.php b/test/Command/Licence/CreateCompanySubsidiaryTest.php similarity index 100% rename from test/src/Command/Licence/CreateCompanySubsidiaryTest.php rename to test/Command/Licence/CreateCompanySubsidiaryTest.php diff --git a/test/src/Command/Licence/CreateOperatingCentreTest.php b/test/Command/Licence/CreateOperatingCentreTest.php similarity index 100% rename from test/src/Command/Licence/CreateOperatingCentreTest.php rename to test/Command/Licence/CreateOperatingCentreTest.php diff --git a/test/src/Command/Licence/OverviewTest.php b/test/Command/Licence/OverviewTest.php similarity index 100% rename from test/src/Command/Licence/OverviewTest.php rename to test/Command/Licence/OverviewTest.php diff --git a/test/src/Command/Licence/PrintLicenceTest.php b/test/Command/Licence/PrintLicenceTest.php similarity index 100% rename from test/src/Command/Licence/PrintLicenceTest.php rename to test/Command/Licence/PrintLicenceTest.php diff --git a/test/src/Command/Licence/ProposeToRevokeTest.php b/test/Command/Licence/ProposeToRevokeTest.php similarity index 100% rename from test/src/Command/Licence/ProposeToRevokeTest.php rename to test/Command/Licence/ProposeToRevokeTest.php diff --git a/test/src/Command/Licence/UpdateCompanySubsidiaryTest.php b/test/Command/Licence/UpdateCompanySubsidiaryTest.php similarity index 100% rename from test/src/Command/Licence/UpdateCompanySubsidiaryTest.php rename to test/Command/Licence/UpdateCompanySubsidiaryTest.php diff --git a/test/src/Command/Licence/UpdatePeopleTest.php b/test/Command/Licence/UpdatePeopleTest.php similarity index 100% rename from test/src/Command/Licence/UpdatePeopleTest.php rename to test/Command/Licence/UpdatePeopleTest.php diff --git a/test/src/Command/LicenceOperatingCentre/UpdateTest.php b/test/Command/LicenceOperatingCentre/UpdateTest.php similarity index 100% rename from test/src/Command/LicenceOperatingCentre/UpdateTest.php rename to test/Command/LicenceOperatingCentre/UpdateTest.php diff --git a/test/src/Command/LicenceVehicle/CreateUnlicensedOperatorLicenceVehicleTest.php b/test/Command/LicenceVehicle/CreateUnlicensedOperatorLicenceVehicleTest.php similarity index 100% rename from test/src/Command/LicenceVehicle/CreateUnlicensedOperatorLicenceVehicleTest.php rename to test/Command/LicenceVehicle/CreateUnlicensedOperatorLicenceVehicleTest.php diff --git a/test/src/Command/LicenceVehicle/UpdateUnlicensedOperatorLicenceVehicleTest.php b/test/Command/LicenceVehicle/UpdateUnlicensedOperatorLicenceVehicleTest.php similarity index 100% rename from test/src/Command/LicenceVehicle/UpdateUnlicensedOperatorLicenceVehicleTest.php rename to test/Command/LicenceVehicle/UpdateUnlicensedOperatorLicenceVehicleTest.php diff --git a/test/src/Command/Lva/AbstractDeleteCompanySubsidiaryTest.php b/test/Command/Lva/AbstractDeleteCompanySubsidiaryTest.php similarity index 100% rename from test/src/Command/Lva/AbstractDeleteCompanySubsidiaryTest.php rename to test/Command/Lva/AbstractDeleteCompanySubsidiaryTest.php diff --git a/test/src/Command/Lva/AbstractUpdateCompanySubsidiaryTest.php b/test/Command/Lva/AbstractUpdateCompanySubsidiaryTest.php similarity index 100% rename from test/src/Command/Lva/AbstractUpdateCompanySubsidiaryTest.php rename to test/Command/Lva/AbstractUpdateCompanySubsidiaryTest.php diff --git a/test/src/Command/Operator/CreateUnlicensedTest.php b/test/Command/Operator/CreateUnlicensedTest.php similarity index 100% rename from test/src/Command/Operator/CreateUnlicensedTest.php rename to test/Command/Operator/CreateUnlicensedTest.php diff --git a/test/src/Command/Operator/UpdateUnlicensedTest.php b/test/Command/Operator/UpdateUnlicensedTest.php similarity index 100% rename from test/src/Command/Operator/UpdateUnlicensedTest.php rename to test/Command/Operator/UpdateUnlicensedTest.php diff --git a/test/src/Command/Organisation/TransferToTest.php b/test/Command/Organisation/TransferToTest.php similarity index 100% rename from test/src/Command/Organisation/TransferToTest.php rename to test/Command/Organisation/TransferToTest.php diff --git a/test/src/Command/Organisation/UpdateBusinessTypeTest.php b/test/Command/Organisation/UpdateBusinessTypeTest.php similarity index 100% rename from test/src/Command/Organisation/UpdateBusinessTypeTest.php rename to test/Command/Organisation/UpdateBusinessTypeTest.php diff --git a/test/src/Command/Partial/ApplicationTrackingTest.php b/test/Command/Partial/ApplicationTrackingTest.php similarity index 100% rename from test/src/Command/Partial/ApplicationTrackingTest.php rename to test/Command/Partial/ApplicationTrackingTest.php diff --git a/test/src/Command/Partial/OperatingCentreEvidenceTest.php b/test/Command/Partial/OperatingCentreEvidenceTest.php similarity index 100% rename from test/src/Command/Partial/OperatingCentreEvidenceTest.php rename to test/Command/Partial/OperatingCentreEvidenceTest.php diff --git a/test/src/Command/Partial/OperatorContactDetailsTest.php b/test/Command/Partial/OperatorContactDetailsTest.php similarity index 100% rename from test/src/Command/Partial/OperatorContactDetailsTest.php rename to test/Command/Partial/OperatorContactDetailsTest.php diff --git a/test/src/Command/Permits/QueueReportTest.php b/test/Command/Permits/QueueReportTest.php similarity index 100% rename from test/src/Command/Permits/QueueReportTest.php rename to test/Command/Permits/QueueReportTest.php diff --git a/test/src/Command/Processing/Note/CreateTest.php b/test/Command/Processing/Note/CreateTest.php similarity index 100% rename from test/src/Command/Processing/Note/CreateTest.php rename to test/Command/Processing/Note/CreateTest.php diff --git a/test/src/Command/Replacement/CreateTest.php b/test/Command/Replacement/CreateTest.php similarity index 100% rename from test/src/Command/Replacement/CreateTest.php rename to test/Command/Replacement/CreateTest.php diff --git a/test/src/Command/Replacement/UpdateTest.php b/test/Command/Replacement/UpdateTest.php similarity index 100% rename from test/src/Command/Replacement/UpdateTest.php rename to test/Command/Replacement/UpdateTest.php diff --git a/test/src/Command/Report/UploadTest.php b/test/Command/Report/UploadTest.php similarity index 100% rename from test/src/Command/Report/UploadTest.php rename to test/Command/Report/UploadTest.php diff --git a/test/src/Command/Submission/AssignSubmissionTest.php b/test/Command/Submission/AssignSubmissionTest.php similarity index 100% rename from test/src/Command/Submission/AssignSubmissionTest.php rename to test/Command/Submission/AssignSubmissionTest.php diff --git a/test/src/Command/Submission/StoreSubmissionSnapshotTest.php b/test/Command/Submission/StoreSubmissionSnapshotTest.php similarity index 100% rename from test/src/Command/Submission/StoreSubmissionSnapshotTest.php rename to test/Command/Submission/StoreSubmissionSnapshotTest.php diff --git a/test/src/Command/Surrender/ApproveTest.php b/test/Command/Surrender/ApproveTest.php similarity index 100% rename from test/src/Command/Surrender/ApproveTest.php rename to test/Command/Surrender/ApproveTest.php diff --git a/test/src/Command/Surrender/CreateTest.php b/test/Command/Surrender/CreateTest.php similarity index 100% rename from test/src/Command/Surrender/CreateTest.php rename to test/Command/Surrender/CreateTest.php diff --git a/test/src/Command/Surrender/SubmitFormTest.php b/test/Command/Surrender/SubmitFormTest.php similarity index 100% rename from test/src/Command/Surrender/SubmitFormTest.php rename to test/Command/Surrender/SubmitFormTest.php diff --git a/test/src/Command/Surrender/UpdateTest.php b/test/Command/Surrender/UpdateTest.php similarity index 100% rename from test/src/Command/Surrender/UpdateTest.php rename to test/Command/Surrender/UpdateTest.php diff --git a/test/src/Command/Surrender/WithdrawTest.php b/test/Command/Surrender/WithdrawTest.php similarity index 100% rename from test/src/Command/Surrender/WithdrawTest.php rename to test/Command/Surrender/WithdrawTest.php diff --git a/test/src/Command/System/CreateFinancialStandingRateTest.php b/test/Command/System/CreateFinancialStandingRateTest.php similarity index 100% rename from test/src/Command/System/CreateFinancialStandingRateTest.php rename to test/Command/System/CreateFinancialStandingRateTest.php diff --git a/test/src/Command/System/InfoMessage/CreateTest.php b/test/Command/System/InfoMessage/CreateTest.php similarity index 100% rename from test/src/Command/System/InfoMessage/CreateTest.php rename to test/Command/System/InfoMessage/CreateTest.php diff --git a/test/src/Command/System/PublicHoliday/CreateTest.php b/test/Command/System/PublicHoliday/CreateTest.php similarity index 100% rename from test/src/Command/System/PublicHoliday/CreateTest.php rename to test/Command/System/PublicHoliday/CreateTest.php diff --git a/test/src/Command/System/UpdateFinancialStandingRateTest.php b/test/Command/System/UpdateFinancialStandingRateTest.php similarity index 100% rename from test/src/Command/System/UpdateFinancialStandingRateTest.php rename to test/Command/System/UpdateFinancialStandingRateTest.php diff --git a/test/src/Command/SystemParameter/CreateSystemParameterTest.php b/test/Command/SystemParameter/CreateSystemParameterTest.php similarity index 100% rename from test/src/Command/SystemParameter/CreateSystemParameterTest.php rename to test/Command/SystemParameter/CreateSystemParameterTest.php diff --git a/test/src/Command/SystemParameter/UpdateSystemParameterTest.php b/test/Command/SystemParameter/UpdateSystemParameterTest.php similarity index 100% rename from test/src/Command/SystemParameter/UpdateSystemParameterTest.php rename to test/Command/SystemParameter/UpdateSystemParameterTest.php diff --git a/test/src/Command/Task/CreateTaskTest.php b/test/Command/Task/CreateTaskTest.php similarity index 100% rename from test/src/Command/Task/CreateTaskTest.php rename to test/Command/Task/CreateTaskTest.php diff --git a/test/src/Command/Template/UpdateTemplateSourceTest.php b/test/Command/Template/UpdateTemplateSourceTest.php similarity index 100% rename from test/src/Command/Template/UpdateTemplateSourceTest.php rename to test/Command/Template/UpdateTemplateSourceTest.php diff --git a/test/src/Command/TmQualification/CreateTest.php b/test/Command/TmQualification/CreateTest.php similarity index 100% rename from test/src/Command/TmQualification/CreateTest.php rename to test/Command/TmQualification/CreateTest.php diff --git a/test/src/Command/TmQualification/UpdateTest.php b/test/Command/TmQualification/UpdateTest.php similarity index 100% rename from test/src/Command/TmQualification/UpdateTest.php rename to test/Command/TmQualification/UpdateTest.php diff --git a/test/src/Command/Trailer/CreateTrailerTest.php b/test/Command/Trailer/CreateTrailerTest.php similarity index 100% rename from test/src/Command/Trailer/CreateTrailerTest.php rename to test/Command/Trailer/CreateTrailerTest.php diff --git a/test/src/Command/Trailer/UpdateTrailerTest.php b/test/Command/Trailer/UpdateTrailerTest.php similarity index 100% rename from test/src/Command/Trailer/UpdateTrailerTest.php rename to test/Command/Trailer/UpdateTrailerTest.php diff --git a/test/src/Command/Transaction/CompleteTransactionTest.php b/test/Command/Transaction/CompleteTransactionTest.php similarity index 100% rename from test/src/Command/Transaction/CompleteTransactionTest.php rename to test/Command/Transaction/CompleteTransactionTest.php diff --git a/test/src/Command/Transaction/PayOutstandingFeesTest.php b/test/Command/Transaction/PayOutstandingFeesTest.php similarity index 100% rename from test/src/Command/Transaction/PayOutstandingFeesTest.php rename to test/Command/Transaction/PayOutstandingFeesTest.php diff --git a/test/src/Command/Transaction/ReverseTransactionTest.php b/test/Command/Transaction/ReverseTransactionTest.php similarity index 100% rename from test/src/Command/Transaction/ReverseTransactionTest.php rename to test/Command/Transaction/ReverseTransactionTest.php diff --git a/test/src/Command/TranslationKey/CreateTest.php b/test/Command/TranslationKey/CreateTest.php similarity index 100% rename from test/src/Command/TranslationKey/CreateTest.php rename to test/Command/TranslationKey/CreateTest.php diff --git a/test/src/Command/TranslationKey/DeleteTest.php b/test/Command/TranslationKey/DeleteTest.php similarity index 100% rename from test/src/Command/TranslationKey/DeleteTest.php rename to test/Command/TranslationKey/DeleteTest.php diff --git a/test/src/Command/TranslationKey/UpdateTest.php b/test/Command/TranslationKey/UpdateTest.php similarity index 100% rename from test/src/Command/TranslationKey/UpdateTest.php rename to test/Command/TranslationKey/UpdateTest.php diff --git a/test/src/Command/TranslationKeyText/DeleteTest.php b/test/Command/TranslationKeyText/DeleteTest.php similarity index 100% rename from test/src/Command/TranslationKeyText/DeleteTest.php rename to test/Command/TranslationKeyText/DeleteTest.php diff --git a/test/src/Command/TransportManagerApplication/OperatorSignedTest.php b/test/Command/TransportManagerApplication/OperatorSignedTest.php similarity index 100% rename from test/src/Command/TransportManagerApplication/OperatorSignedTest.php rename to test/Command/TransportManagerApplication/OperatorSignedTest.php diff --git a/test/src/Command/TransportManagerApplication/SendAmendTmApplicationTest.php b/test/Command/TransportManagerApplication/SendAmendTmApplicationTest.php similarity index 100% rename from test/src/Command/TransportManagerApplication/SendAmendTmApplicationTest.php rename to test/Command/TransportManagerApplication/SendAmendTmApplicationTest.php diff --git a/test/src/Command/TransportManagerApplication/SendTmApplicationTest.php b/test/Command/TransportManagerApplication/SendTmApplicationTest.php similarity index 100% rename from test/src/Command/TransportManagerApplication/SendTmApplicationTest.php rename to test/Command/TransportManagerApplication/SendTmApplicationTest.php diff --git a/test/src/Command/TransportManagerApplication/SubmitTest.php b/test/Command/TransportManagerApplication/SubmitTest.php similarity index 100% rename from test/src/Command/TransportManagerApplication/SubmitTest.php rename to test/Command/TransportManagerApplication/SubmitTest.php diff --git a/test/src/Command/TransportManagerApplication/UpdateDetailsTest.php b/test/Command/TransportManagerApplication/UpdateDetailsTest.php similarity index 100% rename from test/src/Command/TransportManagerApplication/UpdateDetailsTest.php rename to test/Command/TransportManagerApplication/UpdateDetailsTest.php diff --git a/test/src/Command/TransportManagerApplication/UpdateForResponsibilitiesTest.php b/test/Command/TransportManagerApplication/UpdateForResponsibilitiesTest.php similarity index 100% rename from test/src/Command/TransportManagerApplication/UpdateForResponsibilitiesTest.php rename to test/Command/TransportManagerApplication/UpdateForResponsibilitiesTest.php diff --git a/test/src/Command/TransportManagerLicence/DeleteTest.php b/test/Command/TransportManagerLicence/DeleteTest.php similarity index 100% rename from test/src/Command/TransportManagerLicence/DeleteTest.php rename to test/Command/TransportManagerLicence/DeleteTest.php diff --git a/test/src/Command/TransportManagerLicence/UpdateForResponsibilitiesTest.php b/test/Command/TransportManagerLicence/UpdateForResponsibilitiesTest.php similarity index 100% rename from test/src/Command/TransportManagerLicence/UpdateForResponsibilitiesTest.php rename to test/Command/TransportManagerLicence/UpdateForResponsibilitiesTest.php diff --git a/test/src/Command/User/CreateUserTest.php b/test/Command/User/CreateUserTest.php similarity index 100% rename from test/src/Command/User/CreateUserTest.php rename to test/Command/User/CreateUserTest.php diff --git a/test/src/Command/User/UpdateUserLastLoginAtTest.php b/test/Command/User/UpdateUserLastLoginAtTest.php similarity index 100% rename from test/src/Command/User/UpdateUserLastLoginAtTest.php rename to test/Command/User/UpdateUserLastLoginAtTest.php diff --git a/test/src/Command/User/UpdateUserTest.php b/test/Command/User/UpdateUserTest.php similarity index 100% rename from test/src/Command/User/UpdateUserTest.php rename to test/Command/User/UpdateUserTest.php diff --git a/test/src/Command/Variation/UpdateInterimTest.php b/test/Command/Variation/UpdateInterimTest.php similarity index 100% rename from test/src/Command/Variation/UpdateInterimTest.php rename to test/Command/Variation/UpdateInterimTest.php diff --git a/test/src/Command/Variation/UpdateTypeOfLicenceTest.php b/test/Command/Variation/UpdateTypeOfLicenceTest.php similarity index 100% rename from test/src/Command/Variation/UpdateTypeOfLicenceTest.php rename to test/Command/Variation/UpdateTypeOfLicenceTest.php diff --git a/test/src/Command/VariationOperatingCentre/UpdateTest.php b/test/Command/VariationOperatingCentre/UpdateTest.php similarity index 100% rename from test/src/Command/VariationOperatingCentre/UpdateTest.php rename to test/Command/VariationOperatingCentre/UpdateTest.php diff --git a/test/src/Command/Vehicle/UpdateGoodsVehicleTest.php b/test/Command/Vehicle/UpdateGoodsVehicleTest.php similarity index 100% rename from test/src/Command/Vehicle/UpdateGoodsVehicleTest.php rename to test/Command/Vehicle/UpdateGoodsVehicleTest.php diff --git a/test/src/DtoTest.php b/test/DtoTest.php similarity index 100% rename from test/src/DtoTest.php rename to test/DtoTest.php diff --git a/test/src/DtoWithoutFieldTransformationsTest.php b/test/DtoWithoutFieldTransformationsTest.php similarity index 100% rename from test/src/DtoWithoutFieldTransformationsTest.php rename to test/DtoWithoutFieldTransformationsTest.php diff --git a/test/src/DtoWithoutInvalidFieldTest.php b/test/DtoWithoutInvalidFieldTest.php similarity index 100% rename from test/src/DtoWithoutInvalidFieldTest.php rename to test/DtoWithoutInvalidFieldTest.php diff --git a/test/src/DtoWithoutOptionalFieldsTest.php b/test/DtoWithoutOptionalFieldsTest.php similarity index 100% rename from test/src/DtoWithoutOptionalFieldsTest.php rename to test/DtoWithoutOptionalFieldsTest.php diff --git a/test/src/Filter/PostcodeTest.php b/test/Filter/PostcodeTest.php similarity index 100% rename from test/src/Filter/PostcodeTest.php rename to test/Filter/PostcodeTest.php diff --git a/test/src/Filter/VrmTest.php b/test/Filter/VrmTest.php similarity index 100% rename from test/src/Filter/VrmTest.php rename to test/Filter/VrmTest.php diff --git a/test/src/Query/Application/ApplicationTest.php b/test/Query/Application/ApplicationTest.php similarity index 100% rename from test/src/Query/Application/ApplicationTest.php rename to test/Query/Application/ApplicationTest.php diff --git a/test/src/Query/Application/DeclarationTest.php b/test/Query/Application/DeclarationTest.php similarity index 100% rename from test/src/Query/Application/DeclarationTest.php rename to test/Query/Application/DeclarationTest.php diff --git a/test/src/Query/Application/FinancialEvidenceTest.php b/test/Query/Application/FinancialEvidenceTest.php similarity index 100% rename from test/src/Query/Application/FinancialEvidenceTest.php rename to test/Query/Application/FinancialEvidenceTest.php diff --git a/test/src/Query/Application/GetListTest.php b/test/Query/Application/GetListTest.php similarity index 100% rename from test/src/Query/Application/GetListTest.php rename to test/Query/Application/GetListTest.php diff --git a/test/src/Query/Application/OverviewTest.php b/test/Query/Application/OverviewTest.php similarity index 100% rename from test/src/Query/Application/OverviewTest.php rename to test/Query/Application/OverviewTest.php diff --git a/test/src/Query/Audit/ReadIrhpApplicationTest.php b/test/Query/Audit/ReadIrhpApplicationTest.php similarity index 100% rename from test/src/Query/Audit/ReadIrhpApplicationTest.php rename to test/Query/Audit/ReadIrhpApplicationTest.php diff --git a/test/src/Query/BusRegSearchView/BusRegSearchViewListTest.php b/test/Query/BusRegSearchView/BusRegSearchViewListTest.php similarity index 100% rename from test/src/Query/BusRegSearchView/BusRegSearchViewListTest.php rename to test/Query/BusRegSearchView/BusRegSearchViewListTest.php diff --git a/test/src/Query/Cache/ByIdTest.php b/test/Query/Cache/ByIdTest.php similarity index 100% rename from test/src/Query/Cache/ByIdTest.php rename to test/Query/Cache/ByIdTest.php diff --git a/test/src/Query/Cases/Report/OpenListTest.php b/test/Query/Cases/Report/OpenListTest.php similarity index 100% rename from test/src/Query/Cases/Report/OpenListTest.php rename to test/Query/Cases/Report/OpenListTest.php diff --git a/test/src/Query/Category/GetListTest.php b/test/Query/Category/GetListTest.php similarity index 100% rename from test/src/Query/Category/GetListTest.php rename to test/Query/Category/GetListTest.php diff --git a/test/src/Query/CommunityLic/CommunityLicenceTest.php b/test/Query/CommunityLic/CommunityLicenceTest.php similarity index 100% rename from test/src/Query/CommunityLic/CommunityLicenceTest.php rename to test/Query/CommunityLic/CommunityLicenceTest.php diff --git a/test/src/Query/CommunityLic/CommunityLicencesTest.php b/test/Query/CommunityLic/CommunityLicencesTest.php similarity index 100% rename from test/src/Query/CommunityLic/CommunityLicencesTest.php rename to test/Query/CommunityLic/CommunityLicencesTest.php diff --git a/test/src/Query/CompaniesHouse/AlertListTest.php b/test/Query/CompaniesHouse/AlertListTest.php similarity index 100% rename from test/src/Query/CompaniesHouse/AlertListTest.php rename to test/Query/CompaniesHouse/AlertListTest.php diff --git a/test/src/Query/CompaniesHouse/ByNumberTest.php b/test/Query/CompaniesHouse/ByNumberTest.php similarity index 100% rename from test/src/Query/CompaniesHouse/ByNumberTest.php rename to test/Query/CompaniesHouse/ByNumberTest.php diff --git a/test/src/Query/CompaniesHouse/InsolvencyPractitionerTest.php b/test/Query/CompaniesHouse/InsolvencyPractitionerTest.php similarity index 100% rename from test/src/Query/CompaniesHouse/InsolvencyPractitionerTest.php rename to test/Query/CompaniesHouse/InsolvencyPractitionerTest.php diff --git a/test/src/Query/ContactDetail/PhoneContact/GetListTest.php b/test/Query/ContactDetail/PhoneContact/GetListTest.php similarity index 100% rename from test/src/Query/ContactDetail/PhoneContact/GetListTest.php rename to test/Query/ContactDetail/PhoneContact/GetListTest.php diff --git a/test/src/Query/ContactDetail/PhoneContact/GetTest.php b/test/Query/ContactDetail/PhoneContact/GetTest.php similarity index 100% rename from test/src/Query/ContactDetail/PhoneContact/GetTest.php rename to test/Query/ContactDetail/PhoneContact/GetTest.php diff --git a/test/src/Query/Correspondence/CorrespondencesTest.php b/test/Query/Correspondence/CorrespondencesTest.php similarity index 100% rename from test/src/Query/Correspondence/CorrespondencesTest.php rename to test/Query/Correspondence/CorrespondencesTest.php diff --git a/test/src/Query/Cpms/StoredCardListTest.php b/test/Query/Cpms/StoredCardListTest.php similarity index 100% rename from test/src/Query/Cpms/StoredCardListTest.php rename to test/Query/Cpms/StoredCardListTest.php diff --git a/test/src/Query/DataRetention/GetProcessedListTest.php b/test/Query/DataRetention/GetProcessedListTest.php similarity index 100% rename from test/src/Query/DataRetention/GetProcessedListTest.php rename to test/Query/DataRetention/GetProcessedListTest.php diff --git a/test/src/Query/DataRetention/RecordsTest.php b/test/Query/DataRetention/RecordsTest.php similarity index 100% rename from test/src/Query/DataRetention/RecordsTest.php rename to test/Query/DataRetention/RecordsTest.php diff --git a/test/src/Query/DocTemplate/FullListTest.php b/test/Query/DocTemplate/FullListTest.php similarity index 100% rename from test/src/Query/DocTemplate/FullListTest.php rename to test/Query/DocTemplate/FullListTest.php diff --git a/test/src/Query/Document/AbstractDownloadTest.php b/test/Query/Document/AbstractDownloadTest.php similarity index 100% rename from test/src/Query/Document/AbstractDownloadTest.php rename to test/Query/Document/AbstractDownloadTest.php diff --git a/test/src/Query/Document/DocumentListTest.php b/test/Query/Document/DocumentListTest.php similarity index 100% rename from test/src/Query/Document/DocumentListTest.php rename to test/Query/Document/DocumentListTest.php diff --git a/test/src/Query/Document/DownloadGuideTest.php b/test/Query/Document/DownloadGuideTest.php similarity index 100% rename from test/src/Query/Document/DownloadGuideTest.php rename to test/Query/Document/DownloadGuideTest.php diff --git a/test/src/Query/Document/DownloadTest.php b/test/Query/Document/DownloadTest.php similarity index 100% rename from test/src/Query/Document/DownloadTest.php rename to test/Query/Document/DownloadTest.php diff --git a/test/src/Query/Document/PrintLetterTest.php b/test/Query/Document/PrintLetterTest.php similarity index 100% rename from test/src/Query/Document/PrintLetterTest.php rename to test/Query/Document/PrintLetterTest.php diff --git a/test/src/Query/DvlaSearch/VehicleTest.php b/test/Query/DvlaSearch/VehicleTest.php similarity index 100% rename from test/src/Query/DvlaSearch/VehicleTest.php rename to test/Query/DvlaSearch/VehicleTest.php diff --git a/test/src/Query/Fee/FeeListTest.php b/test/Query/Fee/FeeListTest.php similarity index 100% rename from test/src/Query/Fee/FeeListTest.php rename to test/Query/Fee/FeeListTest.php diff --git a/test/src/Query/Fee/FeeTypeListTest.php b/test/Query/Fee/FeeTypeListTest.php similarity index 100% rename from test/src/Query/Fee/FeeTypeListTest.php rename to test/Query/Fee/FeeTypeListTest.php diff --git a/test/src/Query/Fee/InterimRefundsTest.php b/test/Query/Fee/InterimRefundsTest.php similarity index 100% rename from test/src/Query/Fee/InterimRefundsTest.php rename to test/Query/Fee/InterimRefundsTest.php diff --git a/test/src/Query/IrhpApplication/AnswersSummaryTest.php b/test/Query/IrhpApplication/AnswersSummaryTest.php similarity index 100% rename from test/src/Query/IrhpApplication/AnswersSummaryTest.php rename to test/Query/IrhpApplication/AnswersSummaryTest.php diff --git a/test/src/Query/IrhpApplication/BilateralCountryAccessibleTest.php b/test/Query/IrhpApplication/BilateralCountryAccessibleTest.php similarity index 100% rename from test/src/Query/IrhpApplication/BilateralCountryAccessibleTest.php rename to test/Query/IrhpApplication/BilateralCountryAccessibleTest.php diff --git a/test/src/Query/IrhpApplication/BilateralMetadataTest.php b/test/Query/IrhpApplication/BilateralMetadataTest.php similarity index 100% rename from test/src/Query/IrhpApplication/BilateralMetadataTest.php rename to test/Query/IrhpApplication/BilateralMetadataTest.php diff --git a/test/src/Query/IrhpApplication/ByIdTest.php b/test/Query/IrhpApplication/ByIdTest.php similarity index 100% rename from test/src/Query/IrhpApplication/ByIdTest.php rename to test/Query/IrhpApplication/ByIdTest.php diff --git a/test/src/Query/IrhpApplication/DocumentsTest.php b/test/Query/IrhpApplication/DocumentsTest.php similarity index 100% rename from test/src/Query/IrhpApplication/DocumentsTest.php rename to test/Query/IrhpApplication/DocumentsTest.php diff --git a/test/src/Query/IrhpApplication/InternalApplicationsSummaryTest.php b/test/Query/IrhpApplication/InternalApplicationsSummaryTest.php similarity index 100% rename from test/src/Query/IrhpApplication/InternalApplicationsSummaryTest.php rename to test/Query/IrhpApplication/InternalApplicationsSummaryTest.php diff --git a/test/src/Query/IrhpApplication/QuestionAnswerTest.php b/test/Query/IrhpApplication/QuestionAnswerTest.php similarity index 100% rename from test/src/Query/IrhpApplication/QuestionAnswerTest.php rename to test/Query/IrhpApplication/QuestionAnswerTest.php diff --git a/test/src/Query/IrhpApplication/SelfserveApplicationsSummaryTest.php b/test/Query/IrhpApplication/SelfserveApplicationsSummaryTest.php similarity index 100% rename from test/src/Query/IrhpApplication/SelfserveApplicationsSummaryTest.php rename to test/Query/IrhpApplication/SelfserveApplicationsSummaryTest.php diff --git a/test/src/Query/IrhpApplication/SelfserveIssuedPermitsSummaryTest.php b/test/Query/IrhpApplication/SelfserveIssuedPermitsSummaryTest.php similarity index 100% rename from test/src/Query/IrhpApplication/SelfserveIssuedPermitsSummaryTest.php rename to test/Query/IrhpApplication/SelfserveIssuedPermitsSummaryTest.php diff --git a/test/src/Query/IrhpCandidatePermit/ByIdTest.php b/test/Query/IrhpCandidatePermit/ByIdTest.php similarity index 100% rename from test/src/Query/IrhpCandidatePermit/ByIdTest.php rename to test/Query/IrhpCandidatePermit/ByIdTest.php diff --git a/test/src/Query/IrhpCandidatePermit/GetListByIrhpApplicationTest.php b/test/Query/IrhpCandidatePermit/GetListByIrhpApplicationTest.php similarity index 100% rename from test/src/Query/IrhpCandidatePermit/GetListByIrhpApplicationTest.php rename to test/Query/IrhpCandidatePermit/GetListByIrhpApplicationTest.php diff --git a/test/src/Query/IrhpPermit/ByIdTest.php b/test/Query/IrhpPermit/ByIdTest.php similarity index 100% rename from test/src/Query/IrhpPermit/ByIdTest.php rename to test/Query/IrhpPermit/ByIdTest.php diff --git a/test/src/Query/IrhpPermit/GetListByLicenceTest.php b/test/Query/IrhpPermit/GetListByLicenceTest.php similarity index 100% rename from test/src/Query/IrhpPermit/GetListByLicenceTest.php rename to test/Query/IrhpPermit/GetListByLicenceTest.php diff --git a/test/src/Query/IrhpPermit/GetListTest.php b/test/Query/IrhpPermit/GetListTest.php similarity index 100% rename from test/src/Query/IrhpPermit/GetListTest.php rename to test/Query/IrhpPermit/GetListTest.php diff --git a/test/src/Query/IrhpPermit/UniqueCountriesByLicenceTest.php b/test/Query/IrhpPermit/UniqueCountriesByLicenceTest.php similarity index 100% rename from test/src/Query/IrhpPermit/UniqueCountriesByLicenceTest.php rename to test/Query/IrhpPermit/UniqueCountriesByLicenceTest.php diff --git a/test/src/Query/IrhpPermitStock/AvailableCountriesTest.php b/test/Query/IrhpPermitStock/AvailableCountriesTest.php similarity index 100% rename from test/src/Query/IrhpPermitStock/AvailableCountriesTest.php rename to test/Query/IrhpPermitStock/AvailableCountriesTest.php diff --git a/test/src/Query/Licence/GoodsDiscCountTest.php b/test/Query/Licence/GoodsDiscCountTest.php similarity index 100% rename from test/src/Query/Licence/GoodsDiscCountTest.php rename to test/Query/Licence/GoodsDiscCountTest.php diff --git a/test/src/Query/Licence/GoodsVehiclesTest.php b/test/Query/Licence/GoodsVehiclesTest.php similarity index 100% rename from test/src/Query/Licence/GoodsVehiclesTest.php rename to test/Query/Licence/GoodsVehiclesTest.php diff --git a/test/src/Query/Licence/LicenceTest.php b/test/Query/Licence/LicenceTest.php similarity index 100% rename from test/src/Query/Licence/LicenceTest.php rename to test/Query/Licence/LicenceTest.php diff --git a/test/src/Query/Licence/PsvDiscCountTest.php b/test/Query/Licence/PsvDiscCountTest.php similarity index 100% rename from test/src/Query/Licence/PsvDiscCountTest.php rename to test/Query/Licence/PsvDiscCountTest.php diff --git a/test/src/Query/Licence/PsvVehiclesExportTest.php b/test/Query/Licence/PsvVehiclesExportTest.php similarity index 100% rename from test/src/Query/Licence/PsvVehiclesExportTest.php rename to test/Query/Licence/PsvVehiclesExportTest.php diff --git a/test/src/Query/Licence/TypeOfLicenceTest.php b/test/Query/Licence/TypeOfLicenceTest.php similarity index 100% rename from test/src/Query/Licence/TypeOfLicenceTest.php rename to test/Query/Licence/TypeOfLicenceTest.php diff --git a/test/src/Query/Licence/VehiclesTest.php b/test/Query/Licence/VehiclesTest.php similarity index 100% rename from test/src/Query/Licence/VehiclesTest.php rename to test/Query/Licence/VehiclesTest.php diff --git a/test/src/Query/LicenceVehicle/LicenceVehiclesByIdTest.php b/test/Query/LicenceVehicle/LicenceVehiclesByIdTest.php similarity index 100% rename from test/src/Query/LicenceVehicle/LicenceVehiclesByIdTest.php rename to test/Query/LicenceVehicle/LicenceVehiclesByIdTest.php diff --git a/test/src/Query/Lva/AbstractGoodsVehiclesTest.php b/test/Query/Lva/AbstractGoodsVehiclesTest.php similarity index 100% rename from test/src/Query/Lva/AbstractGoodsVehiclesTest.php rename to test/Query/Lva/AbstractGoodsVehiclesTest.php diff --git a/test/src/Query/Organisation/DashboardTest.php b/test/Query/Organisation/DashboardTest.php similarity index 100% rename from test/src/Query/Organisation/DashboardTest.php rename to test/Query/Organisation/DashboardTest.php diff --git a/test/src/Query/Organisation/OrganisationTest.php b/test/Query/Organisation/OrganisationTest.php similarity index 100% rename from test/src/Query/Organisation/OrganisationTest.php rename to test/Query/Organisation/OrganisationTest.php diff --git a/test/src/Query/Organisation/OutstandingFeesTest.php b/test/Query/Organisation/OutstandingFeesTest.php similarity index 100% rename from test/src/Query/Organisation/OutstandingFeesTest.php rename to test/Query/Organisation/OutstandingFeesTest.php diff --git a/test/src/Query/PagedTraitTest.php b/test/Query/PagedTraitTest.php similarity index 100% rename from test/src/Query/PagedTraitTest.php rename to test/Query/PagedTraitTest.php diff --git a/test/src/Query/Permits/AvailableStocksTest.php b/test/Query/Permits/AvailableStocksTest.php similarity index 100% rename from test/src/Query/Permits/AvailableStocksTest.php rename to test/Query/Permits/AvailableStocksTest.php diff --git a/test/src/Query/Permits/AvailableYearsTest.php b/test/Query/Permits/AvailableYearsTest.php similarity index 100% rename from test/src/Query/Permits/AvailableYearsTest.php rename to test/Query/Permits/AvailableYearsTest.php diff --git a/test/src/Query/Permits/EmissionsByYearTest.php b/test/Query/Permits/EmissionsByYearTest.php similarity index 100% rename from test/src/Query/Permits/EmissionsByYearTest.php rename to test/Query/Permits/EmissionsByYearTest.php diff --git a/test/src/Query/Permits/MaxPermittedReachedByStockAndLicenceTest.php b/test/Query/Permits/MaxPermittedReachedByStockAndLicenceTest.php similarity index 100% rename from test/src/Query/Permits/MaxPermittedReachedByStockAndLicenceTest.php rename to test/Query/Permits/MaxPermittedReachedByStockAndLicenceTest.php diff --git a/test/src/Query/Permits/MaxPermittedReachedByTypeAndOrganisationTest.php b/test/Query/Permits/MaxPermittedReachedByTypeAndOrganisationTest.php similarity index 100% rename from test/src/Query/Permits/MaxPermittedReachedByTypeAndOrganisationTest.php rename to test/Query/Permits/MaxPermittedReachedByTypeAndOrganisationTest.php diff --git a/test/src/Query/Permits/OpenWindowsTest.php b/test/Query/Permits/OpenWindowsTest.php similarity index 100% rename from test/src/Query/Permits/OpenWindowsTest.php rename to test/Query/Permits/OpenWindowsTest.php diff --git a/test/src/Query/Permits/PostScoringReportTest.php b/test/Query/Permits/PostScoringReportTest.php similarity index 100% rename from test/src/Query/Permits/PostScoringReportTest.php rename to test/Query/Permits/PostScoringReportTest.php diff --git a/test/src/Query/Permits/ReadyToPrintConfirmTest.php b/test/Query/Permits/ReadyToPrintConfirmTest.php similarity index 100% rename from test/src/Query/Permits/ReadyToPrintConfirmTest.php rename to test/Query/Permits/ReadyToPrintConfirmTest.php diff --git a/test/src/Query/Permits/ReadyToPrintCountryTest.php b/test/Query/Permits/ReadyToPrintCountryTest.php similarity index 100% rename from test/src/Query/Permits/ReadyToPrintCountryTest.php rename to test/Query/Permits/ReadyToPrintCountryTest.php diff --git a/test/src/Query/Permits/ReadyToPrintRangeTypeTest.php b/test/Query/Permits/ReadyToPrintRangeTypeTest.php similarity index 100% rename from test/src/Query/Permits/ReadyToPrintRangeTypeTest.php rename to test/Query/Permits/ReadyToPrintRangeTypeTest.php diff --git a/test/src/Query/Permits/ReadyToPrintStockTest.php b/test/Query/Permits/ReadyToPrintStockTest.php similarity index 100% rename from test/src/Query/Permits/ReadyToPrintStockTest.php rename to test/Query/Permits/ReadyToPrintStockTest.php diff --git a/test/src/Query/Permits/ReadyToPrintTest.php b/test/Query/Permits/ReadyToPrintTest.php similarity index 100% rename from test/src/Query/Permits/ReadyToPrintTest.php rename to test/Query/Permits/ReadyToPrintTest.php diff --git a/test/src/Query/Permits/ReadyToPrintTypeTest.php b/test/Query/Permits/ReadyToPrintTypeTest.php similarity index 100% rename from test/src/Query/Permits/ReadyToPrintTypeTest.php rename to test/Query/Permits/ReadyToPrintTypeTest.php diff --git a/test/src/Query/Permits/StockAlignmentReportTest.php b/test/Query/Permits/StockAlignmentReportTest.php similarity index 100% rename from test/src/Query/Permits/StockAlignmentReportTest.php rename to test/Query/Permits/StockAlignmentReportTest.php diff --git a/test/src/Query/Processing/HistoryTest.php b/test/Query/Processing/HistoryTest.php similarity index 100% rename from test/src/Query/Processing/HistoryTest.php rename to test/Query/Processing/HistoryTest.php diff --git a/test/src/Query/Publication/PublishedListTest.php b/test/Query/Publication/PublishedListTest.php similarity index 100% rename from test/src/Query/Publication/PublishedListTest.php rename to test/Query/Publication/PublishedListTest.php diff --git a/test/src/Query/QueryContainerTest.php b/test/Query/QueryContainerTest.php similarity index 100% rename from test/src/Query/QueryContainerTest.php rename to test/Query/QueryContainerTest.php diff --git a/test/src/Query/QueryTest.php b/test/Query/QueryTest.php similarity index 100% rename from test/src/Query/QueryTest.php rename to test/Query/QueryTest.php diff --git a/test/src/Query/SubCategory/GetListTest.php b/test/Query/SubCategory/GetListTest.php similarity index 100% rename from test/src/Query/SubCategory/GetListTest.php rename to test/Query/SubCategory/GetListTest.php diff --git a/test/src/Query/Surrender/ByLicenceTest.php b/test/Query/Surrender/ByLicenceTest.php similarity index 100% rename from test/src/Query/Surrender/ByLicenceTest.php rename to test/Query/Surrender/ByLicenceTest.php diff --git a/test/src/Query/Surrender/GetStatusTest.php b/test/Query/Surrender/GetStatusTest.php similarity index 100% rename from test/src/Query/Surrender/GetStatusTest.php rename to test/Query/Surrender/GetStatusTest.php diff --git a/test/src/Query/Surrender/OpenBusRegTest.php b/test/Query/Surrender/OpenBusRegTest.php similarity index 100% rename from test/src/Query/Surrender/OpenBusRegTest.php rename to test/Query/Surrender/OpenBusRegTest.php diff --git a/test/src/Query/Surrender/OpenCasesTest.php b/test/Query/Surrender/OpenCasesTest.php similarity index 100% rename from test/src/Query/Surrender/OpenCasesTest.php rename to test/Query/Surrender/OpenCasesTest.php diff --git a/test/src/Query/Surrender/PreviousLicenceStatusTest.php b/test/Query/Surrender/PreviousLicenceStatusTest.php similarity index 100% rename from test/src/Query/Surrender/PreviousLicenceStatusTest.php rename to test/Query/Surrender/PreviousLicenceStatusTest.php diff --git a/test/src/Query/System/InfoMessage/GetListActiveTest.php b/test/Query/System/InfoMessage/GetListActiveTest.php similarity index 100% rename from test/src/Query/System/InfoMessage/GetListActiveTest.php rename to test/Query/System/InfoMessage/GetListActiveTest.php diff --git a/test/src/Query/Task/TaskListTest.php b/test/Query/Task/TaskListTest.php similarity index 100% rename from test/src/Query/Task/TaskListTest.php rename to test/Query/Task/TaskListTest.php diff --git a/test/src/Query/Template/AvailableTemplatesTest.php b/test/Query/Template/AvailableTemplatesTest.php similarity index 100% rename from test/src/Query/Template/AvailableTemplatesTest.php rename to test/Query/Template/AvailableTemplatesTest.php diff --git a/test/src/Query/Template/PreviewTemplateSourceTest.php b/test/Query/Template/PreviewTemplateSourceTest.php similarity index 100% rename from test/src/Query/Template/PreviewTemplateSourceTest.php rename to test/Query/Template/PreviewTemplateSourceTest.php diff --git a/test/src/Query/Template/TemplateSourceTest.php b/test/Query/Template/TemplateSourceTest.php similarity index 100% rename from test/src/Query/Template/TemplateSourceTest.php rename to test/Query/Template/TemplateSourceTest.php diff --git a/test/src/Query/Transaction/TransactionByReferenceTest.php b/test/Query/Transaction/TransactionByReferenceTest.php similarity index 100% rename from test/src/Query/Transaction/TransactionByReferenceTest.php rename to test/Query/Transaction/TransactionByReferenceTest.php diff --git a/test/src/Query/Transaction/TransactionTest.php b/test/Query/Transaction/TransactionTest.php similarity index 100% rename from test/src/Query/Transaction/TransactionTest.php rename to test/Query/Transaction/TransactionTest.php diff --git a/test/src/Query/TranslationKey/ByIdTest.php b/test/Query/TranslationKey/ByIdTest.php similarity index 100% rename from test/src/Query/TranslationKey/ByIdTest.php rename to test/Query/TranslationKey/ByIdTest.php diff --git a/test/src/Query/TranslationKey/GetListTest.php b/test/Query/TranslationKey/GetListTest.php similarity index 100% rename from test/src/Query/TranslationKey/GetListTest.php rename to test/Query/TranslationKey/GetListTest.php diff --git a/test/src/Query/TransportManagerApplication/GetListTest.php b/test/Query/TransportManagerApplication/GetListTest.php similarity index 100% rename from test/src/Query/TransportManagerApplication/GetListTest.php rename to test/Query/TransportManagerApplication/GetListTest.php diff --git a/test/src/Query/User/UserListInternalTest.php b/test/Query/User/UserListInternalTest.php similarity index 100% rename from test/src/Query/User/UserListInternalTest.php rename to test/Query/User/UserListInternalTest.php diff --git a/test/src/Query/User/UserListTest.php b/test/Query/User/UserListTest.php similarity index 100% rename from test/src/Query/User/UserListTest.php rename to test/Query/User/UserListTest.php diff --git a/test/src/Query/Variation/TypeOfLicenceTest.php b/test/Query/Variation/TypeOfLicenceTest.php similarity index 100% rename from test/src/Query/Variation/TypeOfLicenceTest.php rename to test/Query/Variation/TypeOfLicenceTest.php diff --git a/test/src/Query/Variation/VariationTest.php b/test/Query/Variation/VariationTest.php similarity index 100% rename from test/src/Query/Variation/VariationTest.php rename to test/Query/Variation/VariationTest.php diff --git a/test/src/Router/CommandConfigTest.php b/test/Router/CommandConfigTest.php similarity index 100% rename from test/src/Router/CommandConfigTest.php rename to test/Router/CommandConfigTest.php diff --git a/test/src/Router/QueryConfigTest.php b/test/Router/QueryConfigTest.php similarity index 100% rename from test/src/Router/QueryConfigTest.php rename to test/Router/QueryConfigTest.php diff --git a/test/src/Router/RouteConfigTest.php b/test/Router/RouteConfigTest.php similarity index 100% rename from test/src/Router/RouteConfigTest.php rename to test/Router/RouteConfigTest.php diff --git a/test/src/Service/CacheEncryptionFactoryTest.php b/test/Service/CacheEncryptionFactoryTest.php similarity index 100% rename from test/src/Service/CacheEncryptionFactoryTest.php rename to test/Service/CacheEncryptionFactoryTest.php diff --git a/test/src/Service/CacheEncryptionTest.php b/test/Service/CacheEncryptionTest.php similarity index 100% rename from test/src/Service/CacheEncryptionTest.php rename to test/Service/CacheEncryptionTest.php diff --git a/test/src/Util/Annotation/ContinueIfEmptyTest.php b/test/Util/Annotation/ContinueIfEmptyTest.php similarity index 100% rename from test/src/Util/Annotation/ContinueIfEmptyTest.php rename to test/Util/Annotation/ContinueIfEmptyTest.php diff --git a/test/src/Util/Annotation/DoNotExchangeTest.php b/test/Util/Annotation/DoNotExchangeTest.php similarity index 100% rename from test/src/Util/Annotation/DoNotExchangeTest.php rename to test/Util/Annotation/DoNotExchangeTest.php diff --git a/test/src/Util/ChildRoutesGeneratorTest.php b/test/Util/ChildRoutesGeneratorTest.php similarity index 100% rename from test/src/Util/ChildRoutesGeneratorTest.php rename to test/Util/ChildRoutesGeneratorTest.php diff --git a/test/src/Util/DtoTest.php b/test/Util/DtoTest.php similarity index 100% rename from test/src/Util/DtoTest.php rename to test/Util/DtoTest.php diff --git a/test/src/Util/Stub/CommandDtoStub.php b/test/Util/Stub/CommandDtoStub.php similarity index 100% rename from test/src/Util/Stub/CommandDtoStub.php rename to test/Util/Stub/CommandDtoStub.php diff --git a/test/src/Util/Stub/PartialStub.php b/test/Util/Stub/PartialStub.php similarity index 100% rename from test/src/Util/Stub/PartialStub.php rename to test/Util/Stub/PartialStub.php diff --git a/test/src/Util/child-routes-stub/test/single/test_route.php b/test/Util/child-routes-stub/test/single/test_route.php similarity index 100% rename from test/src/Util/child-routes-stub/test/single/test_route.php rename to test/Util/child-routes-stub/test/single/test_route.php diff --git a/test/src/Validators/ApplicationStatusTest.php b/test/Validators/ApplicationStatusTest.php similarity index 100% rename from test/src/Validators/ApplicationStatusTest.php rename to test/Validators/ApplicationStatusTest.php diff --git a/test/src/Validators/ContinuationDetailStatusTest.php b/test/Validators/ContinuationDetailStatusTest.php similarity index 100% rename from test/src/Validators/ContinuationDetailStatusTest.php rename to test/Validators/ContinuationDetailStatusTest.php diff --git a/test/src/Validators/DateCompareTest.php b/test/Validators/DateCompareTest.php similarity index 100% rename from test/src/Validators/DateCompareTest.php rename to test/Validators/DateCompareTest.php diff --git a/test/src/Validators/DateInFutureTest.php b/test/Validators/DateInFutureTest.php similarity index 100% rename from test/src/Validators/DateInFutureTest.php rename to test/Validators/DateInFutureTest.php diff --git a/test/src/Validators/DateNotInFutureTest.php b/test/Validators/DateNotInFutureTest.php similarity index 100% rename from test/src/Validators/DateNotInFutureTest.php rename to test/Validators/DateNotInFutureTest.php diff --git a/test/src/Validators/EbsrSubmissionStatusTest.php b/test/Validators/EbsrSubmissionStatusTest.php similarity index 100% rename from test/src/Validators/EbsrSubmissionStatusTest.php rename to test/Validators/EbsrSubmissionStatusTest.php diff --git a/test/src/Validators/EmailAddressTest.php b/test/Validators/EmailAddressTest.php similarity index 100% rename from test/src/Validators/EmailAddressTest.php rename to test/Validators/EmailAddressTest.php diff --git a/test/src/Validators/FhAdditionalInfoTest.php b/test/Validators/FhAdditionalInfoTest.php similarity index 100% rename from test/src/Validators/FhAdditionalInfoTest.php rename to test/Validators/FhAdditionalInfoTest.php diff --git a/test/src/Validators/InArrayExtraTest.php b/test/Validators/InArrayExtraTest.php similarity index 100% rename from test/src/Validators/InArrayExtraTest.php rename to test/Validators/InArrayExtraTest.php diff --git a/test/src/Validators/LicenceStatusTest.php b/test/Validators/LicenceStatusTest.php similarity index 100% rename from test/src/Validators/LicenceStatusTest.php rename to test/Validators/LicenceStatusTest.php diff --git a/test/src/Validators/MoneyTest.php b/test/Validators/MoneyTest.php similarity index 100% rename from test/src/Validators/MoneyTest.php rename to test/Validators/MoneyTest.php diff --git a/test/src/Validators/OrderTest.php b/test/Validators/OrderTest.php similarity index 100% rename from test/src/Validators/OrderTest.php rename to test/Validators/OrderTest.php diff --git a/test/src/Validators/PostcodeTest.php b/test/Validators/PostcodeTest.php similarity index 100% rename from test/src/Validators/PostcodeTest.php rename to test/Validators/PostcodeTest.php diff --git a/test/src/Validators/SortTest.php b/test/Validators/SortTest.php similarity index 100% rename from test/src/Validators/SortTest.php rename to test/Validators/SortTest.php diff --git a/test/src/Validators/TitleTest.php b/test/Validators/TitleTest.php similarity index 100% rename from test/src/Validators/TitleTest.php rename to test/Validators/TitleTest.php diff --git a/test/src/Validators/TrafficAreaTest.php b/test/Validators/TrafficAreaTest.php similarity index 100% rename from test/src/Validators/TrafficAreaTest.php rename to test/Validators/TrafficAreaTest.php diff --git a/test/src/Validators/TrailerRegNumberTest.php b/test/Validators/TrailerRegNumberTest.php similarity index 100% rename from test/src/Validators/TrailerRegNumberTest.php rename to test/Validators/TrailerRegNumberTest.php diff --git a/test/src/Validators/UploadEvidenceTest.php b/test/Validators/UploadEvidenceTest.php similarity index 100% rename from test/src/Validators/UploadEvidenceTest.php rename to test/Validators/UploadEvidenceTest.php diff --git a/test/src/Validators/UsernameCreateTest.php b/test/Validators/UsernameCreateTest.php similarity index 100% rename from test/src/Validators/UsernameCreateTest.php rename to test/Validators/UsernameCreateTest.php diff --git a/test/src/Validators/UsernameTest.php b/test/Validators/UsernameTest.php similarity index 100% rename from test/src/Validators/UsernameTest.php rename to test/Validators/UsernameTest.php diff --git a/test/src/Validators/ValidateEachTest.php b/test/Validators/ValidateEachTest.php similarity index 100% rename from test/src/Validators/ValidateEachTest.php rename to test/Validators/ValidateEachTest.php diff --git a/test/src/Validators/VrmTest.php b/test/Validators/VrmTest.php similarity index 100% rename from test/src/Validators/VrmTest.php rename to test/Validators/VrmTest.php diff --git a/test/src/Validators/XmlFactoryTest.php b/test/Validators/XmlFactoryTest.php similarity index 100% rename from test/src/Validators/XmlFactoryTest.php rename to test/Validators/XmlFactoryTest.php diff --git a/test/src/Validators/XmlTest.php b/test/Validators/XmlTest.php similarity index 100% rename from test/src/Validators/XmlTest.php rename to test/Validators/XmlTest.php diff --git a/test/src/Validators/YesNoTest.php b/test/Validators/YesNoTest.php similarity index 100% rename from test/src/Validators/YesNoTest.php rename to test/Validators/YesNoTest.php diff --git a/test/phpunit.xml b/test/phpunit.xml deleted file mode 100644 index bc98506d..00000000 --- a/test/phpunit.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - ../src - - - ../src/Module.php - - - - - ./ - - - - - - - - 250 - - - 5 - - - - - - diff --git a/vendor-bin/phpcs/composer.json b/vendor-bin/phpcs/composer.json new file mode 100644 index 00000000..251773c9 --- /dev/null +++ b/vendor-bin/phpcs/composer.json @@ -0,0 +1,6 @@ +{ + "require-dev": { + "squizlabs/php_codesniffer": "^3.7", + "dvsa/coding-standards": "^2.0" + } +} diff --git a/vendor-bin/phpstan/composer.json b/vendor-bin/phpstan/composer.json new file mode 100644 index 00000000..e452dbff --- /dev/null +++ b/vendor-bin/phpstan/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "phpstan/phpstan": "^1.10" + } +} diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json new file mode 100644 index 00000000..376009c7 --- /dev/null +++ b/vendor-bin/psalm/composer.json @@ -0,0 +1,5 @@ +{ + "require-dev": { + "vimeo/psalm": "^5.15" + } +} From ad71cf2b3e94df456e747087dc7c73d3ca0a2395 Mon Sep 17 00:00:00 2001 From: JoshuaLicense Date: Fri, 1 Dec 2023 13:38:14 +0000 Subject: [PATCH 2/4] VOL-4648 Add deprecation notice --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..25e7e3b3 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# This repository has been migrated to: https://github.com/dvsa/olcs-transfer. \ No newline at end of file From 564fcf01080e72adcdf6a92314a44c918e48a799 Mon Sep 17 00:00:00 2001 From: JoshuaLicense Date: Fri, 8 Dec 2023 12:45:17 +0000 Subject: [PATCH 3/4] feat!: drop Laminas v2 support (#3) * Remove bus reg edit restrictions * VOL-3668 Migrate annotations to `NamedArgumentConstructor` * VOL-4006 update namespace for Laminas/Router * VOL-3752 modify deprecated/removed laminas 2 code to work with laminas 3, copy into OLCS codebase * VOL-4002 VOL-4006 update form annotations and tests for Laminas 3 * VOL-4453 remove error suppression from deprecated methods (Laminas version now upgraded) * VOL-3698 upgrade laminas cache to version 3 * VOL-3668 fix GovUkAccount to new annotation style * VOL-4002 fix missing close bracket on create workshop command * VOL-4002 fix options in $paymentMethod parameter * VOL-4002 fix annotation (missing curly brace) * VOL-4002 fix remaining migrations to new annotation style * VOL-3752 fix for correct Lamins route match - we don't use it but done for completeness * VOL-4002 remove errant curly brace from DTO * fix: remove Laminas v2 support * ci: fix Snyk scanning * fix: add missing Laminas packages * fix: fake the redis version (for now) * fix: apply static analysis fixes * fix: restore visibility and missing const * fix: remove superfluous `;` --------- Co-authored-by: Andy Newton Co-authored-by: Ian Lindsay --- composer.json | 14 +- config/backend-routes.config.php | 21 --- config/backend-routes/data-service.php | 2 +- config/backend-routes/public-holiday.php | 2 +- src/Command/AbstractCommand.php | 9 +- src/Command/AbstractPeople.php | 22 +-- src/Command/AbstractSaveBusinessDetails.php | 36 ++-- src/Command/AbstractUpdateInterim.php | 73 ++++---- src/Command/Application/CancelApplication.php | 7 +- src/Command/Application/CreateApplication.php | 36 ++-- .../Application/CreateCompanySubsidiary.php | 2 +- .../Application/CreateGoodsVehicle.php | 15 +- .../Application/CreateOperatingCentre.php | 1 + src/Command/Application/CreatePsvVehicle.php | 19 +- src/Command/Application/CreateSnapshot.php | 13 +- src/Command/Application/CreateTaxiPhv.php | 28 ++- .../Application/CreateVehicleListDocument.php | 1 + src/Command/Application/CreateWorkshop.php | 16 +- .../Application/DeleteGoodsVehicle.php | 5 +- .../Application/DeleteOperatingCentres.php | 5 +- src/Command/Application/DeletePeople.php | 13 +- src/Command/Application/DeletePsvVehicle.php | 5 +- src/Command/Application/DeleteTaxiPhv.php | 26 ++- src/Command/Application/DeleteWorkshop.php | 13 +- src/Command/Application/Grant.php | 13 +- src/Command/Application/GrantInterim.php | 1 + .../Application/NotTakenUpApplication.php | 7 +- src/Command/Application/Overview.php | 26 ++- .../Application/PrintInterimDocument.php | 1 + src/Command/Application/Publish.php | 1 + src/Command/Application/RefuseApplication.php | 7 +- src/Command/Application/RefuseInterim.php | 1 + src/Command/Application/RestorePeople.php | 13 +- src/Command/Application/ReviveApplication.php | 7 +- src/Command/Application/Schedule41.php | 15 +- src/Command/Application/Schedule41Approve.php | 5 +- src/Command/Application/Schedule41Cancel.php | 1 + src/Command/Application/Schedule41Refuse.php | 1 + src/Command/Application/Schedule41Reset.php | 1 + src/Command/Application/SubmitApplication.php | 13 +- src/Command/Application/UndoGrant.php | 1 + src/Command/Application/UpdateAddresses.php | 1 + .../Application/UpdateAuthSignature.php | 9 +- .../Application/UpdateCompanySubsidiary.php | 2 +- src/Command/Application/UpdateCompletion.php | 16 +- src/Command/Application/UpdateDeclaration.php | 34 ++-- .../Application/UpdateFinancialEvidence.php | 19 +- .../Application/UpdateFinancialHistory.php | 37 ++-- .../Application/UpdateGoodsVehicle.php | 13 +- src/Command/Application/UpdateInterim.php | 1 + .../Application/UpdateLicenceHistory.php | 43 ++--- .../Application/UpdateOperatingCentres.php | 40 ++--- src/Command/Application/UpdatePeople.php | 6 +- .../Application/UpdatePreviousConvictions.php | 21 +-- .../Application/UpdatePrivateHireLicence.php | 40 ++--- src/Command/Application/UpdatePsvVehicles.php | 11 +- src/Command/Application/UpdateSafety.php | 24 ++- src/Command/Application/UpdateTaxiPhv.php | 11 +- .../Application/UpdateTypeOfLicence.php | 33 ++-- .../Application/UpdateVehicleDeclaration.php | 51 +++--- src/Command/Application/UpdateVehicles.php | 13 +- src/Command/Application/UpdateWorkshop.php | 28 ++- src/Command/Application/UploadEvidence.php | 2 +- .../Application/WithdrawApplication.php | 11 +- .../AbstractOperatingCentreCommand.php | 18 +- .../ApplicationOperatingCentre/Update.php | 5 +- src/Command/Audit/ReadApplication.php | 1 + src/Command/Audit/ReadBusReg.php | 1 + src/Command/Audit/ReadCase.php | 1 + src/Command/Audit/ReadLicence.php | 1 + src/Command/Audit/ReadOrganisation.php | 1 + src/Command/Audit/ReadTransportManager.php | 1 + src/Command/Auth/RefreshTokens.php | 1 + src/Command/Bus/AdminCancelBusReg.php | 5 +- src/Command/Bus/CreateBus.php | 1 + src/Command/Bus/CreateCancellation.php | 1 + src/Command/Bus/CreateNoticePeriod.php | 12 +- src/Command/Bus/CreateVariation.php | 1 + src/Command/Bus/Ebsr/QueuePacks.php | 2 +- src/Command/Bus/Ebsr/RequestMap.php | 4 +- src/Command/Bus/Ebsr/UpdateTxcInbox.php | 1 + src/Command/Bus/GrantBusReg.php | 14 +- src/Command/Bus/RefuseBusReg.php | 5 +- src/Command/Bus/RefuseBusRegByShortNotice.php | 5 +- src/Command/Bus/ResetBusReg.php | 1 + src/Command/Bus/UpdateQualitySchemes.php | 21 +-- src/Command/Bus/UpdateServiceDetails.php | 47 ++--- src/Command/Bus/UpdateServiceRegister.php | 37 ++-- src/Command/Bus/UpdateShortNotice.php | 77 ++++---- src/Command/Bus/UpdateStops.php | 37 ++-- src/Command/Bus/UpdateTaAuthority.php | 19 +- src/Command/Bus/WithdrawBusReg.php | 5 +- .../CreateConditionUndertaking.php | 50 ++---- src/Command/Cases/Conviction/Create.php | 75 +++----- src/Command/Cases/Conviction/Update.php | 74 +++----- src/Command/Cases/CreateCase.php | 8 +- src/Command/Cases/Hearing/CreateAppeal.php | 66 +++---- src/Command/Cases/Hearing/CreateStay.php | 42 ++--- src/Command/Cases/Hearing/UpdateAppeal.php | 57 ++---- src/Command/Cases/Hearing/UpdateStay.php | 31 +--- .../Cases/Impounding/CreateImpounding.php | 48 +++-- .../Cases/Impounding/UpdateImpounding.php | 50 +++--- src/Command/Cases/NonPi/Create.php | 34 ++-- src/Command/Cases/NonPi/Update.php | 23 ++- .../Cases/Pi/CreateAgreedAndLegislation.php | 43 +++-- .../Cases/Pi/UpdateAgreedAndLegislation.php | 43 +++-- src/Command/Cases/Pi/UpdateDecision.php | 51 +++--- src/Command/Cases/Pi/UpdateSla.php | 23 ++- src/Command/Cases/Pi/UpdateTmDecision.php | 29 ++- src/Command/Cases/PresidingTc/Create.php | 5 +- src/Command/Cases/PresidingTc/Delete.php | 1 + src/Command/Cases/PresidingTc/Update.php | 5 +- src/Command/Cases/Prohibition/Create.php | 32 ++-- .../Cases/Prohibition/Defect/Create.php | 5 +- .../Cases/Prohibition/Defect/Update.php | 4 +- src/Command/Cases/Prohibition/Update.php | 31 ++-- .../ProposeToRevoke/CreateProposeToRevoke.php | 39 ++-- .../ProposeToRevoke/UpdateProposeToRevoke.php | 45 ++--- .../UpdateProposeToRevokeSla.php | 90 +++++----- src/Command/Cases/Si/Applied/Create.php | 14 +- src/Command/Cases/Si/Applied/Update.php | 8 +- src/Command/Cases/Si/ComplianceEpisode.php | 1 - src/Command/Cases/Si/CreateSi.php | 26 +-- src/Command/Cases/Si/UpdateSi.php | 26 +-- .../Cases/Statement/CreateStatement.php | 36 ++-- .../Cases/Statement/UpdateStatement.php | 32 ++-- src/Command/Cases/UpdateAnnualTestHistory.php | 4 +- src/Command/Cases/UpdateCase.php | 8 +- src/Command/Cases/UpdateConvictionNote.php | 4 +- src/Command/Cases/UpdatePenaltiesNote.php | 4 +- src/Command/Cases/UpdateProhibitionNote.php | 4 +- .../ChangeOfEntity/CreateChangeOfEntity.php | 15 +- .../ChangeOfEntity/DeleteChangeOfEntity.php | 13 +- .../ChangeOfEntity/UpdateChangeOfEntity.php | 21 +-- src/Command/CommandContainer.php | 1 + src/Command/CommandContainerInterface.php | 1 + src/Command/CommandInterface.php | 1 + src/Command/CommunityLic/Annul.php | 8 +- .../CommunityLic/Application/Create.php | 19 +- .../Application/CreateOfficeCopy.php | 13 +- src/Command/CommunityLic/EditSuspension.php | 24 ++- src/Command/CommunityLic/Licence/Create.php | 13 +- .../CommunityLic/Licence/CreateOfficeCopy.php | 7 +- src/Command/CommunityLic/Reprint.php | 11 +- src/Command/CommunityLic/Restore.php | 11 +- src/Command/CommunityLic/Stop.php | 25 +-- src/Command/CompaniesHouse/CloseAlerts.php | 1 + src/Command/Complaint/CreateComplaint.php | 44 ++--- src/Command/Complaint/DeleteComplaint.php | 4 +- src/Command/Complaint/UpdateComplaint.php | 55 +++--- src/Command/ConditionUndertaking/Create.php | 37 ++-- .../ConditionUndertaking/DeleteList.php | 7 +- src/Command/ConditionUndertaking/Update.php | 36 ++-- .../ContactDetail/PhoneContact/Create.php | 19 +- src/Command/Continuation/Create.php | 15 +- .../PrepareContinuations.php | 5 +- src/Command/ContinuationDetail/Queue.php | 14 +- src/Command/ContinuationDetail/Submit.php | 4 +- src/Command/ContinuationDetail/Update.php | 31 ++-- .../ContinuationDetail/UpdateFinances.php | 44 ++--- .../UpdateInsufficientFinances.php | 7 +- .../Correspondence/AccessCorrespondence.php | 7 +- src/Command/Cpms/DownloadReport.php | 19 +- src/Command/Cpms/RequestReport.php | 13 +- src/Command/DataRetention/AssignItems.php | 1 + src/Command/DataRetention/DelayItems.php | 5 +- src/Command/DataRetention/MarkForDelete.php | 1 + src/Command/DataRetention/MarkForReview.php | 1 + src/Command/DataRetention/UpdateRule.php | 21 +-- src/Command/Disqualification/Create.php | 27 +-- src/Command/Disqualification/Delete.php | 1 - src/Command/Disqualification/Update.php | 27 +-- src/Command/DocTemplate/Create.php | 1 + src/Command/DocTemplate/Delete.php | 1 + src/Command/DocTemplate/Update.php | 1 + src/Command/Document/CopyDocument.php | 20 +-- src/Command/Document/CreateDocument.php | 88 +++++---- src/Command/Document/CreateLetter.php | 9 +- src/Command/Document/DeleteDocument.php | 1 + src/Command/Document/DeleteDocuments.php | 7 +- src/Command/Document/GenerateAndStore.php | 15 +- src/Command/Document/MoveDocument.php | 20 +-- src/Command/Document/PrintLetter.php | 15 +- src/Command/Document/PrintLetters.php | 15 +- src/Command/Document/UpdateDocumentLinks.php | 71 ++++---- src/Command/Document/Upload.php | 108 ++++++----- src/Command/DvsaReports/GetRedirect.php | 8 +- .../CreateEnvironmentalComplaint.php | 30 ++-- .../DeleteEnvironmentalComplaint.php | 4 +- .../UpdateEnvironmentalComplaint.php | 38 ++-- src/Command/FeatureToggle/Create.php | 1 + src/Command/FeatureToggle/Delete.php | 1 + src/Command/FeatureToggle/Update.php | 1 + src/Command/Fee/ApproveWaive.php | 4 +- src/Command/Fee/CreateFee.php | 40 ++--- src/Command/Fee/RecommendWaive.php | 4 +- src/Command/Fee/RefundFee.php | 2 +- src/Command/Fee/RejectWaive.php | 2 +- src/Command/FeeType/Update.php | 1 + .../GdsVerify/ProcessSignatureResponse.php | 8 +- src/Command/GoodsDisc/ConfirmPrinting.php | 37 ++-- src/Command/GoodsDisc/PrintDiscs.php | 29 ++- .../GovUkAccount/GetGovUkAccountRedirect.php | 6 +- .../GovUkAccount/ProcessAuthResponse.php | 8 +- src/Command/GracePeriod/CreateGracePeriod.php | 13 +- src/Command/GracePeriod/DeleteGracePeriod.php | 7 +- src/Command/GracePeriod/UpdateGracePeriod.php | 25 +-- src/Command/InspectionRequest/Create.php | 77 ++++---- .../InspectionRequest/CreateFromGrant.php | 13 +- src/Command/InspectionRequest/Update.php | 68 ++++--- src/Command/Irfo/ApproveIrfoGvPermit.php | 1 + src/Command/Irfo/ApproveIrfoPsvAuth.php | 1 + src/Command/Irfo/CnsIrfoPsvAuth.php | 1 + src/Command/Irfo/CreateIrfoGvPermit.php | 41 ++--- src/Command/Irfo/CreateIrfoPermitStock.php | 29 +-- src/Command/Irfo/CreateIrfoPsvAuth.php | 80 ++++----- src/Command/Irfo/GenerateIrfoGvPermit.php | 1 + src/Command/Irfo/GenerateIrfoPsvAuth.php | 1 + src/Command/Irfo/GrantIrfoPsvAuth.php | 1 + .../Irfo/PrintIrfoPsvAuthChecklist.php | 1 + src/Command/Irfo/RefuseIrfoGvPermit.php | 1 + src/Command/Irfo/RefuseIrfoPsvAuth.php | 1 + src/Command/Irfo/RenewIrfoPsvAuth.php | 1 + src/Command/Irfo/ResetIrfoGvPermit.php | 1 + src/Command/Irfo/ResetIrfoPsvAuth.php | 1 + src/Command/Irfo/UpdateIrfoDetails.php | 21 +-- src/Command/Irfo/UpdateIrfoGvPermit.php | 47 ++--- src/Command/Irfo/UpdateIrfoPermitStock.php | 16 +- .../Irfo/UpdateIrfoPermitStockIssued.php | 1 + src/Command/Irfo/UpdateIrfoPsvAuth.php | 87 +++++---- src/Command/Irfo/WithdrawIrfoGvPermit.php | 1 + src/Command/Irfo/WithdrawIrfoPsvAuth.php | 1 + .../IrhpApplication/CancelApplication.php | 1 + src/Command/IrhpApplication/Create.php | 1 + src/Command/IrhpApplication/CreateFull.php | 1 + src/Command/IrhpApplication/Grant.php | 1 + .../ResetToNotYetSubmittedFromCancelled.php | 1 + .../ResetToNotYetSubmittedFromValid.php | 1 + .../ReviveFromUnsuccessful.php | 1 + .../IrhpApplication/ReviveFromWithdrawn.php | 1 + .../IrhpApplication/SubmitApplication.php | 1 + .../IrhpApplication/SubmitApplicationPath.php | 1 + .../IrhpApplication/SubmitApplicationStep.php | 1 + src/Command/IrhpApplication/Terminate.php | 1 + .../UpdateCandidatePermitSelection.php | 7 +- .../IrhpApplication/UpdateCheckAnswers.php | 4 +- .../IrhpApplication/UpdateCountries.php | 1 + .../IrhpApplication/UpdateDeclaration.php | 1 + src/Command/IrhpApplication/UpdateFull.php | 1 + .../UpdateMultipleNoOfPermits.php | 1 + src/Command/IrhpApplication/UpdatePeriod.php | 3 +- src/Command/IrhpApplication/Withdraw.php | 1 + src/Command/IrhpCandidatePermit/Create.php | 1 + src/Command/IrhpCandidatePermit/Delete.php | 1 + src/Command/IrhpCandidatePermit/Update.php | 1 + src/Command/IrhpPermit/Replace.php | 5 +- src/Command/IrhpPermit/Terminate.php | 1 + src/Command/IrhpPermitApplication/Delete.php | 1 + src/Command/IrhpPermitJurisdiction/Update.php | 5 +- src/Command/IrhpPermitRange/Create.php | 1 + src/Command/IrhpPermitRange/Delete.php | 1 + src/Command/IrhpPermitRange/Update.php | 1 + src/Command/IrhpPermitSector/Update.php | 5 +- src/Command/IrhpPermitStock/Create.php | 1 + src/Command/IrhpPermitStock/Delete.php | 1 + src/Command/IrhpPermitStock/Update.php | 1 + src/Command/IrhpPermitWindow/Create.php | 1 + src/Command/IrhpPermitWindow/Delete.php | 1 + src/Command/IrhpPermitWindow/Update.php | 1 + src/Command/Licence/ContinueLicence.php | 13 +- .../Licence/CreateCompanySubsidiary.php | 2 +- src/Command/Licence/CreateGoodsVehicle.php | 19 +- src/Command/Licence/CreateOperatingCentre.php | 1 + src/Command/Licence/CreatePsvDiscs.php | 17 +- src/Command/Licence/CreatePsvVehicle.php | 23 +-- src/Command/Licence/CreateVariation.php | 37 ++-- .../Licence/CreateVehicleListDocument.php | 9 +- src/Command/Licence/CurtailLicence.php | 9 +- .../Licence/DeleteCompanySubsidiary.php | 2 +- .../Licence/DeleteOperatingCentres.php | 5 +- src/Command/Licence/DeletePeople.php | 13 +- .../Licence/DeletePeopleViaVariation.php | 13 +- src/Command/Licence/Overview.php | 26 ++- src/Command/Licence/PrintLicence.php | 3 +- src/Command/Licence/ProposeToRevoke.php | 6 +- src/Command/Licence/ReplacePsvDiscs.php | 13 +- src/Command/Licence/ResetToValid.php | 7 +- src/Command/Licence/RevokeLicence.php | 9 +- src/Command/Licence/SurrenderLicence.php | 11 +- src/Command/Licence/SuspendLicence.php | 9 +- src/Command/Licence/TransferVehicles.php | 13 +- src/Command/Licence/UpdateAddresses.php | 1 + .../Licence/UpdateCompanySubsidiary.php | 2 +- .../Licence/UpdateOperatingCentres.php | 28 +-- src/Command/Licence/UpdatePeople.php | 6 +- src/Command/Licence/UpdateSafety.php | 43 ++--- src/Command/Licence/UpdateTrafficArea.php | 17 +- src/Command/Licence/UpdateTrailers.php | 5 +- src/Command/Licence/UpdateVehicles.php | 5 +- src/Command/Licence/VoidPsvDiscs.php | 13 +- src/Command/LicenceOperatingCentre/Update.php | 5 +- .../CreateLicenceStatusRule.php | 15 +- .../DeleteLicenceStatusRule.php | 7 +- .../UpdateLicenceStatusRule.php | 27 +-- ...CreateUnlicensedOperatorLicenceVehicle.php | 11 +- ...DeleteUnlicensedOperatorLicenceVehicle.php | 1 + .../UpdatePsvLicenceVehicle.php | 17 +- ...UpdateUnlicensedOperatorLicenceVehicle.php | 15 +- src/Command/LoggerOmitContentInterface.php | 2 +- .../Lva/AbstractCreateCompanySubsidiary.php | 4 +- .../Lva/AbstractDeleteCompanySubsidiary.php | 6 +- .../Lva/AbstractUpdateCompanySubsidiary.php | 4 +- src/Command/MyAccount/UpdateMyAccount.php | 19 +- .../MyAccount/UpdateMyAccountSelfserve.php | 13 +- src/Command/Operator/Create.php | 41 ++--- src/Command/Operator/CreateUnlicensed.php | 17 +- src/Command/Operator/Update.php | 63 ++++--- src/Command/Operator/UpdateUnlicensed.php | 13 +- src/Command/Opposition/CreateOpposition.php | 83 +++------ src/Command/Opposition/UpdateOpposition.php | 91 +++------- .../Organisation/CpidOrganisationExport.php | 7 +- src/Command/Organisation/GenerateName.php | 4 +- src/Command/Organisation/TransferTo.php | 19 +- .../Organisation/UpdateBusinessType.php | 28 ++- src/Command/OrganisationPerson/Create.php | 11 +- src/Command/OrganisationPerson/DeleteList.php | 7 +- src/Command/OrganisationPerson/Update.php | 17 +- src/Command/OtherLicence/CreateForTm.php | 15 +- src/Command/OtherLicence/CreateForTma.php | 36 ++-- src/Command/OtherLicence/CreateForTml.php | 36 ++-- .../OtherLicence/CreateOtherLicence.php | 19 +- .../OtherLicence/CreatePreviousLicence.php | 15 +- .../OtherLicence/DeleteOtherLicence.php | 5 +- src/Command/OtherLicence/UpdateForTma.php | 33 ++-- .../OtherLicence/UpdateOtherLicence.php | 27 +-- src/Command/Partial/Address.php | 40 ++--- src/Command/Partial/AddressOptional.php | 40 ++--- .../Partial/AddressOptionalPostcode.php | 40 ++--- src/Command/Partial/ApplicationTracking.php | 92 +++++----- src/Command/Partial/ContactDetails.php | 26 +-- src/Command/Partial/IrfoPartner.php | 14 +- src/Command/Partial/IrfoPsvAuthNumber.php | 14 +- .../Partial/OperatingCentreEvidence.php | 10 +- .../Partial/OperatorContactDetails.php | 18 +- src/Command/Partial/Person.php | 32 ++-- src/Command/Partial/PhoneContact.php | 20 +-- src/Command/Partial/RegisteredAddress.php | 26 +-- src/Command/Partial/TradingName.php | 14 +- src/Command/Permits/AcceptIrhpPermits.php | 1 + src/Command/Permits/PrintPermits.php | 1 + src/Command/Permits/QueueAcceptScoring.php | 1 + src/Command/Permits/QueueReport.php | 2 +- src/Command/Permits/QueueRunScoring.php | 1 + .../PreviousConviction/CreateForTma.php | 27 ++- .../CreatePreviousConviction.php | 45 ++--- .../DeletePreviousConviction.php | 7 +- .../UpdatePreviousConviction.php | 42 +++-- src/Command/Printer/CreatePrinter.php | 9 +- src/Command/Printer/DeletePrinter.php | 3 +- src/Command/Printer/UpdatePrinter.php | 9 +- src/Command/PrivateHireLicence/Create.php | 22 ++- src/Command/PrivateHireLicence/DeleteList.php | 20 +-- src/Command/PrivateHireLicence/Update.php | 34 ++-- src/Command/Processing/Note/Create.php | 4 +- src/Command/Processing/Note/Update.php | 4 +- src/Command/PsvDisc/ConfirmPrinting.php | 33 ++-- src/Command/PsvDisc/PrintDiscs.php | 24 ++- src/Command/Publication/Application.php | 7 +- src/Command/Publication/Bus.php | 1 + src/Command/Publication/CreateRecipient.php | 33 ++-- src/Command/Publication/DeleteRecipient.php | 7 +- src/Command/Publication/Generate.php | 1 + src/Command/Publication/Publish.php | 1 + .../Publication/UpdatePublicationLink.php | 13 +- src/Command/Publication/UpdateRecipient.php | 45 ++--- src/Command/Replacement/Create.php | 1 + src/Command/Replacement/Update.php | 1 + src/Command/Report/Upload.php | 1 + .../Scan/CreateContinuationSeparatorSheet.php | 3 +- src/Command/Scan/CreateDocument.php | 7 +- src/Command/Scan/CreateSeparatorSheet.php | 23 +-- src/Command/Submission/AssignSubmission.php | 21 +-- src/Command/Submission/CreateSubmission.php | 20 +-- .../Submission/CreateSubmissionAction.php | 35 ++-- .../CreateSubmissionSectionComment.php | 22 +-- .../Submission/FilterSubmissionSections.php | 13 +- .../InformationCompleteSubmission.php | 7 +- .../Submission/RefreshSubmissionSections.php | 11 +- src/Command/Submission/ReopenSubmission.php | 2 +- .../Submission/StoreSubmissionSnapshot.php | 2 +- src/Command/Submission/UpdateSubmission.php | 34 ++-- .../Submission/UpdateSubmissionAction.php | 37 ++-- .../UpdateSubmissionSectionComment.php | 5 +- src/Command/Surrender/Approve.php | 3 +- src/Command/Surrender/Create.php | 11 +- src/Command/Surrender/SubmitForm.php | 1 - src/Command/Surrender/Update.php | 80 ++++----- .../System/CreateFinancialStandingRate.php | 29 ++- src/Command/System/CreateSlaTargetDate.php | 27 ++- .../DeleteFinancialStandingRateList.php | 1 + src/Command/System/InfoMessage/Create.php | 16 +- src/Command/System/PublicHoliday/Create.php | 18 +- .../System/UpdateFinancialStandingRate.php | 33 ++-- src/Command/System/UpdateSlaTargetDate.php | 27 ++- .../SystemParameter/CreateSystemParameter.php | 13 +- .../SystemParameter/DeleteSystemParameter.php | 5 +- .../SystemParameter/UpdateSystemParameter.php | 13 +- src/Command/Task/CloseTasks.php | 1 + src/Command/Task/CreateTask.php | 56 +++--- src/Command/Task/FlagUrgentTasks.php | 1 + src/Command/Task/ReassignTasks.php | 12 +- src/Command/Task/UpdateTask.php | 38 ++-- src/Command/TaskAllocationRule/Create.php | 12 +- src/Command/TaskAllocationRule/DeleteList.php | 1 + src/Command/TaskAllocationRule/Update.php | 16 +- src/Command/TaskAlphaSplit/Create.php | 10 +- src/Command/TaskAlphaSplit/DeleteList.php | 1 + src/Command/TaskAlphaSplit/Update.php | 10 +- src/Command/Team/CreateTeam.php | 15 +- src/Command/Team/DeleteTeam.php | 9 +- src/Command/Team/UpdateTeam.php | 21 +-- src/Command/TeamPrinter/CreateTeamPrinter.php | 17 +- src/Command/TeamPrinter/DeleteTeamPrinter.php | 1 + src/Command/TeamPrinter/UpdateTeamPrinter.php | 21 +-- src/Command/Template/UpdateTemplateSource.php | 4 +- src/Command/Tm/Create.php | 105 ++++++----- src/Command/Tm/CreateNewUser.php | 23 +-- src/Command/Tm/Merge.php | 9 +- src/Command/Tm/Remove.php | 1 + src/Command/Tm/UndoDisqualification.php | 1 + src/Command/Tm/Unmerge.php | 1 + src/Command/Tm/Update.php | 167 +++++++++--------- .../TmCaseDecision/CreateDeclareUnfit.php | 39 ++-- .../TmCaseDecision/CreateNoFurtherAction.php | 13 +- .../TmCaseDecision/CreateReputeNotLost.php | 13 +- .../TmCaseDecision/UpdateDeclareUnfit.php | 39 ++-- .../TmCaseDecision/UpdateNoFurtherAction.php | 13 +- .../TmCaseDecision/UpdateReputeNotLost.php | 13 +- src/Command/TmEmployment/Create.php | 25 +-- src/Command/TmEmployment/DeleteList.php | 7 +- src/Command/TmEmployment/Update.php | 25 +-- src/Command/TmQualification/Create.php | 26 ++- src/Command/TmQualification/Delete.php | 6 +- src/Command/TmQualification/Update.php | 32 ++-- src/Command/Trailer/CreateTrailer.php | 9 +- src/Command/Trailer/DeleteTrailer.php | 7 +- src/Command/Trailer/UpdateTrailer.php | 13 +- .../Transaction/CompleteTransaction.php | 18 +- .../Transaction/PayOutstandingFees.php | 38 ++-- .../Transaction/ReverseTransaction.php | 6 +- src/Command/TranslationKey/Create.php | 1 + src/Command/TranslationKey/Delete.php | 1 + src/Command/TranslationKey/GenerateCache.php | 2 +- src/Command/TranslationKey/Update.php | 1 + src/Command/TranslationKeyText/Delete.php | 1 + .../TransportManagerApplication/Create.php | 29 ++- .../CreateForResponsibilities.php | 13 +- .../TransportManagerApplication/Delete.php | 7 +- .../DeleteForResponsibilities.php | 6 +- .../OperatorSigned.php | 13 +- .../SendAmendTmApplication.php | 6 +- .../SendTmApplication.php | 6 +- .../TransportManagerApplication/Submit.php | 17 +- .../UpdateDetails.php | 76 ++++---- .../UpdateForResponsibilities.php | 53 +++--- .../UpdateStatus.php | 24 +-- .../TransportManagerLicence/Delete.php | 5 +- .../DeleteForResponsibilities.php | 6 +- .../UpdateForResponsibilities.php | 42 ++--- src/Command/User/CreatePartner.php | 5 +- src/Command/User/CreateUser.php | 66 ++++--- src/Command/User/CreateUserSelfserve.php | 9 +- src/Command/User/DeletePartner.php | 7 +- src/Command/User/DeleteUser.php | 2 +- src/Command/User/DeleteUserSelfserve.php | 2 +- src/Command/User/RegisterUserSelfserve.php | 20 +-- src/Command/User/RemindUsernameSelfserve.php | 9 +- src/Command/User/UpdatePartner.php | 17 +- src/Command/User/UpdateUser.php | 84 ++++----- src/Command/User/UpdateUserSelfserve.php | 17 +- src/Command/Variation/CreatePsvDiscs.php | 17 +- .../DeleteListConditionUndertaking.php | 13 +- .../Variation/DeleteOperatingCentre.php | 5 +- src/Command/Variation/DeleteVariation.php | 1 - src/Command/Variation/Grant.php | 5 +- src/Command/Variation/GrantDirectorChange.php | 3 +- src/Command/Variation/ReplacePsvDiscs.php | 13 +- .../RestoreListConditionUndertaking.php | 13 +- .../Variation/RestoreOperatingCentre.php | 5 +- .../Variation/TransportManagerDeleteDelta.php | 13 +- src/Command/Variation/UpdateAddresses.php | 1 + .../Variation/UpdateConditionUndertaking.php | 42 +++-- src/Command/Variation/UpdateTypeOfLicence.php | 27 +-- src/Command/Variation/VoidPsvDiscs.php | 13 +- .../VariationOperatingCentre/Update.php | 7 +- src/Command/Vehicle/DeleteLicenceVehicle.php | 1 + src/Command/Vehicle/ReprintDisc.php | 7 +- src/Command/Vehicle/UpdateGoodsVehicle.php | 23 +-- src/Command/Vehicle/UpdateSection26.php | 5 +- src/Command/Workshop/CreateWorkshop.php | 16 +- src/Command/Workshop/DeleteWorkshop.php | 11 +- src/Command/Workshop/UpdateWorkshop.php | 26 ++- src/FieldType/ApplicationInterface.php | 1 + src/FieldType/BusRegInterface.php | 1 + src/FieldType/CasesInterface.php | 1 + src/FieldType/IdentityInterface.php | 1 + src/FieldType/IrfoGvPermitInterface.php | 1 + src/FieldType/IrfoPsvAuthInterface.php | 1 + src/FieldType/IrhpApplicationInterface.php | 1 + .../IrhpPermitApplicationInterface.php | 1 + src/FieldType/LicenceInterface.php | 1 + src/FieldType/NoteTypeInterface.php | 1 + src/FieldType/OrganisationInterface.php | 1 + src/FieldType/TaskInterface.php | 1 + .../Traits/AdjournedDateOptional.php | 5 +- .../Traits/AdjournedReasonOptional.php | 5 +- src/FieldType/Traits/AnnualValue.php | 7 +- src/FieldType/Traits/Application.php | 7 +- .../Traits/ApplicationCheckedOptional.php | 2 +- src/FieldType/Traits/ApplicationOptional.php | 7 +- .../Traits/ApplicationPathGroupOptional.php | 7 +- src/FieldType/Traits/ApplicationStepSlug.php | 2 +- src/FieldType/Traits/BusReg.php | 7 +- src/FieldType/Traits/BusRegOptional.php | 7 +- src/FieldType/Traits/BusinessProcess.php | 7 +- src/FieldType/Traits/Cabotage.php | 6 +- src/FieldType/Traits/CabotageOptional.php | 6 +- .../Traits/CancelledDateOptional.php | 3 +- .../Traits/CancelledReasonOptional.php | 5 +- src/FieldType/Traits/CaseCategorys.php | 6 +- src/FieldType/Traits/CaseOutcomesOptional.php | 6 +- src/FieldType/Traits/CaseType.php | 9 +- src/FieldType/Traits/Cases.php | 7 +- src/FieldType/Traits/CasesMultiple.php | 6 +- src/FieldType/Traits/CasesOptional.php | 7 +- src/FieldType/Traits/Category.php | 7 +- src/FieldType/Traits/CategoryOptional.php | 7 +- src/FieldType/Traits/ChallengeSession.php | 3 +- src/FieldType/Traits/Comment.php | 5 +- src/FieldType/Traits/CommentOptional.php | 5 +- src/FieldType/Traits/ConfirmationId.php | 2 +- src/FieldType/Traits/ContinuationDetail.php | 6 +- src/FieldType/Traits/ConvictionCategory.php | 5 +- .../Traits/ConvictionCategoryOptional.php | 5 +- .../Traits/CorCertificateNumberOptional.php | 4 +- src/FieldType/Traits/Countries.php | 8 +- src/FieldType/Traits/Country.php | 8 +- src/FieldType/Traits/CountryOptional.php | 4 +- src/FieldType/Traits/DateReceived.php | 3 +- src/FieldType/Traits/DaysForPayment.php | 5 +- src/FieldType/Traits/DecisionsOptional.php | 11 +- src/FieldType/Traits/Declaration.php | 5 +- src/FieldType/Traits/DefendantType.php | 10 +- src/FieldType/Traits/Description.php | 5 +- src/FieldType/Traits/DescriptionOptional.php | 5 +- src/FieldType/Traits/DetailsOptional.php | 5 +- src/FieldType/Traits/DeviationOptional.php | 5 +- src/FieldType/Traits/DigitalSignature.php | 6 +- src/FieldType/Traits/Drivers.php | 7 +- src/FieldType/Traits/EbsrDisplayStatus.php | 9 +- src/FieldType/Traits/EcmtTrips.php | 4 +- src/FieldType/Traits/EffectiveFrom.php | 5 +- .../Traits/EmailTemplateCategory.php | 5 +- src/FieldType/Traits/Emissions.php | 6 +- src/FieldType/Traits/EmissionsCategory.php | 4 +- src/FieldType/Traits/EndDate.php | 5 +- src/FieldType/Traits/EndDateOptional.php | 5 +- .../EndIrhpApplicationsAndPermitsContext.php | 11 +- .../Traits/ExcludeLimitedReadOnlyOptional.php | 2 +- .../Traits/FeatureToggleConfigName.php | 5 +- .../Traits/FeatureToggleFriendlyName.php | 5 +- src/FieldType/Traits/FeatureToggleStatus.php | 5 +- src/FieldType/Traits/FeeTypeOptional.php | 4 +- src/FieldType/Traits/FilenameAndContent.php | 6 +- .../Traits/FilenameAndContentOptional.php | 6 +- src/FieldType/Traits/FiveYearValue.php | 7 +- src/FieldType/Traits/FixedValue.php | 7 +- src/FieldType/Traits/FromInternal.php | 6 +- src/FieldType/Traits/GoodsOrPsvOptional.php | 9 +- src/FieldType/Traits/GovUkAccountJourney.php | 8 +- src/FieldType/Traits/HasEcmtConstraints.php | 5 +- .../Traits/HasUndertakenTraining.php | 5 +- src/FieldType/Traits/HearingDate.php | 5 +- src/FieldType/Traits/HearingType.php | 10 +- src/FieldType/Traits/HearingTypeOptional.php | 10 +- src/FieldType/Traits/HiddenSs.php | 2 +- src/FieldType/Traits/Identity.php | 6 +- src/FieldType/Traits/IdentityOptional.php | 6 +- src/FieldType/Traits/IdentityString.php | 4 +- src/FieldType/Traits/Ids.php | 6 +- src/FieldType/Traits/IrfoGvPermit.php | 7 +- src/FieldType/Traits/IrfoGvPermitOptional.php | 7 +- .../Traits/IrfoOrganisationOptional.php | 7 +- src/FieldType/Traits/IrfoPsvAuthOptional.php | 7 +- src/FieldType/Traits/IrhpApplication.php | 5 +- .../Traits/IrhpApplicationOptional.php | 5 +- .../Traits/IrhpApplicationStatusOptional.php | 7 +- src/FieldType/Traits/IrhpPermit.php | 5 +- .../Traits/IrhpPermitApplication.php | 5 +- .../Traits/IrhpPermitApplicationOptional.php | 5 +- src/FieldType/Traits/IrhpPermitRange.php | 5 +- src/FieldType/Traits/IrhpPermitRangeFrom.php | 5 +- .../IrhpPermitRangeIsLostReplacement.php | 5 +- .../Traits/IrhpPermitRangePrefix.php | 5 +- .../Traits/IrhpPermitRangeSsReserve.php | 5 +- src/FieldType/Traits/IrhpPermitRangeTo.php | 5 +- .../Traits/IrhpPermitRangeTypeOptional.php | 5 +- .../Traits/IrhpPermitStatusOptional.php | 5 +- src/FieldType/Traits/IrhpPermitStock.php | 5 +- .../Traits/IrhpPermitStockInitialStock.php | 7 +- .../Traits/IrhpPermitStockOptional.php | 5 +- .../Traits/IrhpPermitStockValidFrom.php | 5 +- .../Traits/IrhpPermitStockValidTo.php | 5 +- src/FieldType/Traits/IrhpPermitType.php | 10 +- .../Traits/IrhpPermitTypeOptional.php | 10 +- src/FieldType/Traits/IrhpPermitWindow.php | 5 +- src/FieldType/Traits/IsAdjourned.php | 5 +- src/FieldType/Traits/IsCancelled.php | 5 +- src/FieldType/Traits/IsEcmtStateOptional.php | 5 +- src/FieldType/Traits/IsEeaStateOptional.php | 5 +- src/FieldType/Traits/IsFullDay.php | 5 +- src/FieldType/Traits/IsInternalOptional.php | 2 +- src/FieldType/Traits/IsLongerSemiTrailer.php | 4 +- src/FieldType/Traits/IsMlh.php | 5 +- src/FieldType/Traits/IsNiOptional.php | 5 +- src/FieldType/Traits/IsPreGrant.php | 3 +- src/FieldType/Traits/IsSlugOptional.php | 2 +- src/FieldType/Traits/IsTaOverridden.php | 8 +- src/FieldType/Traits/Iso8601EndDate.php | 5 +- src/FieldType/Traits/Iso8601StartDate.php | 5 +- src/FieldType/Traits/JourneyOptional.php | 4 +- .../Traits/LgvDeclarationConfirmation.php | 6 +- src/FieldType/Traits/Licence.php | 7 +- src/FieldType/Traits/LicenceOptional.php | 7 +- src/FieldType/Traits/Markup.php | 2 +- src/FieldType/Traits/MiscFeesDetails.php | 5 +- src/FieldType/Traits/MultipleNoOfPermits.php | 1 + .../Traits/MultipleNoOfPermitsOptional.php | 1 + src/FieldType/Traits/NewPassword.php | 3 +- src/FieldType/Traits/NonPiType.php | 10 +- src/FieldType/Traits/NonPiTypeOptional.php | 10 +- src/FieldType/Traits/NoteType.php | 10 +- src/FieldType/Traits/NoteTypeOptional.php | 10 +- src/FieldType/Traits/Notes.php | 5 +- src/FieldType/Traits/Organisation.php | 7 +- src/FieldType/Traits/OrganisationOptional.php | 7 +- src/FieldType/Traits/Password.php | 3 +- .../Traits/PeriodNameKeyOptional.php | 5 +- .../Traits/PermitAppWithdrawReason.php | 9 +- .../Traits/PermitCategoryOptional.php | 6 +- src/FieldType/Traits/PermitsRequired.php | 6 +- src/FieldType/Traits/Pi.php | 7 +- src/FieldType/Traits/Placeholder.php | 2 +- src/FieldType/Traits/PostData.php | 1 + src/FieldType/Traits/PostDataOptional.php | 1 + src/FieldType/Traits/PresidedByRole.php | 10 +- .../Traits/PresidingStaffNameOptional.php | 5 +- src/FieldType/Traits/PresidingTC.php | 7 +- src/FieldType/Traits/PresidingTCOptional.php | 7 +- src/FieldType/Traits/PrintOptional.php | 15 +- src/FieldType/Traits/Prohibition.php | 7 +- src/FieldType/Traits/ProhibitionOptional.php | 7 +- src/FieldType/Traits/ProhibitionType.php | 11 +- src/FieldType/Traits/PubTypeOptional.php | 4 +- src/FieldType/Traits/Publish.php | 5 +- src/FieldType/Traits/Realm.php | 9 +- src/FieldType/Traits/ReplacementText.php | 5 +- src/FieldType/Traits/ReportType.php | 10 +- .../Traits/RequiredEuro5Optional.php | 6 +- .../Traits/RequiredEuro6Optional.php | 6 +- src/FieldType/Traits/Roadworthiness.php | 6 +- .../Traits/RoadworthinessOptional.php | 6 +- src/FieldType/Traits/RolesOptional.php | 14 +- src/FieldType/Traits/SecureToken.php | 2 +- src/FieldType/Traits/SiPenaltyType.php | 7 +- src/FieldType/Traits/StartDate.php | 5 +- src/FieldType/Traits/StartDateOptional.php | 5 +- src/FieldType/Traits/SubCategory.php | 7 +- src/FieldType/Traits/SubCategoryOptional.php | 7 +- src/FieldType/Traits/SubmissionOptional.php | 7 +- src/FieldType/Traits/SuppressFromOp.php | 4 +- .../Traits/SurrenderLicenceOptional.php | 7 +- src/FieldType/Traits/SurrenderOptional.php | 7 +- src/FieldType/Traits/TaskOptional.php | 7 +- src/FieldType/Traits/Team.php | 7 +- src/FieldType/Traits/TeamOptional.php | 4 +- src/FieldType/Traits/TemplateFolder.php | 10 +- src/FieldType/Traits/TemplateNameOptional.php | 2 +- src/FieldType/Traits/TemplateSlugOptional.php | 2 +- src/FieldType/Traits/TemplateSource.php | 2 +- src/FieldType/Traits/TmVerifyRole.php | 5 +- src/FieldType/Traits/TokenId.php | 2 +- src/FieldType/Traits/TrafficArea.php | 9 +- src/FieldType/Traits/TrafficAreaOptional.php | 9 +- src/FieldType/Traits/TrafficAreas.php | 14 +- src/FieldType/Traits/TrafficAreasOptional.php | 12 +- .../Traits/TrafficAreasOptionalWithOther.php | 12 +- .../Traits/TranslateToWelshOptional.php | 4 +- src/FieldType/Traits/TranslationKey.php | 4 +- .../Traits/TranslationSearchOptional.php | 5 +- src/FieldType/Traits/TranslationsArray.php | 1 + src/FieldType/Traits/TransportManager.php | 7 +- .../TransportManagerApplicationOptional.php | 7 +- .../Traits/TransportManagerOptional.php | 7 +- .../Traits/UniqueIdStringOptional.php | 4 +- src/FieldType/Traits/UnvalidatedVrm.php | 1 + src/FieldType/Traits/User.php | 7 +- src/FieldType/Traits/UserOptional.php | 7 +- src/FieldType/Traits/Username.php | 5 +- src/FieldType/Traits/ValidOnlyOptional.php | 2 +- src/FieldType/Traits/VehicleType.php | 4 +- src/FieldType/Traits/Venue.php | 7 +- src/FieldType/Traits/VenueOptional.php | 7 +- src/FieldType/Traits/VenueOtherOptional.php | 5 +- src/FieldType/Traits/Version.php | 6 +- src/FieldType/Traits/Vrm.php | 5 +- src/FieldType/Traits/Witnesses.php | 5 +- src/FieldType/Traits/Xml.php | 5 +- src/FieldType/Traits/Year.php | 5 +- src/FieldType/Traits/YearOptional.php | 5 +- src/FieldType/TransportManagerInterface.php | 1 + src/FieldType/UserInterface.php | 1 + src/FieldType/VersionInterface.php | 1 + src/Filter/FilterEmptyItems.php | 4 +- src/Filter/Postcode.php | 1 + src/Query/AbstractListData.php | 1 + src/Query/AbstractQuery.php | 5 + src/Query/Address/GetAddress.php | 7 +- src/Query/Address/GetList.php | 5 +- src/Query/Application/Application.php | 3 +- src/Query/Application/Completion.php | 1 + src/Query/Application/Declaration.php | 1 + .../Application/DeclarationUndertakings.php | 1 + src/Query/Application/EnforcementArea.php | 1 + src/Query/Application/FinancialEvidence.php | 1 + src/Query/Application/FinancialHistory.php | 1 + src/Query/Application/GetList.php | 16 +- src/Query/Application/GoodsVehicles.php | 6 +- src/Query/Application/Grant.php | 1 + src/Query/Application/Interim.php | 1 + src/Query/Application/LicenceHistory.php | 1 + src/Query/Application/OperatingCentre.php | 1 + src/Query/Application/OperatingCentres.php | 5 +- src/Query/Application/OutstandingFees.php | 3 +- src/Query/Application/Overview.php | 3 +- src/Query/Application/People.php | 7 +- src/Query/Application/PreviousConvictions.php | 1 + src/Query/Application/PsvVehicles.php | 11 +- src/Query/Application/Publish.php | 1 + src/Query/Application/Review.php | 1 + src/Query/Application/Safety.php | 5 +- src/Query/Application/Schedule41Approve.php | 1 + src/Query/Application/Summary.php | 1 + src/Query/Application/TaxiPhv.php | 1 + src/Query/Application/TransportManagers.php | 1 + src/Query/Application/VehicleDeclaration.php | 7 +- .../ApplicationOperatingCentre.php | 1 + src/Query/Audit/ReadApplication.php | 5 +- src/Query/Audit/ReadBusReg.php | 5 +- src/Query/Audit/ReadCase.php | 5 +- src/Query/Audit/ReadIrhpApplication.php | 4 +- src/Query/Audit/ReadLicence.php | 5 +- src/Query/Audit/ReadOrganisation.php | 5 +- src/Query/Audit/ReadTransportManager.php | 5 +- src/Query/Bus/BusReg.php | 1 + src/Query/Bus/BusRegBrowseContextList.php | 7 +- src/Query/Bus/BusRegBrowseExport.php | 8 +- src/Query/Bus/BusRegDecision.php | 1 + src/Query/Bus/BusRegList.php | 11 +- src/Query/Bus/Ebsr/BusRegWithTxcInbox.php | 1 + src/Query/Bus/Ebsr/TxcInboxList.php | 9 +- src/Query/Bus/HistoryList.php | 1 - .../Bus/PaginatedRegistrationHistoryList.php | 2 +- src/Query/Bus/RegistrationHistoryList.php | 2 +- src/Query/Bus/SearchViewList.php | 11 +- src/Query/Bus/ShortNoticeByBusReg.php | 3 +- .../BusRegSearchViewContextList.php | 7 +- .../BusRegSearchView/BusRegSearchViewList.php | 19 +- src/Query/Cache/ById.php | 3 +- .../CacheableMediumTermQueryInterface.php | 1 - .../CacheableShortTermQueryInterface.php | 2 +- src/Query/Cases/Cases.php | 1 + src/Query/Cases/CasesWithLicence.php | 1 + src/Query/Cases/CasesWithOppositionDates.php | 1 + .../ConditionUndertaking.php | 6 +- .../ConditionUndertakingList.php | 6 +- src/Query/Cases/Conviction/Conviction.php | 1 - src/Query/Cases/Conviction/ConvictionList.php | 1 - src/Query/Cases/Impounding/ImpoundingList.php | 6 +- src/Query/Cases/LegacyOffence.php | 6 +- src/Query/Cases/LegacyOffenceList.php | 6 +- src/Query/Cases/NonPi/Listing.php | 1 - src/Query/Cases/NonPi/Single.php | 1 - src/Query/Cases/PresidingTc/ById.php | 1 + src/Query/Cases/Prohibition/Defect.php | 1 - src/Query/Cases/Prohibition/DefectList.php | 1 - src/Query/Cases/Prohibition/Prohibition.php | 1 - .../Cases/Prohibition/ProhibitionList.php | 1 - .../ProposeToRevoke/ProposeToRevokeByCase.php | 6 +- src/Query/Cases/Report/OpenList.php | 16 +- src/Query/Cases/Si/Si.php | 1 + src/Query/Cases/Si/SiList.php | 1 + src/Query/Cases/Statement/StatementList.php | 6 +- src/Query/Category/GetList.php | 8 +- src/Query/ChangeOfEntity/ChangeOfEntity.php | 1 + src/Query/CommunityLic/CommunityLicences.php | 8 +- src/Query/CompaniesHouse/AlertList.php | 9 +- src/Query/CompaniesHouse/ByNumber.php | 7 +- .../CompanySubsidiary/CompanySubsidiary.php | 7 +- src/Query/Complaint/Complaint.php | 4 +- src/Query/Complaint/ComplaintList.php | 22 +-- src/Query/ConditionUndertaking/Get.php | 7 +- src/Query/ConditionUndertaking/GetList.php | 17 +- .../ContactDetail/ContactDetailsList.php | 11 +- src/Query/ContactDetail/CountryList.php | 1 + src/Query/ContactDetail/CountrySelectList.php | 5 +- .../ContactDetail/PhoneContact/GetList.php | 6 +- .../ContinuationDetail/ChecklistReminders.php | 15 +- src/Query/ContinuationDetail/GetList.php | 33 ++-- src/Query/Correspondence/Correspondences.php | 9 +- src/Query/Cpms/ReportList.php | 1 + src/Query/Cpms/ReportStatus.php | 5 +- src/Query/Cpms/StoredCardList.php | 3 +- src/Query/DataRetention/GetProcessedList.php | 6 +- src/Query/DataRetention/Records.php | 28 ++- src/Query/DataRetention/RuleList.php | 4 +- src/Query/DiscSequence/DiscPrefixes.php | 15 +- src/Query/DiscSequence/DiscsNumbering.php | 31 ++-- src/Query/DocTemplate/ById.php | 1 + src/Query/DocTemplate/GetList.php | 9 +- src/Query/Document/AbstractDownload.php | 2 +- src/Query/Document/Document.php | 1 + src/Query/Document/DocumentList.php | 51 +++--- src/Query/Document/Download.php | 2 +- src/Query/Document/DownloadGuide.php | 2 +- src/Query/Document/Letter.php | 1 + src/Query/Document/TemplateParagraphs.php | 1 + src/Query/DvlaSearch/Vehicle.php | 1 + .../EnvironmentalComplaint.php | 4 +- .../EnvironmentalComplaintList.php | 22 +-- src/Query/EventHistory/EventHistory.php | 1 + src/Query/FeatureToggle/ById.php | 1 + src/Query/FeatureToggle/GetList.php | 1 + src/Query/FeatureToggle/IsEnabled.php | 5 +- src/Query/Fee/Fee.php | 1 - src/Query/Fee/FeeList.php | 8 +- src/Query/Fee/FeeType.php | 1 - src/Query/Fee/FeeTypeList.php | 6 +- src/Query/Fee/GetLatestFeeType.php | 19 +- src/Query/FeeType/GetDistinctList.php | 1 + src/Query/FeeType/GetList.php | 1 + .../ApplicationInspectionRequestList.php | 10 +- .../InspectionRequest/InspectionRequest.php | 1 + .../LicenceInspectionRequestList.php | 10 +- .../InspectionRequest/OperatingCentres.php | 10 +- src/Query/Irfo/IrfoDetails.php | 6 +- src/Query/Irfo/IrfoGvPermit.php | 6 +- src/Query/Irfo/IrfoGvPermitList.php | 6 +- src/Query/Irfo/IrfoPermitStockList.php | 16 +- src/Query/Irfo/IrfoPsvAuth.php | 6 +- .../Irfo/IrfoPsvAuthContinuationList.php | 10 +- src/Query/Irfo/IrfoPsvAuthList.php | 6 +- src/Query/IrhpApplication/AnswersSummary.php | 5 +- src/Query/IrhpApplication/ApplicationPath.php | 1 + .../ApplicationPathGroupList.php | 1 + src/Query/IrhpApplication/ApplicationStep.php | 1 + .../IrhpApplication/AvailableLicences.php | 1 + .../BilateralCountryAccessible.php | 4 +- .../IrhpApplication/BilateralMetadata.php | 1 + src/Query/IrhpApplication/ById.php | 1 + src/Query/IrhpApplication/Documents.php | 5 +- src/Query/IrhpApplication/FeeBreakdown.php | 1 + src/Query/IrhpApplication/FeePerPermit.php | 1 + src/Query/IrhpApplication/GetGrantability.php | 1 + .../InternalApplicationsSummary.php | 4 +- src/Query/IrhpApplication/MaxStockPermits.php | 1 + .../MaxStockPermitsByApplication.php | 1 + .../IrhpApplication/PermitsAvailable.php | 1 + src/Query/IrhpApplication/QuestionAnswer.php | 1 + .../RangesByIrhpApplication.php | 1 + .../SelfserveApplicationsSummary.php | 1 + .../SelfserveIssuedPermitsSummary.php | 1 + src/Query/IrhpCandidatePermit/ById.php | 1 + .../GetListByIrhpApplication.php | 1 + .../GetListByIrhpApplicationUnpaged.php | 1 + src/Query/IrhpPermit/ById.php | 1 + src/Query/IrhpPermit/GetList.php | 1 + src/Query/IrhpPermit/GetListByIrhpId.php | 1 + src/Query/IrhpPermit/GetListByLicence.php | 1 + .../IrhpPermit/UniqueCountriesByLicence.php | 1 + src/Query/IrhpPermitApplication/ById.php | 1 + src/Query/IrhpPermitApplication/GetList.php | 3 +- src/Query/IrhpPermitJurisdiction/GetList.php | 1 + src/Query/IrhpPermitRange/ById.php | 1 + src/Query/IrhpPermitRange/GetList.php | 1 + src/Query/IrhpPermitSector/GetList.php | 1 + .../IrhpPermitStock/AvailableBilateral.php | 1 + .../IrhpPermitStock/AvailableCountries.php | 1 + src/Query/IrhpPermitStock/ById.php | 1 + src/Query/IrhpPermitStock/GetList.php | 1 + src/Query/IrhpPermitType/ById.php | 1 + src/Query/IrhpPermitType/GetList.php | 1 + src/Query/IrhpPermitWindow/ById.php | 1 + src/Query/IrhpPermitWindow/GetList.php | 1 + src/Query/IrhpPermitWindow/OpenByCountry.php | 1 + src/Query/IrhpPermitWindow/OpenByType.php | 1 + src/Query/Language/GetList.php | 1 + src/Query/Licence/Addresses.php | 1 + src/Query/Licence/BusinessDetails.php | 1 + src/Query/Licence/ConditionUndertaking.php | 1 + src/Query/Licence/ContinuationDetail.php | 7 +- src/Query/Licence/EnforcementArea.php | 1 + src/Query/Licence/Exists.php | 3 +- src/Query/Licence/GetList.php | 11 +- src/Query/Licence/GoodsVehicles.php | 10 +- src/Query/Licence/Licence.php | 1 + src/Query/Licence/LicenceByNumber.php | 5 +- src/Query/Licence/LicenceDecisions.php | 7 +- .../Licence/LicenceRegisteredAddress.php | 5 +- src/Query/Licence/Markers.php | 7 +- src/Query/Licence/OperatingCentre.php | 1 + src/Query/Licence/OperatingCentres.php | 5 +- src/Query/Licence/OtherActiveLicences.php | 1 + src/Query/Licence/Overview.php | 1 + src/Query/Licence/People.php | 7 +- src/Query/Licence/PsvDiscs.php | 5 +- src/Query/Licence/PsvVehicles.php | 11 +- src/Query/Licence/PsvVehiclesExport.php | 2 +- src/Query/Licence/Safety.php | 5 +- src/Query/Licence/TaxiPhv.php | 1 + src/Query/Licence/TransportManagers.php | 1 + src/Query/Licence/TypeOfLicence.php | 1 + src/Query/Licence/Vehicles.php | 20 +-- .../LicenceOperatingCentre.php | 1 + .../LicenceStatusRule/LicenceStatusRule.php | 7 +- src/Query/LicenceVehicle/LicenceVehicle.php | 1 + .../LicenceVehicle/LicenceVehiclesById.php | 1 - .../LicenceVehicle/PsvLicenceVehicle.php | 1 + src/Query/LoggerOmitResponseInterface.php | 2 +- src/Query/Lva/AbstractGoodsVehicles.php | 12 +- src/Query/Nr/ReputeUrl.php | 1 + src/Query/Operator/BusinessDetails.php | 7 +- .../Operator/UnlicensedBusinessDetails.php | 1 + src/Query/Operator/UnlicensedVehicles.php | 5 +- src/Query/Opposition/OppositionList.php | 18 +- src/Query/OrderedQueryInterface.php | 2 + src/Query/OrderedTrait.php | 13 +- src/Query/OrderedTraitOptional.php | 13 +- src/Query/Organisation/BusinessDetails.php | 1 + src/Query/Organisation/CpidOrganisation.php | 14 +- src/Query/Organisation/Dashboard.php | 7 +- src/Query/Organisation/Organisation.php | 1 + .../OrganisationAvailableLicences.php | 1 + src/Query/Organisation/OutstandingFees.php | 3 +- src/Query/Organisation/People.php | 1 + src/Query/Organisation/UnlicensedCases.php | 1 + src/Query/OrganisationPerson/GetSingle.php | 1 + src/Query/OtherLicence/GetList.php | 7 +- src/Query/OtherLicence/OtherLicence.php | 1 + src/Query/PagedQueryInterface.php | 2 + src/Query/PagedTrait.php | 12 +- src/Query/PagedTraitOptional.php | 13 +- src/Query/Permits/AvailableStocks.php | 1 + src/Query/Permits/AvailableTypes.php | 1 + src/Query/Permits/AvailableYears.php | 5 +- src/Query/Permits/EcmtPermitFees.php | 9 +- src/Query/Permits/EmissionsByYear.php | 1 + .../MaxPermittedReachedByStockAndLicence.php | 4 +- ...xPermittedReachedByTypeAndOrganisation.php | 4 +- src/Query/Permits/OpenWindows.php | 5 +- src/Query/Permits/PostScoringReport.php | 1 + src/Query/Permits/ReadyToPrint.php | 1 + src/Query/Permits/ReadyToPrintConfirm.php | 1 + src/Query/Permits/ReadyToPrintCountry.php | 1 + src/Query/Permits/ReadyToPrintRangeType.php | 1 + src/Query/Permits/ReadyToPrintStock.php | 1 + src/Query/Permits/ReadyToPrintType.php | 1 + src/Query/Permits/Sectors.php | 1 + src/Query/Permits/StockAlignmentReport.php | 1 + .../Permits/StockOperationsPermitted.php | 1 + src/Query/PreviousConviction/GetList.php | 7 +- .../PreviousConviction/PreviousConviction.php | 1 + src/Query/Printer/Printer.php | 1 + src/Query/Printer/PrinterList.php | 1 + src/Query/Processing/History.php | 36 ++-- src/Query/Processing/NoteList.php | 1 - src/Query/Publication/PublishedList.php | 15 +- src/Query/QueryInterface.php | 1 + src/Query/Reason/ReasonList.php | 4 +- src/Query/RefData/RefDataList.php | 11 +- src/Query/Replacement/ById.php | 1 + src/Query/Replacement/GetList.php | 1 + src/Query/Search/Licence.php | 1 + src/Query/Si/SiCategoryTypeListData.php | 1 + src/Query/Si/SiPenaltyTypeListData.php | 1 + src/Query/SubCategory/GetList.php | 12 +- src/Query/SubCategoryDescription/GetList.php | 5 +- src/Query/Submission/SubmissionAction.php | 6 +- src/Query/Submission/SubmissionList.php | 6 +- src/Query/Surrender/ByLicence.php | 1 - src/Query/Surrender/GetSignature.php | 1 - src/Query/Surrender/OpenCases.php | 1 - src/Query/Surrender/PreviousLicenceStatus.php | 1 - src/Query/System/FinancialStandingRate.php | 1 - .../System/InfoMessage/GetListActive.php | 2 +- src/Query/System/PublicHoliday/GetList.php | 3 +- src/Query/System/SlaTargetDate.php | 11 +- src/Query/SystemParameter/SystemParameter.php | 4 +- src/Query/Task/Task.php | 1 + src/Query/Task/TaskDetails.php | 1 + src/Query/Task/TaskList.php | 70 ++++---- src/Query/TaskAllocationRule/GetList.php | 4 +- src/Query/TaskAlphaSplit/GetList.php | 6 +- src/Query/Team/Team.php | 1 + src/Query/Team/TeamList.php | 1 + src/Query/Team/TeamListData.php | 1 + src/Query/TeamPrinter/TeamPrinter.php | 1 + .../TeamPrinter/TeamPrinterExceptionsList.php | 7 +- src/Query/Template/AvailableTemplates.php | 1 + src/Query/Template/PreviewTemplateSource.php | 4 +- src/Query/Template/TemplateCategories.php | 1 + src/Query/Template/TemplateSource.php | 1 + src/Query/Tm/Documents.php | 2 +- src/Query/Tm/HistoricTm.php | 7 +- src/Query/Tm/TransportManager.php | 1 + src/Query/TmEmployment/GetList.php | 6 +- src/Query/TmQualification/TmQualification.php | 5 - .../TmQualification/TmQualificationsList.php | 10 +- .../GetDocumentsForResponsibilities.php | 17 +- .../TmResponsibilitiesList.php | 7 +- src/Query/TrafficArea/Get.php | 3 +- src/Query/TrafficArea/TrafficAreaList.php | 1 + src/Query/Transaction/Transaction.php | 1 + .../Transaction/TransactionByReference.php | 5 +- src/Query/TranslationKey/ById.php | 1 + src/Query/TranslationKey/GetList.php | 1 + .../GetDetails.php | 1 + .../GetForResponsibilities.php | 1 + .../TransportManagerApplication/GetList.php | 25 +-- .../TransportManagerApplication/Review.php | 1 + .../GetForResponsibilities.php | 1 + src/Query/TransportManagerLicence/GetList.php | 13 +- .../GetListByVariation.php | 7 +- src/Query/User/Pid.php | 5 +- src/Query/User/User.php | 1 + src/Query/User/UserListInternal.php | 1 + src/Query/User/UserListSelfserve.php | 1 + src/Query/User/UserSelfserve.php | 1 + src/Query/Variation/GoodsVehicles.php | 4 +- src/Query/Variation/PsvVehicles.php | 11 +- src/Query/Variation/TypeOfLicence.php | 1 + src/Query/Variation/Variation.php | 1 + .../VariationOperatingCentre.php | 3 +- src/Query/Workshop/Workshop.php | 7 +- .../Auth/ChangeExpiredPasswordResult.php | 3 +- src/Result/Auth/ChangePasswordResult.php | 3 +- src/Result/Auth/DeleteUserResult.php | 2 +- src/Router/CommandConfig.php | 2 +- src/Router/LaminasRouterHttpQueryV2.php | 145 +++++++++++++++ src/Router/Query.php | 21 +-- src/Router/RouterFactory.php | 3 +- src/Service/CacheEncryption.php | 49 +++-- src/Service/CacheEncryptionFactory.php | 26 +-- src/Traits/LaminasFormVersionTrait.php | 12 -- src/Util/Annotation/AnnotationBuilder.php | 6 +- src/Util/Annotation/ArrayFilter.php | 2 + src/Util/Annotation/ArrayInput.php | 1 + src/Util/Annotation/ArrayValidator.php | 2 + src/Util/Annotation/ContinueIfEmpty.php | 1 + src/Util/Annotation/DoNotExchange.php | 1 + src/Util/Annotation/Escape.php | 1 + src/Util/Annotation/Filter.php | 41 ++--- src/Util/Annotation/InputFilter.php | 27 --- src/Util/Annotation/Method.php | 1 + src/Util/Annotation/Optional.php | 1 + src/Util/Annotation/Partial.php | 13 +- src/Util/Annotation/RouteName.php | 1 + src/Util/Annotation/Validator.php | 35 +--- src/Util/ChildRoutesGenerator.php | 12 +- src/Util/Hostname.php | 17 +- src/Util/StructuredInput.php | 9 +- src/Validators/AbstractCompare.php | 14 +- src/Validators/ContinuationDetailStatus.php | 1 + src/Validators/Date.php | 1 - src/Validators/DateInFuture.php | 13 +- src/Validators/DateNotInFuture.php | 4 +- src/Validators/EmailAddress.php | 17 +- src/Validators/FhAdditionalInfo.php | 6 +- src/Validators/Money.php | 3 +- src/Validators/Order.php | 2 +- src/Validators/Postcode.php | 15 +- src/Validators/Sort.php | 2 +- src/Validators/SubmissionSection.php | 1 + src/Validators/UploadEvidence.php | 10 +- src/Validators/Username.php | 7 +- src/Validators/UsernameCreate.php | 6 +- src/Validators/ValidateEach.php | 2 +- src/Validators/Xml.php | 5 +- src/Validators/YesNo.php | 1 + test/Auth/ChangeExpiredPasswordResultTest.php | 7 +- test/Auth/ChangePasswordResultTest.php | 9 +- test/Auth/DeleteUserResultTest.php | 10 +- test/Bootstrap.php | 12 -- .../Application/CreateOperatingCentreTest.php | 1 - test/Command/Auth/ChangePasswordTest.php | 2 +- test/Command/Auth/ForgotPasswordTest.php | 2 +- test/Command/Auth/RefreshTokensTest.php | 2 +- test/Command/Auth/ResetPasswordTest.php | 2 +- test/Command/Bus/CreateNoticePeriodTest.php | 2 +- .../UpdateProposeToRevokeSlaTest.php | 1 - test/Command/CommunityLic/ReprintTest.php | 1 - .../Licence/CreateCompanySubsidiaryTest.php | 1 - .../AbstractDeleteCompanySubsidiaryTest.php | 14 +- .../AbstractUpdateCompanySubsidiaryTest.php | 14 +- test/Command/Permits/QueueReportTest.php | 2 +- test/Command/TmQualification/CreateTest.php | 2 +- test/Command/TmQualification/UpdateTest.php | 2 +- .../TransportManagerLicence/DeleteTest.php | 5 +- .../VariationOperatingCentre/UpdateTest.php | 1 - test/DtoTest.php | 2 +- test/Filter/PostcodeTest.php | 1 + test/Query/CompaniesHouse/ByNumberTest.php | 5 +- test/Query/DataRetention/RecordsTest.php | 5 - test/Query/Document/AbstractDownloadTest.php | 12 +- test/Query/DvlaSearch/VehicleTest.php | 4 +- test/Query/Licence/GoodsDiscCountTest.php | 2 +- test/Query/Licence/PsvDiscCountTest.php | 2 +- test/Query/Licence/VehiclesTest.php | 4 +- test/Query/Lva/AbstractGoodsVehiclesTest.php | 14 +- test/Query/PagedTraitTest.php | 14 +- test/Query/QueryTest.php | 2 - test/Query/Surrender/ByLicenceTest.php | 2 +- test/Query/Surrender/GetStatusTest.php | 2 +- test/Router/CommandConfigTest.php | 6 +- test/Service/CacheEncryptionFactoryTest.php | 24 ++- test/Util/ChildRoutesGeneratorTest.php | 2 +- test/Util/DtoTest.php | 5 +- test/Util/Stub/CommandDtoStub.php | 15 +- test/Util/Stub/PartialStub.php | 14 +- .../ContinuationDetailStatusTest.php | 1 + test/Validators/DateCompareTest.php | 6 +- test/Validators/EmailAddressTest.php | 21 +-- test/Validators/MoneyTest.php | 1 + test/Validators/PostcodeTest.php | 1 + test/Validators/UsernameTest.php | 1 + test/Validators/YesNoTest.php | 1 + 1146 files changed, 5987 insertions(+), 6006 deletions(-) create mode 100644 src/Router/LaminasRouterHttpQueryV2.php delete mode 100644 src/Traits/LaminasFormVersionTrait.php delete mode 100644 src/Util/Annotation/InputFilter.php diff --git a/composer.json b/composer.json index d826c337..714fa420 100644 --- a/composer.json +++ b/composer.json @@ -4,14 +4,17 @@ "require": { "php": "^7.4", "ext-openssl": "*", - "laminas/laminas-stdlib": "^2.7.9|^3.0", + "laminas/laminas-stdlib": "^3.0", "laminas/laminas-filter": "^2.9.4", "laminas/laminas-validator": "^2.11.1", - "laminas/laminas-servicemanager": "^2.7.11|^3.0", + "laminas/laminas-servicemanager": "^3.0", "laminas/laminas-inputfilter": "^2.10.1", - "laminas/laminas-form": "^2.13.0|^3.0", + "laminas/laminas-form": "^3.1.1", "laminas/laminas-crypt": "^3.4.0", - "laminas/laminas-xml": "^1.4.0" + "laminas/laminas-xml": "^1.4.0", + "laminas/laminas-cache": "^3.6", + "laminas/laminas-cache-storage-adapter-redis": "^2.4", + "laminas/laminas-router": "^3.9" }, "require-dev": { "phpunit/phpunit": "^9.6", @@ -52,6 +55,9 @@ "config": { "allow-plugins": { "bamarni/composer-bin-plugin": true + }, + "platform": { + "ext-redis": "4.3" } } } diff --git a/config/backend-routes.config.php b/config/backend-routes.config.php index 8cd5b4b3..3333e3a2 100644 --- a/config/backend-routes.config.php +++ b/config/backend-routes.config.php @@ -441,7 +441,6 @@ 'schedule-41' => RouteConfig::getRouteConfig( 'schedule-41', [ - 'GET' => QueryConfig::getConfig(Query\Application\Schedule41::class), 'PUT' => CommandConfig::getPutConfig(Command\Application\Schedule41::class) ] ), @@ -1442,20 +1441,6 @@ ) ] ], - 'person' => [ - 'type' => 'Segment', - 'options' => [ - 'route' => 'person[/]', - ], - 'may_terminate' => false, - 'child_routes' => [ - 'single' => RouteConfig::getSingleConfig( - [ - 'PUT' => CommandConfig::getPutConfig(Command\Person\Update::class), - ] - ), - ] - ], 'tm-employment' => [ 'type' => 'Segment', 'options' => [ @@ -1487,12 +1472,6 @@ 'GET' => QueryConfig::getConfig( Query\Cases\ConditionUndertaking\ConditionUndertaking::class ), - 'PUT' => CommandConfig::getPutConfig( - Command\Cases\ConditionUndertaking\UpdateConditionUndertaking::class - ), - 'DELETE' => CommandConfig::getDeleteConfig( - Command\Cases\ConditionUndertaking\DeleteConditionUndertaking::class - ) ] ), 'POST' => CommandConfig::getPostConfig( diff --git a/config/backend-routes/data-service.php b/config/backend-routes/data-service.php index 30a62717..2bc0ba74 100644 --- a/config/backend-routes/data-service.php +++ b/config/backend-routes/data-service.php @@ -6,7 +6,7 @@ return [ 'data-service' => [ - 'type' => \Laminas\Mvc\Router\Http\Segment::class, + 'type' => \Laminas\Router\Http\Segment::class, 'options' => [ 'route' => 'data-service/', ], diff --git a/config/backend-routes/public-holiday.php b/config/backend-routes/public-holiday.php index 1ebbc42f..f19d403c 100644 --- a/config/backend-routes/public-holiday.php +++ b/config/backend-routes/public-holiday.php @@ -5,7 +5,7 @@ use Dvsa\Olcs\Transfer\Router\CommandConfig; use Dvsa\Olcs\Transfer\Router\QueryConfig; use Dvsa\Olcs\Transfer\Router\RouteConfig; -use Laminas\Mvc\Router\Http\Segment; +use Laminas\Router\Http\Segment; return [ 'public-holiday' => [ diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php index 1ff8101f..4cf64e2d 100644 --- a/src/Command/AbstractCommand.php +++ b/src/Command/AbstractCommand.php @@ -2,13 +2,12 @@ namespace Dvsa\Olcs\Transfer\Command; -/** - * Abstract Command - * - * @author Rob Caiger - */ abstract class AbstractCommand implements CommandInterface { + final public function __construct() + { + } + /** * Create instance of a command * diff --git a/src/Command/AbstractPeople.php b/src/Command/AbstractPeople.php index 20a4310d..301e9da1 100644 --- a/src/Command/AbstractPeople.php +++ b/src/Command/AbstractPeople.php @@ -15,45 +15,45 @@ class AbstractPeople extends AbstractCommand /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Title"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Title") * @Transfer\Optional */ protected $title; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":35}) */ protected $forename; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":35}) */ protected $familyName; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":35}) * @Transfer\Optional */ protected $otherName; /** * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $birthDate; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":45}) * @Transfer\Optional */ protected $position; diff --git a/src/Command/AbstractSaveBusinessDetails.php b/src/Command/AbstractSaveBusinessDetails.php index 99328a65..662fb3e4 100644 --- a/src/Command/AbstractSaveBusinessDetails.php +++ b/src/Command/AbstractSaveBusinessDetails.php @@ -12,33 +12,33 @@ abstract class AbstractSaveBusinessDetails extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $name; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 255}) */ protected $natureOfBusiness; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $companyOrLlpNo; @@ -51,23 +51,23 @@ abstract class AbstractSaveBusinessDetails extends AbstractCommand /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) * @Transfer\Optional */ protected $tradingNames = []; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $partial; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $allowEmail; diff --git a/src/Command/AbstractUpdateInterim.php b/src/Command/AbstractUpdateInterim.php index 49f16cdc..a8a7198c 100644 --- a/src/Command/AbstractUpdateInterim.php +++ b/src/Command/AbstractUpdateInterim.php @@ -9,99 +9,96 @@ abstract class AbstractUpdateInterim extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $requested; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 1000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 1000}) * @Transfer\Optional */ protected $reason; /** - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Date", "options":{"format": "Y-m-d"}}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $startDate; /** - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Date", "options":{"format": "Y-m-d"}}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $endDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive": true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive": true}) * @Transfer\Optional */ protected $authHgvVehicles; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive": true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive": true}) * @Transfer\Optional */ protected $authLgvVehicles; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive": true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive": true}) * @Transfer\Optional */ protected $authTrailers; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $operatingCentres = []; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $vehicles = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": { - * "int_sts_requested", - * "int_sts_in_force", - * "int_sts_refused", - * "int_sts_revoked", - * "int_sts_granted", - * "int_sts_ended" - * } - * } + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={ + * "haystack": { + * "int_sts_requested", + * "int_sts_in_force", + * "int_sts_refused", + * "int_sts_revoked", + * "int_sts_granted", + * "int_sts_ended" + * } * }) * @Transfer\Optional */ protected $status; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"grant", "refuse"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"grant", "refuse"}}) * @Transfer\Optional */ protected $action; diff --git a/src/Command/Application/CancelApplication.php b/src/Command/Application/CancelApplication.php index e2c28dce..629b0590 100644 --- a/src/Command/Application/CancelApplication.php +++ b/src/Command/Application/CancelApplication.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ final class CancelApplication extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/Application/CreateApplication.php b/src/Command/Application/CreateApplication.php index 8727c90f..d34a7a7e 100644 --- a/src/Command/Application/CreateApplication.php +++ b/src/Command/Application/CreateApplication.php @@ -5,40 +5,40 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; use Dvsa\Olcs\Transfer\FieldType\Traits\LgvDeclarationConfirmation; use Dvsa\Olcs\Transfer\FieldType\Traits\VehicleType; - + /** * @Transfer\RouteName("backend/application") * @Transfer\Method("POST") */ final class CreateApplication extends AbstractCommand { - use LgvDeclarationConfirmation, VehicleType; + use LgvDeclarationConfirmation; + use VehicleType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lcat_gv","lcat_psv"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lcat_gv","lcat_psv"}}) * @Transfer\Optional */ protected $operatorType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * {"name":"Laminas\Validator\InArray", "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}} - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $niFlag; @@ -56,21 +56,15 @@ final class CreateApplication extends AbstractCommand protected $trafficArea; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", "options": { - * "haystack": {"applied_via_post","applied_via_phone"} - * } - * } - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"applied_via_post","applied_via_phone"}}) * @Transfer\Optional */ protected $appliedVia; diff --git a/src/Command/Application/CreateCompanySubsidiary.php b/src/Command/Application/CreateCompanySubsidiary.php index 65a10824..4cc0b965 100644 --- a/src/Command/Application/CreateCompanySubsidiary.php +++ b/src/Command/Application/CreateCompanySubsidiary.php @@ -8,7 +8,7 @@ /** * @author Rob Caiger - * + * * @Transfer\RouteName("backend/application/named-single/company-subsidiary") * @Transfer\Method("POST") */ diff --git a/src/Command/Application/CreateGoodsVehicle.php b/src/Command/Application/CreateGoodsVehicle.php index f00a56e5..7aecee1c 100644 --- a/src/Command/Application/CreateGoodsVehicle.php +++ b/src/Command/Application/CreateGoodsVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -19,14 +20,14 @@ */ final class CreateGoodsVehicle extends AbstractCommand { - use Identity, - Vrm, - UnvalidatedVrm; + use Identity; + use Vrm; + use UnvalidatedVrm; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 999999}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 999999}) */ protected $platedWeight; @@ -36,7 +37,7 @@ final class CreateGoodsVehicle extends AbstractCommand protected $receivedDate; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $confirm; diff --git a/src/Command/Application/CreateOperatingCentre.php b/src/Command/Application/CreateOperatingCentre.php index 62832e47..c1467dee 100644 --- a/src/Command/Application/CreateOperatingCentre.php +++ b/src/Command/Application/CreateOperatingCentre.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Command\ApplicationOperatingCentre\AbstractOperatingCentreCommand; diff --git a/src/Command/Application/CreatePsvVehicle.php b/src/Command/Application/CreatePsvVehicle.php index 7c74948b..09059163 100644 --- a/src/Command/Application/CreatePsvVehicle.php +++ b/src/Command/Application/CreatePsvVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Application; @@ -18,19 +19,19 @@ */ final class CreatePsvVehicle extends AbstractCommand { - use Application, - Vrm; + use Application; + use Vrm; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":100}) * @Transfer\Optional */ protected $makeModel; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $receivedDate; @@ -49,12 +50,4 @@ public function getReceivedDate() { return $this->receivedDate; } - - /** - * @return mixed - */ - public function getRemovalDate() - { - return $this->removalDate; - } } diff --git a/src/Command/Application/CreateSnapshot.php b/src/Command/Application/CreateSnapshot.php index 706eeb0e..b878d76a 100644 --- a/src/Command/Application/CreateSnapshot.php +++ b/src/Command/Application/CreateSnapshot.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,14 +18,14 @@ */ final class CreateSnapshot extends AbstractCommand { - const ON_SUBMIT = 0; - const ON_GRANT = 1; - const ON_REFUSE = 2; - const ON_WITHDRAW = 3; - const ON_NTU = 4; - use Identity; + public const ON_SUBMIT = 0; + public const ON_GRANT = 1; + public const ON_REFUSE = 2; + public const ON_WITHDRAW = 3; + public const ON_NTU = 4; + /** * @Transfer\Optional */ diff --git a/src/Command/Application/CreateTaxiPhv.php b/src/Command/Application/CreateTaxiPhv.php index 7e8dd477..170d8e87 100644 --- a/src/Command/Application/CreateTaxiPhv.php +++ b/src/Command/Application/CreateTaxiPhv.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,21 +18,21 @@ final class CreateTaxiPhv extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 10}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 10}) */ protected $privateHireLicenceNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 255}) */ protected $councilName; @@ -41,18 +42,15 @@ final class CreateTaxiPhv extends AbstractCommand protected $address; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"application","variation","licence"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"application","variation","licence"}}) * @Transfer\Optional */ protected $lva; diff --git a/src/Command/Application/CreateVehicleListDocument.php b/src/Command/Application/CreateVehicleListDocument.php index 1aaa5175..60f227d3 100644 --- a/src/Command/Application/CreateVehicleListDocument.php +++ b/src/Command/Application/CreateVehicleListDocument.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Application/CreateWorkshop.php b/src/Command/Application/CreateWorkshop.php index a884c128..55353856 100644 --- a/src/Command/Application/CreateWorkshop.php +++ b/src/Command/Application/CreateWorkshop.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,19 +18,16 @@ final class CreateWorkshop extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name": "Laminas\Filter\StringToUpper"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToUpper") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) */ protected $isExternal; diff --git a/src/Command/Application/DeleteGoodsVehicle.php b/src/Command/Application/DeleteGoodsVehicle.php index 3f28977a..53b56f90 100644 --- a/src/Command/Application/DeleteGoodsVehicle.php +++ b/src/Command/Application/DeleteGoodsVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Application; @@ -18,6 +19,6 @@ */ final class DeleteGoodsVehicle extends AbstractCommand { - use Application, - Ids; + use Application; + use Ids; } diff --git a/src/Command/Application/DeleteOperatingCentres.php b/src/Command/Application/DeleteOperatingCentres.php index 9f82d164..6c4dabe3 100644 --- a/src/Command/Application/DeleteOperatingCentres.php +++ b/src/Command/Application/DeleteOperatingCentres.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Application; @@ -18,6 +19,6 @@ */ final class DeleteOperatingCentres extends AbstractCommand { - use Ids, - Application; + use Ids; + use Application; } diff --git a/src/Command/Application/DeletePeople.php b/src/Command/Application/DeletePeople.php index 17c2f008..f9da07a6 100644 --- a/src/Command/Application/DeletePeople.php +++ b/src/Command/Application/DeletePeople.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class DeletePeople extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $personIds = []; diff --git a/src/Command/Application/DeletePsvVehicle.php b/src/Command/Application/DeletePsvVehicle.php index edbe1dc8..f53ed889 100644 --- a/src/Command/Application/DeletePsvVehicle.php +++ b/src/Command/Application/DeletePsvVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Application; @@ -18,6 +19,6 @@ */ final class DeletePsvVehicle extends AbstractCommand { - use Application, - Ids; + use Application; + use Ids; } diff --git a/src/Command/Application/DeleteTaxiPhv.php b/src/Command/Application/DeleteTaxiPhv.php index d712c56d..9e519767 100644 --- a/src/Command/Application/DeleteTaxiPhv.php +++ b/src/Command/Application/DeleteTaxiPhv.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,33 +18,30 @@ final class DeleteTaxiPhv extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"application","variation","licence"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"application","variation","licence"}}) * @Transfer\Optional */ protected $lva; diff --git a/src/Command/Application/DeleteWorkshop.php b/src/Command/Application/DeleteWorkshop.php index c86b351a..1a30a7f4 100644 --- a/src/Command/Application/DeleteWorkshop.php +++ b/src/Command/Application/DeleteWorkshop.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class DeleteWorkshop extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Application/Grant.php b/src/Command/Application/Grant.php index 1f3c38b8..6da6182d 100644 --- a/src/Command/Application/Grant.php +++ b/src/Command/Application/Grant.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -20,15 +21,15 @@ final class Grant extends AbstractCommand use Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $shouldCreateInspectionRequest; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"3", "6", "9", "12"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"3", "6", "9", "12"}}) * @Transfer\Optional */ protected $dueDate; @@ -39,8 +40,8 @@ final class Grant extends AbstractCommand protected $notes; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"grant_authority_dl", "grant_authority_tc", "grant_authority_tr"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"grant_authority_dl", "grant_authority_tc", "grant_authority_tr"}}) */ protected $grantAuthority; diff --git a/src/Command/Application/GrantInterim.php b/src/Command/Application/GrantInterim.php index d1635681..0c446aa6 100644 --- a/src/Command/Application/GrantInterim.php +++ b/src/Command/Application/GrantInterim.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Application/NotTakenUpApplication.php b/src/Command/Application/NotTakenUpApplication.php index 34ef1683..37388ced 100644 --- a/src/Command/Application/NotTakenUpApplication.php +++ b/src/Command/Application/NotTakenUpApplication.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ final class NotTakenUpApplication extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/Application/Overview.php b/src/Command/Application/Overview.php index dfe12eae..2cfca6be 100644 --- a/src/Command/Application/Overview.php +++ b/src/Command/Application/Overview.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,39 +18,36 @@ final class Overview extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** * @Transfer\Optional - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"B", "C", "D", "F", "G", "H", "K", "M", "N"}} - * }) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"B", "C", "D", "F", "G", "H", "K", "M", "N"}}) */ protected $leadTcArea; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $receivedDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $targetCompletionDate; @@ -59,8 +57,8 @@ final class Overview extends AbstractCommand protected $tracking; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $overrideOppositionDate; diff --git a/src/Command/Application/PrintInterimDocument.php b/src/Command/Application/PrintInterimDocument.php index 68114bfc..eff86185 100644 --- a/src/Command/Application/PrintInterimDocument.php +++ b/src/Command/Application/PrintInterimDocument.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Application/Publish.php b/src/Command/Application/Publish.php index 3b044f4b..acbf4cb4 100644 --- a/src/Command/Application/Publish.php +++ b/src/Command/Application/Publish.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Application/RefuseApplication.php b/src/Command/Application/RefuseApplication.php index 5ccbe6b9..079a4343 100644 --- a/src/Command/Application/RefuseApplication.php +++ b/src/Command/Application/RefuseApplication.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ final class RefuseApplication extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/Application/RefuseInterim.php b/src/Command/Application/RefuseInterim.php index 899d8666..27ed8ebd 100644 --- a/src/Command/Application/RefuseInterim.php +++ b/src/Command/Application/RefuseInterim.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Application/RestorePeople.php b/src/Command/Application/RestorePeople.php index ccf4c8b1..f382c3a1 100644 --- a/src/Command/Application/RestorePeople.php +++ b/src/Command/Application/RestorePeople.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class RestorePeople extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $personIds = []; diff --git a/src/Command/Application/ReviveApplication.php b/src/Command/Application/ReviveApplication.php index 647a62be..bcf06708 100644 --- a/src/Command/Application/ReviveApplication.php +++ b/src/Command/Application/ReviveApplication.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ final class ReviveApplication extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/Application/Schedule41.php b/src/Command/Application/Schedule41.php index 94d1902c..8d922069 100644 --- a/src/Command/Application/Schedule41.php +++ b/src/Command/Application/Schedule41.php @@ -5,6 +5,7 @@ * * @author Joshua Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,20 +19,20 @@ */ final class Schedule41 extends AbstractCommand { - use Identity, - Licence; + use Identity; + use Licence; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $operatingCentres = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $surrenderLicence; diff --git a/src/Command/Application/Schedule41Approve.php b/src/Command/Application/Schedule41Approve.php index a541ac15..9649e0e7 100644 --- a/src/Command/Application/Schedule41Approve.php +++ b/src/Command/Application/Schedule41Approve.php @@ -5,6 +5,7 @@ * * @author Joshua Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -21,8 +22,8 @@ final class Schedule41Approve extends AbstractCommand /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $trueS4 = null; diff --git a/src/Command/Application/Schedule41Cancel.php b/src/Command/Application/Schedule41Cancel.php index c08a3714..e1830923 100644 --- a/src/Command/Application/Schedule41Cancel.php +++ b/src/Command/Application/Schedule41Cancel.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Application/Schedule41Refuse.php b/src/Command/Application/Schedule41Refuse.php index d6ad0073..328f2cfe 100644 --- a/src/Command/Application/Schedule41Refuse.php +++ b/src/Command/Application/Schedule41Refuse.php @@ -5,6 +5,7 @@ * * @author Joshua Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Application/Schedule41Reset.php b/src/Command/Application/Schedule41Reset.php index 468844a6..607534b9 100644 --- a/src/Command/Application/Schedule41Reset.php +++ b/src/Command/Application/Schedule41Reset.php @@ -5,6 +5,7 @@ * * @author Joshua Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Application/SubmitApplication.php b/src/Command/Application/SubmitApplication.php index 03d4a94c..7e0324bd 100644 --- a/src/Command/Application/SubmitApplication.php +++ b/src/Command/Application/SubmitApplication.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class SubmitApplication extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; diff --git a/src/Command/Application/UndoGrant.php b/src/Command/Application/UndoGrant.php index 112656db..86e11a27 100644 --- a/src/Command/Application/UndoGrant.php +++ b/src/Command/Application/UndoGrant.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Application/UpdateAddresses.php b/src/Command/Application/UpdateAddresses.php index 8098fad2..e07467c2 100644 --- a/src/Command/Application/UpdateAddresses.php +++ b/src/Command/Application/UpdateAddresses.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Application/UpdateAuthSignature.php b/src/Command/Application/UpdateAuthSignature.php index d39f55d9..0e30388b 100644 --- a/src/Command/Application/UpdateAuthSignature.php +++ b/src/Command/Application/UpdateAuthSignature.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Version; @@ -18,12 +19,12 @@ */ class UpdateAuthSignature extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $authSignature; diff --git a/src/Command/Application/UpdateCompanySubsidiary.php b/src/Command/Application/UpdateCompanySubsidiary.php index 1d88b8e2..3155436c 100644 --- a/src/Command/Application/UpdateCompanySubsidiary.php +++ b/src/Command/Application/UpdateCompanySubsidiary.php @@ -8,7 +8,7 @@ /** * @author Rob Caiger - * + * * @Transfer\RouteName("backend/application/named-single/company-subsidiary/single") * @Transfer\Method("PUT") */ diff --git a/src/Command/Application/UpdateCompletion.php b/src/Command/Application/UpdateCompletion.php index 3d54b91e..fa6e7f37 100644 --- a/src/Command/Application/UpdateCompletion.php +++ b/src/Command/Application/UpdateCompletion.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,20 +18,15 @@ class UpdateCompletion extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": {"people", "conditionsUndertakings", "taxiPhv", "communityLicences", "transportManagers"} - * } - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"people", "conditionsUndertakings", "taxiPhv", "communityLicences", "transportManagers"}}) */ protected $section; diff --git a/src/Command/Application/UpdateDeclaration.php b/src/Command/Application/UpdateDeclaration.php index 6bf45a70..0335ec1c 100644 --- a/src/Command/Application/UpdateDeclaration.php +++ b/src/Command/Application/UpdateDeclaration.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,48 +18,43 @@ final class UpdateDeclaration extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $declarationConfirmation; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $interimRequested; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 1000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 0, "max": 1000}) */ protected $interimReason; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"sig_physical_signature", "sig_digital_signature", "sig_signature_not_required"}} - * } - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"sig_physical_signature", "sig_digital_signature", "sig_signature_not_required"}}) */ protected $signatureType; diff --git a/src/Command/Application/UpdateFinancialEvidence.php b/src/Command/Application/UpdateFinancialEvidence.php index 2d1b9827..a0c6cf10 100644 --- a/src/Command/Application/UpdateFinancialEvidence.php +++ b/src/Command/Application/UpdateFinancialEvidence.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,23 +18,23 @@ final class UpdateFinancialEvidence extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 2}) */ protected $financialEvidenceUploaded; diff --git a/src/Command/Application/UpdateFinancialHistory.php b/src/Command/Application/UpdateFinancialHistory.php index 06b7695f..5cf71a76 100644 --- a/src/Command/Application/UpdateFinancialHistory.php +++ b/src/Command/Application/UpdateFinancialHistory.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,57 +18,57 @@ final class UpdateFinancialHistory extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $bankrupt = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $liquidation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $receivership; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $administration; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $disqualified; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $insolvencyDetails; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $insolvencyConfirmation = false; diff --git a/src/Command/Application/UpdateGoodsVehicle.php b/src/Command/Application/UpdateGoodsVehicle.php index a4faac7f..4985bc93 100644 --- a/src/Command/Application/UpdateGoodsVehicle.php +++ b/src/Command/Application/UpdateGoodsVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Application; @@ -19,14 +20,14 @@ */ final class UpdateGoodsVehicle extends AbstractCommand { - use Identity, - Version, - Application; + use Identity; + use Version; + use Application; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 999999}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 999999}) * @Transfer\Optional */ protected $platedWeight; diff --git a/src/Command/Application/UpdateInterim.php b/src/Command/Application/UpdateInterim.php index 3d749c8d..07c32c0f 100644 --- a/src/Command/Application/UpdateInterim.php +++ b/src/Command/Application/UpdateInterim.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Application/UpdateLicenceHistory.php b/src/Command/Application/UpdateLicenceHistory.php index ca5797e0..5eccf079 100644 --- a/src/Command/Application/UpdateLicenceHistory.php +++ b/src/Command/Application/UpdateLicenceHistory.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,71 +18,71 @@ final class UpdateLicenceHistory extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $prevHasLicence = null; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $prevHadLicence = null; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $prevBeenRefused = null; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $prevBeenRevoked = null; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $prevBeenAtPi = null; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $prevBeenDisqualifiedTc = null; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $prevPurchasedAssets = null; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") */ public $inProgress = null; diff --git a/src/Command/Application/UpdateOperatingCentres.php b/src/Command/Application/UpdateOperatingCentres.php index 1f66ff5f..140b8449 100644 --- a/src/Command/Application/UpdateOperatingCentres.php +++ b/src/Command/Application/UpdateOperatingCentres.php @@ -13,63 +13,63 @@ */ final class UpdateOperatingCentres extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"\Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $partial; /** - * @Transfer\Filter({"name":"\Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $partialAction; /** - * @Transfer\Filter({"name":"\Laminas\Filter\ToInt"}) - * @Transfer\Validator({"name": "Digits"}) - * @Transfer\Validator({"name": "Between", "options": {"min":1, "max": 5000}}) + * @Transfer\Filter("Laminas\Filter\ToInt") + * @Transfer\Validator("Digits") + * @Transfer\Validator("Between", options={"min":1, "max": 5000}) * @Transfer\Optional */ protected $totAuthHgvVehicles; /** - * @Transfer\Filter({"name":"\Laminas\Filter\ToInt"}) - * @Transfer\Validator({"name": "Digits"}) - * @Transfer\Validator({"name": "Between", "options": {"min":0, "max": 5000}}) + * @Transfer\Filter("Laminas\Filter\ToInt") + * @Transfer\Validator("Digits") + * @Transfer\Validator("Between", options={"min":0, "max": 5000}) * @Transfer\Optional */ protected $totAuthLgvVehicles; /** - * @Transfer\Filter({"name":"\Laminas\Filter\ToInt"}) - * @Transfer\Validator({"name": "Digits"}) - * @Transfer\Validator({"name": "Between", "options": {"min":0, "max": 5000}}) + * @Transfer\Filter("Laminas\Filter\ToInt") + * @Transfer\Validator("Digits") + * @Transfer\Validator("Between", options={"min":0, "max": 5000}) * @Transfer\Optional */ protected $totAuthTrailers; /** - * @Transfer\Filter({"name":"\Laminas\Filter\ToInt"}) - * @Transfer\Validator({"name": "Digits"}) - * @Transfer\Validator({"name": "Between", "options": {"min":0, "max": 10000}}) + * @Transfer\Filter("Laminas\Filter\ToInt") + * @Transfer\Validator("Digits") + * @Transfer\Validator("Between", options={"min":0, "max": 10000}) * @Transfer\Optional */ protected $totCommunityLicences; /** - * @Transfer\Filter({"name":"\Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"\Laminas\Validator\StringLength", "options": {"min": 1, "max": "1"}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("\Laminas\Validator\StringLength", options={"min": 1, "max": "1"}) * @Transfer\Optional */ protected $trafficArea; /** - * @Transfer\Filter({"name":"\Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"\Laminas\Validator\StringLength", "options": {"min": 1, "max": "4"}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("\Laminas\Validator\StringLength", options={"min": 1, "max": "4"}) * @Transfer\Optional */ protected $enforcementArea; diff --git a/src/Command/Application/UpdatePeople.php b/src/Command/Application/UpdatePeople.php index a5a34dbf..be6a1bb8 100644 --- a/src/Command/Application/UpdatePeople.php +++ b/src/Command/Application/UpdatePeople.php @@ -16,9 +16,9 @@ final class UpdatePeople extends AbstractPeople /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $person; diff --git a/src/Command/Application/UpdatePreviousConvictions.php b/src/Command/Application/UpdatePreviousConvictions.php index 38443948..18db13aa 100644 --- a/src/Command/Application/UpdatePreviousConvictions.php +++ b/src/Command/Application/UpdatePreviousConvictions.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,28 +18,28 @@ final class UpdatePreviousConvictions extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $prevConviction; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $convictionsConfirmation; diff --git a/src/Command/Application/UpdatePrivateHireLicence.php b/src/Command/Application/UpdatePrivateHireLicence.php index 260580de..e0748bfa 100644 --- a/src/Command/Application/UpdatePrivateHireLicence.php +++ b/src/Command/Application/UpdatePrivateHireLicence.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,35 +18,35 @@ final class UpdatePrivateHireLicence extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $privateHireLicence; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 10}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 10}) */ protected $privateHireLicenceNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 255}) */ protected $councilName; @@ -55,18 +56,15 @@ final class UpdatePrivateHireLicence extends AbstractCommand protected $address; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"application","variation","licence"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"application","variation","licence"}}) * @Transfer\Optional */ protected $lva; diff --git a/src/Command/Application/UpdatePsvVehicles.php b/src/Command/Application/UpdatePsvVehicles.php index 4efba0fa..d4d1aa02 100644 --- a/src/Command/Application/UpdatePsvVehicles.php +++ b/src/Command/Application/UpdatePsvVehicles.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,17 +19,17 @@ */ final class UpdatePsvVehicles extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $hasEnteredReg; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $partial; diff --git a/src/Command/Application/UpdateSafety.php b/src/Command/Application/UpdateSafety.php index d7aa9e8d..5f66b3fb 100644 --- a/src/Command/Application/UpdateSafety.php +++ b/src/Command/Application/UpdateSafety.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,32 +18,29 @@ final class UpdateSafety extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $partial = false; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name": "Laminas\Filter\StringToUpper"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToUpper") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) * @Transfer\Optional */ protected $safetyConfirmation; diff --git a/src/Command/Application/UpdateTaxiPhv.php b/src/Command/Application/UpdateTaxiPhv.php index 3271f382..2104465a 100644 --- a/src/Command/Application/UpdateTaxiPhv.php +++ b/src/Command/Application/UpdateTaxiPhv.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,15 +18,15 @@ final class UpdateTaxiPhv extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\TrafficArea"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\TrafficArea") * @Transfer\Optional */ protected $trafficArea; diff --git a/src/Command/Application/UpdateTypeOfLicence.php b/src/Command/Application/UpdateTypeOfLicence.php index 7f4014af..e1c77665 100644 --- a/src/Command/Application/UpdateTypeOfLicence.php +++ b/src/Command/Application/UpdateTypeOfLicence.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,46 +19,44 @@ */ final class UpdateTypeOfLicence extends AbstractCommand { - use LgvDeclarationConfirmation, VehicleType; + use LgvDeclarationConfirmation; + use VehicleType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lcat_gv","lcat_psv"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lcat_gv","lcat_psv"}}) * @Transfer\Optional */ protected $operatorType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $niFlag; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $confirm = false; diff --git a/src/Command/Application/UpdateVehicleDeclaration.php b/src/Command/Application/UpdateVehicleDeclaration.php index 1c47b1f4..0420a836 100644 --- a/src/Command/Application/UpdateVehicleDeclaration.php +++ b/src/Command/Application/UpdateVehicleDeclaration.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,53 +18,51 @@ final class UpdateVehicleDeclaration extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; // Small vehicles /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": - * {"haystack": {"psvvs_small", "psvvs_medium_large", "psvvs_both"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"psvvs_small", "psvvs_medium_large", "psvvs_both"}}) * @Transfer\Optional */ protected $psvVehicleSize; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $psvNoSmallVhlConfirmation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $psvOperateSmallVhl; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $psvSmallVhlConfirmation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $psvSmallVhlNotes; @@ -71,14 +70,14 @@ final class UpdateVehicleDeclaration extends AbstractCommand // Medium vehicles /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $psvMediumVhlConfirmation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $psvMediumVhlNotes; @@ -86,20 +85,20 @@ final class UpdateVehicleDeclaration extends AbstractCommand // Limos /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $psvLimousines; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $psvNoLimousineConfirmation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $psvOnlyLimousinesConfirmation; diff --git a/src/Command/Application/UpdateVehicles.php b/src/Command/Application/UpdateVehicles.php index d7f13d18..50a4c3ff 100644 --- a/src/Command/Application/UpdateVehicles.php +++ b/src/Command/Application/UpdateVehicles.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,18 +19,18 @@ */ final class UpdateVehicles extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name": "Laminas\Filter\StringToUpper"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToUpper") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) */ protected $hasEnteredReg; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $partial = false; diff --git a/src/Command/Application/UpdateWorkshop.php b/src/Command/Application/UpdateWorkshop.php index a9c1431f..6d9cc222 100644 --- a/src/Command/Application/UpdateWorkshop.php +++ b/src/Command/Application/UpdateWorkshop.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,33 +18,30 @@ final class UpdateWorkshop extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name": "Laminas\Filter\StringToUpper"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToUpper") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) */ protected $isExternal; diff --git a/src/Command/Application/UploadEvidence.php b/src/Command/Application/UploadEvidence.php index 6d2bad77..46a5d827 100644 --- a/src/Command/Application/UploadEvidence.php +++ b/src/Command/Application/UploadEvidence.php @@ -16,7 +16,7 @@ final class UploadEvidence extends AbstractCommand /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") * @Transfer\Partial("Dvsa\Olcs\Transfer\Command\Partial\OperatingCentreEvidence") * @Transfer\Optional */ diff --git a/src/Command/Application/WithdrawApplication.php b/src/Command/Application/WithdrawApplication.php index 238d6934..c385ffbd 100644 --- a/src/Command/Application/WithdrawApplication.php +++ b/src/Command/Application/WithdrawApplication.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,15 +18,15 @@ final class WithdrawApplication extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"withdrawn","reg_in_error"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"withdrawn","reg_in_error"}}) */ protected $reason = false; diff --git a/src/Command/ApplicationOperatingCentre/AbstractOperatingCentreCommand.php b/src/Command/ApplicationOperatingCentre/AbstractOperatingCentreCommand.php index 1202ceee..2ab715fc 100644 --- a/src/Command/ApplicationOperatingCentre/AbstractOperatingCentreCommand.php +++ b/src/Command/ApplicationOperatingCentre/AbstractOperatingCentreCommand.php @@ -20,39 +20,39 @@ abstract class AbstractOperatingCentreCommand extends AbstractCommand protected $address; /** - * @Transfer\Validator({"name": "Laminas\Validator\Between", "options": {"min":0, "max":1000000}}) + * @Transfer\Validator("Laminas\Validator\Between", options={"min":0, "max":1000000}) */ protected $noOfVehiclesRequired; /** - * @Transfer\Validator({"name": "Laminas\Validator\Between", "options": {"min":0, "max":1000000}}) + * @Transfer\Validator("Laminas\Validator\Between", options={"min":0, "max":1000000}) * @Transfer\Optional */ protected $noOfTrailersRequired; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) * @Transfer\Optional */ protected $permission; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 2}) * @Transfer\Optional */ protected $adPlaced; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $adPlacedIn; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $adPlacedDate; diff --git a/src/Command/ApplicationOperatingCentre/Update.php b/src/Command/ApplicationOperatingCentre/Update.php index e464b947..40a1a742 100644 --- a/src/Command/ApplicationOperatingCentre/Update.php +++ b/src/Command/ApplicationOperatingCentre/Update.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\ApplicationOperatingCentre; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,7 +19,7 @@ */ class Update extends AbstractOperatingCentreCommand { - use Identity, - Version; + use Identity; + use Version; use IsTaOverridden; } diff --git a/src/Command/Audit/ReadApplication.php b/src/Command/Audit/ReadApplication.php index c2f84ba6..59f3371e 100644 --- a/src/Command/Audit/ReadApplication.php +++ b/src/Command/Audit/ReadApplication.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Audit/ReadBusReg.php b/src/Command/Audit/ReadBusReg.php index 597aba8a..f343d8c4 100644 --- a/src/Command/Audit/ReadBusReg.php +++ b/src/Command/Audit/ReadBusReg.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Audit/ReadCase.php b/src/Command/Audit/ReadCase.php index a27ed4f2..f50c3234 100644 --- a/src/Command/Audit/ReadCase.php +++ b/src/Command/Audit/ReadCase.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Audit/ReadLicence.php b/src/Command/Audit/ReadLicence.php index 73987e7a..6cba667e 100644 --- a/src/Command/Audit/ReadLicence.php +++ b/src/Command/Audit/ReadLicence.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Audit/ReadOrganisation.php b/src/Command/Audit/ReadOrganisation.php index 7196d596..3d80c71a 100644 --- a/src/Command/Audit/ReadOrganisation.php +++ b/src/Command/Audit/ReadOrganisation.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Audit/ReadTransportManager.php b/src/Command/Audit/ReadTransportManager.php index ecc17671..f6e463cd 100644 --- a/src/Command/Audit/ReadTransportManager.php +++ b/src/Command/Audit/ReadTransportManager.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Auth/RefreshTokens.php b/src/Command/Auth/RefreshTokens.php index 89158cd2..844d7172 100644 --- a/src/Command/Auth/RefreshTokens.php +++ b/src/Command/Auth/RefreshTokens.php @@ -1,4 +1,5 @@ outcome = $outcome; + return $this; } /** @@ -229,6 +220,7 @@ public function getOutcome() public function setOutcomeSentDate($outcomeSentDate) { $this->outcomeSentDate = $outcomeSentDate; + return $this; } /** @@ -246,6 +238,7 @@ public function getOutcomeSentDate() public function setVenue($venue) { $this->venue = $venue; + return $this; } /** @@ -263,6 +256,7 @@ public function getVenue() public function setVenueOther($venueOther) { $this->venueOther = $venueOther; + return $this; } /** @@ -280,6 +274,7 @@ public function getVenueOther() public function setPresidingTc($presidingTc) { $this->presidingTc = $presidingTc; + return $this; } /** @@ -297,6 +292,7 @@ public function getPresidingTc() public function setVrm($vrm) { $this->vrm = $vrm; + return $this; } /** diff --git a/src/Command/Cases/Impounding/UpdateImpounding.php b/src/Command/Cases/Impounding/UpdateImpounding.php index 358c3d34..639bc1f9 100644 --- a/src/Command/Cases/Impounding/UpdateImpounding.php +++ b/src/Command/Cases/Impounding/UpdateImpounding.php @@ -16,52 +16,47 @@ class UpdateImpounding extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id = null; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version = null; /** - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"impt_hearing","impt_paper"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"impt_hearing","impt_paper"}}) */ protected $impoundingType = null; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $applicationReceiptDate = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":20}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":20}) */ protected $vrm = null; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":32}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":32}) */ protected $impoundingLegislationTypes = []; /** * @Transfer\Optional() - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $hearingDate = null; @@ -72,7 +67,7 @@ class UpdateImpounding extends AbstractCommand /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $venueOther = null; @@ -83,31 +78,26 @@ class UpdateImpounding extends AbstractCommand /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"impo_not","impo_returned","impo_wd"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"impo_not","impo_returned","impo_wd"}}) */ protected $outcome = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $outcomeSentDate = null; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $notes = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $closeDate = null; diff --git a/src/Command/Cases/NonPi/Create.php b/src/Command/Cases/NonPi/Create.php index 96a708a4..5652002e 100644 --- a/src/Command/Cases/NonPi/Create.php +++ b/src/Command/Cases/NonPi/Create.php @@ -4,7 +4,6 @@ use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; - use Dvsa\Olcs\Transfer\FieldType as FieldType; /** @@ -20,14 +19,14 @@ class Create extends AbstractCommand implements FieldType\CasesInterface /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $agreedByTcDate; /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $hearingDate; @@ -35,8 +34,8 @@ class Create extends AbstractCommand implements FieldType\CasesInterface * @var string * * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":255}) */ protected $venueOther; @@ -44,29 +43,16 @@ class Create extends AbstractCommand implements FieldType\CasesInterface * @var int * * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between","options":{"min":0,"max":99,"inclusive":true}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Between",options={"min":0,"max":99,"inclusive":true}) */ protected $witnessCount; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": { - * "non_pio_con", - * "non_pio_nfa", - * "non_pio_other", - * "non_pio_ph", - * "non_pio_pi", - * "non_pio_und", - * "non_pio_wl" - * } - * } - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack":{"non_pio_con", "non_pio_nfa", "non_pio_other", "non_pio_ph", "non_pio_pi", "non_pio_und", "non_pio_wl"}}) */ protected $outcome; diff --git a/src/Command/Cases/NonPi/Update.php b/src/Command/Cases/NonPi/Update.php index a4f7dc5d..2d46c347 100644 --- a/src/Command/Cases/NonPi/Update.php +++ b/src/Command/Cases/NonPi/Update.php @@ -29,14 +29,14 @@ class Update extends AbstractCommand implements /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $agreedByTcDate; /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $hearingDate; @@ -44,8 +44,8 @@ class Update extends AbstractCommand implements * @var string * * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":255}) */ protected $venueOther; @@ -53,17 +53,16 @@ class Update extends AbstractCommand implements * @var int * * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":2}) */ protected $witnessCount; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "non_pio_con", * "non_pio_nfa", @@ -74,7 +73,7 @@ class Update extends AbstractCommand implements * "non_pio_wl" * } * } - * }) + * ) */ protected $outcome; diff --git a/src/Command/Cases/Pi/CreateAgreedAndLegislation.php b/src/Command/Cases/Pi/CreateAgreedAndLegislation.php index b9f7b88b..9ff4b5c1 100644 --- a/src/Command/Cases/Pi/CreateAgreedAndLegislation.php +++ b/src/Command/Cases/Pi/CreateAgreedAndLegislation.php @@ -17,66 +17,65 @@ class CreateAgreedAndLegislation extends AbstractCommand /** * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $agreedDate; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $agreedByTc; /** * @var String - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": {"tc_r_dhtru", "tc_r_dtc", "tc_r_htru", "tc_r_tc"} * } - * }) + * ) */ protected $agreedByTcRole; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $assignedCaseworker; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isEcmsCase = null; /** * @var string * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $ecmsFirstReceivedDate; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":32}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":32}) */ protected $piTypes = []; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $reasons = []; diff --git a/src/Command/Cases/Pi/UpdateAgreedAndLegislation.php b/src/Command/Cases/Pi/UpdateAgreedAndLegislation.php index 560bbf5d..f8eeb4e6 100644 --- a/src/Command/Cases/Pi/UpdateAgreedAndLegislation.php +++ b/src/Command/Cases/Pi/UpdateAgreedAndLegislation.php @@ -18,66 +18,65 @@ class UpdateAgreedAndLegislation extends AbstractCommand /** * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $agreedDate; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $agreedByTc; /** * @var String - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": {"tc_r_dhtru", "tc_r_dtc", "tc_r_htru", "tc_r_tc"} * } - * }) + * ) */ protected $agreedByTcRole; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $assignedCaseworker; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isEcmsCase = null; /** * @var string * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $ecmsFirstReceivedDate; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":32}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":32}) */ protected $piTypes = []; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $reasons = []; diff --git a/src/Command/Cases/Pi/UpdateDecision.php b/src/Command/Cases/Pi/UpdateDecision.php index ce2b5052..748e2f5b 100644 --- a/src/Command/Cases/Pi/UpdateDecision.php +++ b/src/Command/Cases/Pi/UpdateDecision.php @@ -21,85 +21,84 @@ class UpdateDecision extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $decidedByTc; /** * @var String - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": {"tc_r_dhtru", "tc_r_dtc", "tc_r_htru", "tc_r_tc"} * } - * }) + * ) */ protected $decidedByTcRole; /** * @var int * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $decisions = []; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $licenceRevokedAtPi; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $licenceSuspendedAtPi; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $licenceCurtailedAtPi; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $decisionDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $notificationDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $decisionNotes; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":32}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":32}) * @Transfer\Optional */ protected $tmDecisions = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $tmCalledWithOperator; diff --git a/src/Command/Cases/Pi/UpdateSla.php b/src/Command/Cases/Pi/UpdateSla.php index cab6518a..fa72b5ec 100644 --- a/src/Command/Cases/Pi/UpdateSla.php +++ b/src/Command/Cases/Pi/UpdateSla.php @@ -18,55 +18,54 @@ class UpdateSla extends AbstractCommand /** * @var String * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": {"piwo_verbal", "piwo_reason", "piwo_decision"} * } - * }) + * ) */ protected $writtenOutcome; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $callUpLetterDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $briefToTcDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $tcWrittenReasonDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $writtenReasonLetterDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $tcWrittenDecisionDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $decisionLetterSentDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $writtenDecisionLetterDate; diff --git a/src/Command/Cases/Pi/UpdateTmDecision.php b/src/Command/Cases/Pi/UpdateTmDecision.php index 4adf3e2e..e452635c 100644 --- a/src/Command/Cases/Pi/UpdateTmDecision.php +++ b/src/Command/Cases/Pi/UpdateTmDecision.php @@ -21,49 +21,48 @@ class UpdateTmDecision extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $decidedByTc; /** * @var String - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": {"tc_r_dhtru", "tc_r_dtc", "tc_r_htru", "tc_r_tc"} * } - * }) + * ) */ protected $decidedByTcRole; /** * @var int * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $decisions = []; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $decisionDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $notificationDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $decisionNotes; diff --git a/src/Command/Cases/PresidingTc/Create.php b/src/Command/Cases/PresidingTc/Create.php index 603ac118..b186c917 100644 --- a/src/Command/Cases/PresidingTc/Create.php +++ b/src/Command/Cases/PresidingTc/Create.php @@ -3,6 +3,7 @@ /** * Create a Presiding TC */ + namespace Dvsa\Olcs\Transfer\Command\Cases\PresidingTc; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -18,8 +19,8 @@ final class Create extends AbstractCommand use User; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 70}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":70}) */ protected $name; diff --git a/src/Command/Cases/PresidingTc/Delete.php b/src/Command/Cases/PresidingTc/Delete.php index e5fe3c7d..4a027dbe 100644 --- a/src/Command/Cases/PresidingTc/Delete.php +++ b/src/Command/Cases/PresidingTc/Delete.php @@ -3,6 +3,7 @@ /** * Delete IRHP Permit Stock */ + namespace Dvsa\Olcs\Transfer\Command\Cases\PresidingTc; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Cases/PresidingTc/Update.php b/src/Command/Cases/PresidingTc/Update.php index 2a1f792a..92f35f49 100644 --- a/src/Command/Cases/PresidingTc/Update.php +++ b/src/Command/Cases/PresidingTc/Update.php @@ -3,6 +3,7 @@ /** * Update Presiding TC Stock */ + namespace Dvsa\Olcs\Transfer\Command\Cases\PresidingTc; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -20,8 +21,8 @@ final class Update extends AbstractCommand use User; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 70}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":70}) */ protected $name; diff --git a/src/Command/Cases/Prohibition/Create.php b/src/Command/Cases/Prohibition/Create.php index 55b39640..81effda0 100644 --- a/src/Command/Cases/Prohibition/Create.php +++ b/src/Command/Cases/Prohibition/Create.php @@ -4,7 +4,6 @@ use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; - use Dvsa\Olcs\Transfer\FieldType as FieldType; /** @@ -23,24 +22,16 @@ class Create extends AbstractCommand implements /** * @var int * - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ public $prohibitionDate = null; /** * @var String * - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": { - * "Y", - * "N" - * } - * } - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $isTrailer = null; @@ -48,16 +39,15 @@ class Create extends AbstractCommand implements * @var string * * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) - * @Transfer\Validator({ - * "name": "\Dvsa\Olcs\Transfer\Validators\DateCompare", - * "options": { + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateCompare", + * options={ * "compare_to":"prohibitionDate", * "compare_to_label":"Prohibition date", * "operator": "gte", * } - * }) + * ) */ public $clearedDate = null; @@ -65,8 +55,8 @@ class Create extends AbstractCommand implements * @var string * * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":255}) */ public $imposedAt = null; diff --git a/src/Command/Cases/Prohibition/Defect/Create.php b/src/Command/Cases/Prohibition/Defect/Create.php index e4aa697b..17833a5d 100644 --- a/src/Command/Cases/Prohibition/Defect/Create.php +++ b/src/Command/Cases/Prohibition/Defect/Create.php @@ -4,7 +4,6 @@ use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; - use Dvsa\Olcs\Transfer\FieldType as FieldType; /** @@ -19,8 +18,8 @@ class Create extends AbstractCommand /** * @var string * - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":255}) */ public $defectType = null; diff --git a/src/Command/Cases/Prohibition/Defect/Update.php b/src/Command/Cases/Prohibition/Defect/Update.php index f8b9e4c8..f853d02a 100644 --- a/src/Command/Cases/Prohibition/Defect/Update.php +++ b/src/Command/Cases/Prohibition/Defect/Update.php @@ -25,8 +25,8 @@ class Update extends AbstractCommand implements /** * @var string * - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":255}) */ public $defectType = null; diff --git a/src/Command/Cases/Prohibition/Update.php b/src/Command/Cases/Prohibition/Update.php index 664a9e9e..46bde156 100644 --- a/src/Command/Cases/Prohibition/Update.php +++ b/src/Command/Cases/Prohibition/Update.php @@ -29,24 +29,16 @@ class Update extends AbstractCommand implements /** * @var int * - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ public $prohibitionDate = null; /** * @var String * - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": { - * "Y", - * "N" - * } - * } - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public $isTrailer = null; @@ -54,16 +46,15 @@ class Update extends AbstractCommand implements * @var string * * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) - * @Transfer\Validator({ - * "name": "\Dvsa\Olcs\Transfer\Validators\DateCompare", - * "options": { + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateCompare", + * options={ * "compare_to":"prohibitionDate", * "compare_to_label":"Prohibition date", * "operator": "gte", * } - * }) + * ) */ public $clearedDate = null; @@ -71,8 +62,8 @@ class Update extends AbstractCommand implements * @var string * * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":255}) */ public $imposedAt = null; diff --git a/src/Command/Cases/ProposeToRevoke/CreateProposeToRevoke.php b/src/Command/Cases/ProposeToRevoke/CreateProposeToRevoke.php index b16cad42..34e11fd0 100644 --- a/src/Command/Cases/ProposeToRevoke/CreateProposeToRevoke.php +++ b/src/Command/Cases/ProposeToRevoke/CreateProposeToRevoke.php @@ -3,6 +3,7 @@ /** * Create ProposeToRevoke */ + namespace Dvsa\Olcs\Transfer\Command\Cases\ProposeToRevoke; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,53 +16,53 @@ final class CreateProposeToRevoke extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $reasons = []; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ protected $assignedCaseworker = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $presidingTc; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $ptrAgreedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") * @Transfer\Optional */ protected $closedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":5,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) * @Transfer\Optional */ protected $comment; diff --git a/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevoke.php b/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevoke.php index 75346c4e..1e4c7f54 100644 --- a/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevoke.php +++ b/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevoke.php @@ -3,6 +3,7 @@ /** * Update ProposeToRevoke */ + namespace Dvsa\Olcs\Transfer\Command\Cases\ProposeToRevoke; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,60 +16,60 @@ final class UpdateProposeToRevoke extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $reasons = []; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ protected $assignedCaseworker = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $presidingTc; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $ptrAgreedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") * @Transfer\Optional */ protected $closedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":5,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) * @Transfer\Optional */ protected $comment; diff --git a/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeSla.php b/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeSla.php index e3d747af..fe197f81 100644 --- a/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeSla.php +++ b/src/Command/Cases/ProposeToRevoke/UpdateProposeToRevokeSla.php @@ -3,6 +3,7 @@ /** * Update ProposeToRevokeSla */ + namespace Dvsa\Olcs\Transfer\Command\Cases\ProposeToRevoke; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,112 +16,109 @@ final class UpdateProposeToRevokeSla extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {1, 0}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {1, 0}}) */ protected $isSubmissionRequiredForApproval; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $approvalSubmissionIssuedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $approvalSubmissionReturnedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $approvalSubmissionPresidingTc; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $iorLetterIssuedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $operatorResponseDueDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $operatorResponseReceivedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {1, 0}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {1, 0}}) */ protected $isSubmissionRequiredForAction; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $finalSubmissionIssuedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $finalSubmissionReturnedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $finalSubmissionPresidingTc; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": { * "ptr_action_to_be_taken_revoke", * "ptr_action_to_be_taken_pi", * "ptr_action_to_be_taken_warning", * "ptr_action_to_be_taken_nfa", * "ptr_action_to_be_taken_other" * }} - * } * ) * */ @@ -128,36 +126,36 @@ final class UpdateProposeToRevokeSla extends AbstractCommand /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $revocationLetterIssuedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $nfaLetterIssuedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $warningLetterIssuedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $piAgreedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $otherActionAgreedDate; diff --git a/src/Command/Cases/Si/Applied/Create.php b/src/Command/Cases/Si/Applied/Create.php index 744b2056..c6431b64 100644 --- a/src/Command/Cases/Si/Applied/Create.php +++ b/src/Command/Cases/Si/Applied/Create.php @@ -18,22 +18,22 @@ class Create extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $si; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $imposed; /** * @var String - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":500}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":500}) * @Transfer\Optional */ protected $reasonNotImposed; diff --git a/src/Command/Cases/Si/Applied/Update.php b/src/Command/Cases/Si/Applied/Update.php index b3b66a12..93bde13b 100644 --- a/src/Command/Cases/Si/Applied/Update.php +++ b/src/Command/Cases/Si/Applied/Update.php @@ -18,15 +18,15 @@ class Update extends AbstractCommand use FieldType\EndDateOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $imposed; /** * @var String - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":500}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":500}) * @Transfer\Optional */ protected $reasonNotImposed; diff --git a/src/Command/Cases/Si/ComplianceEpisode.php b/src/Command/Cases/Si/ComplianceEpisode.php index 7af09ab0..bb5f3138 100644 --- a/src/Command/Cases/Si/ComplianceEpisode.php +++ b/src/Command/Cases/Si/ComplianceEpisode.php @@ -14,5 +14,4 @@ */ class ComplianceEpisode extends AbstractXmlCommand { - } diff --git a/src/Command/Cases/Si/CreateSi.php b/src/Command/Cases/Si/CreateSi.php index 9362df06..f673c498 100644 --- a/src/Command/Cases/Si/CreateSi.php +++ b/src/Command/Cases/Si/CreateSi.php @@ -15,40 +15,40 @@ class CreateSi extends AbstractCommand use FieldType\Cases; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":36}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":36}) * @Transfer\Optional */ protected $notificationNumber = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $siCategoryType; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $infringementDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $checkDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":2}) */ protected $memberStateCode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":5000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":5000}) * @Transfer\Optional */ protected $reason = null; diff --git a/src/Command/Cases/Si/UpdateSi.php b/src/Command/Cases/Si/UpdateSi.php index 10b1ca21..a7bd9ef0 100644 --- a/src/Command/Cases/Si/UpdateSi.php +++ b/src/Command/Cases/Si/UpdateSi.php @@ -16,40 +16,40 @@ class UpdateSi extends AbstractCommand use FieldType\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":36}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":36}) * @Transfer\Optional */ protected $notificationNumber = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $siCategoryType; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $infringementDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $checkDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":2}) */ protected $memberStateCode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":5000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":5000}) * @Transfer\Optional */ protected $reason = null; diff --git a/src/Command/Cases/Statement/CreateStatement.php b/src/Command/Cases/Statement/CreateStatement.php index 13df8f3c..f1cd234d 100644 --- a/src/Command/Cases/Statement/CreateStatement.php +++ b/src/Command/Cases/Statement/CreateStatement.php @@ -12,18 +12,13 @@ class CreateStatement extends AbstractCommand { /** - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case = null; /** - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"statement_t_ni", "statement_t_43", "statement_t_9"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"statement_t_ni", "statement_t_43", "statement_t_9"}}) */ protected $statementType = null; @@ -31,8 +26,8 @@ class CreateStatement extends AbstractCommand /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ protected $assignedCaseworker = null; @@ -46,41 +41,36 @@ class CreateStatement extends AbstractCommand protected $requestorsContactDetails; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":40}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":40}) */ protected $requestorsBody = null; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $stoppedDate = null; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $requestedDate = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $issuedDate = null; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"cm_email", "cm_fax", "cm_letter", "cm_tel"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cm_email", "cm_fax", "cm_letter", "cm_tel"}}) */ protected $contactType = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $authorisersDecision = null; diff --git a/src/Command/Cases/Statement/UpdateStatement.php b/src/Command/Cases/Statement/UpdateStatement.php index ccb44e81..1510495b 100644 --- a/src/Command/Cases/Statement/UpdateStatement.php +++ b/src/Command/Cases/Statement/UpdateStatement.php @@ -19,20 +19,15 @@ class UpdateStatement extends AbstractCommand implements use FieldType\Traits\Version; /** - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"statement_t_ni", "statement_t_43", "statement_t_9"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"statement_t_ni", "statement_t_43", "statement_t_9"}}) */ protected $statementType = null; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ protected $assignedCaseworker = null; @@ -46,41 +41,36 @@ class UpdateStatement extends AbstractCommand implements protected $requestorsContactDetails; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":40}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":40}) */ protected $requestorsBody = null; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $stoppedDate = null; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $requestedDate = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $issuedDate = null; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"cm_email", "cm_fax", "cm_letter", "cm_tel"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cm_email", "cm_fax", "cm_letter", "cm_tel"}}) */ protected $contactType = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $authorisersDecision = null; diff --git a/src/Command/Cases/UpdateAnnualTestHistory.php b/src/Command/Cases/UpdateAnnualTestHistory.php index 12e284df..a474d4b4 100644 --- a/src/Command/Cases/UpdateAnnualTestHistory.php +++ b/src/Command/Cases/UpdateAnnualTestHistory.php @@ -17,8 +17,8 @@ class UpdateAnnualTestHistory extends AbstractCommand use FieldType\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":4000}) * @Transfer\Optional */ protected $annualTestHistory = null; diff --git a/src/Command/Cases/UpdateCase.php b/src/Command/Cases/UpdateCase.php index ed545a9f..0bd76573 100644 --- a/src/Command/Cases/UpdateCase.php +++ b/src/Command/Cases/UpdateCase.php @@ -22,15 +22,15 @@ class UpdateCase extends AbstractCommand use FieldType\CaseType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"max":45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":45}) * @Transfer\Optional */ protected $ecmsNo = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":1024}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":1024}) * @Transfer\Optional */ protected $description = null; diff --git a/src/Command/Cases/UpdateConvictionNote.php b/src/Command/Cases/UpdateConvictionNote.php index ccac6517..995ba550 100644 --- a/src/Command/Cases/UpdateConvictionNote.php +++ b/src/Command/Cases/UpdateConvictionNote.php @@ -16,8 +16,8 @@ class UpdateConvictionNote extends AbstractCommand use FieldType\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":4000}) * @Transfer\Optional */ protected $convictionNote = null; diff --git a/src/Command/Cases/UpdatePenaltiesNote.php b/src/Command/Cases/UpdatePenaltiesNote.php index 87ecbccf..68974d8d 100644 --- a/src/Command/Cases/UpdatePenaltiesNote.php +++ b/src/Command/Cases/UpdatePenaltiesNote.php @@ -16,8 +16,8 @@ class UpdatePenaltiesNote extends AbstractCommand use FieldType\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":4000}) */ protected $penaltiesNote = null; diff --git a/src/Command/Cases/UpdateProhibitionNote.php b/src/Command/Cases/UpdateProhibitionNote.php index c6f23985..1bb9b2cf 100644 --- a/src/Command/Cases/UpdateProhibitionNote.php +++ b/src/Command/Cases/UpdateProhibitionNote.php @@ -16,8 +16,8 @@ class UpdateProhibitionNote extends AbstractCommand use FieldType\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":4000}) * @Transfer\Optional */ protected $prohibitionNote = null; diff --git a/src/Command/ChangeOfEntity/CreateChangeOfEntity.php b/src/Command/ChangeOfEntity/CreateChangeOfEntity.php index 5e5d84ed..d75e47f1 100644 --- a/src/Command/ChangeOfEntity/CreateChangeOfEntity.php +++ b/src/Command/ChangeOfEntity/CreateChangeOfEntity.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\ChangeOfEntity; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,21 +18,21 @@ final class CreateChangeOfEntity extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $applicationId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":18}) */ protected $oldLicenceNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":160}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":160}) */ protected $oldOrganisationName; diff --git a/src/Command/ChangeOfEntity/DeleteChangeOfEntity.php b/src/Command/ChangeOfEntity/DeleteChangeOfEntity.php index 0952dbc3..8c175ec5 100644 --- a/src/Command/ChangeOfEntity/DeleteChangeOfEntity.php +++ b/src/Command/ChangeOfEntity/DeleteChangeOfEntity.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\ChangeOfEntity; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class DeleteChangeOfEntity extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; diff --git a/src/Command/ChangeOfEntity/UpdateChangeOfEntity.php b/src/Command/ChangeOfEntity/UpdateChangeOfEntity.php index 3e1e86cf..f64bac14 100644 --- a/src/Command/ChangeOfEntity/UpdateChangeOfEntity.php +++ b/src/Command/ChangeOfEntity/UpdateChangeOfEntity.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\ChangeOfEntity; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,29 +19,29 @@ final class UpdateChangeOfEntity extends AbstractCommand { /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":18}) */ protected $oldLicenceNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":160}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":160}) */ protected $oldOrganisationName; diff --git a/src/Command/CommandContainer.php b/src/Command/CommandContainer.php index 938c967d..6d496787 100644 --- a/src/Command/CommandContainer.php +++ b/src/Command/CommandContainer.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command; use Laminas\InputFilter\InputFilterInterface; diff --git a/src/Command/CommandContainerInterface.php b/src/Command/CommandContainerInterface.php index 4d5871b8..6976d012 100644 --- a/src/Command/CommandContainerInterface.php +++ b/src/Command/CommandContainerInterface.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command; use Laminas\InputFilter\InputFilterInterface; diff --git a/src/Command/CommandInterface.php b/src/Command/CommandInterface.php index a81593e5..94afa394 100644 --- a/src/Command/CommandInterface.php +++ b/src/Command/CommandInterface.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command; use Laminas\Stdlib\ArraySerializableInterface; diff --git a/src/Command/CommunityLic/Annul.php b/src/Command/CommunityLic/Annul.php index 4e717e53..bbd7905c 100644 --- a/src/Command/CommunityLic/Annul.php +++ b/src/Command/CommunityLic/Annul.php @@ -13,14 +13,14 @@ */ final class Annul extends AbstractCommand { - use ApplicationOptional, - Licence; + use ApplicationOptional; + use Licence; /** * @var array * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $communityLicenceIds = []; diff --git a/src/Command/CommunityLic/Application/Create.php b/src/Command/CommunityLic/Application/Create.php index 9be3ed3a..1ad02d45 100644 --- a/src/Command/CommunityLic/Application/Create.php +++ b/src/Command/CommunityLic/Application/Create.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\CommunityLic\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,23 +18,23 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $totalLicences; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $identifier; diff --git a/src/Command/CommunityLic/Application/CreateOfficeCopy.php b/src/Command/CommunityLic/Application/CreateOfficeCopy.php index 302e005e..00fe6b8c 100644 --- a/src/Command/CommunityLic/Application/CreateOfficeCopy.php +++ b/src/Command/CommunityLic/Application/CreateOfficeCopy.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\CommunityLic\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,16 +18,16 @@ final class CreateOfficeCopy extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $identifier; diff --git a/src/Command/CommunityLic/EditSuspension.php b/src/Command/CommunityLic/EditSuspension.php index 7d9a2157..a8907477 100644 --- a/src/Command/CommunityLic/EditSuspension.php +++ b/src/Command/CommunityLic/EditSuspension.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\CommunityLic; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -21,38 +22,35 @@ final class EditSuspension extends AbstractCommand use FieldTypeTraits\Version; /** - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $communityLicenceId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"cl_sts_active", "cl_sts_suspended"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cl_sts_active", "cl_sts_suspended"}}) */ protected $status; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $startDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $endDate; /** * @Transfer\ArrayInput - * @Transfer\ArrayValidator({"name":"Laminas\Validator\NotEmpty"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\ArrayValidator("Laminas\Validator\NotEmpty") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $reasons = []; diff --git a/src/Command/CommunityLic/Licence/Create.php b/src/Command/CommunityLic/Licence/Create.php index 93e4c79b..a6abc044 100644 --- a/src/Command/CommunityLic/Licence/Create.php +++ b/src/Command/CommunityLic/Licence/Create.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\CommunityLic\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,16 +18,16 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $totalLicences; diff --git a/src/Command/CommunityLic/Licence/CreateOfficeCopy.php b/src/Command/CommunityLic/Licence/CreateOfficeCopy.php index 0464e8bf..112cdd21 100644 --- a/src/Command/CommunityLic/Licence/CreateOfficeCopy.php +++ b/src/Command/CommunityLic/Licence/CreateOfficeCopy.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\CommunityLic\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ final class CreateOfficeCopy extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $licence; diff --git a/src/Command/CommunityLic/Reprint.php b/src/Command/CommunityLic/Reprint.php index 240039b2..15a62712 100644 --- a/src/Command/CommunityLic/Reprint.php +++ b/src/Command/CommunityLic/Reprint.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\CommunityLic; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -23,20 +24,20 @@ final class Reprint extends AbstractCommand use UserOptional; /** - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $licence; /** * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $communityLicenceIds = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $isBatchReprint; diff --git a/src/Command/CommunityLic/Restore.php b/src/Command/CommunityLic/Restore.php index 07ba9671..32622d7a 100644 --- a/src/Command/CommunityLic/Restore.php +++ b/src/Command/CommunityLic/Restore.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\CommunityLic; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,16 +18,16 @@ final class Restore extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $licence; /** * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $communityLicenceIds = []; diff --git a/src/Command/CommunityLic/Stop.php b/src/Command/CommunityLic/Stop.php index 29ca09a7..ba35c5a7 100644 --- a/src/Command/CommunityLic/Stop.php +++ b/src/Command/CommunityLic/Stop.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\CommunityLic; use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationOptional; @@ -18,40 +19,40 @@ */ final class Stop extends AbstractCommand { - use ApplicationOptional, - Licence; + use ApplicationOptional; + use Licence; /** * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $communityLicenceIds = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"withdrawal", "suspension"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"withdrawal", "suspension"}}) */ protected $type; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $startDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $endDate; /** * @Transfer\ArrayInput - * @Transfer\ArrayValidator({"name":"Laminas\Validator\NotEmpty"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\ArrayValidator("Laminas\Validator\NotEmpty") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $reasons = []; diff --git a/src/Command/CompaniesHouse/CloseAlerts.php b/src/Command/CompaniesHouse/CloseAlerts.php index c8b984a9..4cbaa764 100644 --- a/src/Command/CompaniesHouse/CloseAlerts.php +++ b/src/Command/CompaniesHouse/CloseAlerts.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\CompaniesHouse; use Dvsa\Olcs\Transfer\FieldType\Traits\Ids; diff --git a/src/Command/Complaint/CreateComplaint.php b/src/Command/Complaint/CreateComplaint.php index 64ca3cca..bd9edfd2 100644 --- a/src/Command/Complaint/CreateComplaint.php +++ b/src/Command/Complaint/CreateComplaint.php @@ -12,8 +12,8 @@ class CreateComplaint extends AbstractCommand { /** - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case = null; @@ -24,53 +24,45 @@ class CreateComplaint extends AbstractCommand /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) - * @Transfer\Validator({"name":"Laminas\Validator\Identical", "options": {"token": true}}) + * @Transfer\Filter("Laminas\Filter\Boolean") + * @Transfer\Validator("Laminas\Validator\Identical", options={"token": true}) */ protected $isCompliance = true; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $complainantForename = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $complainantFamilyName = null; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $complaintDate = null; /** - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ct_cor","ct_cov","ct_dgm","ct_dsk","ct_fls","ct_lvu","ct_ndl","ct_nol","ct_olr", + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"ct_cor","ct_cov","ct_dgm","ct_dsk","ct_fls","ct_lvu","ct_ndl","ct_nol","ct_olr", * "ct_ovb","ct_pvo","ct_rds","ct_rta","ct_sln","ct_spe","ct_tgo","ct_ufl","ct_ump","ct_urd","ct_vpo"}} - * } * ) */ protected $complaintType = null; /** - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"cs_ack","cs_pin","cs_rfs","cs_vfr","cs_yst"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cs_ack","cs_pin","cs_rfs","cs_vfr","cs_yst"}}) */ protected $status = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":4000}}) + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $description = null; @@ -81,20 +73,20 @@ class CreateComplaint extends AbstractCommand /** * @Transfer\Optional() - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $driverForename = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $driverFamilyName = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $closedDate = null; diff --git a/src/Command/Complaint/DeleteComplaint.php b/src/Command/Complaint/DeleteComplaint.php index ef59d07d..da4c516b 100644 --- a/src/Command/Complaint/DeleteComplaint.php +++ b/src/Command/Complaint/DeleteComplaint.php @@ -15,8 +15,8 @@ class DeleteComplaint extends AbstractDeleteCommand { /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) - * @Transfer\Validator({"name":"Laminas\Validator\Identical", "options": {"token": true}}) + * @Transfer\Filter("Laminas\Filter\Boolean") + * @Transfer\Validator("Laminas\Validator\Identical", options={"token": true}) */ protected $isCompliance = true; diff --git a/src/Command/Complaint/UpdateComplaint.php b/src/Command/Complaint/UpdateComplaint.php index 04620448..805933f9 100644 --- a/src/Command/Complaint/UpdateComplaint.php +++ b/src/Command/Complaint/UpdateComplaint.php @@ -13,24 +13,24 @@ class UpdateComplaint extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id = null; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version = null; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) - * @Transfer\Validator({"name":"Laminas\Validator\Identical", "options": {"token": true}}) + * @Transfer\Filter("Laminas\Filter\Boolean") + * @Transfer\Validator("Laminas\Validator\Identical", options={"token": true}) */ protected $isCompliance = true; @@ -40,47 +40,38 @@ class UpdateComplaint extends AbstractCommand protected $contactType = 'ct_complainant'; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $complainantForename = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $complainantFamilyName = null; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $complaintDate = null; /** - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ct_cor","ct_cov","ct_dgm","ct_dsk","ct_fls","ct_lvu","ct_ndl","ct_nol","ct_olr", - * "ct_ovb","ct_pvo","ct_rds","ct_rta","ct_sln","ct_spe","ct_tgo","ct_ufl","ct_ump","ct_urd","ct_vpo"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"ct_cor","ct_cov","ct_dgm","ct_dsk","ct_fls","ct_lvu","ct_ndl","ct_nol","ct_olr", + * "ct_ovb","ct_pvo","ct_rds","ct_rta","ct_sln","ct_spe","ct_tgo","ct_ufl","ct_ump","ct_urd","ct_vpo"}}) */ protected $complaintType = null; /** - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"cs_ack","cs_pin","cs_rfs","cs_vfr","cs_yst"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cs_ack","cs_pin","cs_rfs","cs_vfr","cs_yst"}}) */ protected $status = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":4000}}) + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $description = null; @@ -91,20 +82,20 @@ class UpdateComplaint extends AbstractCommand /** * @Transfer\Optional() - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $driverForename = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $driverFamilyName = null; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $closedDate = null; diff --git a/src/Command/ConditionUndertaking/Create.php b/src/Command/ConditionUndertaking/Create.php index 8114c31d..2910e91a 100644 --- a/src/Command/ConditionUndertaking/Create.php +++ b/src/Command/ConditionUndertaking/Create.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\ConditionUndertaking; use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationOptional; @@ -19,51 +20,47 @@ */ final class Create extends AbstractCommand { - use LicenceOptional, - ApplicationOptional, - CasesOptional; + use LicenceOptional; + use ApplicationOptional; + use CasesOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"cdt_con", "cdt_und"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cdt_con", "cdt_und"}}) */ protected $type; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={ * "haystack": {"cu_cat_env", "cu_cat_busreg", "cu_cat_fin", "cu_cat_other"} * } - * } * ) */ protected $conditionCategory; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":8000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":8000}) */ protected $notes; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $fulfilled; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"cat_lic", "cat_oc"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cat_lic", "cat_oc"}}) */ protected $attachedTo; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $operatingCentre; diff --git a/src/Command/ConditionUndertaking/DeleteList.php b/src/Command/ConditionUndertaking/DeleteList.php index ab6f5f24..1e3eca94 100644 --- a/src/Command/ConditionUndertaking/DeleteList.php +++ b/src/Command/ConditionUndertaking/DeleteList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\ConditionUndertaking; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ class DeleteList extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/ConditionUndertaking/Update.php b/src/Command/ConditionUndertaking/Update.php index c508a0ee..864750ea 100644 --- a/src/Command/ConditionUndertaking/Update.php +++ b/src/Command/ConditionUndertaking/Update.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\ConditionUndertaking; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,50 +19,47 @@ */ final class Update extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"cdt_con", "cdt_und"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cdt_con", "cdt_und"}}) */ protected $type; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": {"cu_cat_env", "cu_cat_busreg", "cu_cat_fin", "cu_cat_other"} * } - * } * ) */ protected $conditionCategory; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":8000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":8000}) */ protected $notes; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $fulfilled; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"cat_lic", "cat_oc"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cat_lic", "cat_oc"}}) */ protected $attachedTo; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $operatingCentre; diff --git a/src/Command/ContactDetail/PhoneContact/Create.php b/src/Command/ContactDetail/PhoneContact/Create.php index 4e538f27..3ba4307e 100644 --- a/src/Command/ContactDetail/PhoneContact/Create.php +++ b/src/Command/ContactDetail/PhoneContact/Create.php @@ -13,30 +13,29 @@ class Create extends AbstractCommand { /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "phone_t_primary", "phone_t_secondary" * } * } - * }) + * ) */ public $phoneContactType; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max": 45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max": 45}) */ protected $phoneNumber; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $contactDetailsId; diff --git a/src/Command/Continuation/Create.php b/src/Command/Continuation/Create.php index 9e6de867..217aea33 100644 --- a/src/Command/Continuation/Create.php +++ b/src/Command/Continuation/Create.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Continuation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,21 +18,21 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 1, "max": 12}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 1, "max": 12}) */ public $month; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ public $year; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":18}) */ protected $trafficArea; diff --git a/src/Command/ContinuationDetail/PrepareContinuations.php b/src/Command/ContinuationDetail/PrepareContinuations.php index 3b11a67a..1c788093 100644 --- a/src/Command/ContinuationDetail/PrepareContinuations.php +++ b/src/Command/ContinuationDetail/PrepareContinuations.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\ContinuationDetail; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,8 +19,8 @@ final class PrepareContinuations extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") * @Transfer\Optional */ protected $ids = []; diff --git a/src/Command/ContinuationDetail/Queue.php b/src/Command/ContinuationDetail/Queue.php index a042cedb..882cd6c5 100644 --- a/src/Command/ContinuationDetail/Queue.php +++ b/src/Command/ContinuationDetail/Queue.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\ContinuationDetail; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,18 +19,16 @@ final class Queue extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") * @Transfer\Optional */ protected $ids = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "que_typ_cont_check_rem_gen_let", * "que_typ_cpid_export_csv", @@ -38,7 +37,6 @@ final class Queue extends AbstractCommand * "que_typ_cont_checklist" * } * } - * } * ) * @Transfer\Optional */ diff --git a/src/Command/ContinuationDetail/Submit.php b/src/Command/ContinuationDetail/Submit.php index 4061c37c..29857b75 100644 --- a/src/Command/ContinuationDetail/Submit.php +++ b/src/Command/ContinuationDetail/Submit.php @@ -13,6 +13,6 @@ */ final class Submit extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; } diff --git a/src/Command/ContinuationDetail/Update.php b/src/Command/ContinuationDetail/Update.php index f57d8979..618c74d4 100644 --- a/src/Command/ContinuationDetail/Update.php +++ b/src/Command/ContinuationDetail/Update.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\ContinuationDetail; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,43 +19,43 @@ */ final class Update extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $received; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\ContinuationDetailStatus"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\ContinuationDetailStatus") * @Transfer\Optional */ protected $status; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 999999}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 999999}) * @Transfer\Optional */ protected $totAuthVehicles; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 999999}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 999999}) * @Transfer\Optional */ protected $totPsvDiscs; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 999999}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 999999}) * @Transfer\Optional */ protected $totCommunityLicences; diff --git a/src/Command/ContinuationDetail/UpdateFinances.php b/src/Command/ContinuationDetail/UpdateFinances.php index d3ad40ae..76d45186 100644 --- a/src/Command/ContinuationDetail/UpdateFinances.php +++ b/src/Command/ContinuationDetail/UpdateFinances.php @@ -13,65 +13,65 @@ */ final class UpdateFinances extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Money", "options": {"allow_negative": true}}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": -9999999999, "max": 9999999999}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Money", options={"allow_negative": true}) + * @Transfer\Validator("Laminas\Validator\Between", options={"min": -9999999999, "max": 9999999999}) * @Transfer\Optional */ protected $averageBalanceAmount; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $hasOverdraft; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Money"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 9999999999}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Money") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 9999999999}) * @Transfer\Optional */ protected $overdraftAmount; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $hasFactoring; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Money"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 9999999999}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Money") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 9999999999}) * @Transfer\Optional */ protected $factoringAmount; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $hasOtherFinances; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Money"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 9999999999}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Money") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 9999999999}) * @Transfer\Optional */ protected $otherFinancesAmount; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":200}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":200}) * @Transfer\Optional */ protected $otherFinancesDetails; diff --git a/src/Command/ContinuationDetail/UpdateInsufficientFinances.php b/src/Command/ContinuationDetail/UpdateInsufficientFinances.php index 540329e3..ba6b8b34 100644 --- a/src/Command/ContinuationDetail/UpdateInsufficientFinances.php +++ b/src/Command/ContinuationDetail/UpdateInsufficientFinances.php @@ -13,10 +13,11 @@ */ final class UpdateInsufficientFinances extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; + /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $financialEvidenceUploaded; diff --git a/src/Command/Correspondence/AccessCorrespondence.php b/src/Command/Correspondence/AccessCorrespondence.php index 6aaf40e1..6a620a21 100644 --- a/src/Command/Correspondence/AccessCorrespondence.php +++ b/src/Command/Correspondence/AccessCorrespondence.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Correspondence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class AccessCorrespondence extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/Cpms/DownloadReport.php b/src/Command/Cpms/DownloadReport.php index c82ed86d..161c8102 100644 --- a/src/Command/Cpms/DownloadReport.php +++ b/src/Command/Cpms/DownloadReport.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Cpms; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,28 +18,28 @@ final class DownloadReport extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $reference; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $token; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) * @Transfer\Optional */ protected $filename; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $user; diff --git a/src/Command/Cpms/RequestReport.php b/src/Command/Cpms/RequestReport.php index c2bd3655..422c3e54 100644 --- a/src/Command/Cpms/RequestReport.php +++ b/src/Command/Cpms/RequestReport.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Cpms; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,26 +18,26 @@ final class RequestReport extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $reportCode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $name; /** * @var \DateTime - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d"}) */ protected $start; /** * @var \DateTime - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d"}) */ protected $end; diff --git a/src/Command/DataRetention/AssignItems.php b/src/Command/DataRetention/AssignItems.php index c75fd3ad..a4968b73 100644 --- a/src/Command/DataRetention/AssignItems.php +++ b/src/Command/DataRetention/AssignItems.php @@ -1,4 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Command\Disqualification; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,43 +18,43 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $organisation; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $person; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $isDisqualified; /** - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $startDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") * @Transfer\Optional */ protected $period; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 0, "max": 4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":4000}) * @Transfer\Optional */ public $notes; diff --git a/src/Command/Disqualification/Delete.php b/src/Command/Disqualification/Delete.php index a0c3fe94..844ee69e 100644 --- a/src/Command/Disqualification/Delete.php +++ b/src/Command/Disqualification/Delete.php @@ -11,5 +11,4 @@ */ final class Delete extends AbstractDeleteCommand { - } diff --git a/src/Command/Disqualification/Update.php b/src/Command/Disqualification/Update.php index 5a57c993..0c1da235 100644 --- a/src/Command/Disqualification/Update.php +++ b/src/Command/Disqualification/Update.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Disqualification; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,41 +18,41 @@ final class Update extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $isDisqualified; /** - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $startDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") * @Transfer\Optional */ protected $period; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 0, "max": 4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":4000}) * @Transfer\Optional */ public $notes; diff --git a/src/Command/DocTemplate/Create.php b/src/Command/DocTemplate/Create.php index 4f555b43..a57d8930 100644 --- a/src/Command/DocTemplate/Create.php +++ b/src/Command/DocTemplate/Create.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Command\DocTemplate; use Dvsa\Olcs\Transfer\FieldType\Traits\Category; diff --git a/src/Command/DocTemplate/Delete.php b/src/Command/DocTemplate/Delete.php index dafa2f0d..c8abe22e 100644 --- a/src/Command/DocTemplate/Delete.php +++ b/src/Command/DocTemplate/Delete.php @@ -3,6 +3,7 @@ /** * Delete Document Template */ + namespace Dvsa\Olcs\Transfer\Command\DocTemplate; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/DocTemplate/Update.php b/src/Command/DocTemplate/Update.php index f32b50f6..4183d08f 100644 --- a/src/Command/DocTemplate/Update.php +++ b/src/Command/DocTemplate/Update.php @@ -5,6 +5,7 @@ * * author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Command\DocTemplate; use Dvsa\Olcs\Transfer\FieldType\Traits\Category; diff --git a/src/Command/Document/CopyDocument.php b/src/Command/Document/CopyDocument.php index ae5286f5..1f08e2b7 100644 --- a/src/Command/Document/CopyDocument.php +++ b/src/Command/Document/CopyDocument.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Document; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,30 +19,27 @@ final class CopyDocument extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "application", "busReg", "case", "irfoOrganisation", "irhpApplication", "licence", "transportManager" * } * } - * } * ) */ public $type; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $targetId; diff --git a/src/Command/Document/CreateDocument.php b/src/Command/Document/CreateDocument.php index 3f6bc92e..2437f9ee 100644 --- a/src/Command/Document/CreateDocument.php +++ b/src/Command/Document/CreateDocument.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Document; use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationOptional; @@ -21,120 +22,117 @@ */ final class CreateDocument extends AbstractCommand { - use ApplicationOptional, - BusRegOptional, - CasesOptional, - TransportManagerOptional, - LicenceOptional; + use ApplicationOptional; + use BusRegOptional; + use CasesOptional; + use TransportManagerOptional; + use LicenceOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $filename; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $identifier; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $size; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $irfoOrganisation; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $submission; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $trafficArea; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $operatingCentre; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $opposition; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $category; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $subCategory; /** - * @Transfer\Filter({ - * "name":"Laminas\Filter\PregReplace", - * "options": {"pattern": "/[^a-zA-Z0-9\-\_\.]+/", "replacement": ""} - * }) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":255}}) + * @Transfer\Filter("Laminas\Filter\PregReplace", options={"pattern": "/[^a-zA-Z0-9\-\_\.]+/", "replacement": ""}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":255}) * @Transfer\Optional */ protected $description; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $isExternal; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $isScan = 0; /** - * @Transfer\Filter({"name":"Laminas\Filter\DateTimeFormatter"}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") * @Transfer\Optional */ protected $issuedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $user; diff --git a/src/Command/Document/CreateLetter.php b/src/Command/Document/CreateLetter.php index 0bf21ae7..96bdaaa2 100644 --- a/src/Command/Document/CreateLetter.php +++ b/src/Command/Document/CreateLetter.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Document; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,16 +18,16 @@ final class CreateLetter extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $template; protected $data; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $disableBookmarks = false; diff --git a/src/Command/Document/DeleteDocument.php b/src/Command/Document/DeleteDocument.php index f14f33eb..2e54fa85 100644 --- a/src/Command/Document/DeleteDocument.php +++ b/src/Command/Document/DeleteDocument.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Document; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Document/DeleteDocuments.php b/src/Command/Document/DeleteDocuments.php index 9540a353..c22b7181 100644 --- a/src/Command/Document/DeleteDocuments.php +++ b/src/Command/Document/DeleteDocuments.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Document; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class DeleteDocuments extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Document/GenerateAndStore.php b/src/Command/Document/GenerateAndStore.php index 7349ca89..19879c74 100644 --- a/src/Command/Document/GenerateAndStore.php +++ b/src/Command/Document/GenerateAndStore.php @@ -7,6 +7,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Document; use Dvsa\Olcs\Transfer\FieldType\Traits\TrafficAreasOptional; @@ -25,13 +26,13 @@ */ class GenerateAndStore extends AbstractCommand { - use ApplicationOptional, - LicenceOptional, - BusRegOptional, - CasesOptional, - IrfoOrganisationOptional, - TransportManagerOptional, - TrafficAreasOptional; + use ApplicationOptional; + use LicenceOptional; + use BusRegOptional; + use CasesOptional; + use IrfoOrganisationOptional; + use TransportManagerOptional; + use TrafficAreasOptional; protected $template; diff --git a/src/Command/Document/MoveDocument.php b/src/Command/Document/MoveDocument.php index d4018b30..86380551 100644 --- a/src/Command/Document/MoveDocument.php +++ b/src/Command/Document/MoveDocument.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Document; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,30 +19,27 @@ final class MoveDocument extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "application", "busReg", "case", "irfoOrganisation", "irhpApplication", "licence", "transportManager" * } * } - * } * ) */ public $type; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $targetId; diff --git a/src/Command/Document/PrintLetter.php b/src/Command/Document/PrintLetter.php index f2b77d88..d3bc6af4 100644 --- a/src/Command/Document/PrintLetter.php +++ b/src/Command/Document/PrintLetter.php @@ -12,22 +12,21 @@ */ final class PrintLetter extends AbstractCommand { - const METHOD_EMAIL = 'email'; - const METHOD_PRINT_AND_POST = 'printAndPost'; - use Identity; + public const METHOD_EMAIL = 'email'; + public const METHOD_PRINT_AND_POST = 'printAndPost'; + /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * PrintLetter::METHOD_EMAIL, * PrintLetter::METHOD_PRINT_AND_POST, * }, * }, - * }) + * ) * @Transfer\Optional */ protected $method; diff --git a/src/Command/Document/PrintLetters.php b/src/Command/Document/PrintLetters.php index 690dcfb0..9a0de989 100644 --- a/src/Command/Document/PrintLetters.php +++ b/src/Command/Document/PrintLetters.php @@ -12,22 +12,21 @@ */ class PrintLetters extends AbstractCommand { - const METHOD_EMAIL = 'email'; - const METHOD_PRINT_AND_POST = 'printAndPost'; - use Ids; + public const METHOD_EMAIL = 'email'; + public const METHOD_PRINT_AND_POST = 'printAndPost'; + /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * PrintLetter::METHOD_EMAIL, * PrintLetter::METHOD_PRINT_AND_POST, * }, * }, - * }) + * ) * @Transfer\Optional */ protected $method; diff --git a/src/Command/Document/UpdateDocumentLinks.php b/src/Command/Document/UpdateDocumentLinks.php index c002a178..a940bb1a 100644 --- a/src/Command/Document/UpdateDocumentLinks.php +++ b/src/Command/Document/UpdateDocumentLinks.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Document; use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationOptional; @@ -24,93 +25,93 @@ */ final class UpdateDocumentLinks extends AbstractCommand { - use Identity, - ApplicationOptional, - BusRegOptional, - CasesOptional, - TransportManagerOptional, - LicenceOptional, - IrhpApplicationOptional, - SurrenderOptional; + use Identity; + use ApplicationOptional; + use BusRegOptional; + use CasesOptional; + use TransportManagerOptional; + use LicenceOptional; + use IrhpApplicationOptional; + use SurrenderOptional; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $irfoOrganisation; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $submission; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $trafficArea; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $operatingCentre; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $statement; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $continuationDetail; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $hearing; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $opposition; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $complaint; diff --git a/src/Command/Document/Upload.php b/src/Command/Document/Upload.php index 59be7aa3..f723b98f 100644 --- a/src/Command/Document/Upload.php +++ b/src/Command/Document/Upload.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Document; use Dvsa\Olcs\Transfer\Command\LoggerOmitContentInterface; @@ -24,151 +25,143 @@ */ final class Upload extends AbstractCommand implements LoggerOmitContentInterface { - use ApplicationOptional, - BusRegOptional, - CasesOptional, - TransportManagerOptional, - LicenceOptional, - SurrenderOptional, - IrhpApplicationOptional; + use ApplicationOptional; + use BusRegOptional; + use CasesOptional; + use TransportManagerOptional; + use LicenceOptional; + use SurrenderOptional; + use IrhpApplicationOptional; /** - * @Transfer\Filter({ - * "name":"Laminas\Filter\PregReplace", - * "options": {"pattern": "/[^a-zA-Z0-9\-\_\.]+/", "replacement": ""} - * }) + * @Transfer\Filter("Laminas\Filter\PregReplace", options={"pattern": "/[^a-zA-Z0-9\-\_\.]+/", "replacement": ""}) */ protected $filename; protected $content; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $irfoOrganisation; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $submission; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $trafficArea; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $operatingCentre; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $opposition; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $continuationDetail; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $category; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $subCategory; /** - * @Transfer\Filter({ - * "name":"Laminas\Filter\PregReplace", - * "options": {"pattern": "/[^a-zA-Z0-9\-\_\.\ ]+/", "replacement": ""} - * }) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":255}}) + * @Transfer\Filter("Laminas\Filter\PregReplace", options={"pattern": "/[^a-zA-Z0-9\-\_\.\ ]+/", "replacement": ""}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":255}) * @Transfer\Optional */ protected $description; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $isExternal; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $isScan = 0; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $isEbsrPack = 0; /** - * @Transfer\Filter({"name":"Laminas\Filter\DateTimeFormatter"}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") * @Transfer\Optional */ protected $issuedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $user; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $shouldUploadOnly = false; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $additionalCopy; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "application", * "licence", @@ -179,14 +172,13 @@ final class Upload extends AbstractCommand implements LoggerOmitContentInterface * "irhpApplication" * } * } - * } * ) * @Transfer\Optional */ protected $additionalEntities = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $isPostSubmissionUpload = 0; diff --git a/src/Command/DvsaReports/GetRedirect.php b/src/Command/DvsaReports/GetRedirect.php index 42f2c529..bddfccd3 100644 --- a/src/Command/DvsaReports/GetRedirect.php +++ b/src/Command/DvsaReports/GetRedirect.php @@ -12,14 +12,14 @@ class GetRedirect extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1}) */ protected $jwt; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1}) */ protected $refreshToken; diff --git a/src/Command/EnvironmentalComplaint/CreateEnvironmentalComplaint.php b/src/Command/EnvironmentalComplaint/CreateEnvironmentalComplaint.php index 9eaed3c9..f1377570 100644 --- a/src/Command/EnvironmentalComplaint/CreateEnvironmentalComplaint.php +++ b/src/Command/EnvironmentalComplaint/CreateEnvironmentalComplaint.php @@ -12,44 +12,44 @@ class CreateEnvironmentalComplaint extends AbstractCommand { /** - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case = null; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) - * @Transfer\Validator({"name":"Laminas\Validator\Identical", "options": {"token": false}}) + * @Transfer\Filter("Laminas\Filter\Boolean") + * @Transfer\Validator("Laminas\Validator\Identical", options={"token": false}) */ protected $isCompliance = false; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $complaintDate = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $description = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray","options": {"haystack": {"ecst_open","ecst_closed"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray",options={"haystack": {"ecst_open","ecst_closed"}}) */ protected $status = null; /** * @Transfer\Optional() * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $operatingCentres = []; diff --git a/src/Command/EnvironmentalComplaint/DeleteEnvironmentalComplaint.php b/src/Command/EnvironmentalComplaint/DeleteEnvironmentalComplaint.php index 8c83308a..58859b14 100644 --- a/src/Command/EnvironmentalComplaint/DeleteEnvironmentalComplaint.php +++ b/src/Command/EnvironmentalComplaint/DeleteEnvironmentalComplaint.php @@ -15,8 +15,8 @@ class DeleteEnvironmentalComplaint extends AbstractDeleteCommand { /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) - * @Transfer\Validator({"name":"Laminas\Validator\Identical", "options": {"token": false}}) + * @Transfer\Filter("Laminas\Filter\Boolean") + * @Transfer\Validator("Laminas\Validator\Identical", options={"token": false}) */ protected $isCompliance = false; diff --git a/src/Command/EnvironmentalComplaint/UpdateEnvironmentalComplaint.php b/src/Command/EnvironmentalComplaint/UpdateEnvironmentalComplaint.php index 709e65ee..9d7dc5d4 100644 --- a/src/Command/EnvironmentalComplaint/UpdateEnvironmentalComplaint.php +++ b/src/Command/EnvironmentalComplaint/UpdateEnvironmentalComplaint.php @@ -12,52 +12,52 @@ class UpdateEnvironmentalComplaint extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) - * @Transfer\Validator({"name":"Laminas\Validator\Identical", "options": {"token": false}}) + * @Transfer\Filter("Laminas\Filter\Boolean") + * @Transfer\Validator("Laminas\Validator\Identical", options={"token": false}) */ protected $isCompliance = false; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $complaintDate = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $description = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray","options": {"haystack": {"ecst_open","ecst_closed"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ecst_open","ecst_closed"}}) */ protected $status = null; /** * @Transfer\Optional() * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $operatingCentres = []; diff --git a/src/Command/FeatureToggle/Create.php b/src/Command/FeatureToggle/Create.php index 3b433ce1..0842e2a6 100644 --- a/src/Command/FeatureToggle/Create.php +++ b/src/Command/FeatureToggle/Create.php @@ -3,6 +3,7 @@ /** * Create feature toggle */ + namespace Dvsa\Olcs\Transfer\Command\FeatureToggle; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/FeatureToggle/Delete.php b/src/Command/FeatureToggle/Delete.php index d4b2463e..f5f157bf 100644 --- a/src/Command/FeatureToggle/Delete.php +++ b/src/Command/FeatureToggle/Delete.php @@ -3,6 +3,7 @@ /** * Delete feature toggle */ + namespace Dvsa\Olcs\Transfer\Command\FeatureToggle; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/FeatureToggle/Update.php b/src/Command/FeatureToggle/Update.php index 426f105e..039e0d43 100644 --- a/src/Command/FeatureToggle/Update.php +++ b/src/Command/FeatureToggle/Update.php @@ -3,6 +3,7 @@ /** * Update feature toggle */ + namespace Dvsa\Olcs\Transfer\Command\FeatureToggle; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Fee/ApproveWaive.php b/src/Command/Fee/ApproveWaive.php index 6b3c459d..5e36b7f9 100644 --- a/src/Command/Fee/ApproveWaive.php +++ b/src/Command/Fee/ApproveWaive.php @@ -5,11 +5,11 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Fee; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; @@ -24,7 +24,7 @@ final class ApproveWaive extends AbstractCommand implements FieldType\IdentityIn /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $waiveReason; diff --git a/src/Command/Fee/CreateFee.php b/src/Command/Fee/CreateFee.php index f87073f1..f7bd0e01 100644 --- a/src/Command/Fee/CreateFee.php +++ b/src/Command/Fee/CreateFee.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Fee; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -26,53 +27,50 @@ class CreateFee extends AbstractCommand implements FieldType\IrfoGvPermitInterface, FieldType\IrfoPsvAuthInterface { - use FieldTypeTraits\ApplicationOptional, - FieldTypeTraits\BusRegOptional, - FieldTypeTraits\LicenceOptional, - FieldTypeTraits\IrhpApplicationOptional, - FieldTypeTraits\IrhpPermitApplicationOptional, - FieldTypeTraits\TaskOptional, - FieldTypeTraits\IrfoGvPermitOptional, - FieldTypeTraits\IrfoPsvAuthOptional; + use FieldTypeTraits\ApplicationOptional; + use FieldTypeTraits\BusRegOptional; + use FieldTypeTraits\LicenceOptional; + use FieldTypeTraits\IrhpApplicationOptional; + use FieldTypeTraits\IrhpPermitApplicationOptional; + use FieldTypeTraits\TaskOptional; + use FieldTypeTraits\IrfoGvPermitOptional; + use FieldTypeTraits\IrfoPsvAuthOptional; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Money"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Money") */ protected $amount; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $invoicedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $feeType; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $description; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"lfs_ot","lfs_pd","lfs_cn"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lfs_ot","lfs_pd","lfs_cn"}}) */ protected $feeStatus = 'lfs_ot'; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 1,"inclusive": true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 1,"inclusive": true}) */ protected $quantity; diff --git a/src/Command/Fee/RecommendWaive.php b/src/Command/Fee/RecommendWaive.php index d24c5aa5..f2d49039 100644 --- a/src/Command/Fee/RecommendWaive.php +++ b/src/Command/Fee/RecommendWaive.php @@ -5,11 +5,11 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Fee; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; @@ -24,7 +24,7 @@ final class RecommendWaive extends AbstractCommand implements FieldType\Identity /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $waiveReason; diff --git a/src/Command/Fee/RefundFee.php b/src/Command/Fee/RefundFee.php index f8c6eeef..9d673792 100644 --- a/src/Command/Fee/RefundFee.php +++ b/src/Command/Fee/RefundFee.php @@ -5,11 +5,11 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Fee; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; diff --git a/src/Command/Fee/RejectWaive.php b/src/Command/Fee/RejectWaive.php index e5dfee35..1a04f5c5 100644 --- a/src/Command/Fee/RejectWaive.php +++ b/src/Command/Fee/RejectWaive.php @@ -5,11 +5,11 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Fee; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; diff --git a/src/Command/FeeType/Update.php b/src/Command/FeeType/Update.php index 77e7d778..4be17947 100644 --- a/src/Command/FeeType/Update.php +++ b/src/Command/FeeType/Update.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Command\FeeType; use Dvsa\Olcs\Transfer\FieldType\Traits\AnnualValue; diff --git a/src/Command/GdsVerify/ProcessSignatureResponse.php b/src/Command/GdsVerify/ProcessSignatureResponse.php index 41d890ca..08aab305 100644 --- a/src/Command/GdsVerify/ProcessSignatureResponse.php +++ b/src/Command/GdsVerify/ProcessSignatureResponse.php @@ -22,16 +22,16 @@ class ProcessSignatureResponse extends AbstractCommand /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $samlResponse; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $continuationDetail; diff --git a/src/Command/GoodsDisc/ConfirmPrinting.php b/src/Command/GoodsDisc/ConfirmPrinting.php index 9b31c14b..3c923d68 100644 --- a/src/Command/GoodsDisc/ConfirmPrinting.php +++ b/src/Command/GoodsDisc/ConfirmPrinting.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\GoodsDisc; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,52 +18,50 @@ final class ConfirmPrinting extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ public $niFlag; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * {"name":"Laminas\Validator\InArray", "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}} - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $endNumber; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $startNumber; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $discSequence; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $isSuccessfull; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $queueId; diff --git a/src/Command/GoodsDisc/PrintDiscs.php b/src/Command/GoodsDisc/PrintDiscs.php index f36cb8c8..ce57e698 100644 --- a/src/Command/GoodsDisc/PrintDiscs.php +++ b/src/Command/GoodsDisc/PrintDiscs.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\GoodsDisc; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,40 +18,38 @@ final class PrintDiscs extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ public $niFlag; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * {"name":"Laminas\Validator\InArray", "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}} - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ public $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $startNumber; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ public $maxPages; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $discSequence; diff --git a/src/Command/GovUkAccount/GetGovUkAccountRedirect.php b/src/Command/GovUkAccount/GetGovUkAccountRedirect.php index 958dd561..ad4c261e 100644 --- a/src/Command/GovUkAccount/GetGovUkAccountRedirect.php +++ b/src/Command/GovUkAccount/GetGovUkAccountRedirect.php @@ -19,8 +19,8 @@ class GetGovUkAccountRedirect extends AbstractCommand use GovUkAccountJourney; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1}) */ protected $returnUrl; @@ -31,7 +31,7 @@ public function getReturnUrl() /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $returnUrlOnError; diff --git a/src/Command/GovUkAccount/ProcessAuthResponse.php b/src/Command/GovUkAccount/ProcessAuthResponse.php index 70c7648a..cab3714b 100644 --- a/src/Command/GovUkAccount/ProcessAuthResponse.php +++ b/src/Command/GovUkAccount/ProcessAuthResponse.php @@ -13,25 +13,25 @@ class ProcessAuthResponse extends AbstractCommand { /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $code; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $state; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $error; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $errorDescription; diff --git a/src/Command/GracePeriod/CreateGracePeriod.php b/src/Command/GracePeriod/CreateGracePeriod.php index 035e24e1..a0530102 100644 --- a/src/Command/GracePeriod/CreateGracePeriod.php +++ b/src/Command/GracePeriod/CreateGracePeriod.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\GracePeriod; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,28 +19,28 @@ final class CreateGracePeriod extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $startDate; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $endDate; /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $description; diff --git a/src/Command/GracePeriod/DeleteGracePeriod.php b/src/Command/GracePeriod/DeleteGracePeriod.php index 32102518..882487d4 100644 --- a/src/Command/GracePeriod/DeleteGracePeriod.php +++ b/src/Command/GracePeriod/DeleteGracePeriod.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\GracePeriod; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class DeleteGracePeriod extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/GracePeriod/UpdateGracePeriod.php b/src/Command/GracePeriod/UpdateGracePeriod.php index 839d3281..3ec35da6 100644 --- a/src/Command/GracePeriod/UpdateGracePeriod.php +++ b/src/Command/GracePeriod/UpdateGracePeriod.php @@ -3,6 +3,7 @@ /** * UpdateGracePeriod.php */ + namespace Dvsa\Olcs\Transfer\Command\GracePeriod; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,44 +17,44 @@ final class UpdateGracePeriod extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $startDate; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $endDate; /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $description; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; diff --git a/src/Command/InspectionRequest/Create.php b/src/Command/InspectionRequest/Create.php index 20fbf456..240109bb 100644 --- a/src/Command/InspectionRequest/Create.php +++ b/src/Command/InspectionRequest/Create.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\InspectionRequest; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,139 +18,129 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $operatingCentre; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"application", "licence"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"application", "licence"}}) */ protected $type; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={ * "haystack": { * "insp_rep_t_bus", "insp_rep_t_maint", "insp_rep_t_TE" * } * } - * } * ) */ protected $reportType; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "insp_req_t_coe", "insp_req_t_comp", "insp_req_t_fol", "insp_req_t_new_op", "insp_req_t_review", * "insp_req_t_tc", "insp_req_t_var" * } * } - * } * ) */ protected $requestType; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "insp_res_t_new", "insp_res_t_new_sat", "insp_res_t_new_unsat" * } * } - * } * ) */ protected $resultType; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $dueDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $requestDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $returnDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $fromDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $toDate; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $inspectorName; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $vehiclesExaminedNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $trailersExaminedNo; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $requestorNotes; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $inspectorNotes; diff --git a/src/Command/InspectionRequest/CreateFromGrant.php b/src/Command/InspectionRequest/CreateFromGrant.php index dcc56ae1..caec059a 100644 --- a/src/Command/InspectionRequest/CreateFromGrant.php +++ b/src/Command/InspectionRequest/CreateFromGrant.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\InspectionRequest; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,21 +18,21 @@ final class CreateFromGrant extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $application; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"3", "6", "9", "12"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"3", "6", "9", "12"}}) */ public $duePeriod; /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $caseworkerNotes; diff --git a/src/Command/InspectionRequest/Update.php b/src/Command/InspectionRequest/Update.php index 0e83cda9..281276de 100644 --- a/src/Command/InspectionRequest/Update.php +++ b/src/Command/InspectionRequest/Update.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\InspectionRequest; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,126 +18,117 @@ final class Update extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "insp_rep_t_bus", "insp_rep_t_maint", "insp_rep_t_TE" * } * } - * } * ) */ protected $reportType; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "insp_req_t_coe", "insp_req_t_comp", "insp_req_t_fol", "insp_req_t_new_op", "insp_req_t_review", * "insp_req_t_tc", "insp_req_t_var" * } * } - * } * ) */ protected $requestType; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "insp_res_t_new", "insp_res_t_new_sat", "insp_res_t_new_unsat" * } * } - * } * ) */ protected $resultType; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $dueDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $requestDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $returnDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $fromDate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $toDate; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $inspectorName; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $vehiclesExaminedNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $trailersExaminedNo; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $requestorNotes; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $inspectorNotes; diff --git a/src/Command/Irfo/ApproveIrfoGvPermit.php b/src/Command/Irfo/ApproveIrfoGvPermit.php index 53b095b5..894a4c89 100644 --- a/src/Command/Irfo/ApproveIrfoGvPermit.php +++ b/src/Command/Irfo/ApproveIrfoGvPermit.php @@ -3,6 +3,7 @@ /** * Approve IRFO GV Permit */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/ApproveIrfoPsvAuth.php b/src/Command/Irfo/ApproveIrfoPsvAuth.php index 08faa513..88a00310 100644 --- a/src/Command/Irfo/ApproveIrfoPsvAuth.php +++ b/src/Command/Irfo/ApproveIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * Approve IrfoPsvAuth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/CnsIrfoPsvAuth.php b/src/Command/Irfo/CnsIrfoPsvAuth.php index 77c348f2..6103573b 100644 --- a/src/Command/Irfo/CnsIrfoPsvAuth.php +++ b/src/Command/Irfo/CnsIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * CNS IRFO PSV Auth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/CreateIrfoGvPermit.php b/src/Command/Irfo/CreateIrfoGvPermit.php index 6f774bb8..d134f57a 100644 --- a/src/Command/Irfo/CreateIrfoGvPermit.php +++ b/src/Command/Irfo/CreateIrfoGvPermit.php @@ -3,6 +3,7 @@ /** * Create IRFO GV Permit */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,55 +16,55 @@ final class CreateIrfoGvPermit extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $irfoGvPermitType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $yearRequired; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $inForceDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $expiryDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive":true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive":true}) */ protected $noOfCopies; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isFeeExempt; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":255}) * @Transfer\Optional */ protected $exemptionDetails; diff --git a/src/Command/Irfo/CreateIrfoPermitStock.php b/src/Command/Irfo/CreateIrfoPermitStock.php index 8bb59fd9..9c4b99c5 100644 --- a/src/Command/Irfo/CreateIrfoPermitStock.php +++ b/src/Command/Irfo/CreateIrfoPermitStock.php @@ -3,6 +3,7 @@ /** * Create IrfoPermitStock */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,41 +17,41 @@ final class CreateIrfoPermitStock extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $irfoCountry; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 1900}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 1900}) */ protected $validForYear; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"irfo_perm_s_s_ret","irfo_perm_s_s_void","irfo_perm_s_s_issued","irfo_perm_s_s_in_stock"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"irfo_perm_s_s_ret","irfo_perm_s_s_void","irfo_perm_s_s_issued","irfo_perm_s_s_in_stock"}}) * @Transfer\Optional */ protected $status; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $serialNoStart; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $serialNoEnd; diff --git a/src/Command/Irfo/CreateIrfoPsvAuth.php b/src/Command/Irfo/CreateIrfoPsvAuth.php index 803d05ae..13b89a44 100644 --- a/src/Command/Irfo/CreateIrfoPsvAuth.php +++ b/src/Command/Irfo/CreateIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * Create IrfoPsvAuth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,117 +16,114 @@ final class CreateIrfoPsvAuth extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $irfoPsvAuthType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $validityPeriod; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") * @Transfer\Partial("Dvsa\Olcs\Transfer\Command\Partial\IrfoPsvAuthNumber") * @Transfer\Optional */ protected $irfoPsvAuthNumbers = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $inForceDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") * @Transfer\Optional */ protected $expiryDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") * @Transfer\Optional */ protected $applicationSentDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":1,"max":30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) */ protected $serviceRouteFrom; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":1,"max":30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) */ protected $serviceRouteTo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", - * "options": - * {"haystack": {"psv_freq_daily","psv_freq_2_weekly","psv_freq_weekly","psv_freq_fortnight", - * "psv_freq_monthly","psv_freq_other"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"psv_freq_daily","psv_freq_2_weekly","psv_freq_weekly","psv_freq_fortnight","psv_freq_monthly","psv_freq_other"}}) */ protected $journeyFrequency; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) * @Transfer\Optional */ protected $countrys = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isFeeExemptApplication; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isFeeExemptAnnual; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":255}) * @Transfer\Optional */ protected $exemptionDetails; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive":true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive":true}) */ protected $copiesRequired; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive":true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive":true}) */ protected $copiesRequiredTotal; diff --git a/src/Command/Irfo/GenerateIrfoGvPermit.php b/src/Command/Irfo/GenerateIrfoGvPermit.php index 5e55fb8a..d9b0abe7 100644 --- a/src/Command/Irfo/GenerateIrfoGvPermit.php +++ b/src/Command/Irfo/GenerateIrfoGvPermit.php @@ -3,6 +3,7 @@ /** * Generate IRFO GV Permit */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/Irfo/GenerateIrfoPsvAuth.php b/src/Command/Irfo/GenerateIrfoPsvAuth.php index abb6e818..de50724d 100644 --- a/src/Command/Irfo/GenerateIrfoPsvAuth.php +++ b/src/Command/Irfo/GenerateIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * Generate IrfoPsvAuth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/GrantIrfoPsvAuth.php b/src/Command/Irfo/GrantIrfoPsvAuth.php index eeaafff1..40791ffb 100644 --- a/src/Command/Irfo/GrantIrfoPsvAuth.php +++ b/src/Command/Irfo/GrantIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * Grant IrfoPsvAuth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/PrintIrfoPsvAuthChecklist.php b/src/Command/Irfo/PrintIrfoPsvAuthChecklist.php index ad0021f0..096d1373 100644 --- a/src/Command/Irfo/PrintIrfoPsvAuthChecklist.php +++ b/src/Command/Irfo/PrintIrfoPsvAuthChecklist.php @@ -3,6 +3,7 @@ /** * Print IRFO PSV Auth Checklist */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/RefuseIrfoGvPermit.php b/src/Command/Irfo/RefuseIrfoGvPermit.php index 3a2e6f2e..53f25e8b 100644 --- a/src/Command/Irfo/RefuseIrfoGvPermit.php +++ b/src/Command/Irfo/RefuseIrfoGvPermit.php @@ -3,6 +3,7 @@ /** * Refuse IRFO GV Permit */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/RefuseIrfoPsvAuth.php b/src/Command/Irfo/RefuseIrfoPsvAuth.php index e7001a54..9de8ddb1 100644 --- a/src/Command/Irfo/RefuseIrfoPsvAuth.php +++ b/src/Command/Irfo/RefuseIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * Refuse IRFO PSV Auth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/RenewIrfoPsvAuth.php b/src/Command/Irfo/RenewIrfoPsvAuth.php index 30765b5a..e9bfff40 100644 --- a/src/Command/Irfo/RenewIrfoPsvAuth.php +++ b/src/Command/Irfo/RenewIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * Renew IRFO PSV Auth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/ResetIrfoGvPermit.php b/src/Command/Irfo/ResetIrfoGvPermit.php index 97b3068f..ce7cdfee 100644 --- a/src/Command/Irfo/ResetIrfoGvPermit.php +++ b/src/Command/Irfo/ResetIrfoGvPermit.php @@ -3,6 +3,7 @@ /** * Reset IRFO GV Permit */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/ResetIrfoPsvAuth.php b/src/Command/Irfo/ResetIrfoPsvAuth.php index 1cfbb71a..c1e6a81c 100644 --- a/src/Command/Irfo/ResetIrfoPsvAuth.php +++ b/src/Command/Irfo/ResetIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * Reset IRFO PSV Auth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/UpdateIrfoDetails.php b/src/Command/Irfo/UpdateIrfoDetails.php index 063ab0b6..848f1d1f 100644 --- a/src/Command/Irfo/UpdateIrfoDetails.php +++ b/src/Command/Irfo/UpdateIrfoDetails.php @@ -3,6 +3,7 @@ /** * Update IrfoDetails */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,37 +16,37 @@ final class UpdateIrfoDetails extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") * @Transfer\Partial("Dvsa\Olcs\Transfer\Command\Partial\TradingName") * @Transfer\Optional */ protected $tradingNames = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":2}) * @Transfer\Optional */ protected $irfoNationality; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") * @Transfer\Partial("Dvsa\Olcs\Transfer\Command\Partial\IrfoPartner") * @Transfer\Optional */ diff --git a/src/Command/Irfo/UpdateIrfoGvPermit.php b/src/Command/Irfo/UpdateIrfoGvPermit.php index fe04575e..e62860f6 100644 --- a/src/Command/Irfo/UpdateIrfoGvPermit.php +++ b/src/Command/Irfo/UpdateIrfoGvPermit.php @@ -3,6 +3,7 @@ /** * Update IRFO GV Permit */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,62 +16,62 @@ final class UpdateIrfoGvPermit extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $irfoGvPermitType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $yearRequired; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $inForceDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $expiryDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive":true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive":true}) */ protected $noOfCopies; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isFeeExempt; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":255}) * @Transfer\Optional */ protected $exemptionDetails; diff --git a/src/Command/Irfo/UpdateIrfoPermitStock.php b/src/Command/Irfo/UpdateIrfoPermitStock.php index 32c121a9..edaad579 100644 --- a/src/Command/Irfo/UpdateIrfoPermitStock.php +++ b/src/Command/Irfo/UpdateIrfoPermitStock.php @@ -3,6 +3,7 @@ /** * Update IrfoPermitStock */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,21 +17,20 @@ final class UpdateIrfoPermitStock extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": {"irfo_perm_s_s_ret","irfo_perm_s_s_void","irfo_perm_s_s_issued","irfo_perm_s_s_in_stock"} * } - * }) + * ) */ protected $status; diff --git a/src/Command/Irfo/UpdateIrfoPermitStockIssued.php b/src/Command/Irfo/UpdateIrfoPermitStockIssued.php index 7038d574..0ed46aab 100644 --- a/src/Command/Irfo/UpdateIrfoPermitStockIssued.php +++ b/src/Command/Irfo/UpdateIrfoPermitStockIssued.php @@ -3,6 +3,7 @@ /** * Update IRFO Permit Stock Issued */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/UpdateIrfoPsvAuth.php b/src/Command/Irfo/UpdateIrfoPsvAuth.php index a120b597..23ab818f 100644 --- a/src/Command/Irfo/UpdateIrfoPsvAuth.php +++ b/src/Command/Irfo/UpdateIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * Update IrfoPsvAuth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,130 +16,128 @@ class UpdateIrfoPsvAuth extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $irfoPsvAuthType; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $validityPeriod; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") * @Transfer\Partial("Dvsa\Olcs\Transfer\Command\Partial\IrfoPsvAuthNumber") * @Transfer\Optional */ protected $irfoPsvAuthNumbers = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") */ protected $inForceDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") * @Transfer\Optional */ protected $expiryDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") * @Transfer\Optional */ protected $applicationSentDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":1,"max":30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) */ protected $serviceRouteFrom; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":1,"max":30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) */ protected $serviceRouteTo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"psv_freq_daily","psv_freq_2_weekly","psv_freq_weekly","psv_freq_fortnight", + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"psv_freq_daily","psv_freq_2_weekly","psv_freq_weekly","psv_freq_fortnight", * "psv_freq_monthly","psv_freq_other"}} - * } * ) */ protected $journeyFrequency; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) * @Transfer\Optional */ protected $countrys = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isFeeExemptApplication; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isFeeExemptAnnual; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":255}) * @Transfer\Optional */ protected $exemptionDetails; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive":true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive":true}) */ protected $copiesRequired; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0, "inclusive":true}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0, "inclusive":true}) */ protected $copiesRequiredTotal; diff --git a/src/Command/Irfo/WithdrawIrfoGvPermit.php b/src/Command/Irfo/WithdrawIrfoGvPermit.php index 4ae62330..efacf3c1 100644 --- a/src/Command/Irfo/WithdrawIrfoGvPermit.php +++ b/src/Command/Irfo/WithdrawIrfoGvPermit.php @@ -3,6 +3,7 @@ /** * Withdraw IRFO GV Permit */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Irfo/WithdrawIrfoPsvAuth.php b/src/Command/Irfo/WithdrawIrfoPsvAuth.php index 90df392d..25383970 100644 --- a/src/Command/Irfo/WithdrawIrfoPsvAuth.php +++ b/src/Command/Irfo/WithdrawIrfoPsvAuth.php @@ -3,6 +3,7 @@ /** * Withdraw IRFO PSV Auth */ + namespace Dvsa\Olcs\Transfer\Command\Irfo; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/IrhpApplication/CancelApplication.php b/src/Command/IrhpApplication/CancelApplication.php index 82b6fe13..574b951f 100644 --- a/src/Command/IrhpApplication/CancelApplication.php +++ b/src/Command/IrhpApplication/CancelApplication.php @@ -5,6 +5,7 @@ * * @author Tonci Vidovic */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/IrhpApplication/Create.php b/src/Command/IrhpApplication/Create.php index 7244f143..3998be84 100644 --- a/src/Command/IrhpApplication/Create.php +++ b/src/Command/IrhpApplication/Create.php @@ -3,6 +3,7 @@ /** * Create Irhp Application */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpApplication/CreateFull.php b/src/Command/IrhpApplication/CreateFull.php index 8c11f1d0..7d1546e7 100644 --- a/src/Command/IrhpApplication/CreateFull.php +++ b/src/Command/IrhpApplication/CreateFull.php @@ -3,6 +3,7 @@ /** * Create Irhp Application */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\DateReceived; diff --git a/src/Command/IrhpApplication/Grant.php b/src/Command/IrhpApplication/Grant.php index 5e111ed1..00b3c265 100644 --- a/src/Command/IrhpApplication/Grant.php +++ b/src/Command/IrhpApplication/Grant.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/IrhpApplication/ResetToNotYetSubmittedFromCancelled.php b/src/Command/IrhpApplication/ResetToNotYetSubmittedFromCancelled.php index 6c931b79..d5ec560c 100644 --- a/src/Command/IrhpApplication/ResetToNotYetSubmittedFromCancelled.php +++ b/src/Command/IrhpApplication/ResetToNotYetSubmittedFromCancelled.php @@ -3,6 +3,7 @@ /** * Reset to NotYetSubmitted from Cancelled */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpApplication/ResetToNotYetSubmittedFromValid.php b/src/Command/IrhpApplication/ResetToNotYetSubmittedFromValid.php index 71076698..2a120ba3 100644 --- a/src/Command/IrhpApplication/ResetToNotYetSubmittedFromValid.php +++ b/src/Command/IrhpApplication/ResetToNotYetSubmittedFromValid.php @@ -3,6 +3,7 @@ /** * Reset to NotYetSubmitted from Valid */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpApplication/ReviveFromUnsuccessful.php b/src/Command/IrhpApplication/ReviveFromUnsuccessful.php index a2f0685e..9ffeefb9 100644 --- a/src/Command/IrhpApplication/ReviveFromUnsuccessful.php +++ b/src/Command/IrhpApplication/ReviveFromUnsuccessful.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/IrhpApplication/ReviveFromWithdrawn.php b/src/Command/IrhpApplication/ReviveFromWithdrawn.php index 879aa21e..0e7f52d6 100644 --- a/src/Command/IrhpApplication/ReviveFromWithdrawn.php +++ b/src/Command/IrhpApplication/ReviveFromWithdrawn.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/IrhpApplication/SubmitApplication.php b/src/Command/IrhpApplication/SubmitApplication.php index d913d5d5..74c2af60 100644 --- a/src/Command/IrhpApplication/SubmitApplication.php +++ b/src/Command/IrhpApplication/SubmitApplication.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/IrhpApplication/SubmitApplicationPath.php b/src/Command/IrhpApplication/SubmitApplicationPath.php index 6698e4e5..2684116a 100644 --- a/src/Command/IrhpApplication/SubmitApplicationPath.php +++ b/src/Command/IrhpApplication/SubmitApplicationPath.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpApplication/SubmitApplicationStep.php b/src/Command/IrhpApplication/SubmitApplicationStep.php index f12c2eba..6ca2f6f4 100644 --- a/src/Command/IrhpApplication/SubmitApplicationStep.php +++ b/src/Command/IrhpApplication/SubmitApplicationStep.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpApplication/Terminate.php b/src/Command/IrhpApplication/Terminate.php index 5357fef3..04f4402a 100644 --- a/src/Command/IrhpApplication/Terminate.php +++ b/src/Command/IrhpApplication/Terminate.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpApplication/UpdateCandidatePermitSelection.php b/src/Command/IrhpApplication/UpdateCandidatePermitSelection.php index 4faef985..cbac3476 100644 --- a/src/Command/IrhpApplication/UpdateCandidatePermitSelection.php +++ b/src/Command/IrhpApplication/UpdateCandidatePermitSelection.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -21,9 +22,9 @@ class UpdateCandidatePermitSelection extends AbstractCommand /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $selectedCandidatePermitIds; diff --git a/src/Command/IrhpApplication/UpdateCheckAnswers.php b/src/Command/IrhpApplication/UpdateCheckAnswers.php index f9dd1a43..b8096da3 100644 --- a/src/Command/IrhpApplication/UpdateCheckAnswers.php +++ b/src/Command/IrhpApplication/UpdateCheckAnswers.php @@ -5,6 +5,7 @@ * * @author Tonci Vidovic */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,5 +19,6 @@ */ final class UpdateCheckAnswers extends AbstractCommand { - use Identity, IrhpPermitApplicationOptional; + use Identity; + use IrhpPermitApplicationOptional; } diff --git a/src/Command/IrhpApplication/UpdateCountries.php b/src/Command/IrhpApplication/UpdateCountries.php index f535c0bc..f4544f39 100644 --- a/src/Command/IrhpApplication/UpdateCountries.php +++ b/src/Command/IrhpApplication/UpdateCountries.php @@ -3,6 +3,7 @@ /** * Update countries */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpApplication/UpdateDeclaration.php b/src/Command/IrhpApplication/UpdateDeclaration.php index 14ba7c09..23217bbb 100644 --- a/src/Command/IrhpApplication/UpdateDeclaration.php +++ b/src/Command/IrhpApplication/UpdateDeclaration.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/IrhpApplication/UpdateFull.php b/src/Command/IrhpApplication/UpdateFull.php index 7dfdc6af..92b751e1 100644 --- a/src/Command/IrhpApplication/UpdateFull.php +++ b/src/Command/IrhpApplication/UpdateFull.php @@ -3,6 +3,7 @@ /** * Update Irhp Application */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationCheckedOptional; diff --git a/src/Command/IrhpApplication/UpdateMultipleNoOfPermits.php b/src/Command/IrhpApplication/UpdateMultipleNoOfPermits.php index 51a12e31..a451ab05 100644 --- a/src/Command/IrhpApplication/UpdateMultipleNoOfPermits.php +++ b/src/Command/IrhpApplication/UpdateMultipleNoOfPermits.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpApplication/UpdatePeriod.php b/src/Command/IrhpApplication/UpdatePeriod.php index 05f22737..a99dd0d7 100644 --- a/src/Command/IrhpApplication/UpdatePeriod.php +++ b/src/Command/IrhpApplication/UpdatePeriod.php @@ -3,6 +3,7 @@ /** * Update period (stock selection) */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -18,4 +19,4 @@ class UpdatePeriod extends AbstractCommand use Traits\Identity; use Traits\IrhpPermitStock; } -# \ No newline at end of file +# diff --git a/src/Command/IrhpApplication/Withdraw.php b/src/Command/IrhpApplication/Withdraw.php index 1c5bf1ea..36459888 100644 --- a/src/Command/IrhpApplication/Withdraw.php +++ b/src/Command/IrhpApplication/Withdraw.php @@ -5,6 +5,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Command\IrhpApplication; use Dvsa\Olcs\Transfer\Command\WithdrawApplicationInterface; diff --git a/src/Command/IrhpCandidatePermit/Create.php b/src/Command/IrhpCandidatePermit/Create.php index a068a39c..760354f5 100644 --- a/src/Command/IrhpCandidatePermit/Create.php +++ b/src/Command/IrhpCandidatePermit/Create.php @@ -3,6 +3,7 @@ /** * Create Irhp Candidate Permit */ + namespace Dvsa\Olcs\Transfer\Command\IrhpCandidatePermit; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpCandidatePermit/Delete.php b/src/Command/IrhpCandidatePermit/Delete.php index 27d7304f..79b7ec3a 100644 --- a/src/Command/IrhpCandidatePermit/Delete.php +++ b/src/Command/IrhpCandidatePermit/Delete.php @@ -3,6 +3,7 @@ /** * Delete IRHP Candidate Permit */ + namespace Dvsa\Olcs\Transfer\Command\IrhpCandidatePermit; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/IrhpCandidatePermit/Update.php b/src/Command/IrhpCandidatePermit/Update.php index 55aab319..8b7a8622 100644 --- a/src/Command/IrhpCandidatePermit/Update.php +++ b/src/Command/IrhpCandidatePermit/Update.php @@ -3,6 +3,7 @@ /** * Update an IRHP Candidate Permit */ + namespace Dvsa\Olcs\Transfer\Command\IrhpCandidatePermit; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpPermitRange; diff --git a/src/Command/IrhpPermit/Replace.php b/src/Command/IrhpPermit/Replace.php index c987f63e..104d7a14 100644 --- a/src/Command/IrhpPermit/Replace.php +++ b/src/Command/IrhpPermit/Replace.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -21,8 +22,8 @@ final class Replace extends AbstractCommand /** * @var int - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $replacementIrhpPermit; diff --git a/src/Command/IrhpPermit/Terminate.php b/src/Command/IrhpPermit/Terminate.php index 39e01db4..f1c968e9 100644 --- a/src/Command/IrhpPermit/Terminate.php +++ b/src/Command/IrhpPermit/Terminate.php @@ -5,6 +5,7 @@ * * @author Tonci Vidovic */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/IrhpPermitApplication/Delete.php b/src/Command/IrhpPermitApplication/Delete.php index 9633c7cc..43001ca1 100644 --- a/src/Command/IrhpPermitApplication/Delete.php +++ b/src/Command/IrhpPermitApplication/Delete.php @@ -3,6 +3,7 @@ /** * Delete IRHP Permit Stock */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/IrhpPermitJurisdiction/Update.php b/src/Command/IrhpPermitJurisdiction/Update.php index a548dee5..4214f4cb 100644 --- a/src/Command/IrhpPermitJurisdiction/Update.php +++ b/src/Command/IrhpPermitJurisdiction/Update.php @@ -3,6 +3,7 @@ /** * Update IRHP Permit Jurisdiction */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitJurisdiction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,8 +18,8 @@ final class Update extends AbstractCommand /** * @var array * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": -1}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": -1}) */ protected $trafficAreas; diff --git a/src/Command/IrhpPermitRange/Create.php b/src/Command/IrhpPermitRange/Create.php index b448724b..963f9340 100644 --- a/src/Command/IrhpPermitRange/Create.php +++ b/src/Command/IrhpPermitRange/Create.php @@ -3,6 +3,7 @@ /** * Create an IRHP Permit Range */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitRange; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/IrhpPermitRange/Delete.php b/src/Command/IrhpPermitRange/Delete.php index b31ed79b..83162032 100644 --- a/src/Command/IrhpPermitRange/Delete.php +++ b/src/Command/IrhpPermitRange/Delete.php @@ -3,6 +3,7 @@ /** * Delete IRHP Permit Range */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitRange; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/IrhpPermitRange/Update.php b/src/Command/IrhpPermitRange/Update.php index 627fef9b..ab46f7c4 100644 --- a/src/Command/IrhpPermitRange/Update.php +++ b/src/Command/IrhpPermitRange/Update.php @@ -3,6 +3,7 @@ /** * Create an IRHP Permit Range */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitRange; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/IrhpPermitSector/Update.php b/src/Command/IrhpPermitSector/Update.php index e7709042..2f8c5ed0 100644 --- a/src/Command/IrhpPermitSector/Update.php +++ b/src/Command/IrhpPermitSector/Update.php @@ -3,6 +3,7 @@ /** * Update IRHP Permit Sector */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitSector; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,8 +18,8 @@ final class Update extends AbstractCommand /** * @var array * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": -1}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": -1}) */ protected $sectors; diff --git a/src/Command/IrhpPermitStock/Create.php b/src/Command/IrhpPermitStock/Create.php index 17cdfc63..efccbffe 100644 --- a/src/Command/IrhpPermitStock/Create.php +++ b/src/Command/IrhpPermitStock/Create.php @@ -3,6 +3,7 @@ /** * Create an IRHP Permit Stock */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitStock; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpPermitStock/Delete.php b/src/Command/IrhpPermitStock/Delete.php index 1e95437d..fadbaceb 100644 --- a/src/Command/IrhpPermitStock/Delete.php +++ b/src/Command/IrhpPermitStock/Delete.php @@ -3,6 +3,7 @@ /** * Delete IRHP Permit Stock */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitStock; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/IrhpPermitStock/Update.php b/src/Command/IrhpPermitStock/Update.php index b67b9fde..4b7f8bd0 100644 --- a/src/Command/IrhpPermitStock/Update.php +++ b/src/Command/IrhpPermitStock/Update.php @@ -3,6 +3,7 @@ /** * Update IRHP Permit Stock */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitStock; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/IrhpPermitWindow/Create.php b/src/Command/IrhpPermitWindow/Create.php index dcecfca0..6ade950b 100644 --- a/src/Command/IrhpPermitWindow/Create.php +++ b/src/Command/IrhpPermitWindow/Create.php @@ -3,6 +3,7 @@ /** * Create an IRHP Permit Window */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitWindow; use Dvsa\Olcs\Transfer\FieldType\Traits\DaysForPayment; diff --git a/src/Command/IrhpPermitWindow/Delete.php b/src/Command/IrhpPermitWindow/Delete.php index c833036f..8edee524 100644 --- a/src/Command/IrhpPermitWindow/Delete.php +++ b/src/Command/IrhpPermitWindow/Delete.php @@ -3,6 +3,7 @@ /** * Delete IRHP Permit Stock */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitWindow; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/IrhpPermitWindow/Update.php b/src/Command/IrhpPermitWindow/Update.php index 8e9a96de..a99c9b0b 100644 --- a/src/Command/IrhpPermitWindow/Update.php +++ b/src/Command/IrhpPermitWindow/Update.php @@ -3,6 +3,7 @@ /** * Update IRHP Permit Window */ + namespace Dvsa\Olcs\Transfer\Command\IrhpPermitWindow; use Dvsa\Olcs\Transfer\FieldType\Traits\DaysForPayment; diff --git a/src/Command/Licence/ContinueLicence.php b/src/Command/Licence/ContinueLicence.php index 95136c22..ddc50dc3 100644 --- a/src/Command/Licence/ContinueLicence.php +++ b/src/Command/Licence/ContinueLicence.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,16 +18,16 @@ final class ContinueLicence extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; diff --git a/src/Command/Licence/CreateCompanySubsidiary.php b/src/Command/Licence/CreateCompanySubsidiary.php index ffef9610..99d75f27 100644 --- a/src/Command/Licence/CreateCompanySubsidiary.php +++ b/src/Command/Licence/CreateCompanySubsidiary.php @@ -8,7 +8,7 @@ /** * @author Rob Caiger - * + * * @Transfer\RouteName("backend/licence/named-single/company-subsidiary") * @Transfer\Method("POST") */ diff --git a/src/Command/Licence/CreateGoodsVehicle.php b/src/Command/Licence/CreateGoodsVehicle.php index b30ba04a..6c063389 100644 --- a/src/Command/Licence/CreateGoodsVehicle.php +++ b/src/Command/Licence/CreateGoodsVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -19,14 +20,14 @@ */ final class CreateGoodsVehicle extends AbstractCommand { - use Identity, - Vrm, - UnvalidatedVrm; + use Identity; + use Vrm; + use UnvalidatedVrm; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 999999}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 999999}) */ protected $platedWeight; @@ -37,13 +38,13 @@ final class CreateGoodsVehicle extends AbstractCommand /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $specifiedDate; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $confirm; diff --git a/src/Command/Licence/CreateOperatingCentre.php b/src/Command/Licence/CreateOperatingCentre.php index d82535be..0c27ea1e 100644 --- a/src/Command/Licence/CreateOperatingCentre.php +++ b/src/Command/Licence/CreateOperatingCentre.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Command\ApplicationOperatingCentre\AbstractOperatingCentreCommand; diff --git a/src/Command/Licence/CreatePsvDiscs.php b/src/Command/Licence/CreatePsvDiscs.php index 792f27d9..207a4a82 100644 --- a/src/Command/Licence/CreatePsvDiscs.php +++ b/src/Command/Licence/CreatePsvDiscs.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,22 +18,22 @@ final class CreatePsvDiscs extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $amount; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isCopy = 'N'; diff --git a/src/Command/Licence/CreatePsvVehicle.php b/src/Command/Licence/CreatePsvVehicle.php index 54b3bc12..a5d7a739 100644 --- a/src/Command/Licence/CreatePsvVehicle.php +++ b/src/Command/Licence/CreatePsvVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Licence; @@ -18,26 +19,26 @@ */ final class CreatePsvVehicle extends AbstractCommand { - use Licence, - Vrm; + use Licence; + use Vrm; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":100}) * @Transfer\Optional */ protected $makeModel; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $receivedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $specifiedDate; @@ -64,12 +65,4 @@ public function getSpecifiedDate() { return $this->specifiedDate; } - - /** - * @return mixed - */ - public function getRemovalDate() - { - return $this->removalDate; - } } diff --git a/src/Command/Licence/CreateVariation.php b/src/Command/Licence/CreateVariation.php index af47d089..6b13d54d 100644 --- a/src/Command/Licence/CreateVariation.php +++ b/src/Command/Licence/CreateVariation.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -25,48 +26,30 @@ final class CreateVariation extends AbstractCommand protected $receivedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringToUpper"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToUpper") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) * @Transfer\Optional */ protected $feeRequired; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", "options": { - * "haystack": {"applied_via_post","applied_via_phone"} - * } - * } - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"applied_via_post","applied_via_phone"}}) * @Transfer\Optional */ protected $appliedVia; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", "options": { - * "haystack": {"vtyp_director_change"} - * } - * } - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"vtyp_director_change"}}) * @Transfer\Optional * * @var string|null diff --git a/src/Command/Licence/CreateVehicleListDocument.php b/src/Command/Licence/CreateVehicleListDocument.php index c9e10dd1..953def27 100644 --- a/src/Command/Licence/CreateVehicleListDocument.php +++ b/src/Command/Licence/CreateVehicleListDocument.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -20,15 +21,15 @@ final class CreateVehicleListDocument extends AbstractCommand use Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lva", "dp"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lva", "dp"}}) * @Transfer\Optional */ protected $type; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") * @Transfer\Optional */ protected $user; diff --git a/src/Command/Licence/CurtailLicence.php b/src/Command/Licence/CurtailLicence.php index e4b0680b..293bf7c8 100644 --- a/src/Command/Licence/CurtailLicence.php +++ b/src/Command/Licence/CurtailLicence.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,14 +21,14 @@ final class CurtailLicence extends AbstractCommand use FieldType\Traits\DecisionsOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") */ protected $deleteLicenceStatusRules = true; diff --git a/src/Command/Licence/DeleteCompanySubsidiary.php b/src/Command/Licence/DeleteCompanySubsidiary.php index 344ba14d..7a9a0c7a 100644 --- a/src/Command/Licence/DeleteCompanySubsidiary.php +++ b/src/Command/Licence/DeleteCompanySubsidiary.php @@ -8,7 +8,7 @@ /** * @author Rob Caiger - * + * * @Transfer\RouteName("backend/licence/named-single/company-subsidiary") * @Transfer\Method("DELETE") */ diff --git a/src/Command/Licence/DeleteOperatingCentres.php b/src/Command/Licence/DeleteOperatingCentres.php index 580e6ce5..f6436d78 100644 --- a/src/Command/Licence/DeleteOperatingCentres.php +++ b/src/Command/Licence/DeleteOperatingCentres.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Ids; @@ -18,6 +19,6 @@ */ final class DeleteOperatingCentres extends AbstractCommand { - use Ids, - Licence; + use Ids; + use Licence; } diff --git a/src/Command/Licence/DeletePeople.php b/src/Command/Licence/DeletePeople.php index 39a90732..37a379a9 100644 --- a/src/Command/Licence/DeletePeople.php +++ b/src/Command/Licence/DeletePeople.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class DeletePeople extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $personIds = []; diff --git a/src/Command/Licence/DeletePeopleViaVariation.php b/src/Command/Licence/DeletePeopleViaVariation.php index 208b915f..57136cd6 100644 --- a/src/Command/Licence/DeletePeopleViaVariation.php +++ b/src/Command/Licence/DeletePeopleViaVariation.php @@ -1,4 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class Overview extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; @@ -39,24 +40,21 @@ final class Overview extends AbstractCommand /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $reviewDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $expiryDate; /** * @Transfer\Optional() - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name": "Laminas\Filter\StringToUpper"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToUpper") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) */ protected $translateToWelsh; diff --git a/src/Command/Licence/PrintLicence.php b/src/Command/Licence/PrintLicence.php index b4068386..528d6ee4 100644 --- a/src/Command/Licence/PrintLicence.php +++ b/src/Command/Licence/PrintLicence.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -20,7 +21,7 @@ final class PrintLicence extends AbstractCommand use Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $dispatch = true; diff --git a/src/Command/Licence/ProposeToRevoke.php b/src/Command/Licence/ProposeToRevoke.php index 12882ce1..d260ea37 100644 --- a/src/Command/Licence/ProposeToRevoke.php +++ b/src/Command/Licence/ProposeToRevoke.php @@ -15,9 +15,9 @@ class ProposeToRevoke extends AbstractCommand use Licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $document; diff --git a/src/Command/Licence/ReplacePsvDiscs.php b/src/Command/Licence/ReplacePsvDiscs.php index 30b82031..d279523a 100644 --- a/src/Command/Licence/ReplacePsvDiscs.php +++ b/src/Command/Licence/ReplacePsvDiscs.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class ReplacePsvDiscs extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Licence/ResetToValid.php b/src/Command/Licence/ResetToValid.php index da250e88..0796eb7e 100644 --- a/src/Command/Licence/ResetToValid.php +++ b/src/Command/Licence/ResetToValid.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,9 +21,9 @@ final class ResetToValid extends AbstractCommand use FieldType\Traits\DecisionsOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/Licence/RevokeLicence.php b/src/Command/Licence/RevokeLicence.php index cb04c6b2..eb5e1ca2 100644 --- a/src/Command/Licence/RevokeLicence.php +++ b/src/Command/Licence/RevokeLicence.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,14 +21,14 @@ final class RevokeLicence extends AbstractCommand use FieldType\Traits\DecisionsOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") */ protected $deleteLicenceStatusRules = true; diff --git a/src/Command/Licence/SurrenderLicence.php b/src/Command/Licence/SurrenderLicence.php index 33173806..75156666 100644 --- a/src/Command/Licence/SurrenderLicence.php +++ b/src/Command/Licence/SurrenderLicence.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,21 +21,21 @@ final class SurrenderLicence extends AbstractCommand use FieldType\Traits\DecisionsOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @var \DateTime - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d"}) */ protected $surrenderDate; /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") */ protected $terminated = false; diff --git a/src/Command/Licence/SuspendLicence.php b/src/Command/Licence/SuspendLicence.php index 0d2bb83c..7ce9a08a 100644 --- a/src/Command/Licence/SuspendLicence.php +++ b/src/Command/Licence/SuspendLicence.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,14 +21,14 @@ final class SuspendLicence extends AbstractCommand use FieldType\Traits\DecisionsOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") */ protected $deleteLicenceStatusRules = true; diff --git a/src/Command/Licence/TransferVehicles.php b/src/Command/Licence/TransferVehicles.php index 8c978c40..ee82034f 100644 --- a/src/Command/Licence/TransferVehicles.php +++ b/src/Command/Licence/TransferVehicles.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -20,17 +21,17 @@ final class TransferVehicles extends AbstractCommand use Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $target; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licenceVehicles = []; diff --git a/src/Command/Licence/UpdateAddresses.php b/src/Command/Licence/UpdateAddresses.php index bde1641a..43e787d7 100644 --- a/src/Command/Licence/UpdateAddresses.php +++ b/src/Command/Licence/UpdateAddresses.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Licence/UpdateCompanySubsidiary.php b/src/Command/Licence/UpdateCompanySubsidiary.php index 61f49be7..8850bf0e 100644 --- a/src/Command/Licence/UpdateCompanySubsidiary.php +++ b/src/Command/Licence/UpdateCompanySubsidiary.php @@ -8,7 +8,7 @@ /** * @author Rob Caiger - * + * * @Transfer\RouteName("backend/licence/named-single/company-subsidiary/single") * @Transfer\Method("PUT") */ diff --git a/src/Command/Licence/UpdateOperatingCentres.php b/src/Command/Licence/UpdateOperatingCentres.php index 8e49be29..9de8ee7e 100644 --- a/src/Command/Licence/UpdateOperatingCentres.php +++ b/src/Command/Licence/UpdateOperatingCentres.php @@ -13,42 +13,42 @@ */ final class UpdateOperatingCentres extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"\Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $partial; /** - * @Transfer\Filter({"name":"\Laminas\Filter\ToInt"}) - * @Transfer\Validator({"name": "Digits"}) - * @Transfer\Validator({"name": "Between", "options": {"min":0, "max": 5000}}) + * @Transfer\Filter("Laminas\Filter\ToInt") + * @Transfer\Validator("Digits") + * @Transfer\Validator("Between", options={"min":0, "max": 5000}) * @Transfer\Optional */ protected $totAuthHgvVehicles; /** - * @Transfer\Filter({"name":"\Laminas\Filter\ToInt"}) - * @Transfer\Validator({"name": "Digits"}) - * @Transfer\Validator({"name": "Between", "options": {"min":0, "max": 5000}}) + * @Transfer\Filter("Laminas\Filter\ToInt") + * @Transfer\Validator("Digits") + * @Transfer\Validator("Between", options={"min":0, "max": 5000}) * @Transfer\Optional */ protected $totAuthLgvVehicles; /** - * @Transfer\Filter({"name":"\Laminas\Filter\ToInt"}) - * @Transfer\Validator({"name": "Digits"}) - * @Transfer\Validator({"name": "Between", "options": {"min":0, "max": 5000}}) + * @Transfer\Filter("Laminas\Filter\ToInt") + * @Transfer\Validator("Digits") + * @Transfer\Validator("Between", options={"min":0, "max": 5000}) * @Transfer\Optional */ protected $totAuthTrailers; /** - * @Transfer\Filter({"name":"\Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"\Laminas\Validator\StringLength", "options": {"min": 1, "max": "4"}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": "4"}) * @Transfer\Optional */ protected $enforcementArea; diff --git a/src/Command/Licence/UpdatePeople.php b/src/Command/Licence/UpdatePeople.php index 9e4394f6..e8e8cef6 100644 --- a/src/Command/Licence/UpdatePeople.php +++ b/src/Command/Licence/UpdatePeople.php @@ -16,9 +16,9 @@ final class UpdatePeople extends AbstractPeople /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $person; diff --git a/src/Command/Licence/UpdateSafety.php b/src/Command/Licence/UpdateSafety.php index 5368f8f1..56fd64b4 100644 --- a/src/Command/Licence/UpdateSafety.php +++ b/src/Command/Licence/UpdateSafety.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,59 +18,53 @@ final class UpdateSafety extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\Optional - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 1, "max": 13}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 1, "max": 13}) */ protected $safetyInsVehicles; /** * @Transfer\Optional - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 13}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 13}) */ protected $safetyInsTrailers; /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name": "Laminas\Filter\StringToUpper"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToUpper") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) */ protected $safetyInsVaries; /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name": "Laminas\Filter\StringToLower"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"tach_internal","tach_external","tach_na"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToLower") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tach_internal","tach_external","tach_na"}}) */ protected $tachographIns; /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1,"max":"90"}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) */ protected $tachographInsName; diff --git a/src/Command/Licence/UpdateTrafficArea.php b/src/Command/Licence/UpdateTrafficArea.php index 8ec0a8fb..662784e7 100644 --- a/src/Command/Licence/UpdateTrafficArea.php +++ b/src/Command/Licence/UpdateTrafficArea.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,22 +18,22 @@ final class UpdateTrafficArea extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\TrafficArea"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\TrafficArea") */ protected $trafficArea; diff --git a/src/Command/Licence/UpdateTrailers.php b/src/Command/Licence/UpdateTrailers.php index 11ea58f2..7ccfd4a5 100644 --- a/src/Command/Licence/UpdateTrailers.php +++ b/src/Command/Licence/UpdateTrailers.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -22,8 +23,8 @@ final class UpdateTrailers extends AbstractCommand protected $shareInfo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public function getShareInfo() { diff --git a/src/Command/Licence/UpdateVehicles.php b/src/Command/Licence/UpdateVehicles.php index 356b9f8c..220bf455 100644 --- a/src/Command/Licence/UpdateVehicles.php +++ b/src/Command/Licence/UpdateVehicles.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -22,8 +23,8 @@ final class UpdateVehicles extends AbstractCommand protected $shareInfo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ public function getShareInfo() { diff --git a/src/Command/Licence/VoidPsvDiscs.php b/src/Command/Licence/VoidPsvDiscs.php index 4dd778fd..22439d40 100644 --- a/src/Command/Licence/VoidPsvDiscs.php +++ b/src/Command/Licence/VoidPsvDiscs.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class VoidPsvDiscs extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/LicenceOperatingCentre/Update.php b/src/Command/LicenceOperatingCentre/Update.php index 0b7cea68..3d361eb9 100644 --- a/src/Command/LicenceOperatingCentre/Update.php +++ b/src/Command/LicenceOperatingCentre/Update.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\LicenceOperatingCentre; use Dvsa\Olcs\Transfer\Command\ApplicationOperatingCentre\AbstractOperatingCentreCommand; @@ -19,7 +20,7 @@ */ class Update extends AbstractOperatingCentreCommand { - use Identity, - Version; + use Identity; + use Version; use IsTaOverridden; } diff --git a/src/Command/LicenceStatusRule/CreateLicenceStatusRule.php b/src/Command/LicenceStatusRule/CreateLicenceStatusRule.php index 9d7351ea..c0ddb2d9 100644 --- a/src/Command/LicenceStatusRule/CreateLicenceStatusRule.php +++ b/src/Command/LicenceStatusRule/CreateLicenceStatusRule.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\LicenceStatusRule; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -21,9 +22,9 @@ final class CreateLicenceStatusRule extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; @@ -35,16 +36,16 @@ final class CreateLicenceStatusRule extends AbstractCommand /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $startDate; /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $endDate; diff --git a/src/Command/LicenceStatusRule/DeleteLicenceStatusRule.php b/src/Command/LicenceStatusRule/DeleteLicenceStatusRule.php index 2a6eb692..f8b46178 100644 --- a/src/Command/LicenceStatusRule/DeleteLicenceStatusRule.php +++ b/src/Command/LicenceStatusRule/DeleteLicenceStatusRule.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\LicenceStatusRule; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class DeleteLicenceStatusRule extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/LicenceStatusRule/UpdateLicenceStatusRule.php b/src/Command/LicenceStatusRule/UpdateLicenceStatusRule.php index b797e2b0..d4711cb1 100644 --- a/src/Command/LicenceStatusRule/UpdateLicenceStatusRule.php +++ b/src/Command/LicenceStatusRule/UpdateLicenceStatusRule.php @@ -3,6 +3,7 @@ /** * UpdateLicenceStatusRule.php */ + namespace Dvsa\Olcs\Transfer\Command\LicenceStatusRule; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -19,41 +20,41 @@ final class UpdateLicenceStatusRule extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $startDate; /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $endDate; diff --git a/src/Command/LicenceVehicle/CreateUnlicensedOperatorLicenceVehicle.php b/src/Command/LicenceVehicle/CreateUnlicensedOperatorLicenceVehicle.php index 059b22d0..c924a908 100644 --- a/src/Command/LicenceVehicle/CreateUnlicensedOperatorLicenceVehicle.php +++ b/src/Command/LicenceVehicle/CreateUnlicensedOperatorLicenceVehicle.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\LicenceVehicle; use Dvsa\Olcs\Transfer\FieldType\Traits\Organisation; @@ -20,16 +21,16 @@ final class CreateUnlicensedOperatorLicenceVehicle extends AbstractCommand use Organisation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":20}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":20}) * @Transfer\Optional */ protected $vrm; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 999999}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 999999}) * @Transfer\Optional */ protected $platedWeight; diff --git a/src/Command/LicenceVehicle/DeleteUnlicensedOperatorLicenceVehicle.php b/src/Command/LicenceVehicle/DeleteUnlicensedOperatorLicenceVehicle.php index 7029cd58..8d873de4 100644 --- a/src/Command/LicenceVehicle/DeleteUnlicensedOperatorLicenceVehicle.php +++ b/src/Command/LicenceVehicle/DeleteUnlicensedOperatorLicenceVehicle.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\LicenceVehicle; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/LicenceVehicle/UpdatePsvLicenceVehicle.php b/src/Command/LicenceVehicle/UpdatePsvLicenceVehicle.php index 40bdf864..f6288be8 100644 --- a/src/Command/LicenceVehicle/UpdatePsvLicenceVehicle.php +++ b/src/Command/LicenceVehicle/UpdatePsvLicenceVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\LicenceVehicle; use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationOptional; @@ -20,14 +21,14 @@ */ final class UpdatePsvLicenceVehicle extends AbstractCommand { - use Identity, - Version, - ApplicationOptional, - LicenceOptional; + use Identity; + use Version; + use ApplicationOptional; + use LicenceOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":100}) * @Transfer\Optional */ protected $makeModel; @@ -44,8 +45,8 @@ final class UpdatePsvLicenceVehicle extends AbstractCommand /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $specifiedDate; diff --git a/src/Command/LicenceVehicle/UpdateUnlicensedOperatorLicenceVehicle.php b/src/Command/LicenceVehicle/UpdateUnlicensedOperatorLicenceVehicle.php index df276a11..308f9c88 100644 --- a/src/Command/LicenceVehicle/UpdateUnlicensedOperatorLicenceVehicle.php +++ b/src/Command/LicenceVehicle/UpdateUnlicensedOperatorLicenceVehicle.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\LicenceVehicle; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,20 +19,20 @@ */ final class UpdateUnlicensedOperatorLicenceVehicle extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":1,"max":20}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":20}) * @Transfer\Optional */ protected $vrm; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 999999}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 999999}) * @Transfer\Optional */ protected $platedWeight; diff --git a/src/Command/LoggerOmitContentInterface.php b/src/Command/LoggerOmitContentInterface.php index 5a334dab..4dd631bd 100644 --- a/src/Command/LoggerOmitContentInterface.php +++ b/src/Command/LoggerOmitContentInterface.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command; /** @@ -14,5 +15,4 @@ */ interface LoggerOmitContentInterface { - } diff --git a/src/Command/Lva/AbstractCreateCompanySubsidiary.php b/src/Command/Lva/AbstractCreateCompanySubsidiary.php index bf9419f6..1f1ae801 100644 --- a/src/Command/Lva/AbstractCreateCompanySubsidiary.php +++ b/src/Command/Lva/AbstractCreateCompanySubsidiary.php @@ -14,13 +14,13 @@ abstract class AbstractCreateCompanySubsidiary extends AbstractCommand { /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $name; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $companyNo; diff --git a/src/Command/Lva/AbstractDeleteCompanySubsidiary.php b/src/Command/Lva/AbstractDeleteCompanySubsidiary.php index 84334a59..e038bad8 100644 --- a/src/Command/Lva/AbstractDeleteCompanySubsidiary.php +++ b/src/Command/Lva/AbstractDeleteCompanySubsidiary.php @@ -12,9 +12,9 @@ class AbstractDeleteCompanySubsidiary extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Lva/AbstractUpdateCompanySubsidiary.php b/src/Command/Lva/AbstractUpdateCompanySubsidiary.php index f7da9c1f..43a3c163 100644 --- a/src/Command/Lva/AbstractUpdateCompanySubsidiary.php +++ b/src/Command/Lva/AbstractUpdateCompanySubsidiary.php @@ -12,6 +12,6 @@ */ abstract class AbstractUpdateCompanySubsidiary extends AbstractCreateCompanySubsidiary { - use Traits\Identity, - Traits\Version; + use Traits\Identity; + use Traits\Version; } diff --git a/src/Command/MyAccount/UpdateMyAccount.php b/src/Command/MyAccount/UpdateMyAccount.php index 3e91a169..5ce575d8 100644 --- a/src/Command/MyAccount/UpdateMyAccount.php +++ b/src/Command/MyAccount/UpdateMyAccount.php @@ -3,6 +3,7 @@ /** * Update MyAccount */ + namespace Dvsa\Olcs\Transfer\Command\MyAccount; use Dvsa\Olcs\Transfer\FieldType\Traits\TranslateToWelshOptional; @@ -18,23 +19,23 @@ final class UpdateMyAccount extends AbstractCommand use TranslateToWelshOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $team; diff --git a/src/Command/MyAccount/UpdateMyAccountSelfserve.php b/src/Command/MyAccount/UpdateMyAccountSelfserve.php index c885458b..909bdbd2 100644 --- a/src/Command/MyAccount/UpdateMyAccountSelfserve.php +++ b/src/Command/MyAccount/UpdateMyAccountSelfserve.php @@ -3,6 +3,7 @@ /** * Update MyAccount Selfserve */ + namespace Dvsa\Olcs\Transfer\Command\MyAccount; use Dvsa\Olcs\Transfer\FieldType\Traits\TranslateToWelshOptional; @@ -18,16 +19,16 @@ final class UpdateMyAccountSelfserve extends AbstractCommand use TranslateToWelshOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; diff --git a/src/Command/Operator/Create.php b/src/Command/Operator/Create.php index 169f2c03..f7960f3f 100644 --- a/src/Command/Operator/Create.php +++ b/src/Command/Operator/Create.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Operator; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -18,9 +19,8 @@ final class Create extends AbstractCommand { /** * @Transfer\Optional - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "op_cpid_central_government", * "op_cpid_local_government", @@ -28,51 +28,48 @@ final class Create extends AbstractCommand * "op_cpid_default", * } * } - * }) + * ) */ protected $cpid; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"org_t_p","org_t_pa","org_t_rc","org_t_llp","org_t_st","org_t_ir"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"org_t_p","org_t_pa","org_t_rc","org_t_llp","org_t_st","org_t_ir"}}) */ protected $businessType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 8}}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\Alnum"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":8}) + * @Transfer\Validator("Laminas\I18n\Validator\Alnum") * @Transfer\Optional */ protected $companyNumber; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\NotEmpty"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\NotEmpty") * @Transfer\Optional */ protected $name; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 255}) * @Transfer\Optional */ protected $natureOfBusiness; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional */ protected $firstName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional */ protected $lastName; @@ -84,13 +81,13 @@ final class Create extends AbstractCommand protected $address; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $isIrfo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $allowEmail; diff --git a/src/Command/Operator/CreateUnlicensed.php b/src/Command/Operator/CreateUnlicensed.php index ca016131..332a5e82 100644 --- a/src/Command/Operator/CreateUnlicensed.php +++ b/src/Command/Operator/CreateUnlicensed.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Operator; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,20 +18,20 @@ final class CreateUnlicensed extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\NotEmpty"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\NotEmpty") */ protected $name; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lcat_gv","lcat_psv"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lcat_gv", "lcat_psv"}}) */ protected $operatorType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\TrafficArea"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\TrafficArea") */ protected $trafficArea; @@ -41,8 +42,8 @@ final class CreateUnlicensed extends AbstractCommand protected $contactDetails; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isExempt; diff --git a/src/Command/Operator/Update.php b/src/Command/Operator/Update.php index 136a446c..a54c7648 100644 --- a/src/Command/Operator/Update.php +++ b/src/Command/Operator/Update.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Operator; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -20,24 +21,23 @@ final class Update extends AbstractCommand use IdentityOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $confirm = false; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** * @Transfer\Optional - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "op_cpid_central_government", * "op_cpid_local_government", @@ -45,51 +45,50 @@ final class Update extends AbstractCommand * "op_cpid_default", * } * } - * }) + * ) */ protected $cpid; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"org_t_p","org_t_pa","org_t_rc","org_t_llp","org_t_st","org_t_ir"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"org_t_p","org_t_pa","org_t_rc","org_t_llp","org_t_st","org_t_ir"}} + * ) */ protected $businessType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 8}}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\Alnum"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":8}) + * @Transfer\Validator("Laminas\I18n\Validator\Alnum") * @Transfer\Optional */ protected $companyNumber; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\NotEmpty"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\NotEmpty") * @Transfer\Optional */ protected $name; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 255}) * @Transfer\Optional */ protected $natureOfBusiness; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional */ protected $firstName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional */ protected $lastName; @@ -101,29 +100,29 @@ final class Update extends AbstractCommand protected $address; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $personId; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $personVersion; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $isIrfo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $allowEmail; diff --git a/src/Command/Operator/UpdateUnlicensed.php b/src/Command/Operator/UpdateUnlicensed.php index 906e1b72..bc62d8d7 100644 --- a/src/Command/Operator/UpdateUnlicensed.php +++ b/src/Command/Operator/UpdateUnlicensed.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Operator; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -21,20 +22,20 @@ final class UpdateUnlicensed extends AbstractCommand use FieldTypeTraits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\NotEmpty"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\NotEmpty") */ protected $name; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lcat_gv","lcat_psv"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lcat_gv", "lcat_psv"}}) */ protected $operatorType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\TrafficArea"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\TrafficArea") */ protected $trafficArea; diff --git a/src/Command/Opposition/CreateOpposition.php b/src/Command/Opposition/CreateOpposition.php index b6d74a09..e00164f2 100644 --- a/src/Command/Opposition/CreateOpposition.php +++ b/src/Command/Opposition/CreateOpposition.php @@ -12,141 +12,100 @@ class CreateOpposition extends AbstractCommand { /** - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case = null; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"otf_eob", "otf_obj", "otf_rep"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"otf_eob", "otf_obj", "otf_rep"}}) */ protected $oppositionType; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $raisedDate = null; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"obj_t_local_auth", "obj_t_other", "obj_t_police", "obj_t_rta", + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"obj_t_local_auth", "obj_t_other", "obj_t_police", "obj_t_rta", * "obj_t_trade_union" * }} - * } * ) */ protected $opposerType = null; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"opp_v_yes","opp_v_no","opp_v_nd"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"opp_v_yes","opp_v_no","opp_v_nd"}}) */ protected $isValid; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":4000}) */ protected $validNotes; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isCopied; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isWillingToAttendPi; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isInTime; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isWithdrawn; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"opp_ack","opp_cu_acc","opp_cu_prop","opp_cu_ref","opp_pro_rec"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"opp_ack","opp_cu_acc","opp_cu_prop","opp_cu_ref","opp_pro_rec"}}) */ protected $status = null; /** * @Transfer\ArrayInput * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $operatingCentres = []; /** * @Transfer\ArrayInput * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ogf_both","ogf_env","ogf_fin_stan","ogf_fitness","ogf_fumes","ogf_noise","ogf_o", + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"ogf_both","ogf_env","ogf_fin_stan","ogf_fitness","ogf_fumes","ogf_noise","ogf_o", * "ogf_o_ccap","ogf_parking","ogf_pollution","ogf_prof_com","ogf_repute","ogf_safety","ogf_size", * "ogf_unsochrs","ogf_vib","ogf_vis"}} - * } * ) */ protected $grounds = []; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":4000}) */ protected $notes = null; diff --git a/src/Command/Opposition/UpdateOpposition.php b/src/Command/Opposition/UpdateOpposition.php index 67bb5928..468b0704 100644 --- a/src/Command/Opposition/UpdateOpposition.php +++ b/src/Command/Opposition/UpdateOpposition.php @@ -12,148 +12,107 @@ class UpdateOpposition extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"otf_eob", "otf_obj", "otf_rep"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"otf_eob", "otf_obj", "otf_rep"}}) */ protected $oppositionType; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $raisedDate = null; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"obj_t_local_auth", "obj_t_other", "obj_t_police", "obj_t_rta", + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"obj_t_local_auth", "obj_t_other", "obj_t_police", "obj_t_rta", * "obj_t_trade_union"}} - * } * ) */ protected $opposerType = null; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"opp_v_yes","opp_v_no","opp_v_nd"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"opp_v_yes","opp_v_no","opp_v_nd"}}) */ protected $isValid; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":4000}) */ protected $validNotes; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isCopied; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isWillingToAttendPi; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isInTime; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isWithdrawn; /** * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"opp_ack","opp_cu_acc","opp_cu_prop","opp_cu_ref","opp_pro_rec"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"opp_ack","opp_cu_acc","opp_cu_prop","opp_cu_ref","opp_pro_rec"}}) */ protected $status = null; /** * @Transfer\ArrayInput * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $operatingCentres = []; /** * @Transfer\ArrayInput * @Transfer\Optional() - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ogf_both","ogf_env","ogf_fin_stan","ogf_fitness","ogf_fumes","ogf_noise","ogf_o", + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"ogf_both","ogf_env","ogf_fin_stan","ogf_fitness","ogf_fumes","ogf_noise","ogf_o", * "ogf_o_ccap","ogf_parking","ogf_pollution","ogf_prof_com","ogf_repute","ogf_safety","ogf_size", * "ogf_unsochrs","ogf_vib","ogf_vis"}} - * } * ) */ protected $grounds = []; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":4000}) */ protected $notes = null; diff --git a/src/Command/Organisation/CpidOrganisationExport.php b/src/Command/Organisation/CpidOrganisationExport.php index 4f3e0956..ed50e9a4 100644 --- a/src/Command/Organisation/CpidOrganisationExport.php +++ b/src/Command/Organisation/CpidOrganisationExport.php @@ -15,9 +15,8 @@ final class CpidOrganisationExport extends AbstractCommand { /** * @Transfer\Optional - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "op_cpid_central_government", * "op_cpid_local_government", @@ -26,7 +25,7 @@ final class CpidOrganisationExport extends AbstractCommand * "op_cpid_all", * } * } - * }) + * ) */ protected $cpid; diff --git a/src/Command/Organisation/GenerateName.php b/src/Command/Organisation/GenerateName.php index 4b783e7c..66e6dc0b 100644 --- a/src/Command/Organisation/GenerateName.php +++ b/src/Command/Organisation/GenerateName.php @@ -12,6 +12,6 @@ */ final class GenerateName extends AbstractCommand { - use Traits\ApplicationOptional, - Traits\Organisation; + use Traits\ApplicationOptional; + use Traits\Organisation; } diff --git a/src/Command/Organisation/TransferTo.php b/src/Command/Organisation/TransferTo.php index 5e706c73..617c2260 100644 --- a/src/Command/Organisation/TransferTo.php +++ b/src/Command/Organisation/TransferTo.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Organisation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,25 +18,25 @@ final class TransferTo extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $receivingOrganisation; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $licenceIds = []; diff --git a/src/Command/Organisation/UpdateBusinessType.php b/src/Command/Organisation/UpdateBusinessType.php index c52d5de3..9bcb4228 100644 --- a/src/Command/Organisation/UpdateBusinessType.php +++ b/src/Command/Organisation/UpdateBusinessType.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Organisation; use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationOptional; @@ -19,37 +20,34 @@ */ final class UpdateBusinessType extends AbstractCommand { - use Identity, - ApplicationOptional, - LicenceOptional; + use Identity; + use ApplicationOptional; + use LicenceOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $variation; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"org_t_p","org_t_pa","org_t_rc","org_t_llp","org_t_st","org_t_ir"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"org_t_p","org_t_pa","org_t_rc","org_t_llp","org_t_st","org_t_ir"}}) * @Transfer\Optional */ protected $businessType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $confirm = false; diff --git a/src/Command/OrganisationPerson/Create.php b/src/Command/OrganisationPerson/Create.php index 6fd4fb5d..514103f6 100644 --- a/src/Command/OrganisationPerson/Create.php +++ b/src/Command/OrganisationPerson/Create.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\OrganisationPerson; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,15 +18,15 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":45}) * @Transfer\Optional */ protected $position; diff --git a/src/Command/OrganisationPerson/DeleteList.php b/src/Command/OrganisationPerson/DeleteList.php index 23a203ee..c6f18336 100644 --- a/src/Command/OrganisationPerson/DeleteList.php +++ b/src/Command/OrganisationPerson/DeleteList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\OrganisationPerson; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class DeleteList extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/OrganisationPerson/Update.php b/src/Command/OrganisationPerson/Update.php index 039e7a16..73ac59bc 100644 --- a/src/Command/OrganisationPerson/Update.php +++ b/src/Command/OrganisationPerson/Update.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\OrganisationPerson; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,22 +18,22 @@ final class Update extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":45}) * @Transfer\Optional */ protected $position; diff --git a/src/Command/OtherLicence/CreateForTm.php b/src/Command/OtherLicence/CreateForTm.php index 2f141419..2ab5a126 100644 --- a/src/Command/OtherLicence/CreateForTm.php +++ b/src/Command/OtherLicence/CreateForTm.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\OtherLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,21 +18,21 @@ final class CreateForTm extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManagerId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":18}) */ protected $licNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":90}) */ protected $holderName; diff --git a/src/Command/OtherLicence/CreateForTma.php b/src/Command/OtherLicence/CreateForTma.php index 00b9d632..ff78325e 100644 --- a/src/Command/OtherLicence/CreateForTma.php +++ b/src/Command/OtherLicence/CreateForTma.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\OtherLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,48 +18,45 @@ final class CreateForTma extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $tmaId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":18}) */ protected $licNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ol_role_applicant","ol_role_lic_holder","ol_role_tm"}} - * } + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"ol_role_applicant","ol_role_lic_holder","ol_role_tm"}} * ) * @Transfer\Optional */ protected $role; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":255}) */ protected $operatingCentres; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $totalAuthVehicles; /** - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) - * @Transfer\Validator({"name":"Laminas\Validator\LessThan", "options": {"max": 99.9,"inclusive":true}}) + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) + * @Transfer\Validator("Laminas\Validator\LessThan", options={"max": 99.9,"inclusive":true}) */ protected $hoursPerWeek; diff --git a/src/Command/OtherLicence/CreateForTml.php b/src/Command/OtherLicence/CreateForTml.php index 44d87c19..0edb143d 100644 --- a/src/Command/OtherLicence/CreateForTml.php +++ b/src/Command/OtherLicence/CreateForTml.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\OtherLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,46 +18,43 @@ final class CreateForTml extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $tmlId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":18}) */ protected $licNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ol_role_applicant","ol_role_lic_holder","ol_role_tm"}} - * } + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"ol_role_applicant","ol_role_lic_holder","ol_role_tm"}} * ) */ protected $role; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":255}) */ protected $operatingCentres; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $totalAuthVehicles; /** - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) - * @Transfer\Validator({"name":"Laminas\Validator\LessThan", "options": {"max": 99.9,"inclusive":true}}) + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) + * @Transfer\Validator("Laminas\Validator\LessThan", options={"max": 99.9,"inclusive":true}) */ protected $hoursPerWeek; diff --git a/src/Command/OtherLicence/CreateOtherLicence.php b/src/Command/OtherLicence/CreateOtherLicence.php index 5980244c..daeefada 100644 --- a/src/Command/OtherLicence/CreateOtherLicence.php +++ b/src/Command/OtherLicence/CreateOtherLicence.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\OtherLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,47 +18,47 @@ final class CreateOtherLicence extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $licNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $application; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $holderName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ public $willSurrender; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ public $previousLicenceType; /** - * @Transfer\Validator({"name":"Date","options":{"format":"Y-m-d"}}) + * @Transfer\Validator("Date",options={"format":"Y-m-d"}) * @Transfer\Optional */ public $disqualificationDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ public $disqualificationLength; /** - * @Transfer\Validator({"name":"Date","options":{"format":"Y-m-d"}}) + * @Transfer\Validator("Date",options={"format":"Y-m-d"}) * @Transfer\Optional */ public $purchaseDate; diff --git a/src/Command/OtherLicence/CreatePreviousLicence.php b/src/Command/OtherLicence/CreatePreviousLicence.php index 4a770f38..b497fe12 100644 --- a/src/Command/OtherLicence/CreatePreviousLicence.php +++ b/src/Command/OtherLicence/CreatePreviousLicence.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\OtherLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,21 +18,21 @@ final class CreatePreviousLicence extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $tmaId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":18}) */ protected $licNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":90}) */ protected $holderName; diff --git a/src/Command/OtherLicence/DeleteOtherLicence.php b/src/Command/OtherLicence/DeleteOtherLicence.php index 79248865..70ae01ea 100644 --- a/src/Command/OtherLicence/DeleteOtherLicence.php +++ b/src/Command/OtherLicence/DeleteOtherLicence.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\OtherLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,8 +19,8 @@ final class DeleteOtherLicence extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/OtherLicence/UpdateForTma.php b/src/Command/OtherLicence/UpdateForTma.php index b80e1795..377341ed 100644 --- a/src/Command/OtherLicence/UpdateForTma.php +++ b/src/Command/OtherLicence/UpdateForTma.php @@ -12,51 +12,50 @@ */ final class UpdateForTma extends AbstractCommand { - use Traits\Identity, - Traits\Version; + use Traits\Identity; + use Traits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $licNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": {"ol_role_applicant","ol_role_lic_holder","ol_role_tm"}, * }, - * }) + * ) * @Transfer\Optional */ public $role; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":255}) * @Transfer\Optional */ public $operatingCentres; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ public $totalAuthVehicles; /** - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) - * @Transfer\Validator({"name":"Laminas\Validator\LessThan", "options": {"max": 99.9,"inclusive":true}}) + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) + * @Transfer\Validator("Laminas\Validator\LessThan", options={"max": 99.9,"inclusive":true}) * @Transfer\Optional */ public $hoursPerWeek; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ public $holderName; diff --git a/src/Command/OtherLicence/UpdateOtherLicence.php b/src/Command/OtherLicence/UpdateOtherLicence.php index 39a1b9ae..f8cd5e20 100644 --- a/src/Command/OtherLicence/UpdateOtherLicence.php +++ b/src/Command/OtherLicence/UpdateOtherLicence.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\OtherLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,50 +18,50 @@ final class UpdateOtherLicence extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $licNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $holderName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ public $willSurrender; /** - * @Transfer\Validator({"name":"Date","options":{"format":"Y-m-d"}}) + * @Transfer\Validator("Date",options={"format":"Y-m-d"}) * @Transfer\Optional */ public $disqualificationDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ public $disqualificationLength; /** - * @Transfer\Validator({"name":"Date","options":{"format":"Y-m-d"}}) + * @Transfer\Validator("Date",options={"format":"Y-m-d"}) * @Transfer\Optional */ public $purchaseDate; diff --git a/src/Command/Partial/Address.php b/src/Command/Partial/Address.php index a3904c5d..f9879d24 100644 --- a/src/Command/Partial/Address.php +++ b/src/Command/Partial/Address.php @@ -13,66 +13,66 @@ class Address { /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) */ public $addressLine1; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $addressLine2; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) * @Transfer\Optional */ public $addressLine3; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional */ public $addressLine4; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) */ public $town; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Postcode", "options": {"allow_empty": false}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Postcode", options={"allow_empty": false}) * @Transfer\Optional * @Transfer\ContinueIfEmpty */ public $postcode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":2}) */ public $countryCode; diff --git a/src/Command/Partial/AddressOptional.php b/src/Command/Partial/AddressOptional.php index f3ed9917..875496af 100644 --- a/src/Command/Partial/AddressOptional.php +++ b/src/Command/Partial/AddressOptional.php @@ -12,66 +12,66 @@ class AddressOptional { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $addressLine1; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $addressLine2; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) * @Transfer\Optional */ public $addressLine3; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional */ public $addressLine4; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) * @Transfer\Optional */ public $town; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Postcode"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Postcode") * @Transfer\Optional */ public $postcode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":2}) * @Transfer\Optional */ public $countryCode; diff --git a/src/Command/Partial/AddressOptionalPostcode.php b/src/Command/Partial/AddressOptionalPostcode.php index 39d88540..d08abdc0 100644 --- a/src/Command/Partial/AddressOptionalPostcode.php +++ b/src/Command/Partial/AddressOptionalPostcode.php @@ -13,66 +13,66 @@ class AddressOptionalPostcode { /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 1}) * @Transfer\Optional */ protected $id; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 90}) */ public $addressLine1; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 90}) * @Transfer\Optional */ public $addressLine2; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 100}) * @Transfer\Optional */ public $addressLine3; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 35}) * @Transfer\Optional */ public $addressLine4; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 30}) */ public $town; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Postcode", "options": {"allow_empty": true}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Postcode", options={"allow_empty": true}) * @Transfer\Optional * @Transfer\ContinueIfEmpty */ public $postcode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 0, "max": 2}) */ public $countryCode; diff --git a/src/Command/Partial/ApplicationTracking.php b/src/Command/Partial/ApplicationTracking.php index ac15c8aa..30f80baf 100644 --- a/src/Command/Partial/ApplicationTracking.php +++ b/src/Command/Partial/ApplicationTracking.php @@ -14,159 +14,159 @@ class ApplicationTracking extends AbstractCommand { /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $addressesStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $businessDetailsStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $businessTypeStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $communityLicencesStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $conditionsUndertakingsStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $convictionsPenaltiesStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $discsStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $financialEvidenceStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $financialHistoryStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $licenceHistoryStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $operatingCentresStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $peopleStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $safetyStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $taxiPhvStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $transportManagersStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $typeOfLicenceStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $declarationsInternalStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $vehiclesDeclarationsStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $vehiclesPsvStatus; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"0", "1", "2", "3"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"0", "1", "2", "3"}}) */ protected $vehiclesStatus; diff --git a/src/Command/Partial/ContactDetails.php b/src/Command/Partial/ContactDetails.php index 95b7e28d..a81da805 100644 --- a/src/Command/Partial/ContactDetails.php +++ b/src/Command/Partial/ContactDetails.php @@ -13,37 +13,37 @@ class ContactDetails { /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1,"max":90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) */ protected $fao; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\EmailAddress"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\EmailAddress") * @Transfer\Optional */ public $emailAddress; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":5,"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":255}) * @Transfer\Optional */ public $description; @@ -56,7 +56,7 @@ class ContactDetails /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") * @Transfer\Partial("Dvsa\Olcs\Transfer\Command\Partial\PhoneContact") * @Transfer\Optional */ diff --git a/src/Command/Partial/IrfoPartner.php b/src/Command/Partial/IrfoPartner.php index fbabc978..8bd95281 100644 --- a/src/Command/Partial/IrfoPartner.php +++ b/src/Command/Partial/IrfoPartner.php @@ -10,23 +10,23 @@ class IrfoPartner { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $name; diff --git a/src/Command/Partial/IrfoPsvAuthNumber.php b/src/Command/Partial/IrfoPsvAuthNumber.php index 8e079f66..c2612497 100644 --- a/src/Command/Partial/IrfoPsvAuthNumber.php +++ b/src/Command/Partial/IrfoPsvAuthNumber.php @@ -10,23 +10,23 @@ class IrfoPsvAuthNumber { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $name; diff --git a/src/Command/Partial/OperatingCentreEvidence.php b/src/Command/Partial/OperatingCentreEvidence.php index 597afb70..5ddf287f 100644 --- a/src/Command/Partial/OperatingCentreEvidence.php +++ b/src/Command/Partial/OperatingCentreEvidence.php @@ -14,19 +14,19 @@ class OperatingCentreEvidence extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $aocId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $adPlacedIn; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $adPlacedDate; diff --git a/src/Command/Partial/OperatorContactDetails.php b/src/Command/Partial/OperatorContactDetails.php index d454641a..c76c26cd 100644 --- a/src/Command/Partial/OperatorContactDetails.php +++ b/src/Command/Partial/OperatorContactDetails.php @@ -14,23 +14,23 @@ class OperatorContactDetails extends AbstractCommand { /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\EmailAddress"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\EmailAddress") * @Transfer\Optional */ public $emailAddress; @@ -43,7 +43,7 @@ class OperatorContactDetails extends AbstractCommand /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") * @Transfer\Partial("Dvsa\Olcs\Transfer\Command\Partial\PhoneContact") * @Transfer\Optional */ diff --git a/src/Command/Partial/Person.php b/src/Command/Partial/Person.php index 874aad9b..36a25ae9 100644 --- a/src/Command/Partial/Person.php +++ b/src/Command/Partial/Person.php @@ -10,50 +10,50 @@ class Person { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Title"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Title") * @Transfer\Optional */ protected $title; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $forename; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":2,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ protected $familyName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") * @Transfer\Optional */ protected $birthDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":35}) * @Transfer\Optional */ public $otherName; diff --git a/src/Command/Partial/PhoneContact.php b/src/Command/Partial/PhoneContact.php index 8a98259f..cc4bd840 100644 --- a/src/Command/Partial/PhoneContact.php +++ b/src/Command/Partial/PhoneContact.php @@ -10,30 +10,30 @@ class PhoneContact { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"phone_t_primary","phone_t_secondary"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"phone_t_primary","phone_t_secondary"}}) */ protected $phoneContactType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":45}) */ public $phoneNumber; diff --git a/src/Command/Partial/RegisteredAddress.php b/src/Command/Partial/RegisteredAddress.php index af6b90ca..477c7f98 100644 --- a/src/Command/Partial/RegisteredAddress.php +++ b/src/Command/Partial/RegisteredAddress.php @@ -12,54 +12,54 @@ class RegisteredAddress { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $addressLine1; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ public $addressLine2; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ public $addressLine3; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $addressLine4; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $town; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Postcode"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Postcode") */ public $postcode; diff --git a/src/Command/Partial/TradingName.php b/src/Command/Partial/TradingName.php index acd7abfa..bb34b87c 100644 --- a/src/Command/Partial/TradingName.php +++ b/src/Command/Partial/TradingName.php @@ -10,23 +10,23 @@ class TradingName { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $name; diff --git a/src/Command/Permits/AcceptIrhpPermits.php b/src/Command/Permits/AcceptIrhpPermits.php index d1b8ca5a..79e7cc58 100644 --- a/src/Command/Permits/AcceptIrhpPermits.php +++ b/src/Command/Permits/AcceptIrhpPermits.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Command\Permits; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Permits/PrintPermits.php b/src/Command/Permits/PrintPermits.php index 63d66a86..7f21061a 100644 --- a/src/Command/Permits/PrintPermits.php +++ b/src/Command/Permits/PrintPermits.php @@ -1,4 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Command\Permits; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Permits/QueueReport.php b/src/Command/Permits/QueueReport.php index 64e17493..9145f292 100644 --- a/src/Command/Permits/QueueReport.php +++ b/src/Command/Permits/QueueReport.php @@ -1,6 +1,6 @@ */ + namespace Dvsa\Olcs\Transfer\Command\Permits; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/PreviousConviction/CreateForTma.php b/src/Command/PreviousConviction/CreateForTma.php index 615b7e8c..617bbcbc 100644 --- a/src/Command/PreviousConviction/CreateForTma.php +++ b/src/Command/PreviousConviction/CreateForTma.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\PreviousConviction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,45 +18,43 @@ final class CreateForTma extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $tmaId; /** - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d"}) */ protected $convictionDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 1024}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":1024}) */ protected $categoryText; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 0, "max": 4000}) */ protected $notes; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 70}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 0, "max": 70}) */ protected $courtFpn; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":255}) */ protected $penalty; /** * Get Transport Manager Application Id - * - * @return type */ public function getTmaId() { diff --git a/src/Command/PreviousConviction/CreatePreviousConviction.php b/src/Command/PreviousConviction/CreatePreviousConviction.php index 4957ccaf..4c972899 100644 --- a/src/Command/PreviousConviction/CreatePreviousConviction.php +++ b/src/Command/PreviousConviction/CreatePreviousConviction.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Command\PreviousConviction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,69 +18,69 @@ final class CreatePreviousConviction extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $application; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $transportManager; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Title"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Title") * @Transfer\Optional */ protected $title; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":35}) * @Transfer\Optional */ protected $forename; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":35}) * @Transfer\Optional */ protected $familyName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $convictionDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":70}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":70}) */ protected $courtFpn; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":1024}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":1024}) */ protected $categoryText; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":4000}) */ protected $notes; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":255}) */ protected $penalty; diff --git a/src/Command/PreviousConviction/DeletePreviousConviction.php b/src/Command/PreviousConviction/DeletePreviousConviction.php index 80fa11f4..6e35ca2b 100644 --- a/src/Command/PreviousConviction/DeletePreviousConviction.php +++ b/src/Command/PreviousConviction/DeletePreviousConviction.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Command\PreviousConviction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class DeletePreviousConviction extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/PreviousConviction/UpdatePreviousConviction.php b/src/Command/PreviousConviction/UpdatePreviousConviction.php index e9a645b1..7ed0d96e 100644 --- a/src/Command/PreviousConviction/UpdatePreviousConviction.php +++ b/src/Command/PreviousConviction/UpdatePreviousConviction.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Command\PreviousConviction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,73 +18,70 @@ final class UpdatePreviousConviction extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $transportManager; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"title_dr","title_miss","title_mr","title_mrs","title_ms"}} - * } + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"title_dr","title_miss","title_mr","title_mrs","title_ms"}} * ) * @Transfer\Optional */ protected $title; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $forename; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $familyName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $convictionDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $courtFpn; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $categoryText; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $notes; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $penalty; diff --git a/src/Command/Printer/CreatePrinter.php b/src/Command/Printer/CreatePrinter.php index 0ea7791d..b9be7481 100644 --- a/src/Command/Printer/CreatePrinter.php +++ b/src/Command/Printer/CreatePrinter.php @@ -3,6 +3,7 @@ /** * Create Printer */ + namespace Dvsa\Olcs\Transfer\Command\Printer; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,14 +16,14 @@ final class CreatePrinter extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":45}) */ protected $printerName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":255}) * @Transfer\Optional */ protected $description; diff --git a/src/Command/Printer/DeletePrinter.php b/src/Command/Printer/DeletePrinter.php index 8c5d76bf..8b0140fc 100644 --- a/src/Command/Printer/DeletePrinter.php +++ b/src/Command/Printer/DeletePrinter.php @@ -3,6 +3,7 @@ /** * Delete Printer */ + namespace Dvsa\Olcs\Transfer\Command\Printer; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,7 +16,7 @@ final class DeletePrinter extends AbstractDeleteCommand { /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $validate; diff --git a/src/Command/Printer/UpdatePrinter.php b/src/Command/Printer/UpdatePrinter.php index 06e8de14..faa205d3 100644 --- a/src/Command/Printer/UpdatePrinter.php +++ b/src/Command/Printer/UpdatePrinter.php @@ -3,6 +3,7 @@ /** * Create Printer */ + namespace Dvsa\Olcs\Transfer\Command\Printer; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -19,14 +20,14 @@ final class UpdatePrinter extends AbstractCommand use Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":45}) */ protected $printerName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":255}) * @Transfer\Optional */ protected $description; diff --git a/src/Command/PrivateHireLicence/Create.php b/src/Command/PrivateHireLicence/Create.php index 9dedcd10..f9ecd9e6 100644 --- a/src/Command/PrivateHireLicence/Create.php +++ b/src/Command/PrivateHireLicence/Create.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\PrivateHireLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,21 +18,21 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 10}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 10}) */ protected $privateHireLicenceNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 255}) */ protected $councilName; @@ -41,11 +42,8 @@ final class Create extends AbstractCommand protected $address; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"application","variation","licence"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"application","variation","licence"}}) * @Transfer\Optional */ protected $lva; diff --git a/src/Command/PrivateHireLicence/DeleteList.php b/src/Command/PrivateHireLicence/DeleteList.php index 4e7830cf..934a0314 100644 --- a/src/Command/PrivateHireLicence/DeleteList.php +++ b/src/Command/PrivateHireLicence/DeleteList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\PrivateHireLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,25 +19,22 @@ final class DeleteList extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"application","variation","licence"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"application","variation","licence"}}) * @Transfer\Optional */ protected $lva; diff --git a/src/Command/PrivateHireLicence/Update.php b/src/Command/PrivateHireLicence/Update.php index 66723cb9..cd8d9661 100644 --- a/src/Command/PrivateHireLicence/Update.php +++ b/src/Command/PrivateHireLicence/Update.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\PrivateHireLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,28 +18,28 @@ final class Update extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 10}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 10}) */ protected $privateHireLicenceNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 255}) */ protected $councilName; @@ -48,18 +49,15 @@ final class Update extends AbstractCommand protected $address; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"application","variation","licence"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"application","variation","licence"}}) * @Transfer\Optional */ protected $lva; diff --git a/src/Command/Processing/Note/Create.php b/src/Command/Processing/Note/Create.php index 0d7192db..7ddcd891 100644 --- a/src/Command/Processing/Note/Create.php +++ b/src/Command/Processing/Note/Create.php @@ -33,8 +33,8 @@ class Create extends AbstractCommand implements use FieldTypeTraits\CommentOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $priority; diff --git a/src/Command/Processing/Note/Update.php b/src/Command/Processing/Note/Update.php index 6fe7ed0b..5121bc17 100644 --- a/src/Command/Processing/Note/Update.php +++ b/src/Command/Processing/Note/Update.php @@ -22,8 +22,8 @@ class Update extends AbstractCommand implements use FieldTypeTraits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $priority; diff --git a/src/Command/PsvDisc/ConfirmPrinting.php b/src/Command/PsvDisc/ConfirmPrinting.php index 990de4c9..1a3ac9c4 100644 --- a/src/Command/PsvDisc/ConfirmPrinting.php +++ b/src/Command/PsvDisc/ConfirmPrinting.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\PsvDisc; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,45 +18,43 @@ final class ConfirmPrinting extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * {"name":"Laminas\Validator\InArray", "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}} - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $endNumber; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $startNumber; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $discSequence; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $isSuccessfull; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $queueId; diff --git a/src/Command/PsvDisc/PrintDiscs.php b/src/Command/PsvDisc/PrintDiscs.php index 4c280529..ee7544dd 100644 --- a/src/Command/PsvDisc/PrintDiscs.php +++ b/src/Command/PsvDisc/PrintDiscs.php @@ -18,33 +18,31 @@ final class PrintDiscs extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * {"name":"Laminas\Validator\InArray", "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}} - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ public $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $startNumber; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ public $maxPages; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $discSequence; diff --git a/src/Command/Publication/Application.php b/src/Command/Publication/Application.php index 2624dff1..923a42e9 100644 --- a/src/Command/Publication/Application.php +++ b/src/Command/Publication/Application.php @@ -3,6 +3,7 @@ /** * Publish Application */ + namespace Dvsa\Olcs\Transfer\Command\Publication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,9 +21,9 @@ final class Application extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $publicationSection; diff --git a/src/Command/Publication/Bus.php b/src/Command/Publication/Bus.php index 7f3b1a77..47011201 100644 --- a/src/Command/Publication/Bus.php +++ b/src/Command/Publication/Bus.php @@ -3,6 +3,7 @@ /** * Publish Bus */ + namespace Dvsa\Olcs\Transfer\Command\Publication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Publication/CreateRecipient.php b/src/Command/Publication/CreateRecipient.php index 58cc1913..9a066a76 100644 --- a/src/Command/Publication/CreateRecipient.php +++ b/src/Command/Publication/CreateRecipient.php @@ -3,6 +3,7 @@ /** * Create Recipient */ + namespace Dvsa\Olcs\Transfer\Command\Publication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,47 +16,47 @@ final class CreateRecipient extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isObjector; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":100}) */ protected $contactName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\EmailAddress"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\EmailAddress") */ protected $emailAddress; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $sendAppDecision; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $sendNoticesProcs; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $trafficAreas = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isPolice; diff --git a/src/Command/Publication/DeleteRecipient.php b/src/Command/Publication/DeleteRecipient.php index e7cb8b15..4e49b93f 100644 --- a/src/Command/Publication/DeleteRecipient.php +++ b/src/Command/Publication/DeleteRecipient.php @@ -3,6 +3,7 @@ /** * Delete Recipient */ + namespace Dvsa\Olcs\Transfer\Command\Publication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ final class DeleteRecipient extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/Publication/Generate.php b/src/Command/Publication/Generate.php index 624b695e..827985cc 100644 --- a/src/Command/Publication/Generate.php +++ b/src/Command/Publication/Generate.php @@ -3,6 +3,7 @@ /** * Generate a publication */ + namespace Dvsa\Olcs\Transfer\Command\Publication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Publication/Publish.php b/src/Command/Publication/Publish.php index be578d53..e5b24320 100644 --- a/src/Command/Publication/Publish.php +++ b/src/Command/Publication/Publish.php @@ -3,6 +3,7 @@ /** * Publish a publication */ + namespace Dvsa\Olcs\Transfer\Command\Publication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Publication/UpdatePublicationLink.php b/src/Command/Publication/UpdatePublicationLink.php index c173f41b..ee046a65 100644 --- a/src/Command/Publication/UpdatePublicationLink.php +++ b/src/Command/Publication/UpdatePublicationLink.php @@ -3,6 +3,7 @@ /** * Publish a publication */ + namespace Dvsa\Olcs\Transfer\Command\Publication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -19,22 +20,22 @@ final class UpdatePublicationLink extends AbstractCommand use FieldType\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":4000}) * @Transfer\Optional */ public $text1; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":4000}) * @Transfer\Optional */ public $text2; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":4000}) * @Transfer\Optional */ public $text3; diff --git a/src/Command/Publication/UpdateRecipient.php b/src/Command/Publication/UpdateRecipient.php index 99bfaf0a..a4550ef3 100644 --- a/src/Command/Publication/UpdateRecipient.php +++ b/src/Command/Publication/UpdateRecipient.php @@ -3,6 +3,7 @@ /** * Update Recipient */ + namespace Dvsa\Olcs\Transfer\Command\Publication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,61 +16,61 @@ final class UpdateRecipient extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isObjector; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":100}) */ protected $contactName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\EmailAddress"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\EmailAddress") */ protected $emailAddress; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $sendAppDecision; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $sendNoticesProcs; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $trafficAreas = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isPolice; diff --git a/src/Command/Replacement/Create.php b/src/Command/Replacement/Create.php index 15b53c18..b4c8c79b 100644 --- a/src/Command/Replacement/Create.php +++ b/src/Command/Replacement/Create.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Command\Replacement; use Dvsa\Olcs\Transfer\FieldType\Traits\Placeholder; diff --git a/src/Command/Replacement/Update.php b/src/Command/Replacement/Update.php index d57c090f..08959d49 100644 --- a/src/Command/Replacement/Update.php +++ b/src/Command/Replacement/Update.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Command\Replacement; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Report/Upload.php b/src/Command/Report/Upload.php index 639546df..5c0670ab 100644 --- a/src/Command/Report/Upload.php +++ b/src/Command/Report/Upload.php @@ -3,6 +3,7 @@ /** * Upload report */ + namespace Dvsa\Olcs\Transfer\Command\Report; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/Scan/CreateContinuationSeparatorSheet.php b/src/Command/Scan/CreateContinuationSeparatorSheet.php index 11f7afca..601cdbeb 100644 --- a/src/Command/Scan/CreateContinuationSeparatorSheet.php +++ b/src/Command/Scan/CreateContinuationSeparatorSheet.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Scan; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,7 +18,7 @@ final class CreateContinuationSeparatorSheet extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $licNo; diff --git a/src/Command/Scan/CreateDocument.php b/src/Command/Scan/CreateDocument.php index f991830b..85355637 100644 --- a/src/Command/Scan/CreateDocument.php +++ b/src/Command/Scan/CreateDocument.php @@ -3,6 +3,7 @@ /** * CreateDocument - used by the olcs-scanning service to add scanned documents */ + namespace Dvsa\Olcs\Transfer\Command\Scan; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ final class CreateDocument extends AbstractCommand implements LoggerOmitContentInterface { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $scanId; diff --git a/src/Command/Scan/CreateSeparatorSheet.php b/src/Command/Scan/CreateSeparatorSheet.php index 99cdcbc8..ee3cf9cd 100644 --- a/src/Command/Scan/CreateSeparatorSheet.php +++ b/src/Command/Scan/CreateSeparatorSheet.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Scan; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -20,34 +21,34 @@ final class CreateSeparatorSheet extends AbstractCommand use DateReceived; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $categoryId; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $subCategoryId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $entityIdentifier; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $descriptionId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $description; diff --git a/src/Command/Submission/AssignSubmission.php b/src/Command/Submission/AssignSubmission.php index 31770c9a..2709d967 100644 --- a/src/Command/Submission/AssignSubmission.php +++ b/src/Command/Submission/AssignSubmission.php @@ -3,6 +3,7 @@ /** * AssignSubmission Submission */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -21,30 +22,30 @@ final class AssignSubmission extends AbstractCommand /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"tc", "other"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tc", "other"}}) */ protected $tcOrOther; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $recipientUser; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $presidingTcUser; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $urgent; diff --git a/src/Command/Submission/CreateSubmission.php b/src/Command/Submission/CreateSubmission.php index ee267470..3f308874 100644 --- a/src/Command/Submission/CreateSubmission.php +++ b/src/Command/Submission/CreateSubmission.php @@ -3,6 +3,7 @@ /** * Create Submission */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,17 +16,16 @@ final class CreateSubmission extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "submission_type_o_bus_reg", "submission_type_o_clo_fep", "submission_type_o_clo_g", * "submission_type_o_clo_psv", "submission_type_o_env", "submission_type_o_impounding", @@ -33,15 +33,15 @@ final class CreateSubmission extends AbstractCommand * "submission_type_o_schedule_41", "submission_type_o_tm", "submission_type_o_ni_tru" * } * } - * }) + * ) */ protected $submissionType; /** * @Transfer\Optional * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\SubmissionSection"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\SubmissionSection") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $sections = []; diff --git a/src/Command/Submission/CreateSubmissionAction.php b/src/Command/Submission/CreateSubmissionAction.php index ee0d4dcd..3c077a99 100644 --- a/src/Command/Submission/CreateSubmissionAction.php +++ b/src/Command/Submission/CreateSubmissionAction.php @@ -3,6 +3,7 @@ /** * Create SubmissionAction */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,43 +16,43 @@ final class CreateSubmissionAction extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $submission; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isDecision; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":5,"max":32}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":32}) */ protected $actionTypes = []; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $reasons = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"htmlpurifier"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("htmlpurifier") * @Transfer\Escape(false) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5}}) + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5}) */ protected $comment; diff --git a/src/Command/Submission/CreateSubmissionSectionComment.php b/src/Command/Submission/CreateSubmissionSectionComment.php index b4a80ff3..673197c5 100644 --- a/src/Command/Submission/CreateSubmissionSectionComment.php +++ b/src/Command/Submission/CreateSubmissionSectionComment.php @@ -3,6 +3,7 @@ /** * Create SubmissionSectionComment */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,17 +16,16 @@ final class CreateSubmissionSectionComment extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $submission; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "introduction", "case-summary","case-outline", "most-serious-infringement", * "outstanding-applications","people","operating-centres","conditions-and-undertakings", @@ -40,15 +40,15 @@ final class CreateSubmissionSectionComment extends AbstractCommand * "tm-responsibilities","tm-other-employment","tm-previous-history","applicants-responses" * } * } - * }) + * ) */ protected $submissionSection; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"htmlpurifier"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("htmlpurifier") * @Transfer\Escape(false) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5}}) + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5}) */ protected $comment; diff --git a/src/Command/Submission/FilterSubmissionSections.php b/src/Command/Submission/FilterSubmissionSections.php index 158a6850..73a85a31 100644 --- a/src/Command/Submission/FilterSubmissionSections.php +++ b/src/Command/Submission/FilterSubmissionSections.php @@ -4,6 +4,7 @@ * Filter Submission sections. Leave any other sections as is. Just remove specified data from sections passed in * Command */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -21,22 +22,22 @@ final class FilterSubmissionSections extends AbstractCommand use FieldType\Traits\Version; /** - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\SubmissionSection"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":50}}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\SubmissionSection") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":50}) */ protected $section; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":50}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":50}) */ protected $subSection; /** * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $rowsToFilter = []; diff --git a/src/Command/Submission/InformationCompleteSubmission.php b/src/Command/Submission/InformationCompleteSubmission.php index 03238e3e..c7002c06 100644 --- a/src/Command/Submission/InformationCompleteSubmission.php +++ b/src/Command/Submission/InformationCompleteSubmission.php @@ -3,6 +3,7 @@ /** * Complete Submission */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,9 +21,9 @@ final class InformationCompleteSubmission extends AbstractCommand use FieldType\Traits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $informationCompleteDate = null; diff --git a/src/Command/Submission/RefreshSubmissionSections.php b/src/Command/Submission/RefreshSubmissionSections.php index 528baf4e..b3872c9b 100644 --- a/src/Command/Submission/RefreshSubmissionSections.php +++ b/src/Command/Submission/RefreshSubmissionSections.php @@ -3,6 +3,7 @@ /** * Update Submission sections. Leave any other sections as is. Just update section/subsection passed in Command */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,16 +21,16 @@ final class RefreshSubmissionSections extends AbstractCommand use FieldType\Traits\Version; /** - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\SubmissionSection"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":50}}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\SubmissionSection") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":50}) */ protected $section; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max":50}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":50}) */ protected $subSection; diff --git a/src/Command/Submission/ReopenSubmission.php b/src/Command/Submission/ReopenSubmission.php index 76edcd5f..94b60c82 100644 --- a/src/Command/Submission/ReopenSubmission.php +++ b/src/Command/Submission/ReopenSubmission.php @@ -14,5 +14,5 @@ */ class ReopenSubmission extends AbstractReopenCommand { - // + // } diff --git a/src/Command/Submission/StoreSubmissionSnapshot.php b/src/Command/Submission/StoreSubmissionSnapshot.php index 10bf6284..6c3657d2 100644 --- a/src/Command/Submission/StoreSubmissionSnapshot.php +++ b/src/Command/Submission/StoreSubmissionSnapshot.php @@ -15,7 +15,7 @@ final class StoreSubmissionSnapshot extends AbstractCommand use FieldType\Traits\Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Escape(false) */ protected $html; diff --git a/src/Command/Submission/UpdateSubmission.php b/src/Command/Submission/UpdateSubmission.php index dc79a56a..b0d3097a 100644 --- a/src/Command/Submission/UpdateSubmission.php +++ b/src/Command/Submission/UpdateSubmission.php @@ -3,6 +3,7 @@ /** * Update Submission */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,10 +21,9 @@ final class UpdateSubmission extends AbstractCommand use FieldType\Traits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "submission_type_o_bus_reg", "submission_type_o_clo_fep", "submission_type_o_clo_g", * "submission_type_o_clo_psv", "submission_type_o_env", "submission_type_o_impounding", @@ -31,43 +31,43 @@ final class UpdateSubmission extends AbstractCommand * "submission_type_o_schedule_41", "submission_type_o_tm", "submission_type_o_ni_tru" * } * } - * }) + * ) */ protected $submissionType; /** * @Transfer\ArrayInput - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\SubmissionSection"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\SubmissionSection") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $sections = []; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $senderUser; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $recipientUser; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $urgent; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\Date"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\Date") * @Transfer\Optional */ protected $closedDate; diff --git a/src/Command/Submission/UpdateSubmissionAction.php b/src/Command/Submission/UpdateSubmissionAction.php index 2b1746cf..19eae311 100644 --- a/src/Command/Submission/UpdateSubmissionAction.php +++ b/src/Command/Submission/UpdateSubmissionAction.php @@ -3,6 +3,7 @@ /** * Update SubmissionAction */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,44 +16,44 @@ final class UpdateSubmissionAction extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":5,"max":32}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":32}) */ protected $actionTypes = []; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $reasons = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"htmlpurifier"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("htmlpurifier") * @Transfer\Escape(false) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5}}) + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5}) */ protected $comment; diff --git a/src/Command/Submission/UpdateSubmissionSectionComment.php b/src/Command/Submission/UpdateSubmissionSectionComment.php index 2aa0d144..e8a8f43d 100644 --- a/src/Command/Submission/UpdateSubmissionSectionComment.php +++ b/src/Command/Submission/UpdateSubmissionSectionComment.php @@ -3,6 +3,7 @@ /** * Update SubmissionSectionComment */ + namespace Dvsa\Olcs\Transfer\Command\Submission; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -20,8 +21,8 @@ final class UpdateSubmissionSectionComment extends AbstractCommand use FieldType\Traits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"htmlpurifier"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("htmlpurifier") * @Transfer\Escape(false) * @Transfer\Optional */ diff --git a/src/Command/Surrender/Approve.php b/src/Command/Surrender/Approve.php index 31a964fa..d995ef57 100644 --- a/src/Command/Surrender/Approve.php +++ b/src/Command/Surrender/Approve.php @@ -1,6 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Command\System; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,46 +18,40 @@ final class CreateFinancialStandingRate extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lcat_gv","lcat_psv"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lcat_gv", "lcat_psv"}}) * @Transfer\Optional */ protected $goodsOrPsv; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"fin_sta_veh_typ_na","fin_sta_veh_typ_hgv","fin_sta_veh_typ_lgv"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"fin_sta_veh_typ_na","fin_sta_veh_typ_hgv","fin_sta_veh_typ_lgv"}}) * @Transfer\Optional */ protected $vehicleType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Money"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Money") */ protected $firstVehicleRate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Money"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Money") */ protected $additionalVehicleRate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $effectiveFrom; diff --git a/src/Command/System/CreateSlaTargetDate.php b/src/Command/System/CreateSlaTargetDate.php index c70083d3..dbff8f6d 100644 --- a/src/Command/System/CreateSlaTargetDate.php +++ b/src/Command/System/CreateSlaTargetDate.php @@ -13,53 +13,48 @@ class CreateSlaTargetDate extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $entityId = null; /** - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"document"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"document"}}) */ protected $entityType = null; /** * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $agreedDate; /** * @Transfer\Optional * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $targetDate; /** * @Transfer\Optional * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $sentDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $underDelegation; /** * @var String * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":5, "max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $notes; diff --git a/src/Command/System/DeleteFinancialStandingRateList.php b/src/Command/System/DeleteFinancialStandingRateList.php index f43fa317..f186fbe1 100644 --- a/src/Command/System/DeleteFinancialStandingRateList.php +++ b/src/Command/System/DeleteFinancialStandingRateList.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\System; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/System/InfoMessage/Create.php b/src/Command/System/InfoMessage/Create.php index a9a51dde..acf4e753 100644 --- a/src/Command/System/InfoMessage/Create.php +++ b/src/Command/System/InfoMessage/Create.php @@ -12,29 +12,29 @@ class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ public $isInternal; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max": 1024}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max": 1024}) */ protected $description; /** * @var string - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $startDate; /** * @var string - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $endDate; diff --git a/src/Command/System/PublicHoliday/Create.php b/src/Command/System/PublicHoliday/Create.php index 8d67d257..fe9822e6 100644 --- a/src/Command/System/PublicHoliday/Create.php +++ b/src/Command/System/PublicHoliday/Create.php @@ -12,36 +12,36 @@ class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ public $isEngland; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ public $isWales; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ public $isScotland; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ public $isNi; /** * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $holidayDate; diff --git a/src/Command/System/UpdateFinancialStandingRate.php b/src/Command/System/UpdateFinancialStandingRate.php index 3bd51bfc..69458a27 100644 --- a/src/Command/System/UpdateFinancialStandingRate.php +++ b/src/Command/System/UpdateFinancialStandingRate.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\System; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,50 +18,44 @@ */ final class UpdateFinancialStandingRate extends AbstractCommand { - use FieldTypeTraits\Identity, - FieldTypeTraits\Version; + use FieldTypeTraits\Identity; + use FieldTypeTraits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lcat_gv","lcat_psv"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lcat_gv", "lcat_psv"}}) * @Transfer\Optional */ protected $goodsOrPsv; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"fin_sta_veh_typ_na","fin_sta_veh_typ_hgv","fin_sta_veh_typ_lgv"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"fin_sta_veh_typ_na","fin_sta_veh_typ_hgv","fin_sta_veh_typ_lgv"}}) * @Transfer\Optional */ protected $vehicleType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Money"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Money") */ protected $firstVehicleRate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Money"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Money") */ protected $additionalVehicleRate; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $effectiveFrom; diff --git a/src/Command/System/UpdateSlaTargetDate.php b/src/Command/System/UpdateSlaTargetDate.php index 64e002e9..735856a3 100644 --- a/src/Command/System/UpdateSlaTargetDate.php +++ b/src/Command/System/UpdateSlaTargetDate.php @@ -16,53 +16,48 @@ class UpdateSlaTargetDate extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $entityId = null; /** - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"document"}} - * } - * ) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"document"}}) */ protected $entityType = null; /** * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $agreedDate; /** * @Transfer\Optional * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $targetDate; /** * @Transfer\Optional * @var string - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $sentDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $underDelegation; /** * @var String * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":5, "max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":4000}) */ protected $notes; diff --git a/src/Command/SystemParameter/CreateSystemParameter.php b/src/Command/SystemParameter/CreateSystemParameter.php index a0bbd87e..779e9ee8 100644 --- a/src/Command/SystemParameter/CreateSystemParameter.php +++ b/src/Command/SystemParameter/CreateSystemParameter.php @@ -3,6 +3,7 @@ /** * Create System Parameter */ + namespace Dvsa\Olcs\Transfer\Command\SystemParameter; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,20 +16,20 @@ final class CreateSystemParameter extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":32}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":32}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":1024}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":1024}) */ protected $paramValue; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":255}) * @Transfer\Optional */ protected $description; diff --git a/src/Command/SystemParameter/DeleteSystemParameter.php b/src/Command/SystemParameter/DeleteSystemParameter.php index bf691530..90118728 100644 --- a/src/Command/SystemParameter/DeleteSystemParameter.php +++ b/src/Command/SystemParameter/DeleteSystemParameter.php @@ -3,6 +3,7 @@ /** * Delete System Parameter */ + namespace Dvsa\Olcs\Transfer\Command\SystemParameter; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,8 +16,8 @@ final class DeleteSystemParameter extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":32}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":32}) */ protected $id; diff --git a/src/Command/SystemParameter/UpdateSystemParameter.php b/src/Command/SystemParameter/UpdateSystemParameter.php index 9a5e7e8e..a2a05d49 100644 --- a/src/Command/SystemParameter/UpdateSystemParameter.php +++ b/src/Command/SystemParameter/UpdateSystemParameter.php @@ -3,6 +3,7 @@ /** * Update System Parameter */ + namespace Dvsa\Olcs\Transfer\Command\SystemParameter; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,20 +16,20 @@ final class UpdateSystemParameter extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":32}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":32}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":1024}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":1024}) */ protected $paramValue; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":255}) * @Transfer\Optional */ protected $description; diff --git a/src/Command/Task/CloseTasks.php b/src/Command/Task/CloseTasks.php index 0e8d071f..cc32f4cd 100644 --- a/src/Command/Task/CloseTasks.php +++ b/src/Command/Task/CloseTasks.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Task; use Dvsa\Olcs\Transfer\FieldType\Traits\Ids; diff --git a/src/Command/Task/CreateTask.php b/src/Command/Task/CreateTask.php index fe0bdaf1..e6a5ba84 100644 --- a/src/Command/Task/CreateTask.php +++ b/src/Command/Task/CreateTask.php @@ -19,68 +19,68 @@ */ final class CreateTask extends AbstractCommand { - use LicenceOptional, - ApplicationOptional, - TransportManagerOptional, - SubmissionOptional, - BusRegOptional, - CasesOptional, - IrhpApplicationOptional, - SurrenderOptional; + use LicenceOptional; + use ApplicationOptional; + use TransportManagerOptional; + use SubmissionOptional; + use BusRegOptional; + use CasesOptional; + use IrhpApplicationOptional; + use SurrenderOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":255}) */ protected $description; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $actionDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $urgent; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $category; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $subCategory; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $assignedToUser; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $assignedByUser; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $assignedToTeam; diff --git a/src/Command/Task/FlagUrgentTasks.php b/src/Command/Task/FlagUrgentTasks.php index 0c05bcbb..110efe76 100644 --- a/src/Command/Task/FlagUrgentTasks.php +++ b/src/Command/Task/FlagUrgentTasks.php @@ -3,6 +3,7 @@ /** * FlagUrgentTasks */ + namespace Dvsa\Olcs\Transfer\Command\Task; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Task/ReassignTasks.php b/src/Command/Task/ReassignTasks.php index 49460920..4ebd9437 100644 --- a/src/Command/Task/ReassignTasks.php +++ b/src/Command/Task/ReassignTasks.php @@ -16,17 +16,17 @@ final class ReassignTasks extends AbstractCommand /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $user; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $team; diff --git a/src/Command/Task/UpdateTask.php b/src/Command/Task/UpdateTask.php index d41e9eb9..7d43851d 100644 --- a/src/Command/Task/UpdateTask.php +++ b/src/Command/Task/UpdateTask.php @@ -13,53 +13,53 @@ */ final class UpdateTask extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max": 255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":255}) */ protected $description; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $actionDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $urgent; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $category; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $subCategory; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $assignedToUser; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $assignedToTeam; diff --git a/src/Command/TaskAllocationRule/Create.php b/src/Command/TaskAllocationRule/Create.php index 075f3e12..80c212be 100644 --- a/src/Command/TaskAllocationRule/Create.php +++ b/src/Command/TaskAllocationRule/Create.php @@ -11,10 +11,10 @@ */ final class Create extends AbstractCommand { - use \Dvsa\Olcs\Transfer\FieldType\Traits\Category, - \Dvsa\Olcs\Transfer\FieldType\Traits\Team, - \Dvsa\Olcs\Transfer\FieldType\Traits\UserOptional, - \Dvsa\Olcs\Transfer\FieldType\Traits\GoodsOrPsvOptional, - \Dvsa\Olcs\Transfer\FieldType\Traits\IsMlh, - \Dvsa\Olcs\Transfer\FieldType\Traits\TrafficAreaOptional; + use \Dvsa\Olcs\Transfer\FieldType\Traits\Category; + use \Dvsa\Olcs\Transfer\FieldType\Traits\Team; + use \Dvsa\Olcs\Transfer\FieldType\Traits\UserOptional; + use \Dvsa\Olcs\Transfer\FieldType\Traits\GoodsOrPsvOptional; + use \Dvsa\Olcs\Transfer\FieldType\Traits\IsMlh; + use \Dvsa\Olcs\Transfer\FieldType\Traits\TrafficAreaOptional; } diff --git a/src/Command/TaskAllocationRule/DeleteList.php b/src/Command/TaskAllocationRule/DeleteList.php index 9141ef69..cd6b0932 100644 --- a/src/Command/TaskAllocationRule/DeleteList.php +++ b/src/Command/TaskAllocationRule/DeleteList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TaskAllocationRule; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/TaskAllocationRule/Update.php b/src/Command/TaskAllocationRule/Update.php index a30cdbef..4ccf4b62 100644 --- a/src/Command/TaskAllocationRule/Update.php +++ b/src/Command/TaskAllocationRule/Update.php @@ -11,12 +11,12 @@ */ final class Update extends AbstractCommand { - use \Dvsa\Olcs\Transfer\FieldType\Traits\Identity, - \Dvsa\Olcs\Transfer\FieldType\Traits\Version, - \Dvsa\Olcs\Transfer\FieldType\Traits\Category, - \Dvsa\Olcs\Transfer\FieldType\Traits\Team, - \Dvsa\Olcs\Transfer\FieldType\Traits\UserOptional, - \Dvsa\Olcs\Transfer\FieldType\Traits\GoodsOrPsvOptional, - \Dvsa\Olcs\Transfer\FieldType\Traits\IsMlh, - \Dvsa\Olcs\Transfer\FieldType\Traits\TrafficAreaOptional; + use \Dvsa\Olcs\Transfer\FieldType\Traits\Identity; + use \Dvsa\Olcs\Transfer\FieldType\Traits\Version; + use \Dvsa\Olcs\Transfer\FieldType\Traits\Category; + use \Dvsa\Olcs\Transfer\FieldType\Traits\Team; + use \Dvsa\Olcs\Transfer\FieldType\Traits\UserOptional; + use \Dvsa\Olcs\Transfer\FieldType\Traits\GoodsOrPsvOptional; + use \Dvsa\Olcs\Transfer\FieldType\Traits\IsMlh; + use \Dvsa\Olcs\Transfer\FieldType\Traits\TrafficAreaOptional; } diff --git a/src/Command/TaskAlphaSplit/Create.php b/src/Command/TaskAlphaSplit/Create.php index b4194cc4..fe8674ec 100644 --- a/src/Command/TaskAlphaSplit/Create.php +++ b/src/Command/TaskAlphaSplit/Create.php @@ -14,15 +14,15 @@ final class Create extends AbstractCommand use \Dvsa\Olcs\Transfer\FieldType\Traits\User; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $taskAllocationRule; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max": 50}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":50}) */ protected $letters; diff --git a/src/Command/TaskAlphaSplit/DeleteList.php b/src/Command/TaskAlphaSplit/DeleteList.php index c9c39fcc..5e990b1a 100644 --- a/src/Command/TaskAlphaSplit/DeleteList.php +++ b/src/Command/TaskAlphaSplit/DeleteList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TaskAlphaSplit; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/TaskAlphaSplit/Update.php b/src/Command/TaskAlphaSplit/Update.php index 6739f7b9..09bec6ec 100644 --- a/src/Command/TaskAlphaSplit/Update.php +++ b/src/Command/TaskAlphaSplit/Update.php @@ -11,13 +11,13 @@ */ final class Update extends AbstractCommand { - use \Dvsa\Olcs\Transfer\FieldType\Traits\Identity, - \Dvsa\Olcs\Transfer\FieldType\Traits\Version, - \Dvsa\Olcs\Transfer\FieldType\Traits\User; + use \Dvsa\Olcs\Transfer\FieldType\Traits\Identity; + use \Dvsa\Olcs\Transfer\FieldType\Traits\Version; + use \Dvsa\Olcs\Transfer\FieldType\Traits\User; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"max": 50}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":50}) */ protected $letters; diff --git a/src/Command/Team/CreateTeam.php b/src/Command/Team/CreateTeam.php index 16db9255..045871b9 100644 --- a/src/Command/Team/CreateTeam.php +++ b/src/Command/Team/CreateTeam.php @@ -3,6 +3,7 @@ /** * Create Team */ + namespace Dvsa\Olcs\Transfer\Command\Team; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,22 +19,22 @@ final class CreateTeam extends AbstractCommand use TrafficAreaOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":70}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":70}) */ protected $name; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":255}) */ protected $description; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $defaultPrinter; diff --git a/src/Command/Team/DeleteTeam.php b/src/Command/Team/DeleteTeam.php index cffc22c4..4fa0009f 100644 --- a/src/Command/Team/DeleteTeam.php +++ b/src/Command/Team/DeleteTeam.php @@ -3,6 +3,7 @@ /** * Delete Team */ + namespace Dvsa\Olcs\Transfer\Command\Team; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,15 +16,15 @@ final class DeleteTeam extends AbstractDeleteCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $newTeam; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $validate; diff --git a/src/Command/Team/UpdateTeam.php b/src/Command/Team/UpdateTeam.php index 51528471..ef69ad57 100644 --- a/src/Command/Team/UpdateTeam.php +++ b/src/Command/Team/UpdateTeam.php @@ -3,6 +3,7 @@ /** * Create Team */ + namespace Dvsa\Olcs\Transfer\Command\Team; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,27 +18,27 @@ */ final class UpdateTeam extends AbstractCommand { - use TrafficAreaOptional, - Identity, - Version; + use TrafficAreaOptional; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":70}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":70}) */ protected $name; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":255}) */ protected $description; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $defaultPrinter; diff --git a/src/Command/TeamPrinter/CreateTeamPrinter.php b/src/Command/TeamPrinter/CreateTeamPrinter.php index dd8dedbc..771c0997 100644 --- a/src/Command/TeamPrinter/CreateTeamPrinter.php +++ b/src/Command/TeamPrinter/CreateTeamPrinter.php @@ -3,6 +3,7 @@ /** * Create Team Printer */ + namespace Dvsa\Olcs\Transfer\Command\TeamPrinter; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,22 +17,22 @@ */ final class CreateTeamPrinter extends AbstractCommand { - use SubCategoryOptional, - UserOptional; + use SubCategoryOptional; + use UserOptional; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $team; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $printer; diff --git a/src/Command/TeamPrinter/DeleteTeamPrinter.php b/src/Command/TeamPrinter/DeleteTeamPrinter.php index cefaebc2..327f1f52 100644 --- a/src/Command/TeamPrinter/DeleteTeamPrinter.php +++ b/src/Command/TeamPrinter/DeleteTeamPrinter.php @@ -3,6 +3,7 @@ /** * Delete Team Printer */ + namespace Dvsa\Olcs\Transfer\Command\TeamPrinter; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/TeamPrinter/UpdateTeamPrinter.php b/src/Command/TeamPrinter/UpdateTeamPrinter.php index 3c2076ae..c287ee25 100644 --- a/src/Command/TeamPrinter/UpdateTeamPrinter.php +++ b/src/Command/TeamPrinter/UpdateTeamPrinter.php @@ -3,6 +3,7 @@ /** * Update Team Printer */ + namespace Dvsa\Olcs\Transfer\Command\TeamPrinter; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,24 +19,24 @@ */ final class UpdateTeamPrinter extends AbstractCommand { - use SubCategoryOptional, - UserOptional, - Identity, - Version; + use SubCategoryOptional; + use UserOptional; + use Identity; + use Version; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $team; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $printer; diff --git a/src/Command/Template/UpdateTemplateSource.php b/src/Command/Template/UpdateTemplateSource.php index b6886fd7..0771ccf4 100644 --- a/src/Command/Template/UpdateTemplateSource.php +++ b/src/Command/Template/UpdateTemplateSource.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Command\Template; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,5 +19,6 @@ */ final class UpdateTemplateSource extends AbstractCommand { - use Identity, TemplateSource; + use Identity; + use TemplateSource; } diff --git a/src/Command/Tm/Create.php b/src/Command/Tm/Create.php index ffb02546..39e6d143 100644 --- a/src/Command/Tm/Create.php +++ b/src/Command/Tm/Create.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Tm; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,182 +18,176 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 2, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ public $firstName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 2, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ public $lastName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\EmailAddress"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\EmailAddress") * @Transfer\Optional */ public $emailAddress; /** - * @Transfer\Validator({"name":"Date","options":{"format":"Y-m-d"}}) + * @Transfer\Validator("Date",options={"format":"Y-m-d"}) */ public $birthDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) */ public $birthPlace; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "title_dr","title_miss","title_mr","title_mrs","title_ms" * } * } - * } * ) * @Transfer\Optional */ protected $title; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"tm_t_e", "tm_t_i", "tm_t_b"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tm_t_e", "tm_t_i", "tm_t_b"}}) */ protected $type; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "tm_s_cur","tm_s_dis","tm_s_rem" * } * } - * } * ) */ protected $status; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $homeAddressLine1; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $homeAddressLine2; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) * @Transfer\Optional */ public $homeAddressLine3; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional */ public $homeAddressLine4; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) * @Transfer\Optional */ public $homeTown; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 8}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":8}) * @Transfer\Optional */ public $homePostcode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":2}) * @Transfer\Optional */ public $homeCountryCode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $workAddressLine1; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $workAddressLine2; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) * @Transfer\Optional */ public $workAddressLine3; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional */ public $workAddressLine4; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) * @Transfer\Optional */ public $workTown; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 8}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":8}) * @Transfer\Optional */ public $workPostcode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":2}) * @Transfer\Optional */ public $workCountryCode; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) */ public $nysiisForename; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) */ public $nysiisFamilyname; diff --git a/src/Command/Tm/CreateNewUser.php b/src/Command/Tm/CreateNewUser.php index 8aebfde9..034230d2 100644 --- a/src/Command/Tm/CreateNewUser.php +++ b/src/Command/Tm/CreateNewUser.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Tm; use Dvsa\Olcs\Transfer\FieldType\Traits\Application; @@ -22,39 +23,39 @@ final class CreateNewUser extends AbstractCommand use TranslateToWelshOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":35}) */ public $firstName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":35}) */ public $familyName; /** - * @Transfer\Validator({"name":"Date","options":{"format":"Y-m-d"}}) + * @Transfer\Validator("Date",options={"format":"Y-m-d"}) */ public $birthDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ public $hasEmail; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Username"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Username") * @Transfer\Optional */ public $username; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\EmailAddress"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\EmailAddress") * @Transfer\Optional */ public $emailAddress; diff --git a/src/Command/Tm/Merge.php b/src/Command/Tm/Merge.php index 729713f1..ab743c2f 100644 --- a/src/Command/Tm/Merge.php +++ b/src/Command/Tm/Merge.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Tm; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -21,14 +22,14 @@ final class Merge extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $recipientTransportManager; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $confirm; diff --git a/src/Command/Tm/Remove.php b/src/Command/Tm/Remove.php index c1f442af..29f9a1fa 100644 --- a/src/Command/Tm/Remove.php +++ b/src/Command/Tm/Remove.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Tm; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Tm/UndoDisqualification.php b/src/Command/Tm/UndoDisqualification.php index 79d9a1c7..8940f469 100644 --- a/src/Command/Tm/UndoDisqualification.php +++ b/src/Command/Tm/UndoDisqualification.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Tm; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/Tm/Unmerge.php b/src/Command/Tm/Unmerge.php index 34b41967..57e4671a 100644 --- a/src/Command/Tm/Unmerge.php +++ b/src/Command/Tm/Unmerge.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Tm; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Tm/Update.php b/src/Command/Tm/Update.php index 6b72847a..39ddc9bf 100644 --- a/src/Command/Tm/Update.php +++ b/src/Command/Tm/Update.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\Tm; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,259 +18,253 @@ final class Update extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $homeCdId; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $homeCdVersion; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $homeAddressId; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $homeAddressVersion; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $workAddressId; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $workAddressVersion; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $personId; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $personVersion; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 2, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ public $firstName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 2, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":35}) */ public $lastName; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\EmailAddress"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\EmailAddress") * @Transfer\Optional */ public $emailAddress; /** - * @Transfer\Validator({"name":"Date","options":{"format":"Y-m-d"}}) + * @Transfer\Validator("Date",options={"format":"Y-m-d"}) */ public $birthDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) */ public $birthPlace; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "title_dr","title_miss","title_mr","title_mrs","title_ms" * } * } - * } * ) */ protected $title; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"tm_t_e", "tm_t_i", "tm_t_b"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tm_t_e", "tm_t_i", "tm_t_b"}}) */ protected $type; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "tm_s_cur","tm_s_dis","tm_s_rem" * } * } - * } * ) */ protected $status; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $homeAddressLine1; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional * @Transfer\Optional */ public $homeAddressLine2; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) * @Transfer\Optional * @Transfer\Optional */ public $homeAddressLine3; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional * @Transfer\Optional */ public $homeAddressLine4; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) * @Transfer\Optional */ public $homeTown; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 8}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":8}) * @Transfer\Optional */ public $homePostcode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":2}) * @Transfer\Optional */ public $homeCountryCode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $workAddressLine1; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":90}) * @Transfer\Optional */ public $workAddressLine2; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) * @Transfer\Optional */ public $workAddressLine3; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":35}) * @Transfer\Optional */ public $workAddressLine4; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 30}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":30}) * @Transfer\Optional */ public $workTown; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 8}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":8}) * @Transfer\Optional */ public $workPostcode; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":2}) * @Transfer\Optional */ public $workCountryCode; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) */ public $nysiisForename; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 100}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":100}) */ public $nysiisFamilyname; @@ -280,7 +275,7 @@ public function getId() public function getVersion() { - return $this->veersion; + return $this->version; } public function getHomeCdId() diff --git a/src/Command/TmCaseDecision/CreateDeclareUnfit.php b/src/Command/TmCaseDecision/CreateDeclareUnfit.php index c94da6c7..2839612d 100644 --- a/src/Command/TmCaseDecision/CreateDeclareUnfit.php +++ b/src/Command/TmCaseDecision/CreateDeclareUnfit.php @@ -3,6 +3,7 @@ /** * Create DeclareUnfit */ + namespace Dvsa\Olcs\Transfer\Command\TmCaseDecision; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,59 +19,49 @@ final class CreateDeclareUnfit extends AbstractCommand use FieldType\Cases; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isMsi; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $decisionDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $notifiedDate = null; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $unfitnessStartDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $unfitnessEndDate = null; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": {"tm_unfit_inc", "tm_unfit_inn"} - * } - * }) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tm_unfit_inc", "tm_unfit_inn"}}) */ protected $unfitnessReasons = []; /** * @Transfer\Optional() * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": {"tm_rehab_adc", "tm_rehab_adt", "tm_rehab_oth", "tm_rehab_rlc", "tm_rehab_rpt"} - * } - * }) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tm_rehab_adc", "tm_rehab_adt", "tm_rehab_oth", "tm_rehab_rlc", "tm_rehab_rpt"}}) */ protected $rehabMeasures = []; diff --git a/src/Command/TmCaseDecision/CreateNoFurtherAction.php b/src/Command/TmCaseDecision/CreateNoFurtherAction.php index 105ce64c..eb95cb84 100644 --- a/src/Command/TmCaseDecision/CreateNoFurtherAction.php +++ b/src/Command/TmCaseDecision/CreateNoFurtherAction.php @@ -3,6 +3,7 @@ /** * Create NoFurtherAction */ + namespace Dvsa\Olcs\Transfer\Command\TmCaseDecision; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,26 +19,26 @@ final class CreateNoFurtherAction extends AbstractCommand use FieldType\Cases; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isMsi; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $decisionDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $notifiedDate = null; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":4000}) */ protected $noFurtherActionReason = null; diff --git a/src/Command/TmCaseDecision/CreateReputeNotLost.php b/src/Command/TmCaseDecision/CreateReputeNotLost.php index f6ad2f9a..e1d6347c 100644 --- a/src/Command/TmCaseDecision/CreateReputeNotLost.php +++ b/src/Command/TmCaseDecision/CreateReputeNotLost.php @@ -3,6 +3,7 @@ /** * Create ReputeNotLost */ + namespace Dvsa\Olcs\Transfer\Command\TmCaseDecision; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,26 +19,26 @@ final class CreateReputeNotLost extends AbstractCommand use FieldType\Cases; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isMsi; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $decisionDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $notifiedDate = null; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":500}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":500}) */ protected $reputeNotLostReason = null; diff --git a/src/Command/TmCaseDecision/UpdateDeclareUnfit.php b/src/Command/TmCaseDecision/UpdateDeclareUnfit.php index 59ca2f43..0cccb494 100644 --- a/src/Command/TmCaseDecision/UpdateDeclareUnfit.php +++ b/src/Command/TmCaseDecision/UpdateDeclareUnfit.php @@ -3,6 +3,7 @@ /** * Update DeclareUnfit */ + namespace Dvsa\Olcs\Transfer\Command\TmCaseDecision; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -19,59 +20,49 @@ final class UpdateDeclareUnfit extends AbstractCommand use FieldType\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isMsi; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $decisionDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $notifiedDate = null; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $unfitnessStartDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $unfitnessEndDate = null; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": {"tm_unfit_inc", "tm_unfit_inn"} - * } - * }) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tm_unfit_inc", "tm_unfit_inn"}}) */ protected $unfitnessReasons = []; /** * @Transfer\Optional() * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": {"tm_rehab_adc", "tm_rehab_adt", "tm_rehab_oth", "tm_rehab_rlc", "tm_rehab_rpt"} - * } - * }) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tm_rehab_adc", "tm_rehab_adt", "tm_rehab_oth", "tm_rehab_rlc", "tm_rehab_rpt"}}) */ protected $rehabMeasures = []; diff --git a/src/Command/TmCaseDecision/UpdateNoFurtherAction.php b/src/Command/TmCaseDecision/UpdateNoFurtherAction.php index 00445345..8a42af58 100644 --- a/src/Command/TmCaseDecision/UpdateNoFurtherAction.php +++ b/src/Command/TmCaseDecision/UpdateNoFurtherAction.php @@ -3,6 +3,7 @@ /** * Update NoFurtherAction */ + namespace Dvsa\Olcs\Transfer\Command\TmCaseDecision; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -19,26 +20,26 @@ final class UpdateNoFurtherAction extends AbstractCommand use FieldType\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isMsi; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $decisionDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $notifiedDate = null; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":4000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":4000}) */ protected $noFurtherActionReason = null; diff --git a/src/Command/TmCaseDecision/UpdateReputeNotLost.php b/src/Command/TmCaseDecision/UpdateReputeNotLost.php index a75549a6..97b449c8 100644 --- a/src/Command/TmCaseDecision/UpdateReputeNotLost.php +++ b/src/Command/TmCaseDecision/UpdateReputeNotLost.php @@ -3,6 +3,7 @@ /** * Update ReputeNotLost */ + namespace Dvsa\Olcs\Transfer\Command\TmCaseDecision; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -19,26 +20,26 @@ final class UpdateReputeNotLost extends AbstractCommand use FieldType\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isMsi; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $decisionDate; /** * @Transfer\Optional() - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $notifiedDate = null; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":500}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"max":500}) */ protected $reputeNotLostReason = null; diff --git a/src/Command/TmEmployment/Create.php b/src/Command/TmEmployment/Create.php index d7123c21..335f52dc 100644 --- a/src/Command/TmEmployment/Create.php +++ b/src/Command/TmEmployment/Create.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TmEmployment; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,38 +18,38 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $transportManager; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $tmaId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":45}) * @Transfer\Optional */ protected $position; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 300}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":300}) * @Transfer\Optional */ protected $hoursPerWeek; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":90}) */ protected $employerName; diff --git a/src/Command/TmEmployment/DeleteList.php b/src/Command/TmEmployment/DeleteList.php index 8737bdfe..7934ce0c 100644 --- a/src/Command/TmEmployment/DeleteList.php +++ b/src/Command/TmEmployment/DeleteList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TmEmployment; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class DeleteList extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/TmEmployment/Update.php b/src/Command/TmEmployment/Update.php index 4260e3be..994354e6 100644 --- a/src/Command/TmEmployment/Update.php +++ b/src/Command/TmEmployment/Update.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TmEmployment; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,36 +18,36 @@ final class Update extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 45}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":45}) * @Transfer\Optional */ protected $position; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 300}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":300}) * @Transfer\Optional */ protected $hoursPerWeek; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 0, "max": 90}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":90}) */ protected $employerName; diff --git a/src/Command/TmQualification/Create.php b/src/Command/TmQualification/Create.php index 9021820a..4d8c3d03 100644 --- a/src/Command/TmQualification/Create.php +++ b/src/Command/TmQualification/Create.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\TmQualification; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,43 +18,40 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "tm_qt_ar", "tm_qt_cpcsi", "tm_qt_cpcsn", "tm_qt_exsi", "tm_qt_exsn", "tm_qt_niar", * "tm_qt_nicpcsi", "tm_qt_nicpcsn", "tm_qt_niexsi", "tm_qt_niexsn", "tm_qt_lgvar", "tm_qt_nilgvar" * } * } - * } * ) */ protected $qualificationType; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":50}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":50}) * @Transfer\Optional */ protected $serialNo; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $issuedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":2}) */ public $countryCode; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManager; diff --git a/src/Command/TmQualification/Delete.php b/src/Command/TmQualification/Delete.php index 2d3da93b..70d5b61a 100644 --- a/src/Command/TmQualification/Delete.php +++ b/src/Command/TmQualification/Delete.php @@ -15,9 +15,9 @@ class Delete extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/TmQualification/Update.php b/src/Command/TmQualification/Update.php index d08eff90..a0cf4d53 100644 --- a/src/Command/TmQualification/Update.php +++ b/src/Command/TmQualification/Update.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\TmQualification; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,52 +18,49 @@ final class Update extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "tm_qt_ar", "tm_qt_cpcsi", "tm_qt_cpcsn", "tm_qt_exsi", "tm_qt_exsn", "tm_qt_niar", * "tm_qt_nicpcsi", "tm_qt_nicpcsn", "tm_qt_niexsi", "tm_qt_niexsn", "tm_qt_lgvar", "tm_qt_nilgvar" * } * } - * } * ) */ protected $qualificationType; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":50}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":0,"max":50}) * @Transfer\Optional */ protected $serialNo; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $issuedDate; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1, "max": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":1,"max":2}) */ public $countryCode; diff --git a/src/Command/Trailer/CreateTrailer.php b/src/Command/Trailer/CreateTrailer.php index d6868a05..844159c9 100644 --- a/src/Command/Trailer/CreateTrailer.php +++ b/src/Command/Trailer/CreateTrailer.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Trailer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -26,15 +27,15 @@ final class CreateTrailer extends AbstractCommand /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $specifiedDate; diff --git a/src/Command/Trailer/DeleteTrailer.php b/src/Command/Trailer/DeleteTrailer.php index 66a9fddf..f80253e4 100644 --- a/src/Command/Trailer/DeleteTrailer.php +++ b/src/Command/Trailer/DeleteTrailer.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Trailer; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class DeleteTrailer extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Trailer/UpdateTrailer.php b/src/Command/Trailer/UpdateTrailer.php index 6fe7768d..fe6952cb 100644 --- a/src/Command/Trailer/UpdateTrailer.php +++ b/src/Command/Trailer/UpdateTrailer.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Command\Trailer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; @@ -20,9 +21,9 @@ final class UpdateTrailer extends AbstractCommand use IsLongerSemiTrailer; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; @@ -32,9 +33,9 @@ final class UpdateTrailer extends AbstractCommand protected $trailerNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; diff --git a/src/Command/Transaction/CompleteTransaction.php b/src/Command/Transaction/CompleteTransaction.php index 46ede95c..968837dc 100644 --- a/src/Command/Transaction/CompleteTransaction.php +++ b/src/Command/Transaction/CompleteTransaction.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Transaction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,14 @@ class CompleteTransaction extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $reference; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"fpm_card_online", "fpm_card_offline"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"fpm_card_online", "fpm_card_offline"}}) */ protected $paymentMethod; @@ -42,9 +40,9 @@ class CompleteTransaction extends AbstractCommand * and it will be submitted if payment succeeds * * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $submitApplicationId; diff --git a/src/Command/Transaction/PayOutstandingFees.php b/src/Command/Transaction/PayOutstandingFees.php index fd48a3bc..5e9484f7 100644 --- a/src/Command/Transaction/PayOutstandingFees.php +++ b/src/Command/Transaction/PayOutstandingFees.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Transaction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -28,30 +29,29 @@ final class PayOutstandingFees extends AbstractCommand /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisationId; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $applicationId; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $cpmsRedirectUrl; /** - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "fpm_card_offline", * "fpm_card_online", @@ -60,7 +60,7 @@ final class PayOutstandingFees extends AbstractCommand * "fpm_po", * } * } - * }) + * ) * @Transfer\Optional */ protected $paymentMethod; @@ -73,49 +73,49 @@ final class PayOutstandingFees extends AbstractCommand /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $receiptDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $payer; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $slipNo; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $chequeNo; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $chequeDate; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $poNo; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $storedCardReference; /** * Should resolve only - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $shouldResolveOnly; diff --git a/src/Command/Transaction/ReverseTransaction.php b/src/Command/Transaction/ReverseTransaction.php index c3f3afd9..35ec20e6 100644 --- a/src/Command/Transaction/ReverseTransaction.php +++ b/src/Command/Transaction/ReverseTransaction.php @@ -5,11 +5,11 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Command\Transaction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Command\AbstractCommand; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; @@ -23,8 +23,8 @@ final class ReverseTransaction extends AbstractCommand implements FieldType\Iden use FieldTypeTraits\MiscFeesDetails; /** - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1, "max": 1000}}) - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1, "max": 1000}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $reason; diff --git a/src/Command/TranslationKey/Create.php b/src/Command/TranslationKey/Create.php index 18968d7e..268ff082 100644 --- a/src/Command/TranslationKey/Create.php +++ b/src/Command/TranslationKey/Create.php @@ -3,6 +3,7 @@ /** * Create Translation Key */ + namespace Dvsa\Olcs\Transfer\Command\TranslationKey; use Dvsa\Olcs\Transfer\FieldType\Traits\DescriptionOptional; diff --git a/src/Command/TranslationKey/Delete.php b/src/Command/TranslationKey/Delete.php index 4fbacf41..e33f6afa 100644 --- a/src/Command/TranslationKey/Delete.php +++ b/src/Command/TranslationKey/Delete.php @@ -3,6 +3,7 @@ /** * Delete Translation Key */ + namespace Dvsa\Olcs\Transfer\Command\TranslationKey; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/TranslationKey/GenerateCache.php b/src/Command/TranslationKey/GenerateCache.php index b415bfc0..8a648d79 100644 --- a/src/Command/TranslationKey/GenerateCache.php +++ b/src/Command/TranslationKey/GenerateCache.php @@ -3,11 +3,11 @@ /** * Generate translation key cache */ + namespace Dvsa\Olcs\Transfer\Command\TranslationKey; use Dvsa\Olcs\Transfer\FieldType\Traits\IdentityString; use Dvsa\Olcs\Transfer\Command\AbstractCommand; - use Dvsa\Olcs\Transfer\FieldType\Traits\TranslationsArray; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/TranslationKey/Update.php b/src/Command/TranslationKey/Update.php index bf4c9052..119f0237 100644 --- a/src/Command/TranslationKey/Update.php +++ b/src/Command/TranslationKey/Update.php @@ -3,6 +3,7 @@ /** * Update Translation Key */ + namespace Dvsa\Olcs\Transfer\Command\TranslationKey; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Command/TranslationKeyText/Delete.php b/src/Command/TranslationKeyText/Delete.php index 0374efd2..7b954ddf 100644 --- a/src/Command/TranslationKeyText/Delete.php +++ b/src/Command/TranslationKeyText/Delete.php @@ -3,6 +3,7 @@ /** * Delete Translation Key Text */ + namespace Dvsa\Olcs\Transfer\Command\TranslationKeyText; use Dvsa\Olcs\Transfer\Command\AbstractCommand; diff --git a/src/Command/TransportManagerApplication/Create.php b/src/Command/TransportManagerApplication/Create.php index 259b31d1..a8d155ae 100644 --- a/src/Command/TransportManagerApplication/Create.php +++ b/src/Command/TransportManagerApplication/Create.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TransportManagerApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,28 +18,28 @@ final class Create extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $user; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"A","U"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"A","U"}}) */ protected $action; /** * @Transfer\Optional - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d"}) */ protected $dob; @@ -52,16 +53,6 @@ public function getApplication() return $this->application; } - /** - * Get Transport Manager ID - * - * @return int - */ - public function getTransportManager() - { - return $this->transportManager; - } - /** * Get User ID * diff --git a/src/Command/TransportManagerApplication/CreateForResponsibilities.php b/src/Command/TransportManagerApplication/CreateForResponsibilities.php index d34bef6c..3ca43de0 100644 --- a/src/Command/TransportManagerApplication/CreateForResponsibilities.php +++ b/src/Command/TransportManagerApplication/CreateForResponsibilities.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Command\TransportManagerApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,16 +18,16 @@ final class CreateForResponsibilities extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManager; diff --git a/src/Command/TransportManagerApplication/Delete.php b/src/Command/TransportManagerApplication/Delete.php index cc4e934e..9f36ee7b 100644 --- a/src/Command/TransportManagerApplication/Delete.php +++ b/src/Command/TransportManagerApplication/Delete.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TransportManagerApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class Delete extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/TransportManagerApplication/DeleteForResponsibilities.php b/src/Command/TransportManagerApplication/DeleteForResponsibilities.php index 6a7f3052..2b54f7c6 100644 --- a/src/Command/TransportManagerApplication/DeleteForResponsibilities.php +++ b/src/Command/TransportManagerApplication/DeleteForResponsibilities.php @@ -15,9 +15,9 @@ class DeleteForResponsibilities extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/TransportManagerApplication/OperatorSigned.php b/src/Command/TransportManagerApplication/OperatorSigned.php index f53bde5e..7273bec9 100644 --- a/src/Command/TransportManagerApplication/OperatorSigned.php +++ b/src/Command/TransportManagerApplication/OperatorSigned.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TransportManagerApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,16 +18,16 @@ final class OperatorSigned extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; diff --git a/src/Command/TransportManagerApplication/SendAmendTmApplication.php b/src/Command/TransportManagerApplication/SendAmendTmApplication.php index 8091adc3..73737730 100644 --- a/src/Command/TransportManagerApplication/SendAmendTmApplication.php +++ b/src/Command/TransportManagerApplication/SendAmendTmApplication.php @@ -12,9 +12,9 @@ class SendAmendTmApplication extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/TransportManagerApplication/SendTmApplication.php b/src/Command/TransportManagerApplication/SendTmApplication.php index be8623c1..a5e1d449 100644 --- a/src/Command/TransportManagerApplication/SendTmApplication.php +++ b/src/Command/TransportManagerApplication/SendTmApplication.php @@ -12,9 +12,9 @@ final class SendTmApplication extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/TransportManagerApplication/Submit.php b/src/Command/TransportManagerApplication/Submit.php index d404ba39..3da87972 100644 --- a/src/Command/TransportManagerApplication/Submit.php +++ b/src/Command/TransportManagerApplication/Submit.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TransportManagerApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,23 +18,23 @@ final class Submit extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\TmaStatus"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\TmaStatus") * @Transfer\Optional */ protected $nextStatus; diff --git a/src/Command/TransportManagerApplication/UpdateDetails.php b/src/Command/TransportManagerApplication/UpdateDetails.php index 1ae4f8fc..ffba9aa3 100644 --- a/src/Command/TransportManagerApplication/UpdateDetails.php +++ b/src/Command/TransportManagerApplication/UpdateDetails.php @@ -12,24 +12,24 @@ */ final class UpdateDetails extends AbstractCommand { - use Traits\Identity, - Traits\Version; + use Traits\Identity; + use Traits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $email; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $placeOfBirth; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 7, "max": 7}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 7, "max": 7}) * @Transfer\Optional */ protected $lgvAcquiredRightsReferenceNumber; @@ -45,118 +45,118 @@ final class UpdateDetails extends AbstractCommand protected $workAddress; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"tm_t_i","tm_t_e"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tm_t_i","tm_t_e"}}) * @Transfer\Optional */ protected $tmType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isOwner; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursMon; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursTue; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursWed; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursThu; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursFri; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursSat; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursSun; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $additionalInfo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $hasOtherLicences; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $hasOtherEmployment; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $hasConvictions; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $hasPreviousLicences; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $hasUndertakenTraining; /** - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $dob; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $submit; diff --git a/src/Command/TransportManagerApplication/UpdateForResponsibilities.php b/src/Command/TransportManagerApplication/UpdateForResponsibilities.php index efbb6c63..3e32cc84 100644 --- a/src/Command/TransportManagerApplication/UpdateForResponsibilities.php +++ b/src/Command/TransportManagerApplication/UpdateForResponsibilities.php @@ -13,90 +13,87 @@ */ final class UpdateForResponsibilities extends AbstractCommand { - use Traits\Identity, - Traits\HasUndertakenTraining, - Traits\Version; + use Traits\Identity; + use Traits\HasUndertakenTraining; + use Traits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"tm_t_i","tm_t_e"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tm_t_i","tm_t_e"}}) * @Transfer\Optional */ protected $tmType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isOwner; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursMon; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursTue; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursWed; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursThu; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursFri; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursSat; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursSun; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $additionalInformation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "tmap_st_awaiting_signature", "tmap_st_incomplete", "tmap_st_operator_signed", * "tmap_st_postal_application", "tmap_st_received", "tmap_st_tm_signed" * } * } - * } * ) */ protected $tmApplicationStatus; diff --git a/src/Command/TransportManagerApplication/UpdateStatus.php b/src/Command/TransportManagerApplication/UpdateStatus.php index e3c1ec2f..7654d5fd 100644 --- a/src/Command/TransportManagerApplication/UpdateStatus.php +++ b/src/Command/TransportManagerApplication/UpdateStatus.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\TransportManagerApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,27 +18,26 @@ final class UpdateStatus extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"tmap_st_incomplete", "tmap_st_tm_signed", "tmap_st_operator_signed", - * "tmap_st_details_submitted", "tmap_st_details_checked", "tmap_st_operator_approved", "tmap_st_received"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"tmap_st_incomplete", "tmap_st_tm_signed", "tmap_st_operator_signed", + * "tmap_st_details_submitted", "tmap_st_details_checked", "tmap_st_operator_approved", "tmap_st_received"}} + * ) */ protected $status; diff --git a/src/Command/TransportManagerLicence/Delete.php b/src/Command/TransportManagerLicence/Delete.php index 927c7cdb..ec5603a0 100644 --- a/src/Command/TransportManagerLicence/Delete.php +++ b/src/Command/TransportManagerLicence/Delete.php @@ -5,6 +5,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Command\TransportManagerLicence; use Dvsa\Olcs\Transfer\FieldType\Traits\Ids; @@ -21,8 +22,8 @@ final class Delete extends AbstractCommand /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $yesNo = null; diff --git a/src/Command/TransportManagerLicence/DeleteForResponsibilities.php b/src/Command/TransportManagerLicence/DeleteForResponsibilities.php index cb5b1494..1fdf82ce 100644 --- a/src/Command/TransportManagerLicence/DeleteForResponsibilities.php +++ b/src/Command/TransportManagerLicence/DeleteForResponsibilities.php @@ -15,9 +15,9 @@ class DeleteForResponsibilities extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/TransportManagerLicence/UpdateForResponsibilities.php b/src/Command/TransportManagerLicence/UpdateForResponsibilities.php index e5f5fbf0..3620d5da 100644 --- a/src/Command/TransportManagerLicence/UpdateForResponsibilities.php +++ b/src/Command/TransportManagerLicence/UpdateForResponsibilities.php @@ -13,73 +13,73 @@ */ final class UpdateForResponsibilities extends AbstractCommand { - use Traits\Identity, - Traits\Version; + use Traits\Identity; + use Traits\Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"tm_t_i","tm_t_e"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tm_t_i","tm_t_e"}}) */ protected $tmType; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursMon; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursTue; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursWed; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursThu; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursFri; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursSat; /** - * @Transfer\Filter({"name":"Laminas\I18n\Filter\NumberFormat"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\IsFloat"}) + * @Transfer\Filter("Laminas\I18n\Filter\NumberFormat") + * @Transfer\Validator("Laminas\I18n\Validator\IsFloat") * @Transfer\Optional */ protected $hoursSun; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $additionalInformation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y","N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $isOwner; diff --git a/src/Command/User/CreatePartner.php b/src/Command/User/CreatePartner.php index 309104fe..d53ef552 100644 --- a/src/Command/User/CreatePartner.php +++ b/src/Command/User/CreatePartner.php @@ -3,6 +3,7 @@ /** * Create Partner */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,8 +16,8 @@ final class CreatePartner extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":3,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":3,"max":35}) */ protected $description; diff --git a/src/Command/User/CreateUser.php b/src/Command/User/CreateUser.php index d7f66176..32733ae6 100644 --- a/src/Command/User/CreateUser.php +++ b/src/Command/User/CreateUser.php @@ -3,6 +3,7 @@ /** * Create User */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\FieldType\Traits\TranslateToWelshOptional; @@ -18,75 +19,69 @@ final class CreateUser extends AbstractCommand use TranslateToWelshOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Username"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Username") */ protected $loginId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": {"internal","local-authority","partner","operator","transport-manager"} - * } - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"internal","local-authority","partner","operator","transport-manager"}}) */ protected $userType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $team = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $application = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $transportManager = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $localAuthority = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $partnerContactDetails = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":18}) * @Transfer\Optional */ protected $licenceNumber = null; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "system-admin", * "internal-limited-read-only", @@ -103,20 +98,19 @@ final class CreateUser extends AbstractCommand * "local-authority-user" * } * } - * }) + * ) */ protected $roles = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "windows_7", "windows_10", "northern_i" * } * } - * }) + * ) * @Transfer\Optional */ protected $osType = null; diff --git a/src/Command/User/CreateUserSelfserve.php b/src/Command/User/CreateUserSelfserve.php index 11382bee..23e91688 100644 --- a/src/Command/User/CreateUserSelfserve.php +++ b/src/Command/User/CreateUserSelfserve.php @@ -3,6 +3,7 @@ /** * Create User Selfserve */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\FieldType\Traits\TranslateToWelshOptional; @@ -18,8 +19,8 @@ final class CreateUserSelfserve extends AbstractCommand use TranslateToWelshOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Username"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Username") */ protected $loginId; @@ -29,8 +30,8 @@ final class CreateUserSelfserve extends AbstractCommand protected $contactDetails; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"admin", "user"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"admin", "user"}}) */ protected $permission; diff --git a/src/Command/User/DeletePartner.php b/src/Command/User/DeletePartner.php index 2fa7be74..fc716194 100644 --- a/src/Command/User/DeletePartner.php +++ b/src/Command/User/DeletePartner.php @@ -3,6 +3,7 @@ /** * Delete Partner */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ final class DeletePartner extends AbstractCommand { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Command/User/DeleteUser.php b/src/Command/User/DeleteUser.php index 8bc80e37..5a9e1013 100644 --- a/src/Command/User/DeleteUser.php +++ b/src/Command/User/DeleteUser.php @@ -3,6 +3,7 @@ /** * Delete User */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -14,5 +15,4 @@ */ final class DeleteUser extends AbstractDeleteCommand { - } diff --git a/src/Command/User/DeleteUserSelfserve.php b/src/Command/User/DeleteUserSelfserve.php index 332e459e..633bb5ad 100644 --- a/src/Command/User/DeleteUserSelfserve.php +++ b/src/Command/User/DeleteUserSelfserve.php @@ -3,6 +3,7 @@ /** * Delete User Selfserve */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -14,5 +15,4 @@ */ final class DeleteUserSelfserve extends AbstractDeleteCommand { - } diff --git a/src/Command/User/RegisterUserSelfserve.php b/src/Command/User/RegisterUserSelfserve.php index 92d32a06..ea4f8b82 100644 --- a/src/Command/User/RegisterUserSelfserve.php +++ b/src/Command/User/RegisterUserSelfserve.php @@ -3,6 +3,7 @@ /** * Register User Selfserve */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\FieldType\Traits\TranslateToWelshOptional; @@ -18,8 +19,8 @@ final class RegisterUserSelfserve extends AbstractCommand use TranslateToWelshOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\Username"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\Username") */ protected $loginId; @@ -29,25 +30,22 @@ final class RegisterUserSelfserve extends AbstractCommand protected $contactDetails; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":18}) * @Transfer\Optional */ protected $licenceNumber = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":160}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":160}) * @Transfer\Optional */ protected $organisationName = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"org_t_p","org_t_pa","org_t_rc","org_t_llp","org_t_st"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"org_t_p","org_t_pa","org_t_rc","org_t_llp","org_t_st"}}) * @Transfer\Optional */ protected $businessType; diff --git a/src/Command/User/RemindUsernameSelfserve.php b/src/Command/User/RemindUsernameSelfserve.php index a88c3225..9b14a4b6 100644 --- a/src/Command/User/RemindUsernameSelfserve.php +++ b/src/Command/User/RemindUsernameSelfserve.php @@ -3,6 +3,7 @@ /** * Remind Username Selfserve */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,14 +16,14 @@ final class RemindUsernameSelfserve extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":18}) */ protected $licenceNumber; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\EmailAddress"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\EmailAddress") */ public $emailAddress; diff --git a/src/Command/User/UpdatePartner.php b/src/Command/User/UpdatePartner.php index 0c022027..106e4bec 100644 --- a/src/Command/User/UpdatePartner.php +++ b/src/Command/User/UpdatePartner.php @@ -3,6 +3,7 @@ /** * Update Partner */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -15,22 +16,22 @@ final class UpdatePartner extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min":3,"max":35}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":3,"max":35}) */ protected $description; diff --git a/src/Command/User/UpdateUser.php b/src/Command/User/UpdateUser.php index e8f3a05e..8da78736 100644 --- a/src/Command/User/UpdateUser.php +++ b/src/Command/User/UpdateUser.php @@ -3,6 +3,7 @@ /** * Update User */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\FieldType\Traits\TranslateToWelshOptional; @@ -18,83 +19,77 @@ final class UpdateUser extends AbstractCommand use TranslateToWelshOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": {"internal","local-authority","partner","operator","transport-manager"} - * } - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"internal","local-authority","partner","operator","transport-manager"}}) */ protected $userType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $team = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $application = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $transportManager = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $localAuthority = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $partnerContactDetails = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2,"max":18}) * @Transfer\Optional */ protected $licenceNumber = null; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "system-admin", * "internal-limited-read-only", @@ -111,7 +106,7 @@ final class UpdateUser extends AbstractCommand * "local-authority-user" * } * } - * }) + * ) */ protected $roles = []; @@ -121,29 +116,22 @@ final class UpdateUser extends AbstractCommand protected $contactDetails; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $accountDisabled = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"post", "email"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"post", "email"}}) * @Transfer\Optional */ protected $resetPassword = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": { - * "windows_7", "windows_10", "northern_i" - * } - * } - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack":{"windows_7", "windows_10", "northern_i"}}) * @Transfer\Optional */ protected $osType = null; diff --git a/src/Command/User/UpdateUserSelfserve.php b/src/Command/User/UpdateUserSelfserve.php index 22716eb6..98a36ff7 100644 --- a/src/Command/User/UpdateUserSelfserve.php +++ b/src/Command/User/UpdateUserSelfserve.php @@ -3,6 +3,7 @@ /** * Update User Selfserve */ + namespace Dvsa\Olcs\Transfer\Command\User; use Dvsa\Olcs\Transfer\FieldType\Traits\TranslateToWelshOptional; @@ -18,16 +19,16 @@ final class UpdateUserSelfserve extends AbstractCommand use TranslateToWelshOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; @@ -37,8 +38,8 @@ final class UpdateUserSelfserve extends AbstractCommand protected $contactDetails; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"admin", "user", "tm"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"admin", "user", "tm"}}) */ protected $permission; diff --git a/src/Command/Variation/CreatePsvDiscs.php b/src/Command/Variation/CreatePsvDiscs.php index 729ddb96..a41fd3be 100644 --- a/src/Command/Variation/CreatePsvDiscs.php +++ b/src/Command/Variation/CreatePsvDiscs.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,22 +19,22 @@ final class CreatePsvDiscs extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $amount; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isCopy = 'N'; diff --git a/src/Command/Variation/DeleteListConditionUndertaking.php b/src/Command/Variation/DeleteListConditionUndertaking.php index f7d69dae..45bd3bc0 100644 --- a/src/Command/Variation/DeleteListConditionUndertaking.php +++ b/src/Command/Variation/DeleteListConditionUndertaking.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ class DeleteListConditionUndertaking extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Variation/DeleteOperatingCentre.php b/src/Command/Variation/DeleteOperatingCentre.php index 18a0c1e6..daca7bd3 100644 --- a/src/Command/Variation/DeleteOperatingCentre.php +++ b/src/Command/Variation/DeleteOperatingCentre.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\FieldType\Traits\Application; @@ -20,8 +21,8 @@ final class DeleteOperatingCentre extends AbstractCommand use Application; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2}) */ protected $id; diff --git a/src/Command/Variation/DeleteVariation.php b/src/Command/Variation/DeleteVariation.php index b57fbea2..2814b39c 100644 --- a/src/Command/Variation/DeleteVariation.php +++ b/src/Command/Variation/DeleteVariation.php @@ -1,6 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -20,8 +21,8 @@ final class Grant extends AbstractCommand use Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"grant_authority_dl", "grant_authority_tc", "grant_authority_tr"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"grant_authority_dl", "grant_authority_tc", "grant_authority_tr"}}) */ protected $grantAuthority; diff --git a/src/Command/Variation/GrantDirectorChange.php b/src/Command/Variation/GrantDirectorChange.php index d39845f1..74874f83 100644 --- a/src/Command/Variation/GrantDirectorChange.php +++ b/src/Command/Variation/GrantDirectorChange.php @@ -1,6 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class ReplacePsvDiscs extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Variation/RestoreListConditionUndertaking.php b/src/Command/Variation/RestoreListConditionUndertaking.php index c9490276..efc1c276 100644 --- a/src/Command/Variation/RestoreListConditionUndertaking.php +++ b/src/Command/Variation/RestoreListConditionUndertaking.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ class RestoreListConditionUndertaking extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Variation/RestoreOperatingCentre.php b/src/Command/Variation/RestoreOperatingCentre.php index d528df7e..becf5c56 100644 --- a/src/Command/Variation/RestoreOperatingCentre.php +++ b/src/Command/Variation/RestoreOperatingCentre.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\FieldType\Traits\Application; @@ -20,8 +21,8 @@ final class RestoreOperatingCentre extends AbstractCommand use Application; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 2}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":2}) */ protected $id; diff --git a/src/Command/Variation/TransportManagerDeleteDelta.php b/src/Command/Variation/TransportManagerDeleteDelta.php index d657cff9..128af95d 100644 --- a/src/Command/Variation/TransportManagerDeleteDelta.php +++ b/src/Command/Variation/TransportManagerDeleteDelta.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class TransportManagerDeleteDelta extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManagerLicenceIds = []; diff --git a/src/Command/Variation/UpdateAddresses.php b/src/Command/Variation/UpdateAddresses.php index 456abd05..d60aa985 100644 --- a/src/Command/Variation/UpdateAddresses.php +++ b/src/Command/Variation/UpdateAddresses.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Command/Variation/UpdateConditionUndertaking.php b/src/Command/Variation/UpdateConditionUndertaking.php index 6ee2e840..e257ffd8 100644 --- a/src/Command/Variation/UpdateConditionUndertaking.php +++ b/src/Command/Variation/UpdateConditionUndertaking.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,57 +19,54 @@ */ final class UpdateConditionUndertaking extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $conditionUndertaking; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"cdt_con", "cdt_und"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cdt_con", "cdt_und"}}) */ protected $type; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": {"cu_cat_env", "cu_cat_busreg", "cu_cat_fin", "cu_cat_other"} * } - * } * ) */ protected $conditionCategory; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":5,"max":8000}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":5,"max":8000}) */ protected $notes; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) */ protected $fulfilled; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"cat_lic", "cat_oc"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cat_lic", "cat_oc"}}) */ protected $attachedTo; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $operatingCentre; diff --git a/src/Command/Variation/UpdateTypeOfLicence.php b/src/Command/Variation/UpdateTypeOfLicence.php index 724425e5..a34eb750 100644 --- a/src/Command/Variation/UpdateTypeOfLicence.php +++ b/src/Command/Variation/UpdateTypeOfLicence.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,33 +19,33 @@ */ final class UpdateTypeOfLicence extends AbstractCommand { - use LgvDeclarationConfirmation, VehicleType; + use LgvDeclarationConfirmation; + use VehicleType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}} + * ) */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $confirm = false; diff --git a/src/Command/Variation/VoidPsvDiscs.php b/src/Command/Variation/VoidPsvDiscs.php index 0131e9d7..59639ceb 100644 --- a/src/Command/Variation/VoidPsvDiscs.php +++ b/src/Command/Variation/VoidPsvDiscs.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Variation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,17 +18,17 @@ final class VoidPsvDiscs extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/VariationOperatingCentre/Update.php b/src/Command/VariationOperatingCentre/Update.php index 1ac9bbb2..bb1d5817 100644 --- a/src/Command/VariationOperatingCentre/Update.php +++ b/src/Command/VariationOperatingCentre/Update.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\VariationOperatingCentre; use Dvsa\Olcs\Transfer\Command\ApplicationOperatingCentre\AbstractOperatingCentreCommand; @@ -19,12 +20,12 @@ */ class Update extends AbstractOperatingCentreCommand { - use Application, - Version; + use Application; + use Version; use IsTaOverridden; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $id; diff --git a/src/Command/Vehicle/DeleteLicenceVehicle.php b/src/Command/Vehicle/DeleteLicenceVehicle.php index aa7a0869..0fe3cec5 100644 --- a/src/Command/Vehicle/DeleteLicenceVehicle.php +++ b/src/Command/Vehicle/DeleteLicenceVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Vehicle; use Dvsa\Olcs\Transfer\FieldType\Traits\Ids; diff --git a/src/Command/Vehicle/ReprintDisc.php b/src/Command/Vehicle/ReprintDisc.php index 79e2a93d..cdf76eb6 100644 --- a/src/Command/Vehicle/ReprintDisc.php +++ b/src/Command/Vehicle/ReprintDisc.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Vehicle; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ final class ReprintDisc extends AbstractCommand { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Vehicle/UpdateGoodsVehicle.php b/src/Command/Vehicle/UpdateGoodsVehicle.php index 4d82b94b..adffdec6 100644 --- a/src/Command/Vehicle/UpdateGoodsVehicle.php +++ b/src/Command/Vehicle/UpdateGoodsVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Vehicle; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,45 +19,45 @@ */ final class UpdateGoodsVehicle extends AbstractCommand { - use Identity, - Version; + use Identity; + use Version; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 0, "max": 999999}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 0, "max": 999999}) * @Transfer\Optional */ protected $platedWeight; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $receivedDate; /** * @Transfer\Optional - * @Transfer\Filter({"name": "Laminas\Filter\DateTimeFormatter"}) - * @Transfer\Validator({"name": "Date", "options": {"format": \DateTime::ISO8601}}) + * @Transfer\Filter("Laminas\Filter\DateTimeFormatter") + * @Transfer\Validator("Date", options={"format": \DateTime::ISO8601}) */ protected $specifiedDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $seedDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $sentDate; /** * @Transfer\Optional - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) */ protected $removalDate; diff --git a/src/Command/Vehicle/UpdateSection26.php b/src/Command/Vehicle/UpdateSection26.php index 133f0f53..f2a8e248 100644 --- a/src/Command/Vehicle/UpdateSection26.php +++ b/src/Command/Vehicle/UpdateSection26.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Command\Vehicle; use Dvsa\Olcs\Transfer\FieldType\Traits\Ids; @@ -20,8 +21,8 @@ final class UpdateSection26 extends AbstractCommand use Ids; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $section26; diff --git a/src/Command/Workshop/CreateWorkshop.php b/src/Command/Workshop/CreateWorkshop.php index 656d956b..1b4c6e9e 100644 --- a/src/Command/Workshop/CreateWorkshop.php +++ b/src/Command/Workshop/CreateWorkshop.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Workshop; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,19 +18,16 @@ final class CreateWorkshop extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name": "Laminas\Filter\StringToUpper"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToUpper") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) */ protected $isExternal; diff --git a/src/Command/Workshop/DeleteWorkshop.php b/src/Command/Workshop/DeleteWorkshop.php index 0cfda0c6..6bab2cb5 100644 --- a/src/Command/Workshop/DeleteWorkshop.php +++ b/src/Command/Workshop/DeleteWorkshop.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Workshop; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,14 +19,14 @@ */ final class DeleteWorkshop extends AbstractCommand { - use LicenceOptional, - ApplicationOptional; + use LicenceOptional; + use ApplicationOptional; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $ids = []; diff --git a/src/Command/Workshop/UpdateWorkshop.php b/src/Command/Workshop/UpdateWorkshop.php index 4996991d..e65437a9 100644 --- a/src/Command/Workshop/UpdateWorkshop.php +++ b/src/Command/Workshop/UpdateWorkshop.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Command\Workshop; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,30 +19,27 @@ */ final class UpdateWorkshop extends AbstractCommand { - use LicenceOptional, - ApplicationOptional; + use LicenceOptional; + use ApplicationOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name": "Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name": "Laminas\Filter\StringToUpper"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"Y","N"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToUpper") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y","N"}}) */ protected $isExternal; diff --git a/src/FieldType/ApplicationInterface.php b/src/FieldType/ApplicationInterface.php index b56dd49b..8d447750 100644 --- a/src/FieldType/ApplicationInterface.php +++ b/src/FieldType/ApplicationInterface.php @@ -1,4 +1,5 @@ taIsOverridden; } diff --git a/src/FieldType/Traits/Iso8601EndDate.php b/src/FieldType/Traits/Iso8601EndDate.php index 4ae0a910..0370ec5c 100644 --- a/src/FieldType/Traits/Iso8601EndDate.php +++ b/src/FieldType/Traits/Iso8601EndDate.php @@ -1,4 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Filter; use Laminas\Filter\StringTrim; diff --git a/src/Query/AbstractListData.php b/src/Query/AbstractListData.php index d8405660..89e09308 100644 --- a/src/Query/AbstractListData.php +++ b/src/Query/AbstractListData.php @@ -3,6 +3,7 @@ /** * Abstract List Data */ + namespace Dvsa\Olcs\Transfer\Query; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/AbstractQuery.php b/src/Query/AbstractQuery.php index 3ba148f5..d572adb8 100644 --- a/src/Query/AbstractQuery.php +++ b/src/Query/AbstractQuery.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query; use ReflectionProperty; @@ -16,6 +17,10 @@ */ abstract class AbstractQuery implements QueryInterface { + final public function __construct() + { + } + /** * Create instance of a query * diff --git a/src/Query/Address/GetAddress.php b/src/Query/Address/GetAddress.php index 59b403a3..89ab001c 100644 --- a/src/Query/Address/GetAddress.php +++ b/src/Query/Address/GetAddress.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Address; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ final class GetAddress extends AbstractQuery implements CacheableMediumTermQueryInterface { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $uprn; diff --git a/src/Query/Address/GetList.php b/src/Query/Address/GetList.php index 7322154d..ef7c3280 100644 --- a/src/Query/Address/GetList.php +++ b/src/Query/Address/GetList.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Address; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -19,8 +20,8 @@ final class GetList extends AbstractQuery implements CacheableMediumTermQueryInt /** * @var String * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":8}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":8}) */ protected $postcode; diff --git a/src/Query/Application/Application.php b/src/Query/Application/Application.php index f91061b8..2fa8f27e 100644 --- a/src/Query/Application/Application.php +++ b/src/Query/Application/Application.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -20,7 +21,7 @@ class Application extends AbstractQuery implements CacheableShortTermQueryInterf use Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $validateAppCompletion; diff --git a/src/Query/Application/Completion.php b/src/Query/Application/Completion.php index 8dd6ff6f..26e50427 100644 --- a/src/Query/Application/Completion.php +++ b/src/Query/Application/Completion.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/Declaration.php b/src/Query/Application/Declaration.php index bc17f102..7ddb4e33 100644 --- a/src/Query/Application/Declaration.php +++ b/src/Query/Application/Declaration.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/DeclarationUndertakings.php b/src/Query/Application/DeclarationUndertakings.php index 4f981bea..f8547745 100644 --- a/src/Query/Application/DeclarationUndertakings.php +++ b/src/Query/Application/DeclarationUndertakings.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/EnforcementArea.php b/src/Query/Application/EnforcementArea.php index cae3ac4f..1b751cc7 100644 --- a/src/Query/Application/EnforcementArea.php +++ b/src/Query/Application/EnforcementArea.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/FinancialEvidence.php b/src/Query/Application/FinancialEvidence.php index 292a4900..51354c39 100644 --- a/src/Query/Application/FinancialEvidence.php +++ b/src/Query/Application/FinancialEvidence.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/FinancialHistory.php b/src/Query/Application/FinancialHistory.php index c0fd5ce7..d0cdac7a 100644 --- a/src/Query/Application/FinancialHistory.php +++ b/src/Query/Application/FinancialHistory.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/GetList.php b/src/Query/Application/GetList.php index e34dc902..cbe3c70e 100644 --- a/src/Query/Application/GetList.php +++ b/src/Query/Application/GetList.php @@ -14,20 +14,20 @@ */ final class GetList extends AbstractQuery implements OrderedQueryInterface, PagedQueryInterface { - use OrderedTraitOptional, - PagedTrait; + use OrderedTraitOptional; + use PagedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringToLower"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\ApplicationStatus"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToLower") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\ApplicationStatus") * @Transfer\Optional */ protected $status; diff --git a/src/Query/Application/GoodsVehicles.php b/src/Query/Application/GoodsVehicles.php index 16b2e9b2..e182275e 100644 --- a/src/Query/Application/GoodsVehicles.php +++ b/src/Query/Application/GoodsVehicles.php @@ -11,11 +11,11 @@ /** * @author Rob Caiger - * + * * @Transfer\RouteName("backend/application/single/goods-vehicles") */ class GoodsVehicles extends AbstractGoodsVehicles implements PagedQueryInterface, OrderedQueryInterface { - use PagedTrait, - OrderedTrait; + use PagedTrait; + use OrderedTrait; } diff --git a/src/Query/Application/Grant.php b/src/Query/Application/Grant.php index 34fa67fc..e7f6064d 100644 --- a/src/Query/Application/Grant.php +++ b/src/Query/Application/Grant.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/Interim.php b/src/Query/Application/Interim.php index 6104e541..ecbeb710 100644 --- a/src/Query/Application/Interim.php +++ b/src/Query/Application/Interim.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/LicenceHistory.php b/src/Query/Application/LicenceHistory.php index 73add3c5..0b201851 100644 --- a/src/Query/Application/LicenceHistory.php +++ b/src/Query/Application/LicenceHistory.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/OperatingCentre.php b/src/Query/Application/OperatingCentre.php index 057b88ae..3f95cfb1 100644 --- a/src/Query/Application/OperatingCentre.php +++ b/src/Query/Application/OperatingCentre.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/OperatingCentres.php b/src/Query/Application/OperatingCentres.php index 4721efb8..b30bf6e4 100644 --- a/src/Query/Application/OperatingCentres.php +++ b/src/Query/Application/OperatingCentres.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class OperatingCentres extends AbstractQuery implements OrderedQueryInterface { - use Identity, - OrderedTrait; + use Identity; + use OrderedTrait; } diff --git a/src/Query/Application/OutstandingFees.php b/src/Query/Application/OutstandingFees.php index b1c10681..5847ab96 100644 --- a/src/Query/Application/OutstandingFees.php +++ b/src/Query/Application/OutstandingFees.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -21,7 +22,7 @@ class OutstandingFees extends AbstractQuery implements CacheableShortTermQueryIn /** * @return mixed - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $hideExpired; diff --git a/src/Query/Application/Overview.php b/src/Query/Application/Overview.php index e346eef8..5878daa1 100644 --- a/src/Query/Application/Overview.php +++ b/src/Query/Application/Overview.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -19,7 +20,7 @@ class Overview extends AbstractQuery use Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $validateAppCompletion; diff --git a/src/Query/Application/People.php b/src/Query/Application/People.php index 401953b8..19a14862 100644 --- a/src/Query/Application/People.php +++ b/src/Query/Application/People.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ class People extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Application/PreviousConvictions.php b/src/Query/Application/PreviousConvictions.php index d2d0fa25..8db8a7ee 100644 --- a/src/Query/Application/PreviousConvictions.php +++ b/src/Query/Application/PreviousConvictions.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/PsvVehicles.php b/src/Query/Application/PsvVehicles.php index a9fc48f5..7ad7f156 100644 --- a/src/Query/Application/PsvVehicles.php +++ b/src/Query/Application/PsvVehicles.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -24,18 +25,18 @@ class PsvVehicles extends AbstractQuery implements PagedQueryInterface, OrderedQueryInterface { - use Identity, - PagedTrait, - OrderedTrait; + use Identity; + use PagedTrait; + use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $includeRemoved; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $vrm; diff --git a/src/Query/Application/Publish.php b/src/Query/Application/Publish.php index d1b839ac..a8fea55e 100644 --- a/src/Query/Application/Publish.php +++ b/src/Query/Application/Publish.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/Review.php b/src/Query/Application/Review.php index f9c53461..060faad9 100644 --- a/src/Query/Application/Review.php +++ b/src/Query/Application/Review.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/Safety.php b/src/Query/Application/Safety.php index aaf0c158..d9079c5d 100644 --- a/src/Query/Application/Safety.php +++ b/src/Query/Application/Safety.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class Safety extends AbstractQuery implements PagedQueryInterface { - use Identity, - PagedTrait; + use Identity; + use PagedTrait; } diff --git a/src/Query/Application/Schedule41Approve.php b/src/Query/Application/Schedule41Approve.php index f2f71d47..9422bc8b 100644 --- a/src/Query/Application/Schedule41Approve.php +++ b/src/Query/Application/Schedule41Approve.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/Summary.php b/src/Query/Application/Summary.php index f6fad8c7..44cb2ca6 100644 --- a/src/Query/Application/Summary.php +++ b/src/Query/Application/Summary.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/TaxiPhv.php b/src/Query/Application/TaxiPhv.php index 4d539ce2..1f3e66a1 100644 --- a/src/Query/Application/TaxiPhv.php +++ b/src/Query/Application/TaxiPhv.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/TransportManagers.php b/src/Query/Application/TransportManagers.php index 098a6f22..0bf21948 100644 --- a/src/Query/Application/TransportManagers.php +++ b/src/Query/Application/TransportManagers.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Application/VehicleDeclaration.php b/src/Query/Application/VehicleDeclaration.php index 20e76d02..cf6efd1b 100644 --- a/src/Query/Application/VehicleDeclaration.php +++ b/src/Query/Application/VehicleDeclaration.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Application; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ class VehicleDeclaration extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/ApplicationOperatingCentre/ApplicationOperatingCentre.php b/src/Query/ApplicationOperatingCentre/ApplicationOperatingCentre.php index 44cbfc2b..32b6108e 100644 --- a/src/Query/ApplicationOperatingCentre/ApplicationOperatingCentre.php +++ b/src/Query/ApplicationOperatingCentre/ApplicationOperatingCentre.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\ApplicationOperatingCentre; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Audit/ReadApplication.php b/src/Query/Audit/ReadApplication.php index 90317435..ef03da78 100644 --- a/src/Query/Audit/ReadApplication.php +++ b/src/Query/Audit/ReadApplication.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class ReadApplication extends AbstractQuery implements PagedQueryInterface { - use Identity, - PagedTrait; + use Identity; + use PagedTrait; } diff --git a/src/Query/Audit/ReadBusReg.php b/src/Query/Audit/ReadBusReg.php index cacbaba4..5b668643 100644 --- a/src/Query/Audit/ReadBusReg.php +++ b/src/Query/Audit/ReadBusReg.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class ReadBusReg extends AbstractQuery implements PagedQueryInterface { - use Identity, - PagedTrait; + use Identity; + use PagedTrait; } diff --git a/src/Query/Audit/ReadCase.php b/src/Query/Audit/ReadCase.php index ed592192..53b97e56 100644 --- a/src/Query/Audit/ReadCase.php +++ b/src/Query/Audit/ReadCase.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class ReadCase extends AbstractQuery implements PagedQueryInterface { - use Identity, - PagedTrait; + use Identity; + use PagedTrait; } diff --git a/src/Query/Audit/ReadIrhpApplication.php b/src/Query/Audit/ReadIrhpApplication.php index 015e3176..ed6a9198 100644 --- a/src/Query/Audit/ReadIrhpApplication.php +++ b/src/Query/Audit/ReadIrhpApplication.php @@ -13,6 +13,6 @@ */ class ReadIrhpApplication extends AbstractQuery implements PagedQueryInterface { - use Identity, - PagedTrait; + use Identity; + use PagedTrait; } diff --git a/src/Query/Audit/ReadLicence.php b/src/Query/Audit/ReadLicence.php index cfd8bb83..6a744850 100644 --- a/src/Query/Audit/ReadLicence.php +++ b/src/Query/Audit/ReadLicence.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class ReadLicence extends AbstractQuery implements PagedQueryInterface { - use Identity, - PagedTrait; + use Identity; + use PagedTrait; } diff --git a/src/Query/Audit/ReadOrganisation.php b/src/Query/Audit/ReadOrganisation.php index 56d6a9c8..b69daf70 100644 --- a/src/Query/Audit/ReadOrganisation.php +++ b/src/Query/Audit/ReadOrganisation.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class ReadOrganisation extends AbstractQuery implements PagedQueryInterface { - use Identity, - PagedTrait; + use Identity; + use PagedTrait; } diff --git a/src/Query/Audit/ReadTransportManager.php b/src/Query/Audit/ReadTransportManager.php index 34171a69..acc1ff39 100644 --- a/src/Query/Audit/ReadTransportManager.php +++ b/src/Query/Audit/ReadTransportManager.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Audit; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class ReadTransportManager extends AbstractQuery implements PagedQueryInterface { - use Identity, - PagedTrait; + use Identity; + use PagedTrait; } diff --git a/src/Query/Bus/BusReg.php b/src/Query/Bus/BusReg.php index 0dfc03ad..cc034519 100644 --- a/src/Query/Bus/BusReg.php +++ b/src/Query/Bus/BusReg.php @@ -3,6 +3,7 @@ /** * Bus Reg */ + namespace Dvsa\Olcs\Transfer\Query\Bus; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/Bus/BusRegBrowseContextList.php b/src/Query/Bus/BusRegBrowseContextList.php index 93fc7ceb..bb59829e 100644 --- a/src/Query/Bus/BusRegBrowseContextList.php +++ b/src/Query/Bus/BusRegBrowseContextList.php @@ -17,14 +17,13 @@ class BusRegBrowseContextList extends AbstractQuery implements OrderedQueryInter /** * @var string - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "eventRegistrationStatus" * } * } - * }) + * ) */ protected $context; diff --git a/src/Query/Bus/BusRegBrowseExport.php b/src/Query/Bus/BusRegBrowseExport.php index 570e6e06..468231a2 100644 --- a/src/Query/Bus/BusRegBrowseExport.php +++ b/src/Query/Bus/BusRegBrowseExport.php @@ -15,15 +15,15 @@ class BusRegBrowseExport extends AbstractQuery use FieldType\TrafficAreas; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":36}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":36}) * @Transfer\Optional */ protected $status; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) - * @Transfer\Validator({"name":"\Dvsa\Olcs\Transfer\Validators\DateNotInFuture"}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\DateNotInFuture") */ protected $acceptedDate; diff --git a/src/Query/Bus/BusRegDecision.php b/src/Query/Bus/BusRegDecision.php index f9f78003..a24a31e0 100644 --- a/src/Query/Bus/BusRegDecision.php +++ b/src/Query/Bus/BusRegDecision.php @@ -3,6 +3,7 @@ /** * Bus Reg Decision */ + namespace Dvsa\Olcs\Transfer\Query\Bus; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/Bus/BusRegList.php b/src/Query/Bus/BusRegList.php index ff9160ae..75c3c2fd 100644 --- a/src/Query/Bus/BusRegList.php +++ b/src/Query/Bus/BusRegList.php @@ -8,7 +8,6 @@ use Dvsa\Olcs\Transfer\Query\PagedQueryInterface; use Dvsa\Olcs\Transfer\Query\PagedTrait; use Dvsa\Olcs\Transfer\Query\OrderedTrait; - use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; /** @@ -23,30 +22,28 @@ class BusRegList extends AbstractQuery implements PagedQueryInterface, OrderedQu /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $licNo; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $organisationName; /** * @var String * @Transfer\Optional - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray",options={ * "haystack": { * "breg_s_admin","breg_s_cancellation","breg_s_cancelled","breg_s_cns","breg_s_curt","breg_s_expired", * "breg_s_new","breg_s_refused","breg_s_registered","breg_s_revoked","breg_s_surr","breg_s_var", * "breg_s_withdrawn" * } * } - * }) + * ) */ protected $status; diff --git a/src/Query/Bus/Ebsr/BusRegWithTxcInbox.php b/src/Query/Bus/Ebsr/BusRegWithTxcInbox.php index effa47a2..0dd75bcb 100644 --- a/src/Query/Bus/Ebsr/BusRegWithTxcInbox.php +++ b/src/Query/Bus/Ebsr/BusRegWithTxcInbox.php @@ -3,6 +3,7 @@ /** * BusRegWithTxcInbox */ + namespace Dvsa\Olcs\Transfer\Query\Bus\Ebsr; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/Bus/Ebsr/TxcInboxList.php b/src/Query/Bus/Ebsr/TxcInboxList.php index f0b2063d..a2ce8ca9 100644 --- a/src/Query/Bus/Ebsr/TxcInboxList.php +++ b/src/Query/Bus/Ebsr/TxcInboxList.php @@ -22,17 +22,16 @@ class TxcInboxList extends AbstractQuery implements PagedQueryInterface, Ordered /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "breg_s_admin","breg_s_cancellation","breg_s_cancelled","breg_s_cns","breg_s_curt","breg_s_expired", * "breg_s_new","breg_s_refused","breg_s_registered","breg_s_revoked","breg_s_surr","breg_s_var", * "breg_s_withdrawn" * } * } - * }) + * ) */ protected $status; diff --git a/src/Query/Bus/HistoryList.php b/src/Query/Bus/HistoryList.php index 38f0f26d..8c6b74a2 100644 --- a/src/Query/Bus/HistoryList.php +++ b/src/Query/Bus/HistoryList.php @@ -8,7 +8,6 @@ use Dvsa\Olcs\Transfer\Query\PagedQueryInterface; use Dvsa\Olcs\Transfer\Query\PagedTrait; use Dvsa\Olcs\Transfer\Query\OrderedTrait; - use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; /** diff --git a/src/Query/Bus/PaginatedRegistrationHistoryList.php b/src/Query/Bus/PaginatedRegistrationHistoryList.php index 45874ac2..1568afa1 100644 --- a/src/Query/Bus/PaginatedRegistrationHistoryList.php +++ b/src/Query/Bus/PaginatedRegistrationHistoryList.php @@ -18,5 +18,5 @@ class PaginatedRegistrationHistoryList extends AbstractQuery implements OrderedQ { use OrderedTrait; use PagedTrait; - use FieldTypeTraits\Identity; //bus reg id + use FieldTypeTraits\Identity; } diff --git a/src/Query/Bus/RegistrationHistoryList.php b/src/Query/Bus/RegistrationHistoryList.php index a3b5eb8b..6db4ee54 100644 --- a/src/Query/Bus/RegistrationHistoryList.php +++ b/src/Query/Bus/RegistrationHistoryList.php @@ -17,5 +17,5 @@ class RegistrationHistoryList extends AbstractQuery implements OrderedQueryInterface { use OrderedTrait; - use FieldTypeTraits\Identity; //bus reg id + use FieldTypeTraits\Identity; } diff --git a/src/Query/Bus/SearchViewList.php b/src/Query/Bus/SearchViewList.php index 0fb91ce5..0fe4cbfd 100644 --- a/src/Query/Bus/SearchViewList.php +++ b/src/Query/Bus/SearchViewList.php @@ -8,7 +8,6 @@ use Dvsa\Olcs\Transfer\Query\PagedQueryInterface; use Dvsa\Olcs\Transfer\Query\PagedTrait; use Dvsa\Olcs\Transfer\Query\OrderedTrait; - use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; /** @@ -22,9 +21,9 @@ class SearchViewList extends AbstractQuery implements PagedQueryInterface, Order /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licId; @@ -39,8 +38,8 @@ public function getLicId() /** * @var String * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":32}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":32}) */ protected $status; diff --git a/src/Query/Bus/ShortNoticeByBusReg.php b/src/Query/Bus/ShortNoticeByBusReg.php index 958c8aee..0a7985e5 100644 --- a/src/Query/Bus/ShortNoticeByBusReg.php +++ b/src/Query/Bus/ShortNoticeByBusReg.php @@ -3,6 +3,7 @@ /** * Query to get short notice by Bus Reg */ + namespace Dvsa\Olcs\Transfer\Query\Bus; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -14,5 +15,5 @@ */ class ShortNoticeByBusReg extends AbstractQuery { - use FieldType\Identity; //this is the parent bus reg id + use FieldType\Identity; } diff --git a/src/Query/BusRegSearchView/BusRegSearchViewContextList.php b/src/Query/BusRegSearchView/BusRegSearchViewContextList.php index 96adb780..14d358cd 100644 --- a/src/Query/BusRegSearchView/BusRegSearchViewContextList.php +++ b/src/Query/BusRegSearchView/BusRegSearchViewContextList.php @@ -17,14 +17,13 @@ class BusRegSearchViewContextList extends AbstractQuery implements OrderedQueryI /** * @var string - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "organisation","licence","busRegStatus" * } * } - * }) + * ) */ protected $context; diff --git a/src/Query/BusRegSearchView/BusRegSearchViewList.php b/src/Query/BusRegSearchView/BusRegSearchViewList.php index 94adc89d..ef9582ae 100644 --- a/src/Query/BusRegSearchView/BusRegSearchViewList.php +++ b/src/Query/BusRegSearchView/BusRegSearchViewList.php @@ -21,34 +21,33 @@ class BusRegSearchViewList extends AbstractQuery implements PagedQueryInterface, /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisationId; /** * @var int * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licId; /** * @var String * @Transfer\Optional - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "breg_s_admin","breg_s_cancellation","breg_s_cancelled","breg_s_cns","breg_s_curt","breg_s_expired", * "breg_s_new","breg_s_refused","breg_s_registered","breg_s_revoked","breg_s_surr","breg_s_var", * "breg_s_withdrawn" * } * } - * }) + * ) */ protected $busRegStatus; diff --git a/src/Query/Cache/ById.php b/src/Query/Cache/ById.php index b42ee303..bf754463 100644 --- a/src/Query/Cache/ById.php +++ b/src/Query/Cache/ById.php @@ -9,6 +9,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Query\Cache; use Dvsa\Olcs\Transfer\FieldType\Traits\IdentityString; @@ -26,7 +27,7 @@ class ById extends AbstractQuery implements CacheableShortTermQueryInterface use UniqueIdStringOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $shouldRegen = false; diff --git a/src/Query/CacheableMediumTermQueryInterface.php b/src/Query/CacheableMediumTermQueryInterface.php index 6e97f19c..2ba2d386 100644 --- a/src/Query/CacheableMediumTermQueryInterface.php +++ b/src/Query/CacheableMediumTermQueryInterface.php @@ -7,5 +7,4 @@ */ interface CacheableMediumTermQueryInterface { - } diff --git a/src/Query/CacheableShortTermQueryInterface.php b/src/Query/CacheableShortTermQueryInterface.php index e192ae4f..f4a24869 100644 --- a/src/Query/CacheableShortTermQueryInterface.php +++ b/src/Query/CacheableShortTermQueryInterface.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query; /** @@ -14,5 +15,4 @@ */ interface CacheableShortTermQueryInterface { - } diff --git a/src/Query/Cases/Cases.php b/src/Query/Cases/Cases.php index e38b1a84..a272e4c7 100644 --- a/src/Query/Cases/Cases.php +++ b/src/Query/Cases/Cases.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Cases; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Cases/CasesWithLicence.php b/src/Query/Cases/CasesWithLicence.php index bb76d5b5..1652f035 100644 --- a/src/Query/Cases/CasesWithLicence.php +++ b/src/Query/Cases/CasesWithLicence.php @@ -5,6 +5,7 @@ * * @author Shaun Lizzio */ + namespace Dvsa\Olcs\Transfer\Query\Cases; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Cases/CasesWithOppositionDates.php b/src/Query/Cases/CasesWithOppositionDates.php index f8ccbaea..d54f1764 100644 --- a/src/Query/Cases/CasesWithOppositionDates.php +++ b/src/Query/Cases/CasesWithOppositionDates.php @@ -5,6 +5,7 @@ * * @author Shaun Lizzio */ + namespace Dvsa\Olcs\Transfer\Query\Cases; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Cases/ConditionUndertaking/ConditionUndertaking.php b/src/Query/Cases/ConditionUndertaking/ConditionUndertaking.php index 6e0dc401..23138cc6 100644 --- a/src/Query/Cases/ConditionUndertaking/ConditionUndertaking.php +++ b/src/Query/Cases/ConditionUndertaking/ConditionUndertaking.php @@ -16,9 +16,9 @@ class ConditionUndertaking extends AbstractQuery /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; diff --git a/src/Query/Cases/ConditionUndertaking/ConditionUndertakingList.php b/src/Query/Cases/ConditionUndertaking/ConditionUndertakingList.php index 84164b51..9499515c 100644 --- a/src/Query/Cases/ConditionUndertaking/ConditionUndertakingList.php +++ b/src/Query/Cases/ConditionUndertaking/ConditionUndertakingList.php @@ -20,9 +20,9 @@ class ConditionUndertakingList extends AbstractQuery implements PagedQueryInterf /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; diff --git a/src/Query/Cases/Conviction/Conviction.php b/src/Query/Cases/Conviction/Conviction.php index b0b9a9ef..eaf87784 100644 --- a/src/Query/Cases/Conviction/Conviction.php +++ b/src/Query/Cases/Conviction/Conviction.php @@ -4,7 +4,6 @@ use Dvsa\Olcs\Transfer\Query\AbstractQuery; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; - use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; /** diff --git a/src/Query/Cases/Conviction/ConvictionList.php b/src/Query/Cases/Conviction/ConvictionList.php index b36794a7..d8e9ccb6 100644 --- a/src/Query/Cases/Conviction/ConvictionList.php +++ b/src/Query/Cases/Conviction/ConvictionList.php @@ -8,7 +8,6 @@ use Dvsa\Olcs\Transfer\Query\PagedQueryInterface; use Dvsa\Olcs\Transfer\Query\PagedTrait; use Dvsa\Olcs\Transfer\Query\OrderedTrait; - use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; /** diff --git a/src/Query/Cases/Impounding/ImpoundingList.php b/src/Query/Cases/Impounding/ImpoundingList.php index 6f3ad5cf..50826277 100644 --- a/src/Query/Cases/Impounding/ImpoundingList.php +++ b/src/Query/Cases/Impounding/ImpoundingList.php @@ -20,9 +20,9 @@ class ImpoundingList extends AbstractQuery implements PagedQueryInterface, Order /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; diff --git a/src/Query/Cases/LegacyOffence.php b/src/Query/Cases/LegacyOffence.php index d6f3822f..89fcd867 100644 --- a/src/Query/Cases/LegacyOffence.php +++ b/src/Query/Cases/LegacyOffence.php @@ -16,9 +16,9 @@ class LegacyOffence extends AbstractQuery /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; diff --git a/src/Query/Cases/LegacyOffenceList.php b/src/Query/Cases/LegacyOffenceList.php index 76219d97..9cc90c63 100644 --- a/src/Query/Cases/LegacyOffenceList.php +++ b/src/Query/Cases/LegacyOffenceList.php @@ -20,9 +20,9 @@ class LegacyOffenceList extends AbstractQuery implements PagedQueryInterface, Or /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; diff --git a/src/Query/Cases/NonPi/Listing.php b/src/Query/Cases/NonPi/Listing.php index 25aed341..ce7b43f7 100644 --- a/src/Query/Cases/NonPi/Listing.php +++ b/src/Query/Cases/NonPi/Listing.php @@ -8,7 +8,6 @@ use Dvsa\Olcs\Transfer\Query\PagedQueryInterface; use Dvsa\Olcs\Transfer\Query\PagedTrait; use Dvsa\Olcs\Transfer\Query\OrderedTrait; - use Dvsa\Olcs\Transfer\FieldType; /** diff --git a/src/Query/Cases/NonPi/Single.php b/src/Query/Cases/NonPi/Single.php index 94f26933..62d60ec8 100644 --- a/src/Query/Cases/NonPi/Single.php +++ b/src/Query/Cases/NonPi/Single.php @@ -4,7 +4,6 @@ use Dvsa\Olcs\Transfer\Query\AbstractQuery; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; - use Dvsa\Olcs\Transfer\FieldType; /** diff --git a/src/Query/Cases/PresidingTc/ById.php b/src/Query/Cases/PresidingTc/ById.php index 2e7cbc33..7b7caaf8 100644 --- a/src/Query/Cases/PresidingTc/ById.php +++ b/src/Query/Cases/PresidingTc/ById.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\Cases\PresidingTc; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/Cases/Prohibition/Defect.php b/src/Query/Cases/Prohibition/Defect.php index 581bd76b..5b9ac927 100644 --- a/src/Query/Cases/Prohibition/Defect.php +++ b/src/Query/Cases/Prohibition/Defect.php @@ -4,7 +4,6 @@ use Dvsa\Olcs\Transfer\Query\AbstractQuery; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; - use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; /** diff --git a/src/Query/Cases/Prohibition/DefectList.php b/src/Query/Cases/Prohibition/DefectList.php index 2f827cb9..89c77600 100644 --- a/src/Query/Cases/Prohibition/DefectList.php +++ b/src/Query/Cases/Prohibition/DefectList.php @@ -8,7 +8,6 @@ use Dvsa\Olcs\Transfer\Query\PagedQueryInterface; use Dvsa\Olcs\Transfer\Query\PagedTrait; use Dvsa\Olcs\Transfer\Query\OrderedTrait; - use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; /** diff --git a/src/Query/Cases/Prohibition/Prohibition.php b/src/Query/Cases/Prohibition/Prohibition.php index 3cb4a399..6fdd52f1 100644 --- a/src/Query/Cases/Prohibition/Prohibition.php +++ b/src/Query/Cases/Prohibition/Prohibition.php @@ -4,7 +4,6 @@ use Dvsa\Olcs\Transfer\Query\AbstractQuery; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; - use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; /** diff --git a/src/Query/Cases/Prohibition/ProhibitionList.php b/src/Query/Cases/Prohibition/ProhibitionList.php index 4d99e8bd..2e2a4083 100644 --- a/src/Query/Cases/Prohibition/ProhibitionList.php +++ b/src/Query/Cases/Prohibition/ProhibitionList.php @@ -8,7 +8,6 @@ use Dvsa\Olcs\Transfer\Query\PagedQueryInterface; use Dvsa\Olcs\Transfer\Query\PagedTrait; use Dvsa\Olcs\Transfer\Query\OrderedTrait; - use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; /** diff --git a/src/Query/Cases/ProposeToRevoke/ProposeToRevokeByCase.php b/src/Query/Cases/ProposeToRevoke/ProposeToRevokeByCase.php index ce150d3c..20f1cf9b 100644 --- a/src/Query/Cases/ProposeToRevoke/ProposeToRevokeByCase.php +++ b/src/Query/Cases/ProposeToRevoke/ProposeToRevokeByCase.php @@ -13,9 +13,9 @@ class ProposeToRevokeByCase extends AbstractQuery { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; diff --git a/src/Query/Cases/Report/OpenList.php b/src/Query/Cases/Report/OpenList.php index 48035f64..12dca23d 100644 --- a/src/Query/Cases/Report/OpenList.php +++ b/src/Query/Cases/Report/OpenList.php @@ -19,26 +19,26 @@ class OpenList extends AbstractQuery implements PagedQueryInterface /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringToLower"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\CaseType"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToLower") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\CaseType") */ protected $caseType = null; /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringToLower"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\ApplicationStatus"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToLower") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\ApplicationStatus") */ protected $applicationStatus = null; /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\LicenceStatus"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\LicenceStatus") */ protected $licenceStatus = null; diff --git a/src/Query/Cases/Si/Si.php b/src/Query/Cases/Si/Si.php index 5d0a3516..e28b3d8b 100644 --- a/src/Query/Cases/Si/Si.php +++ b/src/Query/Cases/Si/Si.php @@ -5,6 +5,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Query\Cases\Si; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Cases/Si/SiList.php b/src/Query/Cases/Si/SiList.php index 166214bd..4bb7ad0c 100644 --- a/src/Query/Cases/Si/SiList.php +++ b/src/Query/Cases/Si/SiList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Cases\Si; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/Cases/Statement/StatementList.php b/src/Query/Cases/Statement/StatementList.php index b5d6398c..0f9322d6 100644 --- a/src/Query/Cases/Statement/StatementList.php +++ b/src/Query/Cases/Statement/StatementList.php @@ -20,9 +20,9 @@ class StatementList extends AbstractQuery implements PagedQueryInterface, Ordere /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; diff --git a/src/Query/Category/GetList.php b/src/Query/Category/GetList.php index cdc6fbd0..fb8dff17 100644 --- a/src/Query/Category/GetList.php +++ b/src/Query/Category/GetList.php @@ -19,28 +19,28 @@ class GetList extends AbstractQuery implements /** * @var string - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isTaskCategory; /** * @var string - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isDocCategory; /** * @var string - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isScanCategory; /** * @var string - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isOnlyWithItems; diff --git a/src/Query/ChangeOfEntity/ChangeOfEntity.php b/src/Query/ChangeOfEntity/ChangeOfEntity.php index f98e0ce4..0e2291ec 100644 --- a/src/Query/ChangeOfEntity/ChangeOfEntity.php +++ b/src/Query/ChangeOfEntity/ChangeOfEntity.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\ChangeOfEntity; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/CommunityLic/CommunityLicences.php b/src/Query/CommunityLic/CommunityLicences.php index 43915ec1..084f957b 100644 --- a/src/Query/CommunityLic/CommunityLicences.php +++ b/src/Query/CommunityLic/CommunityLicences.php @@ -18,13 +18,13 @@ class CommunityLicences extends AbstractQuery implements OrderedQueryInterface, PagedQueryInterface { - use OrderedTrait, - LicenceOptional, - PagedTrait; + use OrderedTrait; + use LicenceOptional; + use PagedTrait; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @transfer\Optional */ protected $statuses; diff --git a/src/Query/CompaniesHouse/AlertList.php b/src/Query/CompaniesHouse/AlertList.php index 44d8039c..e541fa95 100644 --- a/src/Query/CompaniesHouse/AlertList.php +++ b/src/Query/CompaniesHouse/AlertList.php @@ -26,15 +26,14 @@ class AlertList extends AbstractQuery implements /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") */ protected $includeClosed = false; /** * @Transfer\Optional - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "company_status_change", * "company_name_change", @@ -43,7 +42,7 @@ class AlertList extends AbstractQuery implements * "invalid_company_number" * } * } - * }) + * ) */ protected $typeOfChange; diff --git a/src/Query/CompaniesHouse/ByNumber.php b/src/Query/CompaniesHouse/ByNumber.php index ebaddb2d..4822c095 100644 --- a/src/Query/CompaniesHouse/ByNumber.php +++ b/src/Query/CompaniesHouse/ByNumber.php @@ -1,5 +1,6 @@ - */ + namespace Dvsa\Olcs\Transfer\Query\CompanySubsidiary; use Dvsa\Olcs\Transfer\FieldType\Traits\ApplicationOptional; @@ -18,7 +19,7 @@ */ class CompanySubsidiary extends AbstractQuery { - use Identity, - ApplicationOptional, - LicenceOptional; + use Identity; + use ApplicationOptional; + use LicenceOptional; } diff --git a/src/Query/Complaint/Complaint.php b/src/Query/Complaint/Complaint.php index 12ac628a..9a6e9456 100644 --- a/src/Query/Complaint/Complaint.php +++ b/src/Query/Complaint/Complaint.php @@ -16,8 +16,8 @@ class Complaint extends AbstractQuery /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) - * @Transfer\Validator({"name":"Laminas\Validator\Identical", "options": {"token": true}}) + * @Transfer\Filter("Laminas\Filter\Boolean") + * @Transfer\Validator("Laminas\Validator\Identical", options={"token": true}) */ protected $isCompliance = true; diff --git a/src/Query/Complaint/ComplaintList.php b/src/Query/Complaint/ComplaintList.php index cb926ad9..d084c674 100644 --- a/src/Query/Complaint/ComplaintList.php +++ b/src/Query/Complaint/ComplaintList.php @@ -20,32 +20,32 @@ class ComplaintList extends AbstractQuery implements PagedQueryInterface, Ordere /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) - * @Transfer\Validator({"name":"Laminas\Validator\Identical", "options": {"token": true}}) + * @Transfer\Filter("Laminas\Filter\Boolean") + * @Transfer\Validator("Laminas\Validator\Identical", options={"token": true}) */ protected $isCompliance = true; diff --git a/src/Query/ConditionUndertaking/Get.php b/src/Query/ConditionUndertaking/Get.php index 1a407c33..fbcf267b 100644 --- a/src/Query/ConditionUndertaking/Get.php +++ b/src/Query/ConditionUndertaking/Get.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\ConditionUndertaking; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ class Get extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/ConditionUndertaking/GetList.php b/src/Query/ConditionUndertaking/GetList.php index 1fd19b79..521279d6 100644 --- a/src/Query/ConditionUndertaking/GetList.php +++ b/src/Query/ConditionUndertaking/GetList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\ConditionUndertaking; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,24 +17,24 @@ class GetList extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $application; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"cdt_con","cdt_und"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"cdt_con","cdt_und"}}) * @Transfer\Optional */ protected $conditionType; diff --git a/src/Query/ContactDetail/ContactDetailsList.php b/src/Query/ContactDetail/ContactDetailsList.php index 127bde96..655414a9 100644 --- a/src/Query/ContactDetail/ContactDetailsList.php +++ b/src/Query/ContactDetail/ContactDetailsList.php @@ -18,19 +18,16 @@ class ContactDetailsList extends AbstractQuery implements PagedQueryInterface, O use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringToLower"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options":{ + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToLower") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "ct_complainant", "ct_corr", "ct_driver", "ct_est", "ct_hackney", "ct_irfo_op", * "ct_obj", "ct_partner", "ct_reg", "ct_rep", "ct_requestor", "ct_ta", "ct_tcon", * "ct_team_user", "ct_tm", "ct_user", "ct_work" * } * } - * } * ) * @Transfer\Optional */ diff --git a/src/Query/ContactDetail/CountryList.php b/src/Query/ContactDetail/CountryList.php index 19ba6d30..b1d22231 100644 --- a/src/Query/ContactDetail/CountryList.php +++ b/src/Query/ContactDetail/CountryList.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\ContactDetail; use Dvsa\Olcs\Transfer\Query\PublicQueryCacheInterface; diff --git a/src/Query/ContactDetail/CountrySelectList.php b/src/Query/ContactDetail/CountrySelectList.php index 1fba993d..9d307eeb 100644 --- a/src/Query/ContactDetail/CountrySelectList.php +++ b/src/Query/ContactDetail/CountrySelectList.php @@ -4,6 +4,7 @@ * Country Select List * */ + namespace Dvsa\Olcs\Transfer\Query\ContactDetail; use Dvsa\Olcs\Transfer\FieldType\Traits\IsEcmtStateOptional; @@ -18,6 +19,6 @@ */ class CountrySelectList extends AbstractQuery implements CacheableLongTermQueryInterface, PublicQueryCacheInterface { - use IsEcmtStateOptional, - IsEeaStateOptional; + use IsEcmtStateOptional; + use IsEeaStateOptional; } diff --git a/src/Query/ContactDetail/PhoneContact/GetList.php b/src/Query/ContactDetail/PhoneContact/GetList.php index e0adcc98..d6a11015 100644 --- a/src/Query/ContactDetail/PhoneContact/GetList.php +++ b/src/Query/ContactDetail/PhoneContact/GetList.php @@ -16,9 +16,9 @@ class GetList extends AbstractQuery implements OrderedQueryInterface /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $contactDetailsId; diff --git a/src/Query/ContinuationDetail/ChecklistReminders.php b/src/Query/ContinuationDetail/ChecklistReminders.php index e124ecac..e0bfae73 100644 --- a/src/Query/ContinuationDetail/ChecklistReminders.php +++ b/src/Query/ContinuationDetail/ChecklistReminders.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\ContinuationDetail; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,24 +17,24 @@ final class ChecklistReminders extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 1, "max": 12}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 1, "max": 12}) * @Transfer\Optional */ public $month; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") * @Transfer\Optional */ public $year; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") * @Transfer\Optional */ protected $ids = []; diff --git a/src/Query/ContinuationDetail/GetList.php b/src/Query/ContinuationDetail/GetList.php index 8db4110d..8bef2e9f 100644 --- a/src/Query/ContinuationDetail/GetList.php +++ b/src/Query/ContinuationDetail/GetList.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\ContinuationDetail; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,51 +17,46 @@ final class GetList extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $continuationId; /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\LicenceStatus"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\LicenceStatus") * @Transfer\Optional */ protected $licenceStatus = []; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength","options":{"min":0,"max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength",options={"min":0,"max":18}) * @Transfer\Optional */ protected $licenceNo; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "post", * "email", * "all" * } * } - * } * ) * @Transfer\Optional */ protected $method; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * { - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "con_det_sts_prepared", * "con_det_sts_printing", @@ -71,7 +67,6 @@ final class GetList extends AbstractQuery * "con_det_sts_error" * } * } - * } * ) * @Transfer\Optional */ diff --git a/src/Query/Correspondence/Correspondences.php b/src/Query/Correspondence/Correspondences.php index 28851d5f..195cf6a5 100644 --- a/src/Query/Correspondence/Correspondences.php +++ b/src/Query/Correspondence/Correspondences.php @@ -15,13 +15,14 @@ */ class Correspondences extends AbstractQuery implements PagedQueryInterface, OrderedQueryInterface { - use PagedTrait, OrderedTrait; + use PagedTrait; + use OrderedTrait; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; diff --git a/src/Query/Cpms/ReportList.php b/src/Query/Cpms/ReportList.php index a9db67d8..d30b3814 100644 --- a/src/Query/Cpms/ReportList.php +++ b/src/Query/Cpms/ReportList.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Cpms; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/Cpms/ReportStatus.php b/src/Query/Cpms/ReportStatus.php index 0d9d5e90..cd528260 100644 --- a/src/Query/Cpms/ReportStatus.php +++ b/src/Query/Cpms/ReportStatus.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Cpms; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,8 +17,8 @@ class ReportStatus extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1}) */ protected $reference; diff --git a/src/Query/Cpms/StoredCardList.php b/src/Query/Cpms/StoredCardList.php index 009930b3..4aa1a386 100644 --- a/src/Query/Cpms/StoredCardList.php +++ b/src/Query/Cpms/StoredCardList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Cpms; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,7 +17,7 @@ class StoredCardList extends AbstractQuery { /** - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $isNi; diff --git a/src/Query/DataRetention/GetProcessedList.php b/src/Query/DataRetention/GetProcessedList.php index 4a6419ae..8d6c9877 100644 --- a/src/Query/DataRetention/GetProcessedList.php +++ b/src/Query/DataRetention/GetProcessedList.php @@ -16,9 +16,9 @@ final class GetProcessedList extends AbstractQuery /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $dataRetentionRuleId; diff --git a/src/Query/DataRetention/Records.php b/src/Query/DataRetention/Records.php index 58b86b90..fd889e84 100644 --- a/src/Query/DataRetention/Records.php +++ b/src/Query/DataRetention/Records.php @@ -23,33 +23,32 @@ final class Records extends AbstractQuery implements use UserOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $dataRetentionRuleId; /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "pending", * "deferred" * } * } - * }) + * ) */ protected $nextReview; /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $markedForDeletion; @@ -62,16 +61,15 @@ final class Records extends AbstractQuery implements /** * @var string|null * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", + * options={ * "haystack": { * "lcat_gv", * "lcat_psv" * } * } - * }) + * ) */ protected $goodsOrPsv; diff --git a/src/Query/DataRetention/RuleList.php b/src/Query/DataRetention/RuleList.php index 6b6eaaf1..10df984f 100644 --- a/src/Query/DataRetention/RuleList.php +++ b/src/Query/DataRetention/RuleList.php @@ -20,8 +20,8 @@ final class RuleList extends AbstractQuery implements use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isReview = 'Y'; diff --git a/src/Query/DiscSequence/DiscPrefixes.php b/src/Query/DiscSequence/DiscPrefixes.php index f517771d..46bec117 100644 --- a/src/Query/DiscSequence/DiscPrefixes.php +++ b/src/Query/DiscSequence/DiscPrefixes.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\DiscSequence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,24 +17,22 @@ final class DiscPrefixes extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ public $niFlag; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * {"name":"Laminas\Validator\InArray", "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}} - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lcat_gv","lcat_psv"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lcat_gv", "lcat_psv"}}) * @Transfer\Optional */ protected $operatorType; diff --git a/src/Query/DiscSequence/DiscsNumbering.php b/src/Query/DiscSequence/DiscsNumbering.php index 8a79b509..de91c173 100644 --- a/src/Query/DiscSequence/DiscsNumbering.php +++ b/src/Query/DiscSequence/DiscsNumbering.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\DiscSequence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,45 +17,45 @@ final class DiscsNumbering extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ public $niFlag; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ protected $licenceType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lcat_gv","lcat_psv"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lcat_gv", "lcat_psv"}}) * @Transfer\Optional */ protected $operatorType; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ public $discSequence; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ public $startNumberEntered; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ public $maxPages; diff --git a/src/Query/DocTemplate/ById.php b/src/Query/DocTemplate/ById.php index e1b5ab23..de9dac3d 100644 --- a/src/Query/DocTemplate/ById.php +++ b/src/Query/DocTemplate/ById.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\DocTemplate; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/DocTemplate/GetList.php b/src/Query/DocTemplate/GetList.php index b591056d..69041bc9 100644 --- a/src/Query/DocTemplate/GetList.php +++ b/src/Query/DocTemplate/GetList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\DocTemplate; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -21,15 +22,15 @@ class GetList extends AbstractQuery implements OrderedQueryInterface /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ protected $category; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ protected $subCategory; diff --git a/src/Query/Document/AbstractDownload.php b/src/Query/Document/AbstractDownload.php index f1bf76b9..5a8b5be7 100644 --- a/src/Query/Document/AbstractDownload.php +++ b/src/Query/Document/AbstractDownload.php @@ -17,7 +17,7 @@ class AbstractDownload extends AbstractQuery implements /** * @var bool * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") */ protected $isInline; diff --git a/src/Query/Document/Document.php b/src/Query/Document/Document.php index e9bb6906..9006d89d 100644 --- a/src/Query/Document/Document.php +++ b/src/Query/Document/Document.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Document; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Document/DocumentList.php b/src/Query/Document/DocumentList.php index 324a639d..6a6a7e21 100644 --- a/src/Query/Document/DocumentList.php +++ b/src/Query/Document/DocumentList.php @@ -25,62 +25,57 @@ class DocumentList extends AbstractQuery implements PagedQueryInterface, CacheableShortTermQueryInterface { - use OrderedTrait, - PagedTrait, - ApplicationOptional, - LicenceOptional, - CasesOptional, - BusRegOptional, - TransportManagerOptional, - IrfoOrganisationOptional, - IrhpApplicationOptional; + use OrderedTrait; + use PagedTrait; + use ApplicationOptional; + use LicenceOptional; + use CasesOptional; + use BusRegOptional; + use TransportManagerOptional; + use IrfoOrganisationOptional; + use IrhpApplicationOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $isExternal; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $category; /** * @Transfer\Optional * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $documentSubCategory = []; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": {"tsw_all", "tsw_self_only", "tsw_exclude_irhp"} - * } - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tsw_all", "tsw_self_only", "tsw_exclude_irhp"}}) */ protected $showDocs = null; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\I18n\Validator\Alnum"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\I18n\Validator\Alnum") */ protected $format = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $onlyUnlinked = null; diff --git a/src/Query/Document/Download.php b/src/Query/Document/Download.php index abb26dcc..4ce15674 100644 --- a/src/Query/Document/Download.php +++ b/src/Query/Document/Download.php @@ -11,7 +11,7 @@ class Download extends AbstractDownload { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") */ protected $identifier; diff --git a/src/Query/Document/DownloadGuide.php b/src/Query/Document/DownloadGuide.php index 5396cc7e..6314ea65 100644 --- a/src/Query/Document/DownloadGuide.php +++ b/src/Query/Document/DownloadGuide.php @@ -14,7 +14,7 @@ class DownloadGuide extends AbstractDownload /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $identifier; diff --git a/src/Query/Document/Letter.php b/src/Query/Document/Letter.php index 4deea702..0dbfe4a6 100644 --- a/src/Query/Document/Letter.php +++ b/src/Query/Document/Letter.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Document; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Document/TemplateParagraphs.php b/src/Query/Document/TemplateParagraphs.php index 64c0f007..fb796a52 100644 --- a/src/Query/Document/TemplateParagraphs.php +++ b/src/Query/Document/TemplateParagraphs.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Document; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/DvlaSearch/Vehicle.php b/src/Query/DvlaSearch/Vehicle.php index 52f77707..2ad223f9 100644 --- a/src/Query/DvlaSearch/Vehicle.php +++ b/src/Query/DvlaSearch/Vehicle.php @@ -1,4 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Query\EventHistory; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/FeatureToggle/ById.php b/src/Query/FeatureToggle/ById.php index 63032e25..58f742b0 100644 --- a/src/Query/FeatureToggle/ById.php +++ b/src/Query/FeatureToggle/ById.php @@ -5,6 +5,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Query\FeatureToggle; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/FeatureToggle/GetList.php b/src/Query/FeatureToggle/GetList.php index ac9445c4..75c336b8 100644 --- a/src/Query/FeatureToggle/GetList.php +++ b/src/Query/FeatureToggle/GetList.php @@ -5,6 +5,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Query\FeatureToggle; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/FeatureToggle/IsEnabled.php b/src/Query/FeatureToggle/IsEnabled.php index b6b564e6..860a5403 100644 --- a/src/Query/FeatureToggle/IsEnabled.php +++ b/src/Query/FeatureToggle/IsEnabled.php @@ -5,6 +5,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Query\FeatureToggle; use Dvsa\Olcs\Transfer\Query\CacheableMediumTermQueryInterface; @@ -19,8 +20,8 @@ class IsEnabled extends AbstractQuery implements CacheableMediumTermQueryInterfa { /** * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"max":255}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"max":255}) */ protected $ids = []; diff --git a/src/Query/Fee/Fee.php b/src/Query/Fee/Fee.php index 6d1c6baf..3925437f 100644 --- a/src/Query/Fee/Fee.php +++ b/src/Query/Fee/Fee.php @@ -4,7 +4,6 @@ use Dvsa\Olcs\Transfer\Query\AbstractQuery; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; diff --git a/src/Query/Fee/FeeList.php b/src/Query/Fee/FeeList.php index ec3dbf8e..8c7e7163 100644 --- a/src/Query/Fee/FeeList.php +++ b/src/Query/Fee/FeeList.php @@ -8,7 +8,6 @@ use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Query\PagedTraitOptional; use Dvsa\Olcs\Transfer\Query\OrderedTraitOptional; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; @@ -45,11 +44,8 @@ class FeeList extends AbstractQuery implements /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"current","historical","all"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"current","historical","all"}}) */ protected $status; diff --git a/src/Query/Fee/FeeType.php b/src/Query/Fee/FeeType.php index cb4f29b6..fa7e90b9 100644 --- a/src/Query/Fee/FeeType.php +++ b/src/Query/Fee/FeeType.php @@ -5,7 +5,6 @@ use Dvsa\Olcs\Transfer\Query\AbstractQuery; use Dvsa\Olcs\Transfer\Query\PublicQueryCacheInterface; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; use Dvsa\Olcs\Transfer\Query\CacheableLongTermQueryInterface; diff --git a/src/Query/Fee/FeeTypeList.php b/src/Query/Fee/FeeTypeList.php index 5577f8f1..55edfa52 100644 --- a/src/Query/Fee/FeeTypeList.php +++ b/src/Query/Fee/FeeTypeList.php @@ -28,19 +28,19 @@ class FeeTypeList extends AbstractQuery implements use FieldTypeTraits\OrganisationOptional; /** - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isMiscellaneous; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $effectiveDate; /** - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 1, "inclusive": true}}) + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 1, "inclusive": true}) * @Transfer\Optional */ protected $currentFeeType; diff --git a/src/Query/Fee/GetLatestFeeType.php b/src/Query/Fee/GetLatestFeeType.php index b158fc90..599facbb 100644 --- a/src/Query/Fee/GetLatestFeeType.php +++ b/src/Query/Fee/GetLatestFeeType.php @@ -4,7 +4,6 @@ use Dvsa\Olcs\Transfer\Query\AbstractQuery; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; use Dvsa\Olcs\Transfer\FieldType\Traits\TrafficAreaOptional; @@ -18,30 +17,26 @@ class GetLatestFeeType extends AbstractQuery use TrafficAreaOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\StringLength","options": {"min":"1","max":"32"} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1,"max":32}) */ protected $feeType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"lcat_gv","lcat_psv"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"lcat_gv","lcat_psv"}}) */ protected $operatorType; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator( - * {"name":"Laminas\Validator\InArray", "options": {"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}} - * ) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"ltyp_r","ltyp_sn","ltyp_si","ltyp_sr"}}) * @Transfer\Optional */ protected $licenceType; /** - * @Transfer\Validator({"name": "Date", "options": {"format": "Y-m-d"}}) + * @Transfer\Validator("Date", options={"format": "Y-m-d"}) * @Transfer\Optional */ protected $date; diff --git a/src/Query/FeeType/GetDistinctList.php b/src/Query/FeeType/GetDistinctList.php index 7305428c..8791ac0d 100644 --- a/src/Query/FeeType/GetDistinctList.php +++ b/src/Query/FeeType/GetDistinctList.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\FeeType; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/FeeType/GetList.php b/src/Query/FeeType/GetList.php index c45c6674..96dd90ac 100644 --- a/src/Query/FeeType/GetList.php +++ b/src/Query/FeeType/GetList.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\FeeType; use Dvsa\Olcs\Transfer\FieldType\Traits\FeeTypeOptional; diff --git a/src/Query/InspectionRequest/ApplicationInspectionRequestList.php b/src/Query/InspectionRequest/ApplicationInspectionRequestList.php index 45524d02..9690ef81 100644 --- a/src/Query/InspectionRequest/ApplicationInspectionRequestList.php +++ b/src/Query/InspectionRequest/ApplicationInspectionRequestList.php @@ -16,13 +16,13 @@ */ class ApplicationInspectionRequestList extends AbstractQuery implements PagedQueryInterface, OrderedQueryInterface { - use PagedTrait, - OrderedTrait; + use PagedTrait; + use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; diff --git a/src/Query/InspectionRequest/InspectionRequest.php b/src/Query/InspectionRequest/InspectionRequest.php index aa721d15..85278b3c 100644 --- a/src/Query/InspectionRequest/InspectionRequest.php +++ b/src/Query/InspectionRequest/InspectionRequest.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\InspectionRequest; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/InspectionRequest/LicenceInspectionRequestList.php b/src/Query/InspectionRequest/LicenceInspectionRequestList.php index af8a18ea..4f487e48 100644 --- a/src/Query/InspectionRequest/LicenceInspectionRequestList.php +++ b/src/Query/InspectionRequest/LicenceInspectionRequestList.php @@ -16,13 +16,13 @@ */ class LicenceInspectionRequestList extends AbstractQuery implements PagedQueryInterface, OrderedQueryInterface { - use PagedTrait, - OrderedTrait; + use PagedTrait; + use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; diff --git a/src/Query/InspectionRequest/OperatingCentres.php b/src/Query/InspectionRequest/OperatingCentres.php index ae00222c..8f83a0b4 100644 --- a/src/Query/InspectionRequest/OperatingCentres.php +++ b/src/Query/InspectionRequest/OperatingCentres.php @@ -13,15 +13,15 @@ class OperatingCentres extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"licence", "application"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"licence", "application"}}) */ protected $type; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $identifier; diff --git a/src/Query/Irfo/IrfoDetails.php b/src/Query/Irfo/IrfoDetails.php index c8df4b19..ab87a611 100644 --- a/src/Query/Irfo/IrfoDetails.php +++ b/src/Query/Irfo/IrfoDetails.php @@ -13,9 +13,9 @@ class IrfoDetails extends AbstractQuery { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Irfo/IrfoGvPermit.php b/src/Query/Irfo/IrfoGvPermit.php index 7384cf66..d840b95a 100644 --- a/src/Query/Irfo/IrfoGvPermit.php +++ b/src/Query/Irfo/IrfoGvPermit.php @@ -13,9 +13,9 @@ class IrfoGvPermit extends AbstractQuery { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Irfo/IrfoGvPermitList.php b/src/Query/Irfo/IrfoGvPermitList.php index 3f691208..40dc06bf 100644 --- a/src/Query/Irfo/IrfoGvPermitList.php +++ b/src/Query/Irfo/IrfoGvPermitList.php @@ -20,9 +20,9 @@ class IrfoGvPermitList extends AbstractQuery implements PagedQueryInterface, Ord /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; diff --git a/src/Query/Irfo/IrfoPermitStockList.php b/src/Query/Irfo/IrfoPermitStockList.php index 7e8ad162..993d0458 100644 --- a/src/Query/Irfo/IrfoPermitStockList.php +++ b/src/Query/Irfo/IrfoPermitStockList.php @@ -20,24 +20,24 @@ class IrfoPermitStockList extends AbstractQuery implements PagedQueryInterface, /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits"}) + * @Transfer\Validator("Laminas\Validator\GreaterThan", "options={"min": 0}) */ protected $irfoCountry; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 1900}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 1900}) */ protected $validForYear; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"irfo_perm_s_s_ret","irfo_perm_s_s_void","irfo_perm_s_s_issued","irfo_perm_s_s_in_stock"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"irfo_perm_s_s_ret","irfo_perm_s_s_void","irfo_perm_s_s_issued","irfo_perm_s_s_in_stock"}}) * @Transfer\Optional */ protected $status; diff --git a/src/Query/Irfo/IrfoPsvAuth.php b/src/Query/Irfo/IrfoPsvAuth.php index 57cf3225..e586e533 100644 --- a/src/Query/Irfo/IrfoPsvAuth.php +++ b/src/Query/Irfo/IrfoPsvAuth.php @@ -13,9 +13,9 @@ class IrfoPsvAuth extends AbstractQuery { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfe("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Irfo/IrfoPsvAuthContinuationList.php b/src/Query/Irfo/IrfoPsvAuthContinuationList.php index 18be5bbe..9ba7e366 100644 --- a/src/Query/Irfo/IrfoPsvAuthContinuationList.php +++ b/src/Query/Irfo/IrfoPsvAuthContinuationList.php @@ -19,15 +19,15 @@ class IrfoPsvAuthContinuationList extends AbstractQuery implements PagedQueryInt use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Between", "options": {"min": 1, "max": 12}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\Between", options={"min": 1, "max": 12}) */ public $month; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ public $year; diff --git a/src/Query/Irfo/IrfoPsvAuthList.php b/src/Query/Irfo/IrfoPsvAuthList.php index 4776bda4..703f8f0f 100644 --- a/src/Query/Irfo/IrfoPsvAuthList.php +++ b/src/Query/Irfo/IrfoPsvAuthList.php @@ -20,9 +20,9 @@ class IrfoPsvAuthList extends AbstractQuery implements PagedQueryInterface, Orde /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; diff --git a/src/Query/IrhpApplication/AnswersSummary.php b/src/Query/IrhpApplication/AnswersSummary.php index a5425ef3..b5939a74 100644 --- a/src/Query/IrhpApplication/AnswersSummary.php +++ b/src/Query/IrhpApplication/AnswersSummary.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; @@ -18,5 +19,7 @@ */ class AnswersSummary extends AbstractQuery { - use Identity, IrhpPermitApplicationOptional, TranslateToWelshOptional; + use Identity; + use IrhpPermitApplicationOptional; + use TranslateToWelshOptional; } diff --git a/src/Query/IrhpApplication/ApplicationPath.php b/src/Query/IrhpApplication/ApplicationPath.php index dd55e714..c1fd9211 100644 --- a/src/Query/IrhpApplication/ApplicationPath.php +++ b/src/Query/IrhpApplication/ApplicationPath.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpApplication/ApplicationPathGroupList.php b/src/Query/IrhpApplication/ApplicationPathGroupList.php index d1e13af4..3dc4b6ae 100644 --- a/src/Query/IrhpApplication/ApplicationPathGroupList.php +++ b/src/Query/IrhpApplication/ApplicationPathGroupList.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/IrhpApplication/ApplicationStep.php b/src/Query/IrhpApplication/ApplicationStep.php index 3728a9fa..0e67fb4a 100644 --- a/src/Query/IrhpApplication/ApplicationStep.php +++ b/src/Query/IrhpApplication/ApplicationStep.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpApplication/AvailableLicences.php b/src/Query/IrhpApplication/AvailableLicences.php index a2eab9c2..11ba81be 100644 --- a/src/Query/IrhpApplication/AvailableLicences.php +++ b/src/Query/IrhpApplication/AvailableLicences.php @@ -3,6 +3,7 @@ /** * Get licences for a single IRHP application by application id */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpApplication/BilateralCountryAccessible.php b/src/Query/IrhpApplication/BilateralCountryAccessible.php index d2e5506c..25934ca2 100644 --- a/src/Query/IrhpApplication/BilateralCountryAccessible.php +++ b/src/Query/IrhpApplication/BilateralCountryAccessible.php @@ -3,6 +3,7 @@ /** * Bilateral country accessible */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; @@ -15,5 +16,6 @@ */ class BilateralCountryAccessible extends AbstractQuery { - use Identity, Country; + use Identity; + use Country; } diff --git a/src/Query/IrhpApplication/BilateralMetadata.php b/src/Query/IrhpApplication/BilateralMetadata.php index 57c5b608..83147353 100644 --- a/src/Query/IrhpApplication/BilateralMetadata.php +++ b/src/Query/IrhpApplication/BilateralMetadata.php @@ -3,6 +3,7 @@ /** * Bilateral metadata */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpApplication/ById.php b/src/Query/IrhpApplication/ById.php index 8eb43b03..e4787b4b 100644 --- a/src/Query/IrhpApplication/ById.php +++ b/src/Query/IrhpApplication/ById.php @@ -3,6 +3,7 @@ /** * Get a single IRHP application by id */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpApplication/Documents.php b/src/Query/IrhpApplication/Documents.php index 321e3631..6d82002c 100644 --- a/src/Query/IrhpApplication/Documents.php +++ b/src/Query/IrhpApplication/Documents.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; @@ -18,5 +19,7 @@ */ class Documents extends AbstractQuery { - use Identity, Category, SubCategory; + use Identity; + use Category; + use SubCategory; } diff --git a/src/Query/IrhpApplication/FeeBreakdown.php b/src/Query/IrhpApplication/FeeBreakdown.php index 202f6ad0..395932c9 100644 --- a/src/Query/IrhpApplication/FeeBreakdown.php +++ b/src/Query/IrhpApplication/FeeBreakdown.php @@ -3,6 +3,7 @@ /** * Fee breakdown */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpApplication/FeePerPermit.php b/src/Query/IrhpApplication/FeePerPermit.php index 50cb89f4..7c1532bc 100644 --- a/src/Query/IrhpApplication/FeePerPermit.php +++ b/src/Query/IrhpApplication/FeePerPermit.php @@ -3,6 +3,7 @@ /** * Fee per permit */ + namespace Dvsa\Olcs\Transfer\Query\IrhpApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpApplication/GetGrantability.php b/src/Query/IrhpApplication/GetGrantability.php index 520ac1fb..60404782 100644 --- a/src/Query/IrhpApplication/GetGrantability.php +++ b/src/Query/IrhpApplication/GetGrantability.php @@ -1,6 +1,7 @@ */ + namespace Dvsa\Olcs\Transfer\Query\IrhpCandidatePermit; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpCandidatePermit/GetListByIrhpApplication.php b/src/Query/IrhpCandidatePermit/GetListByIrhpApplication.php index 1b3d9e65..6b2ab6c4 100644 --- a/src/Query/IrhpCandidatePermit/GetListByIrhpApplication.php +++ b/src/Query/IrhpCandidatePermit/GetListByIrhpApplication.php @@ -3,6 +3,7 @@ /** * Get list of IRHP Candidate Permits by IRHP Application id */ + namespace Dvsa\Olcs\Transfer\Query\IrhpCandidatePermit; use Dvsa\Olcs\Transfer\Query\PagedTrait; diff --git a/src/Query/IrhpCandidatePermit/GetListByIrhpApplicationUnpaged.php b/src/Query/IrhpCandidatePermit/GetListByIrhpApplicationUnpaged.php index 005d2e92..b450adb0 100644 --- a/src/Query/IrhpCandidatePermit/GetListByIrhpApplicationUnpaged.php +++ b/src/Query/IrhpCandidatePermit/GetListByIrhpApplicationUnpaged.php @@ -3,6 +3,7 @@ /** * Get list of IRHP Candidate Permits by IRHP Application id (unpaged) */ + namespace Dvsa\Olcs\Transfer\Query\IrhpCandidatePermit; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpApplication; diff --git a/src/Query/IrhpPermit/ById.php b/src/Query/IrhpPermit/ById.php index e26dca38..f826a08a 100644 --- a/src/Query/IrhpPermit/ById.php +++ b/src/Query/IrhpPermit/ById.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermit; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpPermit/GetList.php b/src/Query/IrhpPermit/GetList.php index 5376ad0b..81c05124 100644 --- a/src/Query/IrhpPermit/GetList.php +++ b/src/Query/IrhpPermit/GetList.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermit; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpPermitApplication; diff --git a/src/Query/IrhpPermit/GetListByIrhpId.php b/src/Query/IrhpPermit/GetListByIrhpId.php index c2ab8046..24cce4f9 100644 --- a/src/Query/IrhpPermit/GetListByIrhpId.php +++ b/src/Query/IrhpPermit/GetListByIrhpId.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermit; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpApplication; diff --git a/src/Query/IrhpPermit/GetListByLicence.php b/src/Query/IrhpPermit/GetListByLicence.php index 02c9da76..8fb3ca31 100644 --- a/src/Query/IrhpPermit/GetListByLicence.php +++ b/src/Query/IrhpPermit/GetListByLicence.php @@ -5,6 +5,7 @@ * * @author Tonci Vidovic */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermit; use Dvsa\Olcs\Transfer\FieldType\Traits; diff --git a/src/Query/IrhpPermit/UniqueCountriesByLicence.php b/src/Query/IrhpPermit/UniqueCountriesByLicence.php index c7be44f1..a86fde64 100644 --- a/src/Query/IrhpPermit/UniqueCountriesByLicence.php +++ b/src/Query/IrhpPermit/UniqueCountriesByLicence.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermit; use Dvsa\Olcs\Transfer\FieldType\Traits; diff --git a/src/Query/IrhpPermitApplication/ById.php b/src/Query/IrhpPermitApplication/ById.php index 0c7de18d..07bfccfb 100644 --- a/src/Query/IrhpPermitApplication/ById.php +++ b/src/Query/IrhpPermitApplication/ById.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitApplication; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpPermitApplication/GetList.php b/src/Query/IrhpPermitApplication/GetList.php index 53065c2c..744be474 100644 --- a/src/Query/IrhpPermitApplication/GetList.php +++ b/src/Query/IrhpPermitApplication/GetList.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -25,7 +26,7 @@ final class GetList extends AbstractQuery implements PagedQueryInterface, Ordere use FieldTypeTraits\Licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $status = null; diff --git a/src/Query/IrhpPermitJurisdiction/GetList.php b/src/Query/IrhpPermitJurisdiction/GetList.php index 82d52969..d3d6470b 100644 --- a/src/Query/IrhpPermitJurisdiction/GetList.php +++ b/src/Query/IrhpPermitJurisdiction/GetList.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitJurisdiction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/IrhpPermitRange/ById.php b/src/Query/IrhpPermitRange/ById.php index acab2bf2..c50a4af0 100644 --- a/src/Query/IrhpPermitRange/ById.php +++ b/src/Query/IrhpPermitRange/ById.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitRange; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpPermitRange/GetList.php b/src/Query/IrhpPermitRange/GetList.php index a75b6aaf..724a1f3e 100644 --- a/src/Query/IrhpPermitRange/GetList.php +++ b/src/Query/IrhpPermitRange/GetList.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitRange; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/IrhpPermitSector/GetList.php b/src/Query/IrhpPermitSector/GetList.php index 55b3a44a..568ce601 100644 --- a/src/Query/IrhpPermitSector/GetList.php +++ b/src/Query/IrhpPermitSector/GetList.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitSector; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpPermitStock; diff --git a/src/Query/IrhpPermitStock/AvailableBilateral.php b/src/Query/IrhpPermitStock/AvailableBilateral.php index 64383d93..4bd08415 100644 --- a/src/Query/IrhpPermitStock/AvailableBilateral.php +++ b/src/Query/IrhpPermitStock/AvailableBilateral.php @@ -3,6 +3,7 @@ /** * Get list of available bilateral stocks by country */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitStock; use Dvsa\Olcs\Transfer\FieldType\Traits\Country; diff --git a/src/Query/IrhpPermitStock/AvailableCountries.php b/src/Query/IrhpPermitStock/AvailableCountries.php index 917f930a..3b8deb34 100644 --- a/src/Query/IrhpPermitStock/AvailableCountries.php +++ b/src/Query/IrhpPermitStock/AvailableCountries.php @@ -3,6 +3,7 @@ /** * Get list of all available countries */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitStock; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpPermitStock/ById.php b/src/Query/IrhpPermitStock/ById.php index 5faa8ad5..81cd7a52 100644 --- a/src/Query/IrhpPermitStock/ById.php +++ b/src/Query/IrhpPermitStock/ById.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitStock; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpPermitStock/GetList.php b/src/Query/IrhpPermitStock/GetList.php index 4bcf5caf..57966c1c 100644 --- a/src/Query/IrhpPermitStock/GetList.php +++ b/src/Query/IrhpPermitStock/GetList.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitStock; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/IrhpPermitType/ById.php b/src/Query/IrhpPermitType/ById.php index 89916d8d..57fcbbc5 100644 --- a/src/Query/IrhpPermitType/ById.php +++ b/src/Query/IrhpPermitType/ById.php @@ -3,6 +3,7 @@ /** * Get a single Permit Type by Id */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitType; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/IrhpPermitType/GetList.php b/src/Query/IrhpPermitType/GetList.php index 2b1723f1..672beb0d 100644 --- a/src/Query/IrhpPermitType/GetList.php +++ b/src/Query/IrhpPermitType/GetList.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitType; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/IrhpPermitWindow/ById.php b/src/Query/IrhpPermitWindow/ById.php index 31813a7c..a5930ff5 100644 --- a/src/Query/IrhpPermitWindow/ById.php +++ b/src/Query/IrhpPermitWindow/ById.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitWindow; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/IrhpPermitWindow/GetList.php b/src/Query/IrhpPermitWindow/GetList.php index 8f8a0092..c0861a61 100644 --- a/src/Query/IrhpPermitWindow/GetList.php +++ b/src/Query/IrhpPermitWindow/GetList.php @@ -5,6 +5,7 @@ * * @author Scott Callaway */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitWindow; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpPermitStock; diff --git a/src/Query/IrhpPermitWindow/OpenByCountry.php b/src/Query/IrhpPermitWindow/OpenByCountry.php index 3dbb3008..d470f3e9 100644 --- a/src/Query/IrhpPermitWindow/OpenByCountry.php +++ b/src/Query/IrhpPermitWindow/OpenByCountry.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitWindow; use Dvsa\Olcs\Transfer\FieldType\Traits\Countries; diff --git a/src/Query/IrhpPermitWindow/OpenByType.php b/src/Query/IrhpPermitWindow/OpenByType.php index d8bdad6c..623a76ea 100644 --- a/src/Query/IrhpPermitWindow/OpenByType.php +++ b/src/Query/IrhpPermitWindow/OpenByType.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\IrhpPermitWindow; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpPermitType; diff --git a/src/Query/Language/GetList.php b/src/Query/Language/GetList.php index d618e2bd..187c1411 100644 --- a/src/Query/Language/GetList.php +++ b/src/Query/Language/GetList.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\Language; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/Licence/Addresses.php b/src/Query/Licence/Addresses.php index 3fed98d1..cdcbf07f 100644 --- a/src/Query/Licence/Addresses.php +++ b/src/Query/Licence/Addresses.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/BusinessDetails.php b/src/Query/Licence/BusinessDetails.php index d8ba9f51..b8463325 100644 --- a/src/Query/Licence/BusinessDetails.php +++ b/src/Query/Licence/BusinessDetails.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/ConditionUndertaking.php b/src/Query/Licence/ConditionUndertaking.php index ed86107f..d554b25a 100644 --- a/src/Query/Licence/ConditionUndertaking.php +++ b/src/Query/Licence/ConditionUndertaking.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/ContinuationDetail.php b/src/Query/Licence/ContinuationDetail.php index 5eaaf4e7..ba47d01a 100644 --- a/src/Query/Licence/ContinuationDetail.php +++ b/src/Query/Licence/ContinuationDetail.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ class ContinuationDetail extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Licence/EnforcementArea.php b/src/Query/Licence/EnforcementArea.php index 00e8eca6..5111bf93 100644 --- a/src/Query/Licence/EnforcementArea.php +++ b/src/Query/Licence/EnforcementArea.php @@ -5,6 +5,7 @@ * * @author Enforcement Area */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/Exists.php b/src/Query/Licence/Exists.php index 6d15b058..9451c57b 100644 --- a/src/Query/Licence/Exists.php +++ b/src/Query/Licence/Exists.php @@ -5,6 +5,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,7 +17,7 @@ class Exists extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $licNo; diff --git a/src/Query/Licence/GetList.php b/src/Query/Licence/GetList.php index 7b7449e2..457905db 100644 --- a/src/Query/Licence/GetList.php +++ b/src/Query/Licence/GetList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,17 +19,17 @@ final class GetList extends AbstractQuery implements \Dvsa\Olcs\Transfer\Query\O use \Dvsa\Olcs\Transfer\Query\OrderedTraitOptional; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; /** * @Transfer\Optional * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\LicenceStatus"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\LicenceStatus") */ protected $excludeStatuses = []; diff --git a/src/Query/Licence/GoodsVehicles.php b/src/Query/Licence/GoodsVehicles.php index bc54126c..5e312e26 100644 --- a/src/Query/Licence/GoodsVehicles.php +++ b/src/Query/Licence/GoodsVehicles.php @@ -14,13 +14,13 @@ */ class GoodsVehicles extends AbstractGoodsVehicles implements PagedQueryInterface, OrderedQueryInterface, FiltersByVehicleIdsInterface { - use PagedTrait, OrderedTrait; + use PagedTrait; + use OrderedTrait; /** * @var array|null - * @Transfer\Validator({ - * "name":"\Dvsa\Olcs\Transfer\Validators\ValidateEach", - * "options": { + * @Transfer\Validator("\Dvsa\Olcs\Transfer\Validators\ValidateEach", + * options={ * "min": 1, * "max": 100, * "children": { @@ -28,7 +28,7 @@ class GoodsVehicles extends AbstractGoodsVehicles implements PagedQueryInterface * {"name": "\Laminas\Validator\GreaterThan", "options": {"min": 0}} * }, * } - * }) + * ) * @Transfer\Optional */ protected $vehicleIds; diff --git a/src/Query/Licence/Licence.php b/src/Query/Licence/Licence.php index af3bab27..2cbec1c6 100644 --- a/src/Query/Licence/Licence.php +++ b/src/Query/Licence/Licence.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/LicenceByNumber.php b/src/Query/Licence/LicenceByNumber.php index 7829947c..a0f8c283 100644 --- a/src/Query/Licence/LicenceByNumber.php +++ b/src/Query/Licence/LicenceByNumber.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,8 +17,8 @@ class LicenceByNumber extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":2, "max":18}) */ protected $licenceNumber; diff --git a/src/Query/Licence/LicenceDecisions.php b/src/Query/Licence/LicenceDecisions.php index c7f7858e..79fb8b07 100644 --- a/src/Query/Licence/LicenceDecisions.php +++ b/src/Query/Licence/LicenceDecisions.php @@ -5,6 +5,7 @@ * * @author Josh Curtis */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ class LicenceDecisions extends AbstractQuery { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Licence/LicenceRegisteredAddress.php b/src/Query/Licence/LicenceRegisteredAddress.php index 9c7168f0..f13dd2b0 100644 --- a/src/Query/Licence/LicenceRegisteredAddress.php +++ b/src/Query/Licence/LicenceRegisteredAddress.php @@ -3,6 +3,7 @@ /** * Licence Registered Address */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -14,8 +15,8 @@ class LicenceRegisteredAddress extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":2, "max":18}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":2, "max":18}) */ protected $licenceNumber; diff --git a/src/Query/Licence/Markers.php b/src/Query/Licence/Markers.php index 3c2e3d7d..156801f3 100644 --- a/src/Query/Licence/Markers.php +++ b/src/Query/Licence/Markers.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ class Markers extends AbstractQuery implements CacheableShortTermQueryInterface { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Licence/OperatingCentre.php b/src/Query/Licence/OperatingCentre.php index 4ff57613..af0d3fff 100644 --- a/src/Query/Licence/OperatingCentre.php +++ b/src/Query/Licence/OperatingCentre.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/OperatingCentres.php b/src/Query/Licence/OperatingCentres.php index e558d049..122d1f9f 100644 --- a/src/Query/Licence/OperatingCentres.php +++ b/src/Query/Licence/OperatingCentres.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class OperatingCentres extends AbstractQuery implements OrderedQueryInterface { - use Identity, - OrderedTrait; + use Identity; + use OrderedTrait; } diff --git a/src/Query/Licence/OtherActiveLicences.php b/src/Query/Licence/OtherActiveLicences.php index a50948a8..ab6042a0 100644 --- a/src/Query/Licence/OtherActiveLicences.php +++ b/src/Query/Licence/OtherActiveLicences.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/Overview.php b/src/Query/Licence/Overview.php index 540d6427..ed13765b 100644 --- a/src/Query/Licence/Overview.php +++ b/src/Query/Licence/Overview.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/People.php b/src/Query/Licence/People.php index 83fe1ab0..6d6d32ef 100644 --- a/src/Query/Licence/People.php +++ b/src/Query/Licence/People.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ class People extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Licence/PsvDiscs.php b/src/Query/Licence/PsvDiscs.php index 975ae8bf..f81f894c 100644 --- a/src/Query/Licence/PsvDiscs.php +++ b/src/Query/Licence/PsvDiscs.php @@ -11,10 +11,11 @@ */ class PsvDiscs extends AbstractQuery implements \Dvsa\Olcs\Transfer\Query\PagedQueryInterface { - use Identity, \Dvsa\Olcs\Transfer\Query\PagedTraitOptional; + use Identity; + use \Dvsa\Olcs\Transfer\Query\PagedTraitOptional; /** - * @Transfer\Filter({"name": "Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $includeCeased = false; diff --git a/src/Query/Licence/PsvVehicles.php b/src/Query/Licence/PsvVehicles.php index 7fdac6a6..11e4d170 100644 --- a/src/Query/Licence/PsvVehicles.php +++ b/src/Query/Licence/PsvVehicles.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -24,18 +25,18 @@ class PsvVehicles extends AbstractQuery implements PagedQueryInterface, OrderedQueryInterface { - use Identity, - PagedTrait, - OrderedTrait; + use Identity; + use PagedTrait; + use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $includeRemoved; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $vrm; diff --git a/src/Query/Licence/PsvVehiclesExport.php b/src/Query/Licence/PsvVehiclesExport.php index 0ab3a22b..ca62975a 100644 --- a/src/Query/Licence/PsvVehiclesExport.php +++ b/src/Query/Licence/PsvVehiclesExport.php @@ -16,7 +16,7 @@ class PsvVehiclesExport extends AbstractQuery implements CacheableShortTermQuery use Identity; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $includeRemoved; diff --git a/src/Query/Licence/Safety.php b/src/Query/Licence/Safety.php index 456716aa..62c07b7b 100644 --- a/src/Query/Licence/Safety.php +++ b/src/Query/Licence/Safety.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,6 +19,6 @@ */ class Safety extends AbstractQuery implements PagedQueryInterface { - use Identity, - PagedTrait; + use Identity; + use PagedTrait; } diff --git a/src/Query/Licence/TaxiPhv.php b/src/Query/Licence/TaxiPhv.php index c8ad4cdf..7eea8965 100644 --- a/src/Query/Licence/TaxiPhv.php +++ b/src/Query/Licence/TaxiPhv.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/TransportManagers.php b/src/Query/Licence/TransportManagers.php index a24f19ac..cd744e06 100644 --- a/src/Query/Licence/TransportManagers.php +++ b/src/Query/Licence/TransportManagers.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/TypeOfLicence.php b/src/Query/Licence/TypeOfLicence.php index 1f639142..aff65a72 100644 --- a/src/Query/Licence/TypeOfLicence.php +++ b/src/Query/Licence/TypeOfLicence.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Licence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Licence/Vehicles.php b/src/Query/Licence/Vehicles.php index 3a1a2876..1bacf438 100644 --- a/src/Query/Licence/Vehicles.php +++ b/src/Query/Licence/Vehicles.php @@ -21,24 +21,24 @@ class Vehicles extends AbstractQuery implements OrderedQueryInterface, FiltersByIncludeActiveInterface { - use Identity, - PagedTrait, - OrderedTrait; + use Identity; + use PagedTrait; + use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $includeRemoved; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean", "options": {"casting": false, "type": { + * @Transfer\Filter("Laminas\Filter\Boolean", options={"casting": false, "type": { * Laminas\Filter\Boolean::TYPE_BOOLEAN, * Laminas\Filter\Boolean::TYPE_INTEGER, * Laminas\Filter\Boolean::TYPE_FALSE_STRING, * Laminas\Filter\Boolean::TYPE_ZERO_STRING - * }}}) - * @Transfer\Validator({"name": "Laminas\Validator\InArray", "options": {"haystack": {true, false}, "strict": true}}) + * }}) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {true, false}, "strict": true}) * @Transfer\Escape(false) * @Transfer\ContinueIfEmpty(true) * @Transfer\Optional @@ -46,15 +46,15 @@ class Vehicles extends AbstractQuery implements protected $includeActive = true; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $vrm; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $disc; diff --git a/src/Query/LicenceOperatingCentre/LicenceOperatingCentre.php b/src/Query/LicenceOperatingCentre/LicenceOperatingCentre.php index c1610d46..bb6d4eb5 100644 --- a/src/Query/LicenceOperatingCentre/LicenceOperatingCentre.php +++ b/src/Query/LicenceOperatingCentre/LicenceOperatingCentre.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\LicenceOperatingCentre; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/LicenceStatusRule/LicenceStatusRule.php b/src/Query/LicenceStatusRule/LicenceStatusRule.php index 279c16b8..df879d1c 100644 --- a/src/Query/LicenceStatusRule/LicenceStatusRule.php +++ b/src/Query/LicenceStatusRule/LicenceStatusRule.php @@ -5,6 +5,7 @@ * * @author Joshua Curtis */ + namespace Dvsa\Olcs\Transfer\Query\LicenceStatusRule; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ class LicenceStatusRule extends AbstractQuery { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/LicenceVehicle/LicenceVehicle.php b/src/Query/LicenceVehicle/LicenceVehicle.php index 5135a432..91e60e0e 100644 --- a/src/Query/LicenceVehicle/LicenceVehicle.php +++ b/src/Query/LicenceVehicle/LicenceVehicle.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\LicenceVehicle; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/LicenceVehicle/LicenceVehiclesById.php b/src/Query/LicenceVehicle/LicenceVehiclesById.php index 0dfe50a3..047218a2 100644 --- a/src/Query/LicenceVehicle/LicenceVehiclesById.php +++ b/src/Query/LicenceVehicle/LicenceVehiclesById.php @@ -1,6 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Query\LicenceVehicle; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/LoggerOmitResponseInterface.php b/src/Query/LoggerOmitResponseInterface.php index fd1579b0..a8952e5d 100644 --- a/src/Query/LoggerOmitResponseInterface.php +++ b/src/Query/LoggerOmitResponseInterface.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query; /** @@ -14,5 +15,4 @@ */ interface LoggerOmitResponseInterface { - } diff --git a/src/Query/Lva/AbstractGoodsVehicles.php b/src/Query/Lva/AbstractGoodsVehicles.php index 98545637..c2bc4e3b 100644 --- a/src/Query/Lva/AbstractGoodsVehicles.php +++ b/src/Query/Lva/AbstractGoodsVehicles.php @@ -15,30 +15,30 @@ abstract class AbstractGoodsVehicles extends AbstractQuery /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $vrm; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $specified; /** * @var boolean - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $includeRemoved; /** * @var string - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"Y", "N"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"Y", "N"}}) * @Transfer\Optional */ protected $disc; diff --git a/src/Query/Nr/ReputeUrl.php b/src/Query/Nr/ReputeUrl.php index 9d113945..207311e3 100644 --- a/src/Query/Nr/ReputeUrl.php +++ b/src/Query/Nr/ReputeUrl.php @@ -5,6 +5,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Query\Nr; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Operator/BusinessDetails.php b/src/Query/Operator/BusinessDetails.php index 6f79ee45..116082c0 100644 --- a/src/Query/Operator/BusinessDetails.php +++ b/src/Query/Operator/BusinessDetails.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Operator; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ class BusinessDetails extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Operator/UnlicensedBusinessDetails.php b/src/Query/Operator/UnlicensedBusinessDetails.php index 84dac50e..7d97febc 100644 --- a/src/Query/Operator/UnlicensedBusinessDetails.php +++ b/src/Query/Operator/UnlicensedBusinessDetails.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Operator; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Operator/UnlicensedVehicles.php b/src/Query/Operator/UnlicensedVehicles.php index b88c13b8..1890b1da 100644 --- a/src/Query/Operator/UnlicensedVehicles.php +++ b/src/Query/Operator/UnlicensedVehicles.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Operator; use Dvsa\Olcs\Transfer\FieldType\Traits\Organisation; @@ -18,6 +19,6 @@ */ class UnlicensedVehicles extends AbstractQuery implements PagedQueryInterface { - use Organisation, - PagedTrait; + use Organisation; + use PagedTrait; } diff --git a/src/Query/Opposition/OppositionList.php b/src/Query/Opposition/OppositionList.php index d91103e9..64e49abd 100644 --- a/src/Query/Opposition/OppositionList.php +++ b/src/Query/Opposition/OppositionList.php @@ -17,25 +17,25 @@ class OppositionList extends AbstractQuery implements OrderedQueryInterface /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; diff --git a/src/Query/OrderedQueryInterface.php b/src/Query/OrderedQueryInterface.php index 49d90d00..6452eb0b 100644 --- a/src/Query/OrderedQueryInterface.php +++ b/src/Query/OrderedQueryInterface.php @@ -1,7 +1,9 @@ */ + namespace Dvsa\Olcs\Transfer\Query\Organisation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Organisation/CpidOrganisation.php b/src/Query/Organisation/CpidOrganisation.php index a920d167..9cde2061 100644 --- a/src/Query/Organisation/CpidOrganisation.php +++ b/src/Query/Organisation/CpidOrganisation.php @@ -18,19 +18,7 @@ class CpidOrganisation extends AbstractQuery implements PagedQueryInterface /** * @Transfer\Optional - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": { - * "op_cpid_central_government", - * "op_cpid_local_government", - * "op_cpid_public_corporation", - * "op_cpid_default", - * "op_cpid_default", - * "op_cpid_all", - * } - * } - * }) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"op_cpid_central_government", "op_cpid_local_government", "op_cpid_public_corporation", "op_cpid_default", "op_cpid_default", "op_cpid_all"}}) */ protected $cpid; diff --git a/src/Query/Organisation/Dashboard.php b/src/Query/Organisation/Dashboard.php index a39f262a..b402556f 100644 --- a/src/Query/Organisation/Dashboard.php +++ b/src/Query/Organisation/Dashboard.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Organisation; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ class Dashboard extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Organisation/Organisation.php b/src/Query/Organisation/Organisation.php index ae7d6d05..017a8066 100644 --- a/src/Query/Organisation/Organisation.php +++ b/src/Query/Organisation/Organisation.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Organisation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Organisation/OrganisationAvailableLicences.php b/src/Query/Organisation/OrganisationAvailableLicences.php index 3198251c..5435b699 100644 --- a/src/Query/Organisation/OrganisationAvailableLicences.php +++ b/src/Query/Organisation/OrganisationAvailableLicences.php @@ -3,6 +3,7 @@ /** * Organisation Permits Query */ + namespace Dvsa\Olcs\Transfer\Query\Organisation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Organisation/OutstandingFees.php b/src/Query/Organisation/OutstandingFees.php index 24586b83..3be2aab2 100644 --- a/src/Query/Organisation/OutstandingFees.php +++ b/src/Query/Organisation/OutstandingFees.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Organisation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -21,7 +22,7 @@ class OutstandingFees extends AbstractQuery implements CacheableShortTermQueryIn /** * @return mixed - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $hideExpired; diff --git a/src/Query/Organisation/People.php b/src/Query/Organisation/People.php index 1a3ebe81..8dc3bdab 100644 --- a/src/Query/Organisation/People.php +++ b/src/Query/Organisation/People.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\Organisation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Organisation/UnlicensedCases.php b/src/Query/Organisation/UnlicensedCases.php index f4e55e43..4eb02cd1 100644 --- a/src/Query/Organisation/UnlicensedCases.php +++ b/src/Query/Organisation/UnlicensedCases.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Organisation; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; diff --git a/src/Query/OrganisationPerson/GetSingle.php b/src/Query/OrganisationPerson/GetSingle.php index cb55f6c0..ccd27b74 100644 --- a/src/Query/OrganisationPerson/GetSingle.php +++ b/src/Query/OrganisationPerson/GetSingle.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\OrganisationPerson; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/OtherLicence/GetList.php b/src/Query/OtherLicence/GetList.php index dbd5c6c8..ed5e8712 100644 --- a/src/Query/OtherLicence/GetList.php +++ b/src/Query/OtherLicence/GetList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\OtherLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ final class GetList extends AbstractQuery { /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManager; diff --git a/src/Query/OtherLicence/OtherLicence.php b/src/Query/OtherLicence/OtherLicence.php index 8c590dfa..b2e563a2 100644 --- a/src/Query/OtherLicence/OtherLicence.php +++ b/src/Query/OtherLicence/OtherLicence.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\OtherLicence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/PagedQueryInterface.php b/src/Query/PagedQueryInterface.php index 078631cb..8b23b765 100644 --- a/src/Query/PagedQueryInterface.php +++ b/src/Query/PagedQueryInterface.php @@ -1,7 +1,9 @@ * @author Jason De Jonge */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\Query\AbstractQuery; @@ -20,10 +21,10 @@ class EcmtPermitFees extends AbstractQuery implements CacheableLongTermQueryInte { /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $productReferences; diff --git a/src/Query/Permits/EmissionsByYear.php b/src/Query/Permits/EmissionsByYear.php index 6e538560..3b530ba7 100644 --- a/src/Query/Permits/EmissionsByYear.php +++ b/src/Query/Permits/EmissionsByYear.php @@ -3,6 +3,7 @@ /** * Details emissions standards applicable to years for given type */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpPermitType; diff --git a/src/Query/Permits/MaxPermittedReachedByStockAndLicence.php b/src/Query/Permits/MaxPermittedReachedByStockAndLicence.php index 102872fe..18a66515 100644 --- a/src/Query/Permits/MaxPermittedReachedByStockAndLicence.php +++ b/src/Query/Permits/MaxPermittedReachedByStockAndLicence.php @@ -3,6 +3,7 @@ /** * Establish whether the max permitted number of permits has been reached for a stock and licence */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpPermitStock; @@ -15,5 +16,6 @@ */ class MaxPermittedReachedByStockAndLicence extends AbstractQuery { - use IrhpPermitStock, Licence; + use IrhpPermitStock; + use Licence; } diff --git a/src/Query/Permits/MaxPermittedReachedByTypeAndOrganisation.php b/src/Query/Permits/MaxPermittedReachedByTypeAndOrganisation.php index 9bad1ced..af62f4ec 100644 --- a/src/Query/Permits/MaxPermittedReachedByTypeAndOrganisation.php +++ b/src/Query/Permits/MaxPermittedReachedByTypeAndOrganisation.php @@ -3,6 +3,7 @@ /** * Establish whether the max permitted number of permits has been reached for a permit type and organisation */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpPermitType; @@ -15,5 +16,6 @@ */ class MaxPermittedReachedByTypeAndOrganisation extends AbstractQuery { - use IrhpPermitType, Organisation; + use IrhpPermitType; + use Organisation; } diff --git a/src/Query/Permits/OpenWindows.php b/src/Query/Permits/OpenWindows.php index 8c629e2b..92d71225 100644 --- a/src/Query/Permits/OpenWindows.php +++ b/src/Query/Permits/OpenWindows.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\Query\AbstractQuery; @@ -17,8 +18,8 @@ class OpenWindows extends AbstractQuery { /** * @var int - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $permitType; diff --git a/src/Query/Permits/PostScoringReport.php b/src/Query/Permits/PostScoringReport.php index f43bbc0e..f163bbcd 100644 --- a/src/Query/Permits/PostScoringReport.php +++ b/src/Query/Permits/PostScoringReport.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/Permits/ReadyToPrint.php b/src/Query/Permits/ReadyToPrint.php index 6e5410d3..cb7795b8 100644 --- a/src/Query/Permits/ReadyToPrint.php +++ b/src/Query/Permits/ReadyToPrint.php @@ -3,6 +3,7 @@ /** * Get a list of permits ready to print */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\FieldType\Traits\IrhpPermitRangeTypeOptional; diff --git a/src/Query/Permits/ReadyToPrintConfirm.php b/src/Query/Permits/ReadyToPrintConfirm.php index 3927f8bc..e3fdba2e 100644 --- a/src/Query/Permits/ReadyToPrintConfirm.php +++ b/src/Query/Permits/ReadyToPrintConfirm.php @@ -3,6 +3,7 @@ /** * Get a list of permits ready to print for confirmation */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\FieldType\Traits\Ids; diff --git a/src/Query/Permits/ReadyToPrintCountry.php b/src/Query/Permits/ReadyToPrintCountry.php index 4511080e..8afa8a59 100644 --- a/src/Query/Permits/ReadyToPrintCountry.php +++ b/src/Query/Permits/ReadyToPrintCountry.php @@ -3,6 +3,7 @@ /** * Get a list of permit countries ready to print */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; diff --git a/src/Query/Permits/ReadyToPrintRangeType.php b/src/Query/Permits/ReadyToPrintRangeType.php index 4c584be9..325a9c87 100644 --- a/src/Query/Permits/ReadyToPrintRangeType.php +++ b/src/Query/Permits/ReadyToPrintRangeType.php @@ -3,6 +3,7 @@ /** * Get a list of permit range types ready to print */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; diff --git a/src/Query/Permits/ReadyToPrintStock.php b/src/Query/Permits/ReadyToPrintStock.php index 6386d31b..e9f7cf1e 100644 --- a/src/Query/Permits/ReadyToPrintStock.php +++ b/src/Query/Permits/ReadyToPrintStock.php @@ -3,6 +3,7 @@ /** * Get a list of permit stocks ready to print */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; diff --git a/src/Query/Permits/ReadyToPrintType.php b/src/Query/Permits/ReadyToPrintType.php index cd38add6..8522fd97 100644 --- a/src/Query/Permits/ReadyToPrintType.php +++ b/src/Query/Permits/ReadyToPrintType.php @@ -3,6 +3,7 @@ /** * Get a list of permit types ready to print */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/Permits/Sectors.php b/src/Query/Permits/Sectors.php index 1dcdcf78..12fee27f 100644 --- a/src/Query/Permits/Sectors.php +++ b/src/Query/Permits/Sectors.php @@ -5,6 +5,7 @@ * * @author Tonci Vidovic */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\Query\CacheableLongTermQueryInterface; diff --git a/src/Query/Permits/StockAlignmentReport.php b/src/Query/Permits/StockAlignmentReport.php index 67ac9179..6d261eeb 100644 --- a/src/Query/Permits/StockAlignmentReport.php +++ b/src/Query/Permits/StockAlignmentReport.php @@ -3,6 +3,7 @@ /** * Stock alignment report */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/Permits/StockOperationsPermitted.php b/src/Query/Permits/StockOperationsPermitted.php index 5758762b..58467f24 100644 --- a/src/Query/Permits/StockOperationsPermitted.php +++ b/src/Query/Permits/StockOperationsPermitted.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\Permits; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/PreviousConviction/GetList.php b/src/Query/PreviousConviction/GetList.php index a52315d7..c1e7d741 100644 --- a/src/Query/PreviousConviction/GetList.php +++ b/src/Query/PreviousConviction/GetList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\PreviousConviction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,9 +18,9 @@ final class GetList extends AbstractQuery { /** * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManager; diff --git a/src/Query/PreviousConviction/PreviousConviction.php b/src/Query/PreviousConviction/PreviousConviction.php index c3da34a1..bb4d8f82 100644 --- a/src/Query/PreviousConviction/PreviousConviction.php +++ b/src/Query/PreviousConviction/PreviousConviction.php @@ -5,6 +5,7 @@ * * @author Nick Payne */ + namespace Dvsa\Olcs\Transfer\Query\PreviousConviction; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Printer/Printer.php b/src/Query/Printer/Printer.php index 2417b99a..de85e2dc 100644 --- a/src/Query/Printer/Printer.php +++ b/src/Query/Printer/Printer.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Printer; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Printer/PrinterList.php b/src/Query/Printer/PrinterList.php index 3f841f53..239f0c0f 100644 --- a/src/Query/Printer/PrinterList.php +++ b/src/Query/Printer/PrinterList.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Printer; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/Processing/History.php b/src/Query/Processing/History.php index 01650e16..af4cfe4b 100644 --- a/src/Query/Processing/History.php +++ b/src/Query/Processing/History.php @@ -23,54 +23,54 @@ class History extends AbstractQuery implements PagedQueryInterface, OrderedQuery /** * @var int * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; /** * @var int * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licence; /** * @var int * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $organisation; /** * @var int * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManager; /** * @var int * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $user; /** * @var int * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $application; diff --git a/src/Query/Processing/NoteList.php b/src/Query/Processing/NoteList.php index d18f9e4d..9703b5b4 100644 --- a/src/Query/Processing/NoteList.php +++ b/src/Query/Processing/NoteList.php @@ -8,7 +8,6 @@ use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Query\PagedTrait; use Dvsa\Olcs\Transfer\Query\OrderedTrait; - use Dvsa\Olcs\Transfer\FieldType; use Dvsa\Olcs\Transfer\FieldType\Traits as FieldTypeTraits; diff --git a/src/Query/Publication/PublishedList.php b/src/Query/Publication/PublishedList.php index 3237a238..6e3e9d92 100644 --- a/src/Query/Publication/PublishedList.php +++ b/src/Query/Publication/PublishedList.php @@ -21,23 +21,23 @@ class PublishedList extends AbstractQuery implements PagedQueryInterface, Ordere /** * @var string * - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional() - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"A&D", "N&P"}}}) + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"A&D", "N&P"}}) */ protected $pubType; /** * @var DateTime|string in format "D-m-y H:i:s" * - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d H:i:s"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d H:i:s"}) */ protected $pubDateFrom; /** * @var DateTime|string in format "D-m-y H:i:s" * - * @Transfer\Validator({"name":"Laminas\Validator\Date", "options": {"format": "Y-m-d H:i:s"}}) + * @Transfer\Validator("Laminas\Validator\Date", options={"format": "Y-m-d H:i:s"}) */ protected $pubDateTo; @@ -45,11 +45,8 @@ class PublishedList extends AbstractQuery implements PagedQueryInterface, Ordere * @var int|string * * @Transfer\Optional() - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": {"haystack": {"B","C","D","F","G","H","K","M","N"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"B","C","D","F","G","H","K","M","N"}}) */ protected $trafficArea; diff --git a/src/Query/QueryInterface.php b/src/Query/QueryInterface.php index 8383f1f3..6312f127 100644 --- a/src/Query/QueryInterface.php +++ b/src/Query/QueryInterface.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query; use Laminas\Stdlib\ArraySerializableInterface; diff --git a/src/Query/Reason/ReasonList.php b/src/Query/Reason/ReasonList.php index 5d409073..f2ebe416 100644 --- a/src/Query/Reason/ReasonList.php +++ b/src/Query/Reason/ReasonList.php @@ -20,8 +20,8 @@ class ReasonList extends AbstractQuery implements OrderedQueryInterface /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") */ protected $isProposeToRevoke; diff --git a/src/Query/RefData/RefDataList.php b/src/Query/RefData/RefDataList.php index b69ea76d..f7379283 100644 --- a/src/Query/RefData/RefDataList.php +++ b/src/Query/RefData/RefDataList.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\RefData; use Dvsa\Olcs\Transfer\Query\PublicQueryCacheInterface; @@ -18,15 +19,15 @@ class RefDataList extends AbstractQuery implements CacheableLongTermQueryInterface, PublicQueryCacheInterface { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringToLower"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToLower") */ protected $refDataCategory; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringToLower"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray","options":{"haystack": {"en", "cy"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToLower") + * @Transfer\Validator("Laminas\Validator\InArray",options={"haystack": {"en", "cy"}}) */ protected $language; diff --git a/src/Query/Replacement/ById.php b/src/Query/Replacement/ById.php index aef5d95f..e0ed4036 100644 --- a/src/Query/Replacement/ById.php +++ b/src/Query/Replacement/ById.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\Replacement; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Replacement/GetList.php b/src/Query/Replacement/GetList.php index 03e75f35..c4b833b7 100644 --- a/src/Query/Replacement/GetList.php +++ b/src/Query/Replacement/GetList.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\Replacement; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/Search/Licence.php b/src/Query/Search/Licence.php index daf67888..b67e0846 100644 --- a/src/Query/Search/Licence.php +++ b/src/Query/Search/Licence.php @@ -5,6 +5,7 @@ * * @author Shaun Lizzio */ + namespace Dvsa\Olcs\Transfer\Query\Search; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Si/SiCategoryTypeListData.php b/src/Query/Si/SiCategoryTypeListData.php index e38e350d..2c948aa6 100644 --- a/src/Query/Si/SiCategoryTypeListData.php +++ b/src/Query/Si/SiCategoryTypeListData.php @@ -3,6 +3,7 @@ /** * Get a list of all Si Category Type for select */ + namespace Dvsa\Olcs\Transfer\Query\Si; use Dvsa\Olcs\Transfer\Query\AbstractListData; diff --git a/src/Query/Si/SiPenaltyTypeListData.php b/src/Query/Si/SiPenaltyTypeListData.php index 97a40c57..6f3b7eb5 100644 --- a/src/Query/Si/SiPenaltyTypeListData.php +++ b/src/Query/Si/SiPenaltyTypeListData.php @@ -3,6 +3,7 @@ /** * Get a list of all Si Penalty Type for select */ + namespace Dvsa\Olcs\Transfer\Query\Si; use Dvsa\Olcs\Transfer\Query\AbstractListData; diff --git a/src/Query/SubCategory/GetList.php b/src/Query/SubCategory/GetList.php index aeabe899..9b372c54 100644 --- a/src/Query/SubCategory/GetList.php +++ b/src/Query/SubCategory/GetList.php @@ -19,21 +19,21 @@ class GetList extends AbstractQuery implements /** * @var string - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isTaskCategory; /** * @var string - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isDocCategory; /** * @var string - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isScanCategory; @@ -41,14 +41,14 @@ class GetList extends AbstractQuery implements /** * @var string * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ protected $category; /** * @var string - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\YesNo"}) + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\YesNo") * @Transfer\Optional */ protected $isOnlyWithItems; diff --git a/src/Query/SubCategoryDescription/GetList.php b/src/Query/SubCategoryDescription/GetList.php index f6d8dced..48d86b83 100644 --- a/src/Query/SubCategoryDescription/GetList.php +++ b/src/Query/SubCategoryDescription/GetList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\SubCategoryDescription; use Dvsa\Olcs\Transfer\Query\PublicQueryCacheInterface; @@ -24,8 +25,8 @@ class GetList extends AbstractQuery implements /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") */ protected $subCategory; diff --git a/src/Query/Submission/SubmissionAction.php b/src/Query/Submission/SubmissionAction.php index f48ccbc7..203bfa35 100644 --- a/src/Query/Submission/SubmissionAction.php +++ b/src/Query/Submission/SubmissionAction.php @@ -13,9 +13,9 @@ class SubmissionAction extends AbstractQuery { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; diff --git a/src/Query/Submission/SubmissionList.php b/src/Query/Submission/SubmissionList.php index 22b85727..335eb0c5 100644 --- a/src/Query/Submission/SubmissionList.php +++ b/src/Query/Submission/SubmissionList.php @@ -20,9 +20,9 @@ class SubmissionList extends AbstractQuery implements PagedQueryInterface, Order /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $case; diff --git a/src/Query/Surrender/ByLicence.php b/src/Query/Surrender/ByLicence.php index 87c76762..9b47780d 100644 --- a/src/Query/Surrender/ByLicence.php +++ b/src/Query/Surrender/ByLicence.php @@ -1,6 +1,5 @@ */ + namespace Dvsa\Olcs\Transfer\Query\System; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -19,16 +20,16 @@ class SlaTargetDate extends AbstractQuery implements CacheableShortTermQueryInte { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $entityId; /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"document"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"document"}}) */ protected $entityType; diff --git a/src/Query/SystemParameter/SystemParameter.php b/src/Query/SystemParameter/SystemParameter.php index 66e8c2f0..ac7d07f3 100644 --- a/src/Query/SystemParameter/SystemParameter.php +++ b/src/Query/SystemParameter/SystemParameter.php @@ -11,8 +11,8 @@ class SystemParameter extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min":1, "max":32}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1, "max":32}) */ protected $id; diff --git a/src/Query/Task/Task.php b/src/Query/Task/Task.php index 2ddae32c..6c803cfc 100644 --- a/src/Query/Task/Task.php +++ b/src/Query/Task/Task.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Task; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Task/TaskDetails.php b/src/Query/Task/TaskDetails.php index 82a140a0..2b76a7a2 100644 --- a/src/Query/Task/TaskDetails.php +++ b/src/Query/Task/TaskDetails.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Task; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Task/TaskList.php b/src/Query/Task/TaskList.php index 8bf5a9b6..7511371b 100644 --- a/src/Query/Task/TaskList.php +++ b/src/Query/Task/TaskList.php @@ -20,80 +20,72 @@ */ class TaskList extends AbstractQuery implements PagedQueryInterface, OrderedQueryInterface { - use PagedTrait, - OrderedTrait, - LicenceOptional, - TransportManagerOptional, - ApplicationOptional, - BusRegOptional, - CasesOptional, - OrganisationOptional; - - /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + use PagedTrait; + use OrderedTrait; + use LicenceOptional; + use TransportManagerOptional; + use ApplicationOptional; + use BusRegOptional; + use CasesOptional; + use OrganisationOptional; + + /** + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $assignedToUser; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $assignedToTeam; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $category; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $taskSubCategory; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringToLower"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options":{"haystack": {"tdt_today", "tdt_all"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToLower") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tdt_today", "tdt_all"}}) * @Transfer\Optional */ protected $date; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Filter({"name":"Laminas\Filter\StringToLower"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options":{"haystack": {"tst_open", "tst_closed", "tst_all"}} - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Filter("Laminas\Filter\StringToLower") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tst_open", "tst_closed", "tst_all"}}) * @Transfer\Optional */ protected $status; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({ - * "name":"Laminas\Validator\InArray", - * "options": { - * "haystack": {"tsw_all", "tsw_self_only"} - * } - * }) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"tsw_all", "tsw_self_only"}}) */ protected $showTasks = null; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $urgent; diff --git a/src/Query/TaskAllocationRule/GetList.php b/src/Query/TaskAllocationRule/GetList.php index c1bee253..f8ff1c0d 100644 --- a/src/Query/TaskAllocationRule/GetList.php +++ b/src/Query/TaskAllocationRule/GetList.php @@ -14,6 +14,6 @@ */ class GetList extends AbstractQuery implements PagedQueryInterface, OrderedQueryInterface { - use PagedTrait, - OrderedTraitOptional; + use PagedTrait; + use OrderedTraitOptional; } diff --git a/src/Query/TaskAlphaSplit/GetList.php b/src/Query/TaskAlphaSplit/GetList.php index bdf632d9..6a3b5f56 100644 --- a/src/Query/TaskAlphaSplit/GetList.php +++ b/src/Query/TaskAlphaSplit/GetList.php @@ -12,9 +12,9 @@ class GetList extends AbstractQuery { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $taskAllocationRule; diff --git a/src/Query/Team/Team.php b/src/Query/Team/Team.php index fd2a38b8..492db2e0 100644 --- a/src/Query/Team/Team.php +++ b/src/Query/Team/Team.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Team; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Team/TeamList.php b/src/Query/Team/TeamList.php index 3d65cefc..47f45d45 100644 --- a/src/Query/Team/TeamList.php +++ b/src/Query/Team/TeamList.php @@ -5,6 +5,7 @@ * For internal users with limited permissions, the backend will proxy * to Dvsa\Olcs\Api\Domain\Query\Team\TeamListByTrafficArea */ + namespace Dvsa\Olcs\Transfer\Query\Team; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/Team/TeamListData.php b/src/Query/Team/TeamListData.php index 15b89a45..966d6f80 100644 --- a/src/Query/Team/TeamListData.php +++ b/src/Query/Team/TeamListData.php @@ -5,6 +5,7 @@ * For internal users with limited permissions, the backend will proxy * to Dvsa\Olcs\Api\Domain\Query\Team\TeamListByTrafficArea */ + namespace Dvsa\Olcs\Transfer\Query\Team; use Dvsa\Olcs\Transfer\Query\AbstractListData; diff --git a/src/Query/TeamPrinter/TeamPrinter.php b/src/Query/TeamPrinter/TeamPrinter.php index a52c2d8a..018a4656 100644 --- a/src/Query/TeamPrinter/TeamPrinter.php +++ b/src/Query/TeamPrinter/TeamPrinter.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\TeamPrinter; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/TeamPrinter/TeamPrinterExceptionsList.php b/src/Query/TeamPrinter/TeamPrinterExceptionsList.php index b618f39d..7b94043a 100644 --- a/src/Query/TeamPrinter/TeamPrinterExceptionsList.php +++ b/src/Query/TeamPrinter/TeamPrinterExceptionsList.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\TeamPrinter; use Dvsa\Olcs\Transfer\Query\AbstractQuery; @@ -16,9 +17,9 @@ final class TeamPrinterExceptionsList extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $team; diff --git a/src/Query/Template/AvailableTemplates.php b/src/Query/Template/AvailableTemplates.php index caf1cfd1..7ecc35c7 100644 --- a/src/Query/Template/AvailableTemplates.php +++ b/src/Query/Template/AvailableTemplates.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\Template; use Dvsa\Olcs\Transfer\FieldType\Traits\EmailTemplateCategory; diff --git a/src/Query/Template/PreviewTemplateSource.php b/src/Query/Template/PreviewTemplateSource.php index f57f4167..ac29a80a 100644 --- a/src/Query/Template/PreviewTemplateSource.php +++ b/src/Query/Template/PreviewTemplateSource.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\Template; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -17,5 +18,6 @@ */ class PreviewTemplateSource extends AbstractQuery { - use Identity, TemplateSource; + use Identity; + use TemplateSource; } diff --git a/src/Query/Template/TemplateCategories.php b/src/Query/Template/TemplateCategories.php index eb3353a4..78571a83 100644 --- a/src/Query/Template/TemplateCategories.php +++ b/src/Query/Template/TemplateCategories.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\Template; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/Template/TemplateSource.php b/src/Query/Template/TemplateSource.php index 1dcee665..1e495ffd 100644 --- a/src/Query/Template/TemplateSource.php +++ b/src/Query/Template/TemplateSource.php @@ -5,6 +5,7 @@ * * @author Jonathan Thomas */ + namespace Dvsa\Olcs\Transfer\Query\Template; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Tm/Documents.php b/src/Query/Tm/Documents.php index 645988c2..3f0fa15b 100644 --- a/src/Query/Tm/Documents.php +++ b/src/Query/Tm/Documents.php @@ -8,7 +8,7 @@ /** * Class Documents - * + * * @Transfer\RouteName("backend/transport-manager/single/documents") */ class Documents extends AbstractQuery diff --git a/src/Query/Tm/HistoricTm.php b/src/Query/Tm/HistoricTm.php index d47330cc..e0e8ad65 100644 --- a/src/Query/Tm/HistoricTm.php +++ b/src/Query/Tm/HistoricTm.php @@ -5,6 +5,7 @@ * * @author Shaun Lizzio */ + namespace Dvsa\Olcs\Transfer\Query\Tm; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -18,9 +19,9 @@ class HistoricTm extends AbstractQuery implements CacheableShortTermQueryInterfa { /** * @var int - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $historicId; diff --git a/src/Query/Tm/TransportManager.php b/src/Query/Tm/TransportManager.php index a377667d..25df1604 100644 --- a/src/Query/Tm/TransportManager.php +++ b/src/Query/Tm/TransportManager.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\Tm; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/TmEmployment/GetList.php b/src/Query/TmEmployment/GetList.php index 988b5204..aeace8c8 100644 --- a/src/Query/TmEmployment/GetList.php +++ b/src/Query/TmEmployment/GetList.php @@ -13,9 +13,9 @@ class GetList extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManager; diff --git a/src/Query/TmQualification/TmQualification.php b/src/Query/TmQualification/TmQualification.php index 44bc3367..fcaf50fa 100644 --- a/src/Query/TmQualification/TmQualification.php +++ b/src/Query/TmQualification/TmQualification.php @@ -2,11 +2,6 @@ namespace Dvsa\Olcs\Transfer\Query\TmQualification; -/** - * TmQualification - * - * @author Alex Peshkov - */ use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; use Dvsa\Olcs\Transfer\Query\AbstractQuery; diff --git a/src/Query/TmQualification/TmQualificationsList.php b/src/Query/TmQualification/TmQualificationsList.php index c9352a07..1b1513ed 100644 --- a/src/Query/TmQualification/TmQualificationsList.php +++ b/src/Query/TmQualification/TmQualificationsList.php @@ -16,13 +16,13 @@ */ class TmQualificationsList extends AbstractQuery implements PagedQueryInterface, OrderedQueryInterface { - use PagedTrait, - OrderedTrait; + use PagedTrait; + use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManager; diff --git a/src/Query/TmResponsibilities/GetDocumentsForResponsibilities.php b/src/Query/TmResponsibilities/GetDocumentsForResponsibilities.php index f403c036..b37d84eb 100644 --- a/src/Query/TmResponsibilities/GetDocumentsForResponsibilities.php +++ b/src/Query/TmResponsibilities/GetDocumentsForResponsibilities.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\TmResponsibilities; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,22 +17,22 @@ class GetDocumentsForResponsibilities extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManager; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $licOrAppId; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\InArray", "options": {"haystack": {"application", "licence"}}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\InArray", options={"haystack": {"application", "licence"}}) * @Transfer\Optional */ protected $type; diff --git a/src/Query/TmResponsibilities/TmResponsibilitiesList.php b/src/Query/TmResponsibilities/TmResponsibilitiesList.php index 4775e061..e8f3c9f0 100644 --- a/src/Query/TmResponsibilities/TmResponsibilitiesList.php +++ b/src/Query/TmResponsibilities/TmResponsibilitiesList.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\TmResponsibilities; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ final class TmResponsibilitiesList extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $transportManager; diff --git a/src/Query/TrafficArea/Get.php b/src/Query/TrafficArea/Get.php index 101d97b6..c1973670 100644 --- a/src/Query/TrafficArea/Get.php +++ b/src/Query/TrafficArea/Get.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\TrafficArea; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -19,7 +20,7 @@ final class Get extends AbstractQuery implements CacheableLongTermQueryInterface { /** * @var string - * Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\TrafficArea"}) + * Transfer\Validator("Dvsa\Olcs\Transfer\Validators\TrafficArea") */ protected $id; diff --git a/src/Query/TrafficArea/TrafficAreaList.php b/src/Query/TrafficArea/TrafficAreaList.php index 22d59d89..9297779d 100644 --- a/src/Query/TrafficArea/TrafficAreaList.php +++ b/src/Query/TrafficArea/TrafficAreaList.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\TrafficArea; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/Transaction/Transaction.php b/src/Query/Transaction/Transaction.php index 3ee6ab37..54af34ee 100644 --- a/src/Query/Transaction/Transaction.php +++ b/src/Query/Transaction/Transaction.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Transaction; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Transaction/TransactionByReference.php b/src/Query/Transaction/TransactionByReference.php index 23016f0c..34fa36bb 100644 --- a/src/Query/Transaction/TransactionByReference.php +++ b/src/Query/Transaction/TransactionByReference.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Query\Transaction; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,8 +17,8 @@ class TransactionByReference extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options":{"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min":1}) */ protected $reference; diff --git a/src/Query/TranslationKey/ById.php b/src/Query/TranslationKey/ById.php index 840acaa9..23897064 100644 --- a/src/Query/TranslationKey/ById.php +++ b/src/Query/TranslationKey/ById.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\TranslationKey; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/TranslationKey/GetList.php b/src/Query/TranslationKey/GetList.php index a18f15e9..80470529 100644 --- a/src/Query/TranslationKey/GetList.php +++ b/src/Query/TranslationKey/GetList.php @@ -5,6 +5,7 @@ * * @author Andy Newton */ + namespace Dvsa\Olcs\Transfer\Query\TranslationKey; use Dvsa\Olcs\Transfer\FieldType\Traits\TranslationSearchOptional; diff --git a/src/Query/TransportManagerApplication/GetDetails.php b/src/Query/TransportManagerApplication/GetDetails.php index 82d104b2..9271f733 100644 --- a/src/Query/TransportManagerApplication/GetDetails.php +++ b/src/Query/TransportManagerApplication/GetDetails.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\TransportManagerApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/TransportManagerApplication/GetForResponsibilities.php b/src/Query/TransportManagerApplication/GetForResponsibilities.php index 6469b541..e9623ce6 100644 --- a/src/Query/TransportManagerApplication/GetForResponsibilities.php +++ b/src/Query/TransportManagerApplication/GetForResponsibilities.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\TransportManagerApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/TransportManagerApplication/GetList.php b/src/Query/TransportManagerApplication/GetList.php index 872ae03e..566d79f9 100644 --- a/src/Query/TransportManagerApplication/GetList.php +++ b/src/Query/TransportManagerApplication/GetList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\TransportManagerApplication; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,25 +17,25 @@ class GetList extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $user; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $application; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $transportManager; @@ -42,14 +43,14 @@ class GetList extends AbstractQuery /** * @Transfer\Optional * @Transfer\ArrayInput - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Dvsa\Olcs\Transfer\Validators\ApplicationStatus"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Dvsa\Olcs\Transfer\Validators\ApplicationStatus") */ protected $appStatuses = []; /** * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") */ protected $filterByOrgUser; diff --git a/src/Query/TransportManagerApplication/Review.php b/src/Query/TransportManagerApplication/Review.php index 5e1e7b6c..25a3a289 100644 --- a/src/Query/TransportManagerApplication/Review.php +++ b/src/Query/TransportManagerApplication/Review.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\TransportManagerApplication; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/TransportManagerLicence/GetForResponsibilities.php b/src/Query/TransportManagerLicence/GetForResponsibilities.php index ca73f686..8c49e5ea 100644 --- a/src/Query/TransportManagerLicence/GetForResponsibilities.php +++ b/src/Query/TransportManagerLicence/GetForResponsibilities.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\TransportManagerLicence; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/TransportManagerLicence/GetList.php b/src/Query/TransportManagerLicence/GetList.php index fc684513..e88a1535 100644 --- a/src/Query/TransportManagerLicence/GetList.php +++ b/src/Query/TransportManagerLicence/GetList.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\TransportManagerLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,17 +17,17 @@ class GetList extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $licence; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) * @Transfer\Optional */ protected $transportManager; diff --git a/src/Query/TransportManagerLicence/GetListByVariation.php b/src/Query/TransportManagerLicence/GetListByVariation.php index b5a237fb..8fe54c59 100644 --- a/src/Query/TransportManagerLicence/GetListByVariation.php +++ b/src/Query/TransportManagerLicence/GetListByVariation.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Query\TransportManagerLicence; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,9 +17,9 @@ class GetListByVariation extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $variation; diff --git a/src/Query/User/Pid.php b/src/Query/User/Pid.php index 83f1a5b0..5f221ea8 100644 --- a/src/Query/User/Pid.php +++ b/src/Query/User/Pid.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\User; use Dvsa\Olcs\Transfer\Query\AbstractQuery; @@ -16,8 +17,8 @@ class Pid extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) - * @Transfer\Validator({"name":"Laminas\Validator\StringLength", "options": {"min": 1}}) + * @Transfer\Filter("Laminas\Filter\StringTrim") + * @Transfer\Validator("Laminas\Validator\StringLength", options={"min": 1}) */ protected $id; diff --git a/src/Query/User/User.php b/src/Query/User/User.php index f3ea7256..d5a60f84 100644 --- a/src/Query/User/User.php +++ b/src/Query/User/User.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Query\User; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/User/UserListInternal.php b/src/Query/User/UserListInternal.php index c77e04b8..81a6f5d1 100644 --- a/src/Query/User/UserListInternal.php +++ b/src/Query/User/UserListInternal.php @@ -7,6 +7,7 @@ * 1. No team was specified in the team parameter * 2. The user has limited data access (GB/NI - not to be confused with read only access) */ + namespace Dvsa\Olcs\Transfer\Query\User; use Dvsa\Olcs\Transfer\FieldType\Traits\ExcludeLimitedReadOnlyOptional; diff --git a/src/Query/User/UserListSelfserve.php b/src/Query/User/UserListSelfserve.php index 5c01e559..1f0daae4 100644 --- a/src/Query/User/UserListSelfserve.php +++ b/src/Query/User/UserListSelfserve.php @@ -3,6 +3,7 @@ /** * User List Selfserve */ + namespace Dvsa\Olcs\Transfer\Query\User; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; diff --git a/src/Query/User/UserSelfserve.php b/src/Query/User/UserSelfserve.php index 3be018b6..33ca9c1b 100644 --- a/src/Query/User/UserSelfserve.php +++ b/src/Query/User/UserSelfserve.php @@ -3,6 +3,7 @@ /** * User Selfserve */ + namespace Dvsa\Olcs\Transfer\Query\User; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Variation/GoodsVehicles.php b/src/Query/Variation/GoodsVehicles.php index 9f7329d8..a35f9589 100644 --- a/src/Query/Variation/GoodsVehicles.php +++ b/src/Query/Variation/GoodsVehicles.php @@ -16,6 +16,6 @@ */ class GoodsVehicles extends AbstractGoodsVehicles implements PagedQueryInterface, OrderedQueryInterface { - use PagedTrait, - OrderedTrait; + use PagedTrait; + use OrderedTrait; } diff --git a/src/Query/Variation/PsvVehicles.php b/src/Query/Variation/PsvVehicles.php index 9f69d6ec..f547a1a0 100644 --- a/src/Query/Variation/PsvVehicles.php +++ b/src/Query/Variation/PsvVehicles.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Variation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -24,18 +25,18 @@ class PsvVehicles extends AbstractQuery implements PagedQueryInterface, OrderedQueryInterface { - use Identity, - PagedTrait, - OrderedTrait; + use Identity; + use PagedTrait; + use OrderedTrait; /** - * @Transfer\Filter({"name":"Laminas\Filter\Boolean"}) + * @Transfer\Filter("Laminas\Filter\Boolean") * @Transfer\Optional */ protected $includeRemoved; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") * @Transfer\Optional */ protected $vrm; diff --git a/src/Query/Variation/TypeOfLicence.php b/src/Query/Variation/TypeOfLicence.php index 945d167c..3d8bdfaf 100644 --- a/src/Query/Variation/TypeOfLicence.php +++ b/src/Query/Variation/TypeOfLicence.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Variation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/Variation/Variation.php b/src/Query/Variation/Variation.php index 920c185c..e529901d 100644 --- a/src/Query/Variation/Variation.php +++ b/src/Query/Variation/Variation.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Variation; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; diff --git a/src/Query/VariationOperatingCentre/VariationOperatingCentre.php b/src/Query/VariationOperatingCentre/VariationOperatingCentre.php index 2721e68c..d00b4aa8 100644 --- a/src/Query/VariationOperatingCentre/VariationOperatingCentre.php +++ b/src/Query/VariationOperatingCentre/VariationOperatingCentre.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\VariationOperatingCentre; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -16,7 +17,7 @@ class VariationOperatingCentre extends AbstractQuery { /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $id; diff --git a/src/Query/Workshop/Workshop.php b/src/Query/Workshop/Workshop.php index 5dc863b3..2ccbc080 100644 --- a/src/Query/Workshop/Workshop.php +++ b/src/Query/Workshop/Workshop.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Query\Workshop; use Dvsa\Olcs\Transfer\FieldType\Traits\Identity; @@ -18,7 +19,7 @@ */ class Workshop extends AbstractQuery { - use Identity, - LicenceOptional, - ApplicationOptional; + use Identity; + use LicenceOptional; + use ApplicationOptional; } diff --git a/src/Result/Auth/ChangeExpiredPasswordResult.php b/src/Result/Auth/ChangeExpiredPasswordResult.php index 5a4a3f85..fa798932 100644 --- a/src/Result/Auth/ChangeExpiredPasswordResult.php +++ b/src/Result/Auth/ChangeExpiredPasswordResult.php @@ -1,4 +1,5 @@ \Laminas\Mvc\Router\Http\Method::class, + 'type' => \Laminas\Router\Http\Method::class, 'options' => [ 'verb' => $method, 'defaults' => [ diff --git a/src/Router/LaminasRouterHttpQueryV2.php b/src/Router/LaminasRouterHttpQueryV2.php new file mode 100644 index 00000000..cdd4b210 --- /dev/null +++ b/src/Router/LaminasRouterHttpQueryV2.php @@ -0,0 +1,145 @@ +defaults = $defaults; + } + + /** + * factory(): defined by RouteInterface interface. + * + * @see \Laminas\Router\RouteInterface::factory() + * @param array|Traversable $options + * @return LaminasRouterHttpQueryV2 + * @throws Exception\InvalidArgumentException + */ + public static function factory($options = []) + { + if ($options instanceof Traversable) { + $options = ArrayUtils::iteratorToArray($options); + } elseif (!is_array($options)) { + throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable set of options'); + } + + if (!isset($options['defaults'])) { + $options['defaults'] = []; + } + + return new self($options['defaults']); + } + + /** + * match(): defined by RouteInterface interface. + * + * @see \Laminas\Router\RouteInterface::match() + * @param Request $request + * @return RouteMatch + */ + public function match(Request $request) + { + // We don't merge the query parameters into the route match here because + // of possible security problems. Use the Query object instead which is + // included in the Request object. + return new RouteMatch($this->defaults); + } + + /** + * Recursively urldecodes keys and values from an array + * + * @param array $array + * @return array + */ + protected function recursiveUrldecode(array $array) + { + $matches = []; + + foreach ($array as $key => $value) { + if (is_array($value)) { + $matches[urldecode($key)] = $this->recursiveUrldecode($value); + } else { + $matches[urldecode($key)] = urldecode($value); + } + } + + return $matches; + } + + /** + * assemble(): Defined by RouteInterface interface. + * + * @see \Laminas\Router\RouteInterface::assemble() + * @param array $params + * @param array $options + * @return mixed + */ + public function assemble(array $params = [], array $options = []) + { + $mergedParams = array_merge($this->defaults, $params); + $this->assembledParams = []; + + if (isset($options['uri']) && count($mergedParams)) { + foreach ($mergedParams as $key => $value) { + $this->assembledParams[] = $key; + } + + $options['uri']->setQuery($mergedParams); + } + + // A query does not contribute to the path, thus nothing is returned. + return ''; + } + + /** + * getAssembledParams(): defined by RouteInterface interface. + * + * @see RouteInterface::getAssembledParams + * @return array + */ + public function getAssembledParams() + { + return $this->assembledParams; + } +} diff --git a/src/Router/Query.php b/src/Router/Query.php index 9d28c5a1..9d687cc6 100644 --- a/src/Router/Query.php +++ b/src/Router/Query.php @@ -1,32 +1,17 @@ - */ namespace Dvsa\Olcs\Transfer\Router; -use Laminas\Mvc\Router\Http\Query as LaminasQuery; +use Dvsa\Olcs\Transfer\Router\LaminasRouterHttpQueryV2 as LaminasQuery; use Laminas\Stdlib\RequestInterface as Request; -use Laminas\Mvc\Router\Http\RouteMatch; +use Laminas\Router\Http\RouteMatch; -/** - * Query - * - * @author Rob Caiger - */ class Query extends LaminasQuery { - public function __construct(array $defaults = array()) - { - $this->defaults = $defaults; - } - /** * match(): defined by RouteInterface interface. * - * @see \Laminas\Mvc\Router\RouteInterface::match() + * @see \Laminas\Router\RouteInterface::match() * @param Request $request * @return RouteMatch|null */ diff --git a/src/Router/RouterFactory.php b/src/Router/RouterFactory.php index 8dcd5728..3a4a408f 100644 --- a/src/Router/RouterFactory.php +++ b/src/Router/RouterFactory.php @@ -3,6 +3,7 @@ /** * Custom Router Factory for api routing */ + namespace Dvsa\Olcs\Transfer\Router; use Interop\Container\ContainerInterface; @@ -19,7 +20,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o $config = $container->has('Config') ? $container->get('Config') : []; // Defaults - $routerClass = 'Laminas\Mvc\Router\Http\TreeRouteStack'; + $routerClass = 'Laminas\Router\Http\TreeRouteStack'; $routerConfig = isset($config['api_router']) ? $config['api_router'] : []; // Obtain the configured router class, if any diff --git a/src/Service/CacheEncryption.php b/src/Service/CacheEncryption.php index 4a8d6dc8..575daf8e 100644 --- a/src/Service/CacheEncryption.php +++ b/src/Service/CacheEncryption.php @@ -11,42 +11,42 @@ class CacheEncryption { - const ERR_NO_KEY_AVAILABLE = 'No encryption key available for this encryption mode'; - const ERR_NO_IDS_TO_DELETE = 'Please provide ids for the items being deleted'; + public const ERR_NO_KEY_AVAILABLE = 'No encryption key available for this encryption mode'; + public const ERR_NO_IDS_TO_DELETE = 'Please provide ids for the items being deleted'; - const ENCRYPTION_MODE_PUBLIC = 'encryption_public'; - const ENCRYPTION_MODE_SHARED = 'encryption_shared'; - const ENCRYPTION_MODE_NODE = 'encryption_node'; + public const ENCRYPTION_MODE_PUBLIC = 'encryption_public'; + public const ENCRYPTION_MODE_SHARED = 'encryption_shared'; + public const ENCRYPTION_MODE_NODE = 'encryption_node'; - const ENCRYPTION_PUBLIC_NODE_SUFFIX = 'public'; - const ENCRYPTION_SHARED_NODE_SUFFIX = 'shared'; + public const ENCRYPTION_PUBLIC_NODE_SUFFIX = 'public'; + public const ENCRYPTION_SHARED_NODE_SUFFIX = 'shared'; - const TTL_DEFAULT = 3600; - const TTL_2_MINUTES = 120; - const TTL_60_DAYS = 5184000; + public const TTL_DEFAULT = 3600; + public const TTL_2_MINUTES = 120; + public const TTL_60_DAYS = 5184000; - const TTL_20_DAYS = 1728000; + public const TTL_20_DAYS = 1728000; - const TRANSLATION_KEY_IDENTIFIER = 'translation_key'; - const TRANSLATION_REPLACEMENT_IDENTIFIER = 'translation_replacement'; + public const TRANSLATION_KEY_IDENTIFIER = 'translation_key'; + public const TRANSLATION_REPLACEMENT_IDENTIFIER = 'translation_replacement'; - const SYS_PARAM_IDENTIFIER = 'sys_param'; - const SYS_PARAM_LIST_IDENTIFIER = 'sys_param_list'; - const USER_ACCOUNT_IDENTIFIER = 'user_account'; + public const SYS_PARAM_IDENTIFIER = 'sys_param'; + public const SYS_PARAM_LIST_IDENTIFIER = 'sys_param_list'; + public const USER_ACCOUNT_IDENTIFIER = 'user_account'; - const SECRETS_MANAGER_IDENTIFIER = 'secretsmanager'; + public const SECRETS_MANAGER_IDENTIFIER = 'secretsmanager'; /** @var string[] a list of caches held against a user id */ - const USER_CACHES = [ + public const USER_CACHES = [ self::USER_ACCOUNT_IDENTIFIER ]; - const QUERY_MAP = [ + public const QUERY_MAP = [ SystemParameter::class => self::SYS_PARAM_IDENTIFIER, SystemParameterList::class => self::SYS_PARAM_LIST_IDENTIFIER, ]; - const CUSTOM_CACHE_TYPE = [ + public const CUSTOM_CACHE_TYPE = [ self::SYS_PARAM_IDENTIFIER => [ 'mode' => self::ENCRYPTION_MODE_PUBLIC, 'ttl' => self::TTL_60_DAYS, @@ -149,7 +149,6 @@ public function hasCustomItem(string $cacheType, string $uniqueId = ''): bool * Shared mode: value will have been encrypted using a key shared between all nodes * Node specific mode: value will have been encrypted for a single group of nodes only e.g. ssweb, iuweb or api * - * @todo https://jira.dvsacloud.uk/browse/OLCS-28306 * The suppression of errors here is due to Laminas using deprecated methods * This will be fixed by an upgrade to the laminas-cache package, covered by the above ticket * @@ -162,13 +161,12 @@ public function hasCustomItem(string $cacheType, string $uniqueId = ''): bool public function removeItem(string $cacheKey, string $encryptionMode): bool { $nodeSuffix = $this->getSuffix($encryptionMode); - return @$this->cache->removeItem($cacheKey . $nodeSuffix); + return $this->cache->removeItem($cacheKey . $nodeSuffix); } /** * Remove a custom (non CQRS) cache item * - * @todo https://jira.dvsacloud.uk/browse/OLCS-28306 * The suppression of errors here is due to Laminas using deprecated methods * This will be fixed by an upgrade to the laminas-cache package, covered by the above ticket * @@ -182,7 +180,7 @@ public function removeCustomItem(string $cacheKey, string $uniqueId = ''): bool { $cacheConfig = $this->getCustomCacheConfig($cacheKey); $nodeSuffix = $this->getSuffix($cacheConfig['mode']); - return @$this->cache->removeItem($cacheKey . $uniqueId. $nodeSuffix); + return $this->cache->removeItem($cacheKey . $uniqueId . $nodeSuffix); } /** @@ -190,7 +188,6 @@ public function removeCustomItem(string $cacheKey, string $uniqueId = ''): bool * Note that the method expects that ids will be included, to delete a cache which isn't specific * to a user/licence etc, use the removeCustomItem method which allows a blank value for $uniqueId * - * @todo https://jira.dvsacloud.uk/browse/OLCS-28306 * The suppression of errors here is due to Laminas using deprecated methods * This will be fixed by an upgrade to the laminas-cache package, covered by the above ticket * @@ -214,7 +211,7 @@ public function removeCustomItems(string $cacheKey, array $uniqueIds): array $cacheKeys[$uniqueId] = $cacheKey . $uniqueId . $nodeSuffix; } - return @$this->cache->removeItems($cacheKeys); + return $this->cache->removeItems($cacheKeys); } /** diff --git a/src/Service/CacheEncryptionFactory.php b/src/Service/CacheEncryptionFactory.php index ad1a0342..dbe82bfa 100644 --- a/src/Service/CacheEncryptionFactory.php +++ b/src/Service/CacheEncryptionFactory.php @@ -3,26 +3,13 @@ namespace Dvsa\Olcs\Transfer\Service; use Interop\Container\ContainerInterface; -use Laminas\ServiceManager\FactoryInterface; -use Laminas\ServiceManager\ServiceLocatorInterface; -use Laminas\Cache\Storage\Adapter\Redis; +use Laminas\Cache\Storage\StorageInterface; +use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\Crypt\BlockCipher; class CacheEncryptionFactory implements FactoryInterface { - const MISSING_CONFIG = 'Config is missing for cache encryption'; - - /** - * Create service - * - * @param ServiceLocatorInterface $serviceLocator - * - * @return CacheEncryption|mixed - */ - public function createService(ServiceLocatorInterface $serviceLocator) - { - return $this($serviceLocator, CacheEncryption::class); - } + public const MISSING_CONFIG = 'Config is missing for cache encryption'; /** * Invoke @@ -34,7 +21,7 @@ public function createService(ServiceLocatorInterface $serviceLocator) * @throws \Exception * @return CacheEncryption */ - public function __invoke(ContainerInterface $container, $requestedName, array $options = null) + public function __invoke(ContainerInterface $container, $requestedName, array $options = null): CacheEncryption { $config = $container->get('Config'); @@ -42,6 +29,9 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o throw new \Exception(self::MISSING_CONFIG); } + $cache = $container->get('default-cache'); + assert($cache instanceof StorageInterface); + /** @var BlockCipher $blockCipher */ $blockCipher = BlockCipher::factory( $config['cache-encryption']['adapter'], @@ -49,7 +39,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o ); return new CacheEncryption( - $container->get(Redis::class), + $cache, $blockCipher, $config['cache-encryption']['secrets']['node'], $config['cache-encryption']['secrets']['shared'], diff --git a/src/Traits/LaminasFormVersionTrait.php b/src/Traits/LaminasFormVersionTrait.php deleted file mode 100644 index f2b5baef..00000000 --- a/src/Traits/LaminasFormVersionTrait.php +++ /dev/null @@ -1,12 +0,0 @@ - */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; use Doctrine\Common\Annotations\AnnotationReader; @@ -193,6 +194,9 @@ protected function processProperty(\ReflectionProperty $property) $escape = true; + $arrayFilterChain = new \Laminas\Filter\FilterChain(); + $arrayValidatorChain = new \Laminas\Validator\ValidatorChain(); + // Determine what type of input we have foreach ($propertyAnnotations as $annotation) { if ($annotation instanceof ArrayInput) { @@ -200,8 +204,6 @@ protected function processProperty(\ReflectionProperty $property) $input = new \Dvsa\Olcs\Transfer\Util\ArrayInput($property->getName()); - $arrayFilterChain = new \Laminas\Filter\FilterChain(); - $arrayValidatorChain = new \Laminas\Validator\ValidatorChain(); break; } diff --git a/src/Util/Annotation/ArrayFilter.php b/src/Util/Annotation/ArrayFilter.php index 0725e8a8..1c56856c 100644 --- a/src/Util/Annotation/ArrayFilter.php +++ b/src/Util/Annotation/ArrayFilter.php @@ -5,10 +5,12 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; /** * @Annotation + * @NamedArgumentConstructor */ class ArrayFilter extends Filter { diff --git a/src/Util/Annotation/ArrayInput.php b/src/Util/Annotation/ArrayInput.php index 64b7b6d7..c5c80f38 100644 --- a/src/Util/Annotation/ArrayInput.php +++ b/src/Util/Annotation/ArrayInput.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; /** diff --git a/src/Util/Annotation/ArrayValidator.php b/src/Util/Annotation/ArrayValidator.php index d4ccc1ee..839d813e 100644 --- a/src/Util/Annotation/ArrayValidator.php +++ b/src/Util/Annotation/ArrayValidator.php @@ -5,10 +5,12 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; /** * @Annotation + * @NamedArgumentConstructor */ class ArrayValidator extends Validator { diff --git a/src/Util/Annotation/ContinueIfEmpty.php b/src/Util/Annotation/ContinueIfEmpty.php index 6baba334..dafd7b22 100644 --- a/src/Util/Annotation/ContinueIfEmpty.php +++ b/src/Util/Annotation/ContinueIfEmpty.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; /** diff --git a/src/Util/Annotation/DoNotExchange.php b/src/Util/Annotation/DoNotExchange.php index 90c717cd..79ccad4a 100644 --- a/src/Util/Annotation/DoNotExchange.php +++ b/src/Util/Annotation/DoNotExchange.php @@ -7,6 +7,7 @@ * * You'll need to use this together with the Transfer\Optional annotation */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; /** diff --git a/src/Util/Annotation/Escape.php b/src/Util/Annotation/Escape.php index 21da6cc8..8fc7aa7d 100644 --- a/src/Util/Annotation/Escape.php +++ b/src/Util/Annotation/Escape.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; /** diff --git a/src/Util/Annotation/Filter.php b/src/Util/Annotation/Filter.php index 6bd57f7c..49c57976 100644 --- a/src/Util/Annotation/Filter.php +++ b/src/Util/Annotation/Filter.php @@ -1,35 +1,26 @@ + */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; -use Dvsa\Olcs\Transfer\Traits\LaminasFormVersionTrait; use Laminas\Form\Annotation\Filter as LaminasFilter; /** * @Annotation + * @NamedArgumentConstructor */ class Filter { - use LaminasFormVersionTrait; - protected LaminasFilter $filter; - public function __construct(array $annotation) + public function __construct($name, array $options = [], ?int $priority = null) { - // To avoid the migration path for annotations: `laminas/laminas-form:^2` -> `laminas/laminas-form:^3` -> PHP 8 native annotations. - // Can just be: `laminas/laminas-form:^2` -> PHP 8 native annotations. Once PHP 8 is available. - // Rector: https://github.com/rectorphp/rector/blob/main/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php - if ($this->isLaminasForm2()) { - //laminas 2 code path - $this->filter = new LaminasFilter($annotation); - } else { - //laminas 3 code path - $name = $annotation['value']['name']; - $options = $annotation['value']['options'] ?? []; - $priority = $annotation['value']['priority'] ?? null; - - $this->filter = new LaminasFilter($name, $options, $priority); - } + $this->filter = new LaminasFilter($name, $options, $priority); } public function __call($name, $arguments) @@ -39,14 +30,14 @@ public function __call($name, $arguments) public function getName() { - $spec = $this->getSpec(); + $spec = $this->filter->getFilterSpecification(); return $spec['name']; } public function getOptions() { - $spec = $this->getSpec(); + $spec = $this->filter->getFilterSpecification(); if (empty($spec['options'])) { return null; @@ -54,14 +45,4 @@ public function getOptions() return $spec['options']; } - - /** get spec based on different Laminas versions */ - private function getSpec(): array - { - if ($this->isLaminasForm2()) { - return $this->getFilter(); - } - - return $this->getFilterSpecification(); - } } diff --git a/src/Util/Annotation/InputFilter.php b/src/Util/Annotation/InputFilter.php deleted file mode 100644 index b21029d9..00000000 --- a/src/Util/Annotation/InputFilter.php +++ /dev/null @@ -1,27 +0,0 @@ - - */ -namespace Dvsa\Olcs\Transfer\Util\Annotation; - -use Laminas\Form\Annotation\InputFilter as LaminasInputFilter; - -/** - * @Annotation - */ -class InputFilter extends LaminasInputFilter -{ - public function getName() - { - $spec = $this->getInputFilter(); - - if (empty($spec['name'])) { - return null; - } - - return $spec['name']; - } -} diff --git a/src/Util/Annotation/Method.php b/src/Util/Annotation/Method.php index d2072dbc..8a1ea4b6 100644 --- a/src/Util/Annotation/Method.php +++ b/src/Util/Annotation/Method.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; /** diff --git a/src/Util/Annotation/Optional.php b/src/Util/Annotation/Optional.php index b0acf8af..cc89e39d 100644 --- a/src/Util/Annotation/Optional.php +++ b/src/Util/Annotation/Optional.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; /** diff --git a/src/Util/Annotation/Partial.php b/src/Util/Annotation/Partial.php index ceb2df37..90f05a14 100644 --- a/src/Util/Annotation/Partial.php +++ b/src/Util/Annotation/Partial.php @@ -5,27 +5,22 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; -use Dvsa\Olcs\Transfer\Traits\LaminasFormVersionTrait; use Laminas\Form\Annotation\ComposedObject; /** * @Annotation + * @NamedArgumentConstructor */ class Partial { - use LaminasFormVersionTrait; - protected ComposedObject $composedObject; - public function __construct(array $data) + public function __construct(string $value) { - if ($this->isLaminasForm2()) { - $this->composedObject = new ComposedObject($data); - } else { - $this->composedObject = new ComposedObject($data['value']); - } + $this->composedObject = new ComposedObject($value); } public function __call($name, $arguments) diff --git a/src/Util/Annotation/RouteName.php b/src/Util/Annotation/RouteName.php index 8157bbf9..a22a610b 100644 --- a/src/Util/Annotation/RouteName.php +++ b/src/Util/Annotation/RouteName.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; /** diff --git a/src/Util/Annotation/Validator.php b/src/Util/Annotation/Validator.php index 283a5736..8a0c717b 100644 --- a/src/Util/Annotation/Validator.php +++ b/src/Util/Annotation/Validator.php @@ -5,35 +5,22 @@ * * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Util\Annotation; -use Dvsa\Olcs\Transfer\Traits\LaminasFormVersionTrait; use Laminas\Form\Annotation\Validator as LaminasValidator; /** * @Annotation + * @NamedArgumentConstructor */ class Validator { - use LaminasFormVersionTrait; - protected LaminasValidator $validator; - public function __construct(array $annotation) + public function __construct($name, array $options = [], ?bool $breakChainOnFailure = null, ?int $priority = null) { - // To avoid the migration path for annotations: `laminas/laminas-form:^2` -> `laminas/laminas-form:^3` -> PHP 8 native annotations. - // Can just be: `laminas/laminas-form:^2` -> PHP 8 native annotations. Once PHP 8 is available. - // Rector: https://github.com/rectorphp/rector/blob/main/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php - if ($this->isLaminasForm2()) { - $this->validator = new LaminasValidator($annotation); - } else { - $name = $annotation['value']['name']; - $options = $annotation['value']['options'] ?? []; - $breakChainOnFailure = $annotation['value']['breakChainOnFailure'] ?? null; - $priority = $annotation['value']['priority'] ?? null; - - $this->validator = new LaminasValidator($name, $options, $breakChainOnFailure, $priority); - } + $this->validator = new LaminasValidator($name, $options, $breakChainOnFailure, $priority); } public function __call($name, $arguments) @@ -43,14 +30,14 @@ public function __call($name, $arguments) public function getName() { - $spec = $this->getSpec(); + $spec = $this->validator->getValidatorSpecification(); return $spec['name']; } public function getOptions() { - $spec = $this->getSpec(); + $spec = $this->validator->getValidatorSpecification(); if (empty($spec['options'])) { return null; @@ -58,14 +45,4 @@ public function getOptions() return $spec['options']; } - - /** get spec based on different Laminas versions */ - private function getSpec(): array - { - if ($this->isLaminasForm2()) { - return $this->getValidator(); - } - - return $this->getValidatorSpecification(); - } } diff --git a/src/Util/ChildRoutesGenerator.php b/src/Util/ChildRoutesGenerator.php index bcfe063a..f2f45a54 100644 --- a/src/Util/ChildRoutesGenerator.php +++ b/src/Util/ChildRoutesGenerator.php @@ -2,10 +2,8 @@ namespace Dvsa\Olcs\Transfer\Util; - class ChildRoutesGenerator { - private $routes; private $directory; @@ -24,12 +22,11 @@ private function buildChildRoutes($directory, array $child = []): array $paths = scandir($directory); foreach ($paths as $path) { - - if(substr($path, 0, 1) === '.') { + if (substr($path, 0, 1) === '.') { continue; } - if(!is_dir($path) && pathinfo($path, PATHINFO_EXTENSION) === 'php') { + if (!is_dir($path) && pathinfo($path, PATHINFO_EXTENSION) === 'php') { $childRoot = include $directory . '/' . $path; $child[key($childRoot)] = current($childRoot); } else { @@ -38,13 +35,12 @@ private function buildChildRoutes($directory, array $child = []): array ]; $child[$path]['child_routes'] = $this->buildChildRoutes($directory . '/' . $path, $child[$path]['child_routes']); } - } return $child; } - public function getUpdatedRoutes() : array + public function getUpdatedRoutes(): array { $childRoutes = $this->buildChildRoutes($this->directory); @@ -59,4 +55,4 @@ public function getUpdatedRoutes() : array return $this->routes; } -} \ No newline at end of file +} diff --git a/src/Util/Hostname.php b/src/Util/Hostname.php index ebfe28ed..2c95dea9 100644 --- a/src/Util/Hostname.php +++ b/src/Util/Hostname.php @@ -2,10 +2,10 @@ namespace Dvsa\Olcs\Transfer\Util; -use Laminas\Mvc\Router\Http\RouteInterface; -use Laminas\Mvc\Router\Http\RouteMatch; +use Laminas\Router\Http\RouteInterface; +use Laminas\Router\Http\RouteMatch; use Traversable; -use Laminas\Mvc\Router\Exception; +use Laminas\Router\Exception; use Laminas\Stdlib\ArrayUtils; use Laminas\Stdlib\RequestInterface as Request; @@ -71,7 +71,7 @@ public function __construct($route, array $constraints = array(), array $default * * @param array|Traversable $options options * - * @see \Laminas\Mvc\Router\RouteInterface::factory() + * @see \Laminas\Router\RouteInterface::factory() * @return Hostname * @throws Exception\InvalidArgumentException */ @@ -96,7 +96,7 @@ public static function factory($options = array()) $options['defaults'] = array(); } - return new static($options['route'], $options['constraints'], $options['defaults']); + return new self($options['route'], $options['constraints'], $options['defaults']); } /** @@ -237,7 +237,8 @@ protected function buildHost(array $parts, array $mergedParams, $isOptional) } return ''; - } elseif (!$isOptional + } elseif ( + !$isOptional || !isset($this->defaults[$part[1]]) || $this->defaults[$part[1]] !== $mergedParams[$part[1]] ) { @@ -273,7 +274,7 @@ protected function buildHost(array $parts, array $mergedParams, $isOptional) * * @param Request $request request * - * @see \Laminas\Mvc\Router\RouteInterface::match() + * @see \Laminas\Router\RouteInterface::match() * @return RouteMatch|null */ public function match(Request $request) @@ -308,7 +309,7 @@ public function match(Request $request) * @param array $params params * @param array $options options * - * @see \Laminas\Mvc\Router\RouteInterface::assemble() + * @see \Laminas\Router\RouteInterface::assemble() * @return string */ public function assemble(array $params = array(), array $options = array()) diff --git a/src/Util/StructuredInput.php b/src/Util/StructuredInput.php index 1bab23d6..a041095b 100644 --- a/src/Util/StructuredInput.php +++ b/src/Util/StructuredInput.php @@ -581,7 +581,8 @@ protected function validateInputs() // key exists, is null, input is required, allows empty; valid if // continueIfEmpty is false or input doesn't implement // that interface; otherwise validation chain continues - if ($dataExists && null === $data[$name] && $input instanceof InputInterface && $input->isRequired() + if ( + $dataExists && null === $data[$name] && $input instanceof InputInterface && $input->isRequired() && $input->allowEmpty() ) { if (!($input instanceof EmptyContextInterface && $input->continueIfEmpty())) { @@ -591,7 +592,8 @@ protected function validateInputs() } // key exists, empty string, input is not required, allows empty; valid - if ($dataExists && '' === $data[$name] && $input instanceof InputInterface && !$input->isRequired() + if ( + $dataExists && '' === $data[$name] && $input instanceof InputInterface && !$input->isRequired() && $input->allowEmpty() ) { $this->validInputs[$name] = $input; @@ -600,7 +602,8 @@ protected function validateInputs() // key exists, empty string, input is required, allows empty; valid // if continueIfEmpty is false, otherwise validation continues - if ($dataExists && '' === $data[$name] && $input instanceof InputInterface && $input->isRequired() + if ( + $dataExists && '' === $data[$name] && $input instanceof InputInterface && $input->isRequired() && $input->allowEmpty() ) { if (!($input instanceof EmptyContextInterface && $input->continueIfEmpty())) { diff --git a/src/Validators/AbstractCompare.php b/src/Validators/AbstractCompare.php index bf361259..8c9d9606 100644 --- a/src/Validators/AbstractCompare.php +++ b/src/Validators/AbstractCompare.php @@ -18,13 +18,13 @@ abstract class AbstractCompare extends AbstractValidator * Error codes * @const string */ - const NOT_GTE = 'notGreaterThanOrEqual'; - const NOT_GT = 'notGreaterThan'; - const NOT_LTE = 'notLessThanOrEqual'; - const NOT_LT = 'notLessThan'; - const INVALID_OPERATOR = 'invalidOperator'; - const INVALID_FIELD = 'invalidField'; - const NO_COMPARE = 'noCompare'; + public const NOT_GTE = 'notGreaterThanOrEqual'; + public const NOT_GT = 'notGreaterThan'; + public const NOT_LTE = 'notLessThanOrEqual'; + public const NOT_LT = 'notLessThan'; + public const INVALID_OPERATOR = 'invalidOperator'; + public const INVALID_FIELD = 'invalidField'; + public const NO_COMPARE = 'noCompare'; /** * @var array diff --git a/src/Validators/ContinuationDetailStatus.php b/src/Validators/ContinuationDetailStatus.php index b090c579..b880440c 100644 --- a/src/Validators/ContinuationDetailStatus.php +++ b/src/Validators/ContinuationDetailStatus.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Validators; /** diff --git a/src/Validators/Date.php b/src/Validators/Date.php index 38c16399..4fe6460b 100644 --- a/src/Validators/Date.php +++ b/src/Validators/Date.php @@ -11,7 +11,6 @@ */ class Date extends LaminasDate { - /** * Validation failure message template definitions * diff --git a/src/Validators/DateInFuture.php b/src/Validators/DateInFuture.php index 919b8849..8ec1a866 100644 --- a/src/Validators/DateInFuture.php +++ b/src/Validators/DateInFuture.php @@ -2,6 +2,7 @@ namespace Dvsa\Olcs\Transfer\Validators; +use Exception; use Laminas\Validator\AbstractValidator as AbstractValidator; /** @@ -14,12 +15,12 @@ class DateInFuture extends AbstractValidator /** * @const string */ - const IN_FUTURE = 'inFuture'; + public const IN_FUTURE = 'inFuture'; /** * @const string */ - const TODAY_OR_IN_FUTURE = 'todayOrInFuture'; + public const TODAY_OR_IN_FUTURE = 'todayOrInFuture'; /** * @var bool @@ -45,7 +46,7 @@ class DateInFuture extends AbstractValidator */ public function setIncludeToday($includeToday) { - $this->includeToday = (boolean) $includeToday; + $this->includeToday = (bool) $includeToday; return $this; } @@ -68,7 +69,7 @@ public function getIncludeToday() */ public function setUseTime($useTime) { - $this->useTime = (boolean) $useTime; + $this->useTime = (bool) $useTime; return $this; } @@ -91,7 +92,7 @@ public function getUseTime() */ public function setAllowEmpty($allowEmpty) { - $this->allowEmpty = (boolean) $allowEmpty; + $this->allowEmpty = (bool) $allowEmpty; return $this; } @@ -142,7 +143,7 @@ public function setOptions($options = array()) * @param mixed $value value * * @return bool - * @throws Exception\RuntimeException if the token doesn't exist in the context array + * @throws Exception if the token doesn't exist in the context array */ public function isValid($value) { diff --git a/src/Validators/DateNotInFuture.php b/src/Validators/DateNotInFuture.php index 920e4714..3627c150 100644 --- a/src/Validators/DateNotInFuture.php +++ b/src/Validators/DateNotInFuture.php @@ -6,6 +6,7 @@ * @author Ian Lindsay * @author Rob Caiger */ + namespace Dvsa\Olcs\Transfer\Validators; use Laminas\Validator\AbstractValidator as AbstractValidator; @@ -22,7 +23,7 @@ class DateNotInFuture extends AbstractValidator * Error codes * @const string */ - const IN_FUTURE = 'inFuture'; + public const IN_FUTURE = 'inFuture'; /** * Error messages @@ -37,7 +38,6 @@ class DateNotInFuture extends AbstractValidator * * @param mixed $value * @return bool - * @throws Exception\RuntimeException if the token doesn't exist in the context array */ public function isValid($value) { diff --git a/src/Validators/EmailAddress.php b/src/Validators/EmailAddress.php index 723963c2..88583647 100644 --- a/src/Validators/EmailAddress.php +++ b/src/Validators/EmailAddress.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\Olcs\Transfer\Validators; use Laminas\Validator\Hostname; @@ -22,10 +23,10 @@ class EmailAddress extends AbstractValidator /** * Should be consistent across the application, see OLCS-9884 */ - const EMAIL_ADDRESS_MAX_LENGTH = 254; - const INVALID = 'emailAddressInvalid'; - const INVALID_FORMAT = 'emailAddressInvalidFormat'; - const ERROR_INVALID = 'emailAddressLengthNotInRange'; + public const EMAIL_ADDRESS_MAX_LENGTH = 254; + public const INVALID = 'emailAddressInvalid'; + public const INVALID_FORMAT = 'emailAddressInvalidFormat'; + public const ERROR_INVALID = 'emailAddressLengthNotInRange'; /** * @var array @@ -221,7 +222,7 @@ protected function validateLocalPart() // Quoted-string characters are: DQUOTE *(qtext/quoted-pair) DQUOTE $qtext = '\x20-\x21\x23-\x5b\x5d-\x7e'; // %d32-33 / %d35-91 / %d93-126 $quotedPair = '\x20-\x7e'; // %d92 %d32-126 - if (preg_match('/^"(['. $qtext .']|\x5c[' . $quotedPair . '])*"$/', $this->localPart)) { + if (preg_match('/^"([' . $qtext . ']|\x5c[' . $quotedPair . '])*"$/', $this->localPart)) { return true; } @@ -267,8 +268,10 @@ protected function isAdditionalValidTld() protected function splitEmailParts($value) { // Split email address up and disallow '..' - if ((strpos($value, '..') !== false) or - (!preg_match('/^(.+)@([^@]+)$/', $value, $matches))) { + if ( + (strpos($value, '..') !== false) or + (!preg_match('/^(.+)@([^@]+)$/', $value, $matches)) + ) { return false; } diff --git a/src/Validators/FhAdditionalInfo.php b/src/Validators/FhAdditionalInfo.php index 86d8fd40..5d6d8c9b 100644 --- a/src/Validators/FhAdditionalInfo.php +++ b/src/Validators/FhAdditionalInfo.php @@ -14,10 +14,10 @@ */ class FhAdditionalInfo extends LaminasValidator\AbstractValidator { - const TOO_SHORT = 'stringLengthTooShort'; - const IS_EMPTY = 'isEmpty'; + public const TOO_SHORT = 'stringLengthTooShort'; + public const IS_EMPTY = 'isEmpty'; - const MIN_LEN = 150; + public const MIN_LEN = 150; /** * Validation failure message template definitions diff --git a/src/Validators/Money.php b/src/Validators/Money.php index 33fcac33..3d82da67 100644 --- a/src/Validators/Money.php +++ b/src/Validators/Money.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Validators; use Laminas\Validator\AbstractValidator; @@ -16,7 +17,7 @@ */ class Money extends AbstractValidator { - const INVALID = 'invalid'; + public const INVALID = 'invalid'; /** * Holds the templates diff --git a/src/Validators/Order.php b/src/Validators/Order.php index 64895d80..443a726e 100644 --- a/src/Validators/Order.php +++ b/src/Validators/Order.php @@ -9,7 +9,7 @@ */ class Order extends \Laminas\Validator\AbstractValidator { - const NOT_ASC_OR_DESC = 'notAscOrDesc'; + public const NOT_ASC_OR_DESC = 'notAscOrDesc'; protected $messageTemplates = array( self::NOT_ASC_OR_DESC => 'The order was not ASC or DESC', diff --git a/src/Validators/Postcode.php b/src/Validators/Postcode.php index f516b781..9dc92854 100644 --- a/src/Validators/Postcode.php +++ b/src/Validators/Postcode.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\Olcs\Transfer\Validators; use Laminas\Validator\AbstractValidator; @@ -16,12 +17,12 @@ */ class Postcode extends AbstractValidator { - const POSTCODE_MIN_LENGTH = 5; - const POSTCODE_MAX_LENGTH = 8; - const POSTCODE_BAD_LENGTH = 'postcodeBadLength'; - const POSTCODE_INVALID_FORMAT = 'invalidPostcodeFormat'; - const POSTCODE_IS_EMPTY = 'isEmpty'; - const POSTCODE_TOO_LONG = 'stringLengthTooLong'; + public const POSTCODE_MIN_LENGTH = 5; + public const POSTCODE_MAX_LENGTH = 8; + public const POSTCODE_BAD_LENGTH = 'postcodeBadLength'; + public const POSTCODE_INVALID_FORMAT = 'invalidPostcodeFormat'; + public const POSTCODE_IS_EMPTY = 'isEmpty'; + public const POSTCODE_TOO_LONG = 'stringLengthTooLong'; protected $messageTemplates = [ self::POSTCODE_BAD_LENGTH => 'postcode.validation.postcodeBadLength', @@ -91,7 +92,7 @@ public function isValid($value, $context = null) return $this->validateUkPostcode($value); } - return $this->validateNonUkPostcode($value, $context); + return $this->validateNonUkPostcode($value); } /** diff --git a/src/Validators/Sort.php b/src/Validators/Sort.php index bdcb1df1..30e9557e 100644 --- a/src/Validators/Sort.php +++ b/src/Validators/Sort.php @@ -4,7 +4,7 @@ class Sort extends \Laminas\Validator\AbstractValidator { - const INVALID_SORT = 'invalidSort'; + public const INVALID_SORT = 'invalidSort'; protected $messageTemplates = array( self::INVALID_SORT => 'The sort value is not valid', diff --git a/src/Validators/SubmissionSection.php b/src/Validators/SubmissionSection.php index 05348625..aabf4373 100644 --- a/src/Validators/SubmissionSection.php +++ b/src/Validators/SubmissionSection.php @@ -5,6 +5,7 @@ * * @author Shaun Lizzio */ + namespace Dvsa\Olcs\Transfer\Validators; /** diff --git a/src/Validators/UploadEvidence.php b/src/Validators/UploadEvidence.php index 9ea310ab..031251c1 100644 --- a/src/Validators/UploadEvidence.php +++ b/src/Validators/UploadEvidence.php @@ -11,7 +11,7 @@ */ class UploadEvidence extends AbstractValidator { - const UPLOAD_ADVERT = 'upload_advert'; + public const UPLOAD_ADVERT = 'upload_advert'; /** * @var array @@ -28,13 +28,15 @@ class UploadEvidence extends AbstractValidator public function isValid($value, $context = null) { $isValid = true; - if ((!empty($context['adPlacedIn']) + if ( + (!empty($context['adPlacedIn']) || !empty($context['adPlacedDate']['day']) || !empty($context['adPlacedDate']['month']) || !empty($context['adPlacedDate']['year']) - ) && (!isset($context['file']['list']) + ) && (!isset($context['file']['list']) || count($context['file']['list']) === 0 - )) { + ) + ) { $isValid = false; } diff --git a/src/Validators/Username.php b/src/Validators/Username.php index 312b8f6c..376c4e50 100644 --- a/src/Validators/Username.php +++ b/src/Validators/Username.php @@ -3,6 +3,7 @@ /** * Ensure the username matches the required criteria */ + namespace Dvsa\Olcs\Transfer\Validators; use Laminas\Validator\StringLength; @@ -12,9 +13,9 @@ */ class Username extends StringLength { - const USERNAME_LENGTH_MIN = 2; - const USERNAME_LENGTH_MAX = 40; - const USERNAME_INVALID = 'usernameInvalid'; + public const USERNAME_LENGTH_MIN = 2; + public const USERNAME_LENGTH_MAX = 40; + public const USERNAME_INVALID = 'usernameInvalid'; /** * Sets validator options diff --git a/src/Validators/UsernameCreate.php b/src/Validators/UsernameCreate.php index 755574d4..93206035 100644 --- a/src/Validators/UsernameCreate.php +++ b/src/Validators/UsernameCreate.php @@ -9,9 +9,9 @@ */ class UsernameCreate extends StringLength { - const USERNAME_LENGTH_MIN = 4; - const USERNAME_LENGTH_MAX = 40; - const USERNAME_INVALID = 'usernameCreateInvalid'; + public const USERNAME_LENGTH_MIN = 4; + public const USERNAME_LENGTH_MAX = 40; + public const USERNAME_INVALID = 'usernameCreateInvalid'; /** * Sets validator options diff --git a/src/Validators/ValidateEach.php b/src/Validators/ValidateEach.php index a13f009b..98d34f47 100644 --- a/src/Validators/ValidateEach.php +++ b/src/Validators/ValidateEach.php @@ -9,7 +9,7 @@ class ValidateEach extends IsCountable { - protected const OPTION_CHILDREN = 'children'; + public const OPTION_CHILDREN = 'children'; public const ERROR_TEMPLATE_KEY_NOT_ARRAY = 'notArray'; public const ERROR_TEMPLATE_NOT_ARRAY = 'Expected input to be an array'; diff --git a/src/Validators/Xml.php b/src/Validators/Xml.php index e98acc32..569c0c95 100644 --- a/src/Validators/Xml.php +++ b/src/Validators/Xml.php @@ -5,6 +5,7 @@ * * @author Ian Lindsay */ + namespace Dvsa\Olcs\Transfer\Validators; use Laminas\Validator\AbstractValidator; @@ -18,8 +19,8 @@ */ class Xml extends AbstractValidator { - const XML_NOT_VALID = 'xml_not_valid_error'; - const XML_CONTAINS_EXTERNAL_ENTITIES = 'xml_external_entities_error'; + public const XML_NOT_VALID = 'xml_not_valid_error'; + public const XML_CONTAINS_EXTERNAL_ENTITIES = 'xml_external_entities_error'; protected $messageTemplates = array( self::XML_NOT_VALID => 'The XML was not valid', diff --git a/src/Validators/YesNo.php b/src/Validators/YesNo.php index 85c6c772..d6c3a4ac 100644 --- a/src/Validators/YesNo.php +++ b/src/Validators/YesNo.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\Olcs\Transfer\Validators; /** diff --git a/test/Auth/ChangeExpiredPasswordResultTest.php b/test/Auth/ChangeExpiredPasswordResultTest.php index b3b82ca7..acfb3c59 100644 --- a/test/Auth/ChangeExpiredPasswordResultTest.php +++ b/test/Auth/ChangeExpiredPasswordResultTest.php @@ -1,4 +1,5 @@ expectException(InvalidArgumentException::class); $this->expectExceptionMessage('999 is not a valid code'); @@ -24,7 +25,7 @@ public function __construct_ThrowsInvalidArgumentException_WhenCodeIsNotValid() * @test * @dataProvider validCodeDataProvider */ - public function __construct_CreatesInstance_WhenCodeIsValid(int $code) + public function constructCreatesInstanceWhenCodeIsValid(int $code) { $this->assertInstanceOf(ChangeExpiredPasswordResult::class, new ChangeExpiredPasswordResult($code)); } @@ -45,7 +46,7 @@ public function validCodeDataProvider() * @test * @dataProvider validCodeDataProvider */ - public function isValid_ReturnsExpectedResponse(int $code, bool $isValid) + public function isValidReturnsExpectedResponse(int $code, bool $isValid) { $result = new ChangeExpiredPasswordResult($code); diff --git a/test/Auth/ChangePasswordResultTest.php b/test/Auth/ChangePasswordResultTest.php index 1338bcd5..b8fd5c7b 100644 --- a/test/Auth/ChangePasswordResultTest.php +++ b/test/Auth/ChangePasswordResultTest.php @@ -1,4 +1,5 @@ expectException(InvalidArgumentException::class); $this->expectExceptionMessage('999 is not a valid code'); @@ -23,7 +24,7 @@ public function construct_ThrowsInvalidArgumentException_WhenCodeIsNotValid(): v /** * @test */ - public function fromArray_ThrowsInvalidArgumentException_WhenCodeIsNotValid(): void + public function fromArrayThrowsInvalidArgumentExceptionWhenCodeIsNotValid(): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('999 is not a valid code'); @@ -35,7 +36,7 @@ public function fromArray_ThrowsInvalidArgumentException_WhenCodeIsNotValid(): v * @test * @dataProvider validCodeDataProvider */ - public function construct_CreatesInstance_WhenCodeIsValid(int $code): void + public function constructCreatesInstanceWhenCodeIsValid(int $code): void { $this->assertInstanceOf(ChangePasswordResult::class, new ChangePasswordResult($code)); } @@ -57,7 +58,7 @@ public function validCodeDataProvider(): array * @test * @dataProvider validCodeDataProvider */ - public function isValid_ReturnsExpectedResponse(int $code, bool $isValid): void + public function isValidReturnsExpectedResponse(int $code, bool $isValid): void { $result = new ChangePasswordResult($code); diff --git a/test/Auth/DeleteUserResultTest.php b/test/Auth/DeleteUserResultTest.php index 7b2e9938..2cfd24e8 100644 --- a/test/Auth/DeleteUserResultTest.php +++ b/test/Auth/DeleteUserResultTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Dvsa\OlcsTest\Transfer\Result\Auth; +namespace Dvsa\OlcsTest\Transfer\Auth; use Dvsa\Olcs\Transfer\Result\Auth\DeleteUserResult; use InvalidArgumentException; @@ -13,7 +13,7 @@ class DeleteUserResultTest extends TestCase /** * @test */ - public function __construct_ThrowsInvalidArgumentException_WhenCodeIsNotValid() + public function constructThrowsInvalidArgumentExceptionWhenCodeIsNotValid() { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('999 is not a valid code'); @@ -25,7 +25,7 @@ public function __construct_ThrowsInvalidArgumentException_WhenCodeIsNotValid() * @test * @dataProvider validCodeDataProvider */ - public function __construct_CreatesInstance_WhenCodeIsValid(int $code) + public function constructCreatesInstanceWhenCodeIsValid(int $code) { $this->assertInstanceOf(DeleteUserResult::class, new DeleteUserResult($code)); } @@ -34,7 +34,7 @@ public function __construct_CreatesInstance_WhenCodeIsValid(int $code) * @test * @dataProvider validCodeDataProvider */ - public function isValid_ReturnsExpectedResponse(int $code, bool $isValid) + public function isValidReturnsExpectedResponse(int $code, bool $isValid) { $result = new DeleteUserResult($code); $this->assertSame($isValid, $result->isValid()); @@ -53,7 +53,7 @@ public function validCodeDataProvider() * @test * @dataProvider notPresentCodeDataProvider */ - public function notPresent_ReturnsExpectedResponse(int $code, bool $isValid) + public function notPresentReturnsExpectedResponse(int $code, bool $isValid) { $result = new DeleteUserResult($code); $this->assertSame($isValid, $result->isUserNotPresent()); diff --git a/test/Bootstrap.php b/test/Bootstrap.php index 4080a72a..fb0f1794 100644 --- a/test/Bootstrap.php +++ b/test/Bootstrap.php @@ -3,11 +3,6 @@ namespace Dvsa\OlcsTest\Transfer; use Mockery as m; -use Doctrine\Common\Annotations\AnnotationRegistry; - -error_reporting(-1); -chdir(dirname(__DIR__)); -date_default_timezone_set('Europe/London'); /** * Test bootstrap, for setting up autoloading @@ -49,11 +44,4 @@ public static function getServiceManager() return $sm; } - - protected static function initAutoloader() - { - return require('vendor/autoload.php'); - } } - -Bootstrap::init(); diff --git a/test/Command/Application/CreateOperatingCentreTest.php b/test/Command/Application/CreateOperatingCentreTest.php index e6e08138..8fa49107 100644 --- a/test/Command/Application/CreateOperatingCentreTest.php +++ b/test/Command/Application/CreateOperatingCentreTest.php @@ -1,6 +1,5 @@ [111, 222, 333], ] @@ -20,10 +23,3 @@ public function testGetSet() static::assertEquals([111, 222, 333], $command->getIds()); } } - -/** - * Class for testing Abstract Class - */ -class TestAbstractDeleteCompanySubsidiary extends AbstractDeleteCompanySubsidiary -{ -} diff --git a/test/Command/Lva/AbstractUpdateCompanySubsidiaryTest.php b/test/Command/Lva/AbstractUpdateCompanySubsidiaryTest.php index d75b5158..3b7a8fa8 100644 --- a/test/Command/Lva/AbstractUpdateCompanySubsidiaryTest.php +++ b/test/Command/Lva/AbstractUpdateCompanySubsidiaryTest.php @@ -1,6 +1,6 @@ 111, 'version' => 2, @@ -27,10 +30,3 @@ public function testGetSet() static::assertEquals('unit_CompNo', $command->getCompanyNo()); } } - -/** - * Class for testing Abstract Class - */ -class TestAbstractUpdateCompanySubsidiary extends AbstractUpdateCompanySubsidiary -{ -} diff --git a/test/Command/Permits/QueueReportTest.php b/test/Command/Permits/QueueReportTest.php index 0ac478cd..404cfd40 100644 --- a/test/Command/Permits/QueueReportTest.php +++ b/test/Command/Permits/QueueReportTest.php @@ -1,6 +1,6 @@ 1]); $command->setYesNo(0); $this->assertEquals(0, $command->getYesNo()); } - public function testGetYesNo() : void + public function testGetYesNo(): void { $command = Delete::create(['yesNo' => 1]); $this->assertEquals(1, $command->getYesNo()); diff --git a/test/Command/VariationOperatingCentre/UpdateTest.php b/test/Command/VariationOperatingCentre/UpdateTest.php index f85a1aef..7c3892ab 100644 --- a/test/Command/VariationOperatingCentre/UpdateTest.php +++ b/test/Command/VariationOperatingCentre/UpdateTest.php @@ -108,7 +108,6 @@ protected function getFilterTransformations() { return [ 'application' => [[99, '99'], ['string', '']], - 'id' => [[' 99 ', '99']], 'taIsOverridden' => [['Y ', 'Y']], 'id' => [[99, '99'], [' 98 ', '98']], 'permission' => [[99, '99'], [' Y', 'Y']] diff --git a/test/DtoTest.php b/test/DtoTest.php index 3e5a2dbd..76cbe8b2 100644 --- a/test/DtoTest.php +++ b/test/DtoTest.php @@ -5,7 +5,7 @@ use Dvsa\Olcs\Transfer\Command\CommandContainer; use Dvsa\Olcs\Transfer\Query\QueryContainer; use Dvsa\OlcsTest\Transfer\Query\QueryTest; -use \PHPUnit\Framework\Assert as Assert; +use PHPUnit\Framework\Assert as Assert; use ReflectionMethod; use Laminas\Stdlib\ArraySerializableInterface; diff --git a/test/Filter/PostcodeTest.php b/test/Filter/PostcodeTest.php index bc75e990..1470a982 100644 --- a/test/Filter/PostcodeTest.php +++ b/test/Filter/PostcodeTest.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\OlcsTest\Transfer\Filter; use Dvsa\Olcs\Transfer\Filter\Postcode; diff --git a/test/Query/CompaniesHouse/ByNumberTest.php b/test/Query/CompaniesHouse/ByNumberTest.php index 2e52ab6c..5db984a8 100644 --- a/test/Query/CompaniesHouse/ByNumberTest.php +++ b/test/Query/CompaniesHouse/ByNumberTest.php @@ -1,5 +1,6 @@ -[ + 'companyNumber' => [ '00001234', 'SC123456' ] diff --git a/test/Query/DataRetention/RecordsTest.php b/test/Query/DataRetention/RecordsTest.php index 4bf59468..16b52220 100644 --- a/test/Query/DataRetention/RecordsTest.php +++ b/test/Query/DataRetention/RecordsTest.php @@ -125,11 +125,6 @@ protected function getFilterTransformations() { return [ 'dataRetentionRuleId' => [[99, '99']], - 'goodsOrPsv' => [ - ['lcat_gv ', 'lcat_gv'], - [' lcat_gv', 'lcat_gv'], - [' lcat_gv ', 'lcat_gv'] - ], 'goodsOrPsv' => [ ['pending ', 'pending'], [' pending', 'pending'], diff --git a/test/Query/Document/AbstractDownloadTest.php b/test/Query/Document/AbstractDownloadTest.php index 3505f08c..111a6334 100644 --- a/test/Query/Document/AbstractDownloadTest.php +++ b/test/Query/Document/AbstractDownloadTest.php @@ -18,15 +18,11 @@ public function testGetSet() ]; /** @var AbstractDownload $sut */ - $sut = AbstractDownloadStub::create($data); + $class = new class extends AbstractDownload { + }; + + $sut = $class::create($data); static::assertEquals('unit_Inline', $sut->isInline()); } } - -/** - * Stub class for testign AbstractDownload class - */ -class AbstractDownloadStub extends AbstractDownload -{ -} diff --git a/test/Query/DvlaSearch/VehicleTest.php b/test/Query/DvlaSearch/VehicleTest.php index 33c6c4c6..c4fbbb18 100644 --- a/test/Query/DvlaSearch/VehicleTest.php +++ b/test/Query/DvlaSearch/VehicleTest.php @@ -1,4 +1,6 @@ -[ + "id" => [ 0 ] ]; diff --git a/test/Query/Licence/PsvDiscCountTest.php b/test/Query/Licence/PsvDiscCountTest.php index 8f607596..a02bbf13 100644 --- a/test/Query/Licence/PsvDiscCountTest.php +++ b/test/Query/Licence/PsvDiscCountTest.php @@ -65,7 +65,7 @@ protected function getValidFieldValues() protected function getInvalidFieldValues() { return [ - "id"=>[ + "id" => [ 0 ] ]; diff --git a/test/Query/Licence/VehiclesTest.php b/test/Query/Licence/VehiclesTest.php index 88d95666..7c20bb6f 100644 --- a/test/Query/Licence/VehiclesTest.php +++ b/test/Query/Licence/VehiclesTest.php @@ -181,7 +181,7 @@ protected function getFilterTransformations() /** * @test */ - public function includeActive_IsOptional() + public function includeActiveIsOptional() { $sut = $this->createDtoContainer($this->createBlankDto()); $inputFilter = $sut->getInputFilter(); @@ -193,7 +193,7 @@ public function includeActive_IsOptional() /** * @test */ - public function includeActive_DefaultsToTrue() + public function includeActiveDefaultsToTrue() { $dto = $this->createBlankDto(); $dto->exchangeArray([]); diff --git a/test/Query/Lva/AbstractGoodsVehiclesTest.php b/test/Query/Lva/AbstractGoodsVehiclesTest.php index e2e6caf0..20528127 100644 --- a/test/Query/Lva/AbstractGoodsVehiclesTest.php +++ b/test/Query/Lva/AbstractGoodsVehiclesTest.php @@ -1,6 +1,6 @@ 'unit_Vrm', 'specified' => 'unit_Spec', 'includeRemoved' => 'unit_IncRem', 'disc' => 'unit_Disc', ]; - $sut = DummyAbstractGoodsVehicles::create($data); + $sut = $class::create($data); static::assertEquals($sut->getVrm(), 'unit_Vrm'); static::assertEquals($sut->getSpecified(), 'unit_Spec'); @@ -25,10 +28,3 @@ public function testGetSet() static::assertEquals($sut->getDisc(), 'unit_Disc'); } } - -/** - * Dummy class to test AbstractGoodsVehicles - */ -class DummyAbstractGoodsVehicles extends AbstractGoodsVehicles -{ -} diff --git a/test/Query/PagedTraitTest.php b/test/Query/PagedTraitTest.php index bd629721..69522f93 100644 --- a/test/Query/PagedTraitTest.php +++ b/test/Query/PagedTraitTest.php @@ -12,24 +12,16 @@ class PagedTraitTest extends MockeryTestCase { public function testGetSet() { - $sut = new DummyPagedTrait(); + $sut = new class { + use PagedTrait; + }; // check limit $actual = $sut->setLimit(1234); - static::assertInstanceOf(DummyPagedTrait::class, $actual); static::assertEquals(1234, $sut->getLimit()); // check page $actual = $sut->setPage(9999); - static::assertInstanceOf(DummyPagedTrait::class, $actual); static::assertEquals(9999, $sut->getPage()); } } - -/** - * Dummy class for testing PagedTrait - */ -class DummyPagedTrait -{ - use PagedTrait; -} diff --git a/test/Query/QueryTest.php b/test/Query/QueryTest.php index cf3f0d2f..089c94b4 100644 --- a/test/Query/QueryTest.php +++ b/test/Query/QueryTest.php @@ -2,7 +2,6 @@ namespace Dvsa\OlcsTest\Transfer\Query; -use Dvsa\Olcs\Transfer\Traits\LaminasFormVersionTrait; use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder; use Dvsa\OlcsTest\Transfer\DtoTest; use Laminas\Filter\FilterPluginManager; @@ -14,7 +13,6 @@ trait QueryTest { use DtoTest; - use LaminasFormVersionTrait; protected function createDtoContainer(ArraySerializableInterface $dto) { diff --git a/test/Query/Surrender/ByLicenceTest.php b/test/Query/Surrender/ByLicenceTest.php index 04393b22..ad8e8fd4 100644 --- a/test/Query/Surrender/ByLicenceTest.php +++ b/test/Query/Surrender/ByLicenceTest.php @@ -65,7 +65,7 @@ protected function getValidFieldValues() protected function getInvalidFieldValues() { return [ - "id"=>[ + "id" => [ 0 ] ]; diff --git a/test/Query/Surrender/GetStatusTest.php b/test/Query/Surrender/GetStatusTest.php index 93223202..a0a1eaf4 100644 --- a/test/Query/Surrender/GetStatusTest.php +++ b/test/Query/Surrender/GetStatusTest.php @@ -65,7 +65,7 @@ protected function getValidFieldValues() protected function getInvalidFieldValues() { return [ - "id"=>[ + "id" => [ 0 ] ]; diff --git a/test/Router/CommandConfigTest.php b/test/Router/CommandConfigTest.php index 0a17f48b..307c02d8 100644 --- a/test/Router/CommandConfigTest.php +++ b/test/Router/CommandConfigTest.php @@ -16,7 +16,7 @@ public function testGetDeleteConfig() $config = CommandConfig::getDeleteConfig('Foo\Bar'); $expected = [ - 'type' => \Laminas\Mvc\Router\Http\Method::class, + 'type' => \Laminas\Router\Http\Method::class, 'options' => [ 'verb' => 'DELETE', 'defaults' => [ @@ -33,7 +33,7 @@ public function testGetPutConfig() $config = CommandConfig::getPutConfig('Foo\Bar'); $expected = [ - 'type' => \Laminas\Mvc\Router\Http\Method::class, + 'type' => \Laminas\Router\Http\Method::class, 'options' => [ 'verb' => 'PUT', 'defaults' => [ @@ -50,7 +50,7 @@ public function testGetPostConfig() $config = CommandConfig::getPostConfig('Foo\Bar'); $expected = [ - 'type' => \Laminas\Mvc\Router\Http\Method::class, + 'type' => \Laminas\Router\Http\Method::class, 'options' => [ 'verb' => 'POST', 'defaults' => [ diff --git a/test/Service/CacheEncryptionFactoryTest.php b/test/Service/CacheEncryptionFactoryTest.php index ee2fc4cf..74f60898 100644 --- a/test/Service/CacheEncryptionFactoryTest.php +++ b/test/Service/CacheEncryptionFactoryTest.php @@ -1,34 +1,30 @@ - */ class CacheEncryptionFactoryTest extends MockeryTestCase { - public function testCreateServiceNoConfig() + public function testInvokeNoConfig() { $this->expectException(\Exception::class); $this->expectExceptionMessage(CacheEncryptionFactory::MISSING_CONFIG); - $mockSl = m::mock(ServiceLocatorInterface::class); + $mockSl = m::mock(ContainerInterface::class); $mockSl->shouldReceive('get')->with('Config')->andReturn([]); $sut = new CacheEncryptionFactory(); - $sut->createService($mockSl); + $sut->__invoke($mockSl, CacheEncryption::class); } - public function testCreateService() + public function testInvoke() { $config = [ 'cache-encryption' => [ @@ -47,12 +43,12 @@ public function testCreateService() $cache = m::mock(StorageInterface::class); - $mockSl = m::mock(ServiceLocatorInterface::class); + $mockSl = m::mock(ContainerInterface::class); $mockSl->shouldReceive('get')->with('Config')->andReturn($config); - $mockSl->shouldReceive('get')->with(Redis::class)->andReturn($cache); + $mockSl->shouldReceive('get')->with('default-cache')->andReturn($cache); $sut = new CacheEncryptionFactory(); - $service = $sut->createService($mockSl); + $service = $sut->__invoke($mockSl, CacheEncryption::class); self::assertInstanceOf(CacheEncryption::class, $service); self::assertEquals('ssweb', $service->getNodeSuffix()); diff --git a/test/Util/ChildRoutesGeneratorTest.php b/test/Util/ChildRoutesGeneratorTest.php index d2081488..19912497 100644 --- a/test/Util/ChildRoutesGeneratorTest.php +++ b/test/Util/ChildRoutesGeneratorTest.php @@ -40,4 +40,4 @@ public function testGetUpdatedRoutes() $updatedRoutes = $childRootGenerator->getUpdatedRoutes(); $this->assertSame($expected, $updatedRoutes); } -} \ No newline at end of file +} diff --git a/test/Util/DtoTest.php b/test/Util/DtoTest.php index 2c0a7d6a..a8046094 100644 --- a/test/Util/DtoTest.php +++ b/test/Util/DtoTest.php @@ -2,7 +2,6 @@ namespace Dvsa\OlcsTest\Transfer\Util; -use Dvsa\Olcs\Transfer\Traits\LaminasFormVersionTrait; use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder; use Laminas\Filter\FilterPluginManager; use Laminas\ServiceManager\ServiceManager; @@ -21,8 +20,6 @@ */ class DtoTest extends MockeryTestCase { - use LaminasFormVersionTrait; - /** * @var AnnotationBuilder */ @@ -30,7 +27,7 @@ class DtoTest extends MockeryTestCase public function setUp(): void { - $annotationBuilder = new AnnotationBuilder();; + $annotationBuilder = new AnnotationBuilder(); $serviceManager = m::mock(ServiceManager::class); diff --git a/test/Util/Stub/CommandDtoStub.php b/test/Util/Stub/CommandDtoStub.php index 2758127b..97aef5fd 100644 --- a/test/Util/Stub/CommandDtoStub.php +++ b/test/Util/Stub/CommandDtoStub.php @@ -5,6 +5,7 @@ * * @author Rob Caiger */ + namespace Dvsa\OlcsTest\Transfer\Util\Stub; use Dvsa\Olcs\Transfer\Util\Annotation as Transfer; @@ -17,18 +18,18 @@ class CommandDtoStub extends AbstractCommand { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** * @Transfer\ArrayInput - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\FilterEmptyItems"}) - * @Transfer\ArrayFilter({"name":"Dvsa\Olcs\Transfer\Filter\UniqueItems"}) - * @Transfer\ArrayValidator({"name":"Laminas\Validator\NotEmpty", "options": {"type":"array"}}) - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\FilterEmptyItems") + * @Transfer\ArrayFilter("Dvsa\Olcs\Transfer\Filter\UniqueItems") + * @Transfer\ArrayValidator("Laminas\Validator\NotEmpty", options={"type":"array"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ protected $list = []; diff --git a/test/Util/Stub/PartialStub.php b/test/Util/Stub/PartialStub.php index 6f32784e..ff60a17a 100644 --- a/test/Util/Stub/PartialStub.php +++ b/test/Util/Stub/PartialStub.php @@ -12,21 +12,21 @@ class PartialStub { /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $id; /** - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) + * @Transfer\Filter("Laminas\Filter\Digits") + * @Transfer\Validator("Laminas\Validator\Digits") + * @Transfer\Validator("Laminas\Validator\GreaterThan", options={"min": 0}) */ protected $version; /** - * @Transfer\Filter({"name":"Laminas\Filter\StringTrim"}) + * @Transfer\Filter("Laminas\Filter\StringTrim") */ public $foo; diff --git a/test/Validators/ContinuationDetailStatusTest.php b/test/Validators/ContinuationDetailStatusTest.php index f016e48d..fae3edc5 100644 --- a/test/Validators/ContinuationDetailStatusTest.php +++ b/test/Validators/ContinuationDetailStatusTest.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\OlcsTest\Transfer\Validators; use Dvsa\Olcs\Transfer\Validators\ContinuationDetailStatus; diff --git a/test/Validators/DateCompareTest.php b/test/Validators/DateCompareTest.php index 9dc4ba23..95be9fbe 100644 --- a/test/Validators/DateCompareTest.php +++ b/test/Validators/DateCompareTest.php @@ -18,8 +18,7 @@ public function testSetOptions() $sut = new DateCompare(); $sut->setOptions( [ - 'compare_to' =>'test', - 'operator' => false, + 'compare_to' => 'test', 'compare_to_label' => [null], 'operator' => 'lt', 'has_time' => false @@ -30,7 +29,6 @@ public function testSetOptions() $this->assertEquals([null], $sut->getCompareToLabel()); $this->assertEquals('lt', $sut->getOperator()); $this->assertEquals(false, $sut->getHasTime()); - } /** @@ -97,7 +95,7 @@ public function provideIsValid() false, ['compare_to' => 'other_field', 'operator' => 'invalid', 'compare_to_label' => 'Other field'], '2014-01-10', - ['other_field'=> ''], + ['other_field' => ''], [DateCompare::INVALID_FIELD => 'Input field being compared to doesn\'t exist'] ], //context matches value is empty diff --git a/test/Validators/EmailAddressTest.php b/test/Validators/EmailAddressTest.php index f299d876..cabc91cb 100644 --- a/test/Validators/EmailAddressTest.php +++ b/test/Validators/EmailAddressTest.php @@ -5,6 +5,7 @@ * * @author Alex Peshkov */ + namespace Dvsa\OlcsTest\Transfer\Validators; use Dvsa\Olcs\Transfer\Validators\EmailAddress; @@ -36,7 +37,7 @@ public function isValidProvider() return [ [ #0 - '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890@'. + '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890@' . '123456789012345678901234567890123456789012345678901234567890.com', true ], @@ -48,16 +49,16 @@ public function isValidProvider() [ #2 // total length greater than 254 - '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890@'. - '123456789012345678901234567890123456789012345678901234567890.'. - '123456789012345678901234567890123456789012345678901234567890.'. + '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890@' . + '123456789012345678901234567890123456789012345678901234567890.' . + '123456789012345678901234567890123456789012345678901234567890.' . '123456789012345678901234567890123456789012345678901234567890.com', false ], [ #3 // domain parts max greater than 63 chars - '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890'. + '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890' . '@1234567890123456789012345678901234567890123456789012345678901234.com', false ], @@ -69,7 +70,7 @@ public function isValidProvider() [ #5 // custom additional valid Top Level Domain - '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890@'. + '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890@' . '123456789012345678901234567890123456789012345678901234567890.ltd', true ], @@ -83,9 +84,9 @@ public function isValidProvider() #7 // custom additional valid Top Level Domain // total length greater than 254 - '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890@'. - '123456789012345678901234567890123456789012345678901234567890.'. - '123456789012345678901234567890123456789012345678901234567890.'. + '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890@' . + '123456789012345678901234567890123456789012345678901234567890.' . + '123456789012345678901234567890123456789012345678901234567890.' . '123456789012345678901234567890123456789012345678901234567890.ltd', false ], @@ -93,7 +94,7 @@ public function isValidProvider() #8 // custom additional valid Top Level Domain // domain parts max greater than 63 chars - '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890'. + '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890' . '@1234567890123456789012345678901234567890123456789012345678901234.ltd', false ], diff --git a/test/Validators/MoneyTest.php b/test/Validators/MoneyTest.php index 38defaf3..05c6f7f8 100644 --- a/test/Validators/MoneyTest.php +++ b/test/Validators/MoneyTest.php @@ -6,6 +6,7 @@ * @author Rob Caiger * @author Dan Eggleston */ + namespace Dvsa\OlcsTest\Transfer\Validators; use Dvsa\Olcs\Transfer\Validators\Money; diff --git a/test/Validators/PostcodeTest.php b/test/Validators/PostcodeTest.php index adb95321..bae8a1e3 100644 --- a/test/Validators/PostcodeTest.php +++ b/test/Validators/PostcodeTest.php @@ -5,6 +5,7 @@ * * @author Dan Eggleston */ + namespace Dvsa\OlcsTest\Transfer\Validators; use Dvsa\Olcs\Transfer\Validators\Postcode; diff --git a/test/Validators/UsernameTest.php b/test/Validators/UsernameTest.php index 9f81e035..eed4fcf7 100644 --- a/test/Validators/UsernameTest.php +++ b/test/Validators/UsernameTest.php @@ -3,6 +3,7 @@ /** * UsernameTest */ + namespace Dvsa\OlcsTest\Transfer\Validators; use Dvsa\Olcs\Transfer\Validators\Username; diff --git a/test/Validators/YesNoTest.php b/test/Validators/YesNoTest.php index 80727e81..09151460 100644 --- a/test/Validators/YesNoTest.php +++ b/test/Validators/YesNoTest.php @@ -5,6 +5,7 @@ * * @author Mat Evans */ + namespace Dvsa\OlcsTest\Transfer\Validators; use Dvsa\Olcs\Transfer\Validators\YesNo; From a63c5990e9e65eeeb1f21e23cee645d18dccb765 Mon Sep 17 00:00:00 2001 From: Saul Wilcox Date: Fri, 8 Dec 2023 13:31:20 +0000 Subject: [PATCH 4/4] Cleanup --- src/Query/Messaging/GetConversationList.php | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/Query/Messaging/GetConversationList.php b/src/Query/Messaging/GetConversationList.php index 6464e1d1..d3c57517 100644 --- a/src/Query/Messaging/GetConversationList.php +++ b/src/Query/Messaging/GetConversationList.php @@ -16,27 +16,9 @@ final class GetConversationList extends AbstractQuery implements PagedQueryInterface { use PagedTrait; + use LicenceOptional; use ApplicationOptional; - /** - * @var int - * @Transfer\Optional - * @Transfer\Filter({"name":"Laminas\Filter\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\Digits"}) - * @Transfer\Validator({"name":"Laminas\Validator\GreaterThan", "options": {"min": 0}}) - */ - protected $licence; - - /** - * Get licence - * - * @return int - */ - public function getLicence() - { - return $this->licence; - } - /** * @Transfer\Optional * @Transfer\Filter({"name":"Laminas\Filter\Boolean"})