From ad314df7cc28a13a58caee38ccf30750572c5f11 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Mon, 12 Jan 2015 17:48:58 -0500 Subject: [PATCH] INFRA-132 - Remove @static annotation --- CRM/ACL/API.php | 1 - CRM/ACL/BAO/ACL.php | 9 ---- CRM/ACL/BAO/EntityRole.php | 2 - CRM/ACL/Page/ACL.php | 2 - CRM/ACL/Page/ACLBasic.php | 2 - CRM/ACL/Page/EntityRole.php | 2 - CRM/Activity/BAO/Activity.php | 13 ----- CRM/Activity/BAO/Query.php | 1 - CRM/Activity/Form/Activity.php | 1 - CRM/Activity/Form/Task/PickOption.php | 1 - CRM/Activity/Form/Task/PickProfile.php | 1 - CRM/Activity/Import/Form/MapField.php | 1 - CRM/Activity/Selector/Activity.php | 1 - CRM/Activity/Selector/Search.php | 3 -- CRM/Activity/Task.php | 5 -- CRM/Admin/Form/ContactType.php | 1 - CRM/Admin/Form/Extensions.php | 1 - CRM/Admin/Form/MailSettings.php | 1 - CRM/Admin/Form/Options.php | 3 -- CRM/Admin/Form/PreferencesDate.php | 1 - CRM/Admin/Form/ScheduleReminders.php | 1 - CRM/Admin/Form/Setting/Component.php | 1 - CRM/Admin/Form/Setting/Mapping.php | 1 - CRM/Admin/Form/Setting/Miscellaneous.php | 1 - CRM/Admin/Form/Setting/Smtp.php | 1 - CRM/Admin/Form/WordReplacements.php | 1 - CRM/Admin/Page/ContactType.php | 1 - CRM/Admin/Page/EventTemplate.php | 2 - CRM/Admin/Page/Extensions.php | 2 - CRM/Admin/Page/Job.php | 2 - CRM/Admin/Page/JobLog.php | 2 - CRM/Admin/Page/LabelFormats.php | 2 - CRM/Admin/Page/LocationType.php | 1 - CRM/Admin/Page/MailSettings.php | 2 - CRM/Admin/Page/Mapping.php | 1 - CRM/Admin/Page/MessageTemplates.php | 1 - CRM/Admin/Page/Navigation.php | 1 - CRM/Admin/Page/Options.php | 6 --- CRM/Admin/Page/PaymentProcessor.php | 2 - CRM/Admin/Page/PaymentProcessorType.php | 1 - CRM/Admin/Page/PdfFormats.php | 2 - CRM/Admin/Page/Persistent.php | 2 - CRM/Admin/Page/PreferencesDate.php | 1 - CRM/Admin/Page/RelationshipType.php | 1 - CRM/Admin/Page/ScheduleReminders.php | 2 - CRM/Admin/Page/Tag.php | 1 - CRM/Badge/BAO/Badge.php | 1 - CRM/Badge/BAO/Layout.php | 6 --- CRM/Badge/Page/Layout.php | 1 - CRM/Batch/BAO/Batch.php | 4 -- CRM/Batch/Form/Entry.php | 1 - CRM/Batch/Page/Batch.php | 1 - CRM/Campaign/BAO/Campaign.php | 5 -- CRM/Campaign/BAO/Petition.php | 8 --- CRM/Campaign/BAO/Query.php | 4 -- CRM/Campaign/BAO/Survey.php | 16 ------ CRM/Campaign/Form/SurveyType.php | 1 - CRM/Campaign/Form/Task/Reserve.php | 1 - CRM/Campaign/Page/Petition/Confirm.php | 1 - CRM/Campaign/Page/SurveyType.php | 5 -- CRM/Campaign/PseudoConstant.php | 9 ---- CRM/Campaign/Selector/Search.php | 3 -- CRM/Campaign/Task.php | 5 -- CRM/Case/BAO/Case.php | 24 --------- CRM/Case/BAO/CaseType.php | 7 --- CRM/Case/BAO/Query.php | 1 - CRM/Case/Form/Activity.php | 1 - .../Form/Activity/ChangeCaseStartDate.php | 1 - CRM/Case/Form/Activity/ChangeCaseStatus.php | 1 - CRM/Case/Form/Activity/ChangeCaseType.php | 1 - CRM/Case/Form/Activity/LinkCases.php | 1 - CRM/Case/Form/Activity/OpenCase.php | 1 - CRM/Case/Form/Case.php | 1 - CRM/Case/Form/Search.php | 1 - CRM/Case/Page/Tab.php | 2 - CRM/Case/PseudoConstant.php | 11 ---- CRM/Case/Selector/Search.php | 3 -- CRM/Case/Task.php | 6 --- CRM/Contact/BAO/Contact.php | 32 ------------ CRM/Contact/BAO/Contact/Location.php | 3 -- CRM/Contact/BAO/Contact/Permission.php | 4 -- CRM/Contact/BAO/Contact/Utils.php | 14 ------ CRM/Contact/BAO/ContactType.php | 18 ------- CRM/Contact/BAO/Group.php | 9 ---- CRM/Contact/BAO/GroupContact.php | 11 ---- CRM/Contact/BAO/GroupContactCache.php | 3 -- CRM/Contact/BAO/GroupOrganization.php | 4 -- CRM/Contact/BAO/Household.php | 1 - CRM/Contact/BAO/Individual.php | 2 - CRM/Contact/BAO/Query.php | 11 ---- CRM/Contact/BAO/Query/Hook.php | 1 - CRM/Contact/BAO/Relationship.php | 22 -------- CRM/Contact/BAO/RelationshipType.php | 4 -- CRM/Contact/BAO/SavedSearch.php | 4 -- CRM/Contact/BAO/SubscriptionHistory.php | 2 - CRM/Contact/Form/Contact.php | 5 -- CRM/Contact/Form/DedupeRules.php | 1 - CRM/Contact/Form/Domain.php | 1 - CRM/Contact/Form/Edit/Address.php | 3 -- .../Form/Edit/CommunicationPreferences.php | 3 -- CRM/Contact/Form/Edit/CustomData.php | 1 - CRM/Contact/Form/Edit/Demographics.php | 1 - CRM/Contact/Form/Edit/Email.php | 1 - CRM/Contact/Form/Edit/Household.php | 1 - CRM/Contact/Form/Edit/IM.php | 1 - CRM/Contact/Form/Edit/Individual.php | 1 - CRM/Contact/Form/Edit/Lock.php | 1 - CRM/Contact/Form/Edit/Notes.php | 1 - CRM/Contact/Form/Edit/OpenID.php | 1 - CRM/Contact/Form/Edit/Phone.php | 1 - CRM/Contact/Form/Edit/TagsAndGroups.php | 2 - CRM/Contact/Form/Edit/Website.php | 1 - CRM/Contact/Form/Inline/Email.php | 1 - CRM/Contact/Form/Inline/IM.php | 1 - CRM/Contact/Form/Inline/Lock.php | 1 - CRM/Contact/Form/Inline/OpenID.php | 1 - CRM/Contact/Form/Inline/Phone.php | 1 - CRM/Contact/Form/ProfileContact.php | 1 - CRM/Contact/Form/Relationship.php | 1 - CRM/Contact/Form/Search.php | 4 -- CRM/Contact/Form/Search/Basic.php | 1 - CRM/Contact/Form/Search/Builder.php | 1 - CRM/Contact/Form/Task/AddToGroup.php | 1 - CRM/Contact/Form/Task/Batch.php | 1 - CRM/Contact/Form/Task/Delete.php | 1 - CRM/Contact/Form/Task/PickProfile.php | 1 - CRM/Contact/Form/Task/ProximityCommon.php | 1 - CRM/Contact/Form/Task/Useradd.php | 1 - CRM/Contact/Import/Form/MapField.php | 1 - CRM/Contact/Import/Form/Preview.php | 1 - CRM/Contact/Import/Parser/Contact.php | 3 -- CRM/Contact/Page/CustomSearch.php | 1 - CRM/Contact/Page/DedupeRules.php | 1 - CRM/Contact/Page/SavedSearch.php | 2 - CRM/Contact/Page/View/CustomData.php | 1 - CRM/Contact/Page/View/Note.php | 4 -- CRM/Contact/Page/View/Relationship.php | 2 - CRM/Contact/Page/View/UserDashBoard.php | 2 - CRM/Contact/Selector.php | 3 -- CRM/Contact/Selector/Custom.php | 3 -- CRM/Contact/Task.php | 4 -- CRM/Contribute/BAO/Contribution.php | 28 ----------- CRM/Contribute/BAO/Contribution/Utils.php | 4 -- CRM/Contribute/BAO/ContributionPage.php | 8 --- CRM/Contribute/BAO/ContributionRecur.php | 6 --- CRM/Contribute/BAO/ContributionSoft.php | 4 -- CRM/Contribute/BAO/ManagePremiums.php | 4 -- CRM/Contribute/BAO/Premium.php | 8 --- CRM/Contribute/BAO/Query.php | 3 -- CRM/Contribute/Form/Contribution.php | 1 - CRM/Contribute/Form/Contribution/Confirm.php | 2 - CRM/Contribute/Form/Contribution/Main.php | 1 - .../Form/Contribution/OnBehalfOf.php | 1 - .../Form/ContributionPage/Amount.php | 1 - .../Form/ContributionPage/Custom.php | 1 - .../Form/ContributionPage/Premium.php | 1 - .../Form/ContributionPage/Settings.php | 1 - .../Form/ContributionPage/ThankYou.php | 1 - .../Form/ContributionPage/Widget.php | 1 - CRM/Contribute/Form/ManagePremiums.php | 1 - CRM/Contribute/Form/SoftCredit.php | 1 - CRM/Contribute/Form/Task/Invoice.php | 3 -- CRM/Contribute/Form/Task/PDF.php | 1 - CRM/Contribute/Form/Task/PickProfile.php | 1 - CRM/Contribute/Form/Task/Status.php | 1 - CRM/Contribute/Form/UpdateBilling.php | 1 - CRM/Contribute/Import/Form/MapField.php | 1 - CRM/Contribute/Page/ContributionPage.php | 1 - CRM/Contribute/Page/ManagePremiums.php | 2 - CRM/Contribute/Page/Premium.php | 2 - CRM/Contribute/Page/Tab.php | 1 - CRM/Contribute/PseudoConstant.php | 22 -------- CRM/Contribute/Selector/Search.php | 3 -- CRM/Contribute/Task.php | 5 -- CRM/Core/Action.php | 9 ---- CRM/Core/BAO/ActionSchedule.php | 6 --- CRM/Core/BAO/Address.php | 14 ------ CRM/Core/BAO/Block.php | 8 --- CRM/Core/BAO/CMSUser.php | 4 -- CRM/Core/BAO/Cache.php | 7 --- CRM/Core/BAO/ConfigSetting.php | 6 --- CRM/Core/BAO/CustomField.php | 22 -------- CRM/Core/BAO/CustomGroup.php | 12 ----- CRM/Core/BAO/CustomOption.php | 4 -- CRM/Core/BAO/CustomQuery.php | 1 - CRM/Core/BAO/CustomValue.php | 3 -- CRM/Core/BAO/CustomValueTable.php | 4 -- CRM/Core/BAO/Dashboard.php | 9 ---- CRM/Core/BAO/Discount.php | 2 - CRM/Core/BAO/Domain.php | 2 - CRM/Core/BAO/Email.php | 6 --- CRM/Core/BAO/EntityTag.php | 7 --- CRM/Core/BAO/Extension.php | 2 - CRM/Core/BAO/File.php | 3 -- CRM/Core/BAO/FinancialTrxn.php | 9 ---- CRM/Core/BAO/IM.php | 4 -- CRM/Core/BAO/Job.php | 4 -- CRM/Core/BAO/LabelFormat.php | 12 ----- CRM/Core/BAO/Location.php | 8 --- CRM/Core/BAO/LocationType.php | 5 -- CRM/Core/BAO/Log.php | 3 -- CRM/Core/BAO/MailSettings.php | 4 -- CRM/Core/BAO/Mapping.php | 10 ---- CRM/Core/BAO/MessageTemplate.php | 5 -- CRM/Core/BAO/Navigation.php | 13 ----- CRM/Core/BAO/Note.php | 14 ------ CRM/Core/BAO/OpenID.php | 4 -- CRM/Core/BAO/OptionGroup.php | 5 -- CRM/Core/BAO/OptionValue.php | 10 ---- CRM/Core/BAO/PaperSize.php | 6 --- CRM/Core/BAO/PdfFormat.php | 6 --- CRM/Core/BAO/Persistent.php | 2 - CRM/Core/BAO/Phone.php | 5 -- CRM/Core/BAO/PreferencesDate.php | 3 -- CRM/Core/BAO/RecurringEntity.php | 13 ----- CRM/Core/BAO/SchemaHandler.php | 2 - CRM/Core/BAO/Setting.php | 5 -- CRM/Core/BAO/Tag.php | 6 --- CRM/Core/BAO/UFField.php | 18 ------- CRM/Core/BAO/UFGroup.php | 33 ------------ CRM/Core/BAO/UFJoin.php | 3 -- CRM/Core/BAO/UFMatch.php | 10 ---- CRM/Core/BAO/Website.php | 5 -- CRM/Core/BAO/WordReplacement.php | 3 -- CRM/Core/ClassLoader.php | 1 - CRM/Core/Component.php | 1 - CRM/Core/Config.php | 2 - CRM/Core/Config/Defaults.php | 2 - CRM/Core/DAO.php | 22 -------- CRM/Core/Error.php | 12 ----- CRM/Core/Form/Date.php | 2 - CRM/Core/Form/RecurringEntity.php | 1 - CRM/Core/Form/Renderer.php | 3 -- CRM/Core/Form/Tag.php | 2 - CRM/Core/IDS.php | 1 - CRM/Core/Invoke.php | 2 - CRM/Core/Joomla.php | 1 - CRM/Core/Key.php | 3 -- CRM/Core/Menu.php | 4 -- CRM/Core/OptionGroup.php | 5 -- CRM/Core/OptionValue.php | 8 --- CRM/Core/Page.php | 2 - CRM/Core/Page/AJAX.php | 2 - CRM/Core/Payment.php | 1 - CRM/Core/Payment/AuthorizeNet.php | 1 - CRM/Core/Payment/Dummy.php | 1 - CRM/Core/Payment/Elavon.php | 1 - CRM/Core/Payment/FirstData.php | 1 - CRM/Core/Payment/Form.php | 3 -- CRM/Core/Payment/Google.php | 1 - CRM/Core/Payment/GoogleIPN.php | 3 -- CRM/Core/Payment/IATS.php | 1 - CRM/Core/Payment/Moneris.php | 1 - CRM/Core/Payment/PayJunction.php | 1 - CRM/Core/Payment/PayPalImpl.php | 1 - CRM/Core/Payment/PayflowPro.php | 1 - CRM/Core/Payment/PaymentExpress.php | 1 - CRM/Core/Payment/PaymentExpressIPN.php | 2 - CRM/Core/Payment/Realex.php | 1 - CRM/Core/Payment/eWAY.php | 1 - CRM/Core/Permission.php | 4 -- CRM/Core/Permission/Joomla.php | 1 - CRM/Core/PseudoConstant.php | 50 ------------------- CRM/Core/Report/Excel.php | 2 - CRM/Core/Resources.php | 1 - CRM/Core/SelectValues.php | 36 ------------- CRM/Core/Selector/Controller.php | 1 - CRM/Core/Session.php | 3 -- CRM/Core/ShowHideBlocks.php | 2 - CRM/Core/Smarty.php | 1 - CRM/Core/TableHierarchy.php | 1 - CRM/Custom/Form/Field.php | 2 - CRM/Custom/Form/Group.php | 1 - CRM/Custom/Form/Option.php | 1 - CRM/Custom/Import/Form/MapField.php | 1 - CRM/Custom/Import/Parser/Api.php | 1 - CRM/Dedupe/BAO/RuleGroup.php | 1 - CRM/Dedupe/Merger.php | 7 --- CRM/Event/BAO/Event.php | 14 ------ CRM/Event/BAO/Participant.php | 28 ----------- CRM/Event/BAO/ParticipantPayment.php | 2 - CRM/Event/Form/ManageEvent/EventInfo.php | 1 - CRM/Event/Form/ManageEvent/Fee.php | 1 - CRM/Event/Form/ManageEvent/Location.php | 1 - CRM/Event/Form/ManageEvent/Registration.php | 4 -- CRM/Event/Form/ManageEvent/Repeat.php | 1 - CRM/Event/Form/Participant.php | 1 - .../Registration/AdditionalParticipant.php | 1 - CRM/Event/Form/Registration/Register.php | 2 - CRM/Event/Form/Task/AddToGroup.php | 1 - CRM/Event/Form/Task/PickProfile.php | 1 - CRM/Event/Import/Form/MapField.php | 1 - CRM/Event/Page/ManageEvent.php | 1 - CRM/Event/PseudoConstant.php | 13 ----- CRM/Event/Selector/Search.php | 3 -- CRM/Event/Task.php | 6 --- CRM/Export/BAO/Export.php | 1 - CRM/Export/Form/Map.php | 1 - CRM/Export/Form/Select.php | 1 - CRM/Financial/BAO/FinancialAccount.php | 6 --- CRM/Financial/BAO/FinancialItem.php | 6 --- CRM/Financial/BAO/FinancialType.php | 5 -- CRM/Financial/BAO/FinancialTypeAccount.php | 7 --- CRM/Financial/BAO/PaymentProcessor.php | 7 --- CRM/Financial/BAO/PaymentProcessorType.php | 5 -- CRM/Financial/Form/FinancialAccount.php | 1 - CRM/Financial/Form/FinancialBatch.php | 2 - CRM/Financial/Form/FinancialTypeAccount.php | 1 - CRM/Financial/Page/Batch.php | 1 - CRM/Financial/Page/BatchTransaction.php | 2 - CRM/Financial/Page/FinancialAccount.php | 2 - CRM/Financial/Page/FinancialBatch.php | 1 - CRM/Financial/Page/FinancialType.php | 2 - CRM/Financial/Page/FinancialTypeAccount.php | 3 -- CRM/Friend/BAO/Friend.php | 4 -- CRM/Friend/Form.php | 1 - CRM/Grant/BAO/Grant.php | 11 ---- CRM/Grant/BAO/Query.php | 1 - CRM/Grant/Page/Tab.php | 1 - CRM/Grant/Selector/Search.php | 3 -- CRM/Grant/Task.php | 5 -- CRM/Group/Form/Edit.php | 2 - CRM/Import/Parser.php | 3 -- CRM/Logging/Schema.php | 1 - CRM/Mailing/BAO/BouncePattern.php | 2 - CRM/Mailing/BAO/Component.php | 3 -- CRM/Mailing/BAO/Mailing.php | 9 ---- CRM/Mailing/BAO/MailingAB.php | 3 -- CRM/Mailing/BAO/MailingJob.php | 5 -- CRM/Mailing/BAO/Query.php | 1 - CRM/Mailing/BAO/TrackableURL.php | 1 - CRM/Mailing/Event/BAO/Bounce.php | 2 - CRM/Mailing/Event/BAO/Confirm.php | 1 - CRM/Mailing/Event/BAO/Delivered.php | 4 -- CRM/Mailing/Event/BAO/Forward.php | 2 - CRM/Mailing/Event/BAO/Opened.php | 5 -- CRM/Mailing/Event/BAO/Queue.php | 6 --- CRM/Mailing/Event/BAO/Reply.php | 5 -- CRM/Mailing/Event/BAO/Resubscribe.php | 2 - CRM/Mailing/Event/BAO/Subscribe.php | 4 -- CRM/Mailing/Event/BAO/TrackableURLOpen.php | 5 -- CRM/Mailing/Event/BAO/Unsubscribe.php | 5 -- CRM/Mailing/Form/Component.php | 1 - CRM/Mailing/Form/Group.php | 1 - CRM/Mailing/Form/Schedule.php | 1 - CRM/Mailing/Form/Upload.php | 1 - CRM/Mailing/Page/Component.php | 1 - CRM/Mailing/Page/Tab.php | 1 - CRM/Mailing/PseudoConstant.php | 8 --- CRM/Mailing/Selector/Browse.php | 2 - CRM/Mailing/Selector/Event.php | 2 - CRM/Mailing/Selector/Search.php | 3 -- CRM/Mailing/Task.php | 5 -- CRM/Member/BAO/Membership.php | 29 ----------- CRM/Member/BAO/MembershipBlock.php | 2 - CRM/Member/BAO/MembershipLog.php | 2 - CRM/Member/BAO/MembershipPayment.php | 2 - CRM/Member/BAO/MembershipStatus.php | 8 --- CRM/Member/BAO/MembershipType.php | 12 ----- CRM/Member/Form/Membership.php | 2 - CRM/Member/Form/MembershipBlock.php | 1 - CRM/Member/Form/MembershipRenewal.php | 1 - CRM/Member/Form/MembershipType.php | 1 - CRM/Member/Form/MembershipView.php | 1 - CRM/Member/Form/Task/PickProfile.php | 1 - CRM/Member/Import/Form/MapField.php | 2 - CRM/Member/Page/MembershipStatus.php | 2 - CRM/Member/Page/MembershipType.php | 2 - CRM/Member/Page/Tab.php | 2 - CRM/Member/PseudoConstant.php | 5 -- CRM/Member/Selector/Search.php | 3 -- CRM/Member/Task.php | 5 -- CRM/PCP/BAO/PCP.php | 19 ------- CRM/PCP/Form/Campaign.php | 1 - CRM/PCP/Form/Contribute.php | 1 - CRM/PCP/Form/Event.php | 1 - CRM/PCP/Form/PCP.php | 1 - CRM/PCP/Form/PCPAccount.php | 1 - CRM/PCP/Page/PCP.php | 2 - CRM/Pledge/BAO/Pledge.php | 10 ---- CRM/Pledge/BAO/PledgeBlock.php | 6 --- CRM/Pledge/BAO/PledgePayment.php | 11 ---- CRM/Pledge/Form/Pledge.php | 1 - CRM/Pledge/Form/Search.php | 1 - CRM/Pledge/Selector/Search.php | 3 -- CRM/Pledge/Task.php | 6 --- CRM/Price/BAO/LineItem.php | 6 --- CRM/Price/BAO/PriceField.php | 9 ---- CRM/Price/BAO/PriceFieldValue.php | 9 ---- CRM/Price/BAO/PriceSet.php | 14 ------ CRM/Price/Form/Field.php | 1 - CRM/Price/Form/Option.php | 1 - CRM/Price/Form/Set.php | 1 - CRM/Profile/Form.php | 1 - CRM/Profile/Form/Dynamic.php | 1 - .../Page/MultipleRecordFieldsListing.php | 1 - CRM/Profile/Page/Router.php | 1 - CRM/Profile/Selector/Listings.php | 2 - CRM/Report/BAO/Hook.php | 1 - CRM/Report/BAO/ReportInstance.php | 2 - CRM/Report/Page/InstanceList.php | 1 - CRM/Report/Page/Options.php | 5 -- CRM/Report/Utils/Report.php | 1 - CRM/SMS/Form/Group.php | 1 - CRM/SMS/Form/Schedule.php | 1 - CRM/SMS/Form/Upload.php | 1 - CRM/SMS/Page/Provider.php | 2 - CRM/SMS/Provider.php | 2 - CRM/UF/Form/Field.php | 4 -- CRM/UF/Form/Group.php | 1 - CRM/UF/Page/Field.php | 1 - CRM/UF/Page/Group.php | 1 - CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php | 8 --- .../Snapshot/V4p2/Price/BAO/FieldValue.php | 8 --- .../Snapshot/V4p2/Price/BAO/LineItem.php | 3 -- CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php | 12 ----- CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php | 9 ---- .../Snapshot/V4p2/Price/DAO/FieldValue.php | 9 ---- .../Snapshot/V4p2/Price/DAO/LineItem.php | 9 ---- CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php | 9 ---- .../Snapshot/V4p2/Price/DAO/SetEntity.php | 9 ---- CRM/Utils/Address.php | 1 - CRM/Utils/Cache.php | 3 -- CRM/Utils/Cache/NoCache.php | 1 - CRM/Utils/Check.php | 1 - CRM/Utils/Date.php | 16 ------ CRM/Utils/File.php | 3 -- CRM/Utils/Geocode/Google.php | 3 -- CRM/Utils/Geocode/Yahoo.php | 3 -- CRM/Utils/GlobalStack.php | 1 - CRM/Utils/Hook.php | 1 - CRM/Utils/JSON.php | 1 - CRM/Utils/Mail.php | 2 - CRM/Utils/Money.php | 1 - CRM/Utils/OpenFlashChart.php | 4 -- CRM/Utils/PagerAToZ.php | 4 -- CRM/Utils/PseudoConstant.php | 2 - CRM/Utils/REST.php | 1 - CRM/Utils/ReCAPTCHA.php | 2 - CRM/Utils/Recent.php | 6 --- CRM/Utils/Rule.php | 4 -- CRM/Utils/SoapServer.php | 2 - CRM/Utils/Sort.php | 1 - CRM/Utils/String.php | 16 ------ CRM/Utils/System/Base.php | 2 - CRM/Utils/System/Drupal.php | 2 - CRM/Utils/System/Drupal6.php | 2 - CRM/Utils/System/Drupal8.php | 1 - CRM/Utils/System/DrupalBase.php | 1 - CRM/Utils/System/Joomla.php | 1 - CRM/Utils/System/Soap.php | 2 - CRM/Utils/System/UnitTests.php | 1 - CRM/Utils/System/WordPress.php | 7 --- CRM/Utils/Time.php | 2 - CRM/Utils/Token.php | 23 --------- CRM/Utils/Verp.php | 2 - CRM/Utils/VersionCheck.php | 1 - api/api.php | 1 - api/v3/CaseType.php | 1 - api/v3/Contact.php | 4 -- api/v3/Contribution.php | 6 --- api/v3/Extension.php | 8 --- api/v3/Job.php | 11 ---- api/v3/MailingContact.php | 2 - api/v3/Note.php | 1 - api/v3/PaymentProcessorType.php | 1 - api/v3/Pledge.php | 1 - api/v3/PledgePayment.php | 3 -- api/v3/Relationship.php | 2 - api/v3/RelationshipType.php | 1 - api/v3/SurveyRespondant.php | 1 - api/v3/System.php | 1 - api/v3/utils.php | 2 - .../main.php | 1 - tests/phpunit/WebTest/Contact/SearchTest.php | 1 - 475 files changed, 1869 deletions(-) diff --git a/CRM/ACL/API.php b/CRM/ACL/API.php index 271352fafb..955d03fcc4 100644 --- a/CRM/ACL/API.php +++ b/CRM/ACL/API.php @@ -56,7 +56,6 @@ class CRM_ACL_API { * * @return boolean * true if yes, else false - * @static */ public static function check($str, $contactID = NULL) { if ($contactID == NULL) { diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php index ee5f7b2a7d..18b60cdd85 100644 --- a/CRM/ACL/BAO/ACL.php +++ b/CRM/ACL/BAO/ACL.php @@ -106,7 +106,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { * * @return string * The WHERE clause, or 0 on failure - * @static */ public static function permissionClause( &$tables, $operation, @@ -330,7 +329,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { * @return string|null * WHERE-style clause to filter results, * or null if $table or $id is null - * @static */ public static function getClause($table, $id, &$tables) { $table = CRM_Utils_Type::escape($table, 'String'); @@ -392,7 +390,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { * * @return array * Array of assoc. arrays of ACL rules - * @static */ public static function &getACLs($contact_id = NULL, $group_id = NULL, $aclRoles = FALSE) { $results = array(); @@ -458,7 +455,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { * * @return array * Array of assoc. arrays of ACL rules - * @static */ public static function &getACLRoles($contact_id = NULL, $group_id = NULL) { $contact_id = CRM_Utils_Type::escape($contact_id, 'Integer'); @@ -525,7 +521,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL { * * @return array * Assoc array of ACL rules - * @static */ public static function &getGroupACLs($contact_id, $aclRoles = FALSE) { $contact_id = CRM_Utils_Type::escape($contact_id, 'Integer'); @@ -570,7 +565,6 @@ SELECT $acl.* * * @return array * Array of assoc. arrays of ACL rules - * @static */ public static function &getGroupACLRoles($contact_id) { $contact_id = CRM_Utils_Type::escape($contact_id, 'Integer'); @@ -643,7 +637,6 @@ SELECT $acl.* * * @return array * Assoc array of ACL rules - * @static */ public static function &getAllByContact($contact_id) { $result = array(); @@ -687,7 +680,6 @@ SELECT $acl.* * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { // note this also resets any ACL cache @@ -976,7 +968,6 @@ ORDER BY a.object_id * @param int $aclId * ID of the ACL record to be deleted. * - * @static */ public static function del($aclId) { // delete all entries from the acl cache diff --git a/CRM/ACL/BAO/EntityRole.php b/CRM/ACL/BAO/EntityRole.php index 40778c736c..9e7f124224 100644 --- a/CRM/ACL/BAO/EntityRole.php +++ b/CRM/ACL/BAO/EntityRole.php @@ -82,7 +82,6 @@ class CRM_ACL_BAO_EntityRole extends CRM_ACL_DAO_EntityRole { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_ACL_DAO_EntityRole', $id, 'is_active', $is_active); @@ -94,7 +93,6 @@ class CRM_ACL_BAO_EntityRole extends CRM_ACL_DAO_EntityRole { * @param int $entityRoleId * ID of the EntityRole record to be deleted. * - * @static */ public static function del($entityRoleId) { $entityDAO = new CRM_ACL_DAO_EntityRole(); diff --git a/CRM/ACL/Page/ACL.php b/CRM/ACL/Page/ACL.php index b711625c5e..82e5744119 100644 --- a/CRM/ACL/Page/ACL.php +++ b/CRM/ACL/Page/ACL.php @@ -48,7 +48,6 @@ class CRM_ACL_Page_ACL extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -157,7 +156,6 @@ class CRM_ACL_Page_ACL extends CRM_Core_Page_Basic { * Browse all acls * * @return void - * @static */ public function browse() { // get all acl's sorted by weight diff --git a/CRM/ACL/Page/ACLBasic.php b/CRM/ACL/Page/ACLBasic.php index ad580950f0..09f260b79b 100644 --- a/CRM/ACL/Page/ACLBasic.php +++ b/CRM/ACL/Page/ACLBasic.php @@ -46,7 +46,6 @@ class CRM_ACL_Page_ACLBasic extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -133,7 +132,6 @@ class CRM_ACL_Page_ACLBasic extends CRM_Core_Page_Basic { * Browse all acls * * @return void - * @static */ public function browse() { diff --git a/CRM/ACL/Page/EntityRole.php b/CRM/ACL/Page/EntityRole.php index aaaa9d4f72..338504d984 100644 --- a/CRM/ACL/Page/EntityRole.php +++ b/CRM/ACL/Page/EntityRole.php @@ -48,7 +48,6 @@ class CRM_ACL_Page_EntityRole extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -154,7 +153,6 @@ class CRM_ACL_Page_EntityRole extends CRM_Core_Page_Basic { * Browse all acls * * @return void - * @static */ public function browse() { diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 99607e06fd..30529a7d00 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -43,7 +43,6 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { * Static field for all the activity information that we can potentially export * * @var array - * @static */ static $_exportableFields = NULL; @@ -51,7 +50,6 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { * Static field for all the activity information that we can potentially import * * @var array - * @static */ static $_importableFields = NULL; @@ -659,7 +657,6 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { * @return array * (reference) $values the relevant data object values of open activities * - * @static */ public static function &getActivities($input) { //step 1: Get the basic activity data @@ -908,7 +905,6 @@ ORDER BY fixed_sort_order * * @return array * Array of component id and name. - * @static **/ public static function activityComponents() { $components = array(); @@ -950,7 +946,6 @@ ORDER BY fixed_sort_order * @return int * count of activities * - * @static */ public static function &getActivitiesCount($input) { $input['count'] = TRUE; @@ -988,7 +983,6 @@ LEFT JOIN civicrm_case_activity ON ( civicrm_case_activity.activity_id = tbl.a * @return int * count of activities * - * @static */ public static function getActivitySQLClause($input) { $params = array(); @@ -1181,7 +1175,6 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND * * @return array * ( sent, activityId) if any email is sent and activityId - * @static */ static function sendEmail( &$contactDetails, @@ -1514,7 +1507,6 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND * * @return bool|PEAR_Error * true on success or PEAR_Error object - * @static */ static function sendSMSMessage( $toID, @@ -1598,7 +1590,6 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND * * @return boolean * true if successfull else false. - * @static */ static function sendMessage( $from, @@ -1671,7 +1662,6 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND * * @return array * array of importable Fields - * @static */ public static function &importableFields($status = FALSE) { if (!self::$_importableFields) { @@ -1802,7 +1792,6 @@ WHERE activity.id IN ($activityIds)"; * @param int $targetContactID * * @return bool - * @static */ static function addActivity( &$activity, @@ -2111,7 +2100,6 @@ AND cl.modified_id = c.id * @return string|bool * if file exists returns $activityTypeFile activity filename otherwise false. * - * @static */ public static function getFileForActivityTypeId($activityTypeId, $crmDir = 'Activity') { $activityTypes = CRM_Case_PseudoConstant::caseActivityType(FALSE, TRUE); @@ -2162,7 +2150,6 @@ AND cl.modified_id = c.id * * @return array * array of exportable Fields - * @static */ public static function &exportableFields($name = 'Activity') { if (!isset(self::$_exportableFields[$name])) { diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php index 3279b71f81..dc67c9270e 100644 --- a/CRM/Activity/BAO/Query.php +++ b/CRM/Activity/BAO/Query.php @@ -423,7 +423,6 @@ class CRM_Activity_BAO_Query { * * @param CRM_Core_Form $form * @return void - * @static */ public static function buildSearchForm(&$form) { $activityOptions = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE); diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index b10b90cb23..2d212c52d9 100644 --- a/CRM/Activity/Form/Activity.php +++ b/CRM/Activity/Form/Activity.php @@ -830,7 +830,6 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { // skip form rule if deleting diff --git a/CRM/Activity/Form/Task/PickOption.php b/CRM/Activity/Form/Task/PickOption.php index 08821a4658..7f138e90e6 100644 --- a/CRM/Activity/Form/Task/PickOption.php +++ b/CRM/Activity/Form/Task/PickOption.php @@ -123,7 +123,6 @@ class CRM_Activity_Form_Task_PickOption extends CRM_Activity_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { if (!isset($fields['with_contact']) && diff --git a/CRM/Activity/Form/Task/PickProfile.php b/CRM/Activity/Form/Task/PickProfile.php index 6590fb817f..e3a7ba962b 100755 --- a/CRM/Activity/Form/Task/PickProfile.php +++ b/CRM/Activity/Form/Task/PickProfile.php @@ -153,7 +153,6 @@ class CRM_Activity_Form_Task_PickProfile extends CRM_Activity_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { return TRUE; diff --git a/CRM/Activity/Import/Form/MapField.php b/CRM/Activity/Import/Form/MapField.php index e10d2fff80..c1fdd6014a 100644 --- a/CRM/Activity/Import/Form/MapField.php +++ b/CRM/Activity/Import/Form/MapField.php @@ -275,7 +275,6 @@ class CRM_Activity_Import_Form_MapField extends CRM_Import_Form_MapField { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Activity/Selector/Activity.php b/CRM/Activity/Selector/Activity.php index 02606caacb..217d3e1471 100644 --- a/CRM/Activity/Selector/Activity.php +++ b/CRM/Activity/Selector/Activity.php @@ -43,7 +43,6 @@ class CRM_Activity_Selector_Activity extends CRM_Core_Selector_Base implements C * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; diff --git a/CRM/Activity/Selector/Search.php b/CRM/Activity/Selector/Search.php index cd71340535..ade1404e27 100644 --- a/CRM/Activity/Selector/Search.php +++ b/CRM/Activity/Selector/Search.php @@ -44,7 +44,6 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -52,14 +51,12 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( diff --git a/CRM/Activity/Task.php b/CRM/Activity/Task.php index 5148e57630..e83b54861a 100644 --- a/CRM/Activity/Task.php +++ b/CRM/Activity/Task.php @@ -50,7 +50,6 @@ class CRM_Activity_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -58,7 +57,6 @@ class CRM_Activity_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -68,7 +66,6 @@ class CRM_Activity_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function &tasks() { if (!(self::$_tasks)) { @@ -153,7 +150,6 @@ class CRM_Activity_Task { * * @return array * the set of task titles - * @static */ public static function &taskTitles() { self::tasks(); @@ -199,7 +195,6 @@ class CRM_Activity_Task { * * @return array * the set of tasks for a group of activity - * @static */ public static function getTask($value) { self::tasks(); diff --git a/CRM/Admin/Form/ContactType.php b/CRM/Admin/Form/ContactType.php index b8597e961b..c121468eda 100644 --- a/CRM/Admin/Form/ContactType.php +++ b/CRM/Admin/Form/ContactType.php @@ -92,7 +92,6 @@ class CRM_Admin_Form_ContactType extends CRM_Admin_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { diff --git a/CRM/Admin/Form/Extensions.php b/CRM/Admin/Form/Extensions.php index c7d142ea70..d22e27e8bc 100644 --- a/CRM/Admin/Form/Extensions.php +++ b/CRM/Admin/Form/Extensions.php @@ -159,7 +159,6 @@ class CRM_Admin_Form_Extensions extends CRM_Admin_Form { * * @return bool|array * true if no errors, else an array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Admin/Form/MailSettings.php b/CRM/Admin/Form/MailSettings.php index a3de9c5d0b..0d45fe10fa 100644 --- a/CRM/Admin/Form/MailSettings.php +++ b/CRM/Admin/Form/MailSettings.php @@ -109,7 +109,6 @@ class CRM_Admin_Form_MailSettings extends CRM_Admin_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php index 9ee6bcef0b..375e91bac2 100644 --- a/CRM/Admin/Form/Options.php +++ b/CRM/Admin/Form/Options.php @@ -43,7 +43,6 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form { * The option group name * * @var array - * @static */ protected $_gName; @@ -51,7 +50,6 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form { * The option group name in display format (capitalized, without underscores...etc) * * @var array - * @static */ protected $_gLabel; @@ -344,7 +342,6 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form { * * @return array * array of errors / empty array. - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Admin/Form/PreferencesDate.php b/CRM/Admin/Form/PreferencesDate.php index 9037b956f9..c12bd0f1a3 100644 --- a/CRM/Admin/Form/PreferencesDate.php +++ b/CRM/Admin/Form/PreferencesDate.php @@ -96,7 +96,6 @@ class CRM_Admin_Form_PreferencesDate extends CRM_Admin_Form { * @return array * if errors then list of errors to be posted back to the form, * true otherwise - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php index 2db0d71dde..3b1ee87705 100644 --- a/CRM/Admin/Form/ScheduleReminders.php +++ b/CRM/Admin/Form/ScheduleReminders.php @@ -270,7 +270,6 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Admin/Form/Setting/Component.php b/CRM/Admin/Form/Setting/Component.php index 61326fb8a3..a361363692 100644 --- a/CRM/Admin/Form/Setting/Component.php +++ b/CRM/Admin/Form/Setting/Component.php @@ -76,7 +76,6 @@ class CRM_Admin_Form_Setting_Component extends CRM_Admin_Form_Setting { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $options) { $errors = array(); diff --git a/CRM/Admin/Form/Setting/Mapping.php b/CRM/Admin/Form/Setting/Mapping.php index c5e7ad2966..a8a052b75a 100644 --- a/CRM/Admin/Form/Setting/Mapping.php +++ b/CRM/Admin/Form/Setting/Mapping.php @@ -65,7 +65,6 @@ class CRM_Admin_Form_Setting_Mapping extends CRM_Admin_Form_Setting { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Admin/Form/Setting/Miscellaneous.php b/CRM/Admin/Form/Setting/Miscellaneous.php index 4bff04c95f..fc964512d7 100644 --- a/CRM/Admin/Form/Setting/Miscellaneous.php +++ b/CRM/Admin/Form/Setting/Miscellaneous.php @@ -128,7 +128,6 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $options) { $errors = array(); diff --git a/CRM/Admin/Form/Setting/Smtp.php b/CRM/Admin/Form/Setting/Smtp.php index 3ce97c290d..cbb44aa8c2 100644 --- a/CRM/Admin/Form/Setting/Smtp.php +++ b/CRM/Admin/Form/Setting/Smtp.php @@ -210,7 +210,6 @@ class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { if ($fields['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_SMTP) { diff --git a/CRM/Admin/Form/WordReplacements.php b/CRM/Admin/Form/WordReplacements.php index 5d632ef332..4394353ba6 100644 --- a/CRM/Admin/Form/WordReplacements.php +++ b/CRM/Admin/Form/WordReplacements.php @@ -184,7 +184,6 @@ class CRM_Admin_Form_WordReplacements extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values) { $errors = array(); diff --git a/CRM/Admin/Page/ContactType.php b/CRM/Admin/Page/ContactType.php index c386824998..eaff918f5e 100644 --- a/CRM/Admin/Page/ContactType.php +++ b/CRM/Admin/Page/ContactType.php @@ -44,7 +44,6 @@ class CRM_Admin_Page_ContactType extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Admin/Page/EventTemplate.php b/CRM/Admin/Page/EventTemplate.php index 70f42ce582..da2c1ab391 100644 --- a/CRM/Admin/Page/EventTemplate.php +++ b/CRM/Admin/Page/EventTemplate.php @@ -42,7 +42,6 @@ class CRM_Admin_Page_EventTemplate extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -88,7 +87,6 @@ class CRM_Admin_Page_EventTemplate extends CRM_Core_Page_Basic { * Browse all event templates. * * @return void - * @static */ public function browse() { //get all event templates. diff --git a/CRM/Admin/Page/Extensions.php b/CRM/Admin/Page/Extensions.php index 2cc2726f90..e442cc38f2 100644 --- a/CRM/Admin/Page/Extensions.php +++ b/CRM/Admin/Page/Extensions.php @@ -43,7 +43,6 @@ class CRM_Admin_Page_Extensions extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -131,7 +130,6 @@ class CRM_Admin_Page_Extensions extends CRM_Core_Page_Basic { * * * @return void - * @static */ public function browse() { $mapper = CRM_Extension_System::singleton()->getMapper(); diff --git a/CRM/Admin/Page/Job.php b/CRM/Admin/Page/Job.php index 02d86e0e3d..89d6993b56 100644 --- a/CRM/Admin/Page/Job.php +++ b/CRM/Admin/Page/Job.php @@ -42,7 +42,6 @@ class CRM_Admin_Page_Job extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -147,7 +146,6 @@ class CRM_Admin_Page_Job extends CRM_Core_Page_Basic { * @param null $action * * @return void - * @static */ public function browse($action = NULL) { diff --git a/CRM/Admin/Page/JobLog.php b/CRM/Admin/Page/JobLog.php index 889e0699f2..366d2c58fe 100644 --- a/CRM/Admin/Page/JobLog.php +++ b/CRM/Admin/Page/JobLog.php @@ -42,7 +42,6 @@ class CRM_Admin_Page_JobLog extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -96,7 +95,6 @@ class CRM_Admin_Page_JobLog extends CRM_Core_Page_Basic { * @param null $action * * @return void - * @static */ public function browse($action = NULL) { diff --git a/CRM/Admin/Page/LabelFormats.php b/CRM/Admin/Page/LabelFormats.php index 9826496bbe..e281eb266b 100644 --- a/CRM/Admin/Page/LabelFormats.php +++ b/CRM/Admin/Page/LabelFormats.php @@ -45,7 +45,6 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -131,7 +130,6 @@ class CRM_Admin_Page_LabelFormats extends CRM_Core_Page_Basic { * @param null $action * * @return void - * @static */ public function browse($action = NULL) { // Get list of configured Label Formats diff --git a/CRM/Admin/Page/LocationType.php b/CRM/Admin/Page/LocationType.php index 8a22660daa..cf88450a2d 100644 --- a/CRM/Admin/Page/LocationType.php +++ b/CRM/Admin/Page/LocationType.php @@ -44,7 +44,6 @@ class CRM_Admin_Page_LocationType extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Admin/Page/MailSettings.php b/CRM/Admin/Page/MailSettings.php index a3f915b7e5..358aba0740 100644 --- a/CRM/Admin/Page/MailSettings.php +++ b/CRM/Admin/Page/MailSettings.php @@ -44,7 +44,6 @@ class CRM_Admin_Page_MailSettings extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -90,7 +89,6 @@ class CRM_Admin_Page_MailSettings extends CRM_Core_Page_Basic { * Browse all mail settings. * * @return void - * @static */ public function browse() { //get all mail settings. diff --git a/CRM/Admin/Page/Mapping.php b/CRM/Admin/Page/Mapping.php index 068a13a051..c1b4c7404f 100644 --- a/CRM/Admin/Page/Mapping.php +++ b/CRM/Admin/Page/Mapping.php @@ -44,7 +44,6 @@ class CRM_Admin_Page_Mapping extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Admin/Page/MessageTemplates.php b/CRM/Admin/Page/MessageTemplates.php index 75f5a57eff..ad3bed60bf 100644 --- a/CRM/Admin/Page/MessageTemplates.php +++ b/CRM/Admin/Page/MessageTemplates.php @@ -42,7 +42,6 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Admin/Page/Navigation.php b/CRM/Admin/Page/Navigation.php index ac6ce47fb1..76b33e36d1 100644 --- a/CRM/Admin/Page/Navigation.php +++ b/CRM/Admin/Page/Navigation.php @@ -42,7 +42,6 @@ class CRM_Admin_Page_Navigation extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Admin/Page/Options.php b/CRM/Admin/Page/Options.php index 252e3b4255..49d42dab9e 100644 --- a/CRM/Admin/Page/Options.php +++ b/CRM/Admin/Page/Options.php @@ -44,7 +44,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -52,7 +51,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { * The option group name * * @var array - * @static */ static $_gName = NULL; @@ -60,7 +58,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { * The option group name in display format (capitalized, without underscores...etc) * * @var array - * @static */ static $_gLabel = NULL; @@ -68,7 +65,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { * The option group id * * @var array - * @static */ static $_gId = NULL; @@ -76,7 +72,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { * A boolean determining if you can add options to this group in the GUI * * @var boolean - * @static */ static $_isLocked = FALSE; @@ -238,7 +233,6 @@ class CRM_Admin_Page_Options extends CRM_Core_Page_Basic { * * * @return void - * @static */ public function browse() { if (!self::$_gName) { diff --git a/CRM/Admin/Page/PaymentProcessor.php b/CRM/Admin/Page/PaymentProcessor.php index 9734efbce2..b329ea11e7 100644 --- a/CRM/Admin/Page/PaymentProcessor.php +++ b/CRM/Admin/Page/PaymentProcessor.php @@ -42,7 +42,6 @@ class CRM_Admin_Page_PaymentProcessor extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -128,7 +127,6 @@ class CRM_Admin_Page_PaymentProcessor extends CRM_Core_Page_Basic { * @param null $action * * @return void - * @static */ public function browse($action = NULL) { // get all custom groups sorted by weight diff --git a/CRM/Admin/Page/PaymentProcessorType.php b/CRM/Admin/Page/PaymentProcessorType.php index f6a7e315c4..ea7c4666f2 100644 --- a/CRM/Admin/Page/PaymentProcessorType.php +++ b/CRM/Admin/Page/PaymentProcessorType.php @@ -42,7 +42,6 @@ class CRM_Admin_Page_PaymentProcessorType extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Admin/Page/PdfFormats.php b/CRM/Admin/Page/PdfFormats.php index 261ca0006b..5cdff8748c 100644 --- a/CRM/Admin/Page/PdfFormats.php +++ b/CRM/Admin/Page/PdfFormats.php @@ -45,7 +45,6 @@ class CRM_Admin_Page_PdfFormats extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -125,7 +124,6 @@ class CRM_Admin_Page_PdfFormats extends CRM_Core_Page_Basic { * @param null $action * * @return void - * @static */ public function browse($action = NULL) { // Get list of configured PDF Page Formats diff --git a/CRM/Admin/Page/Persistent.php b/CRM/Admin/Page/Persistent.php index e838a904a4..9413518fcf 100644 --- a/CRM/Admin/Page/Persistent.php +++ b/CRM/Admin/Page/Persistent.php @@ -42,7 +42,6 @@ class CRM_Admin_Page_Persistent extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ private static $_stringActionLinks; private static $_customizeActionLinks; @@ -104,7 +103,6 @@ class CRM_Admin_Page_Persistent extends CRM_Core_Page { * * * @return void - * @static */ public function browse() { $permission = FALSE; diff --git a/CRM/Admin/Page/PreferencesDate.php b/CRM/Admin/Page/PreferencesDate.php index 51955edfb5..b1d1e7ff0d 100644 --- a/CRM/Admin/Page/PreferencesDate.php +++ b/CRM/Admin/Page/PreferencesDate.php @@ -42,7 +42,6 @@ class CRM_Admin_Page_PreferencesDate extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Admin/Page/RelationshipType.php b/CRM/Admin/Page/RelationshipType.php index 928b120917..a8b8be2281 100644 --- a/CRM/Admin/Page/RelationshipType.php +++ b/CRM/Admin/Page/RelationshipType.php @@ -44,7 +44,6 @@ class CRM_Admin_Page_RelationshipType extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Admin/Page/ScheduleReminders.php b/CRM/Admin/Page/ScheduleReminders.php index 1103162059..abf55130b5 100644 --- a/CRM/Admin/Page/ScheduleReminders.php +++ b/CRM/Admin/Page/ScheduleReminders.php @@ -45,7 +45,6 @@ class CRM_Admin_Page_ScheduleReminders extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -135,7 +134,6 @@ class CRM_Admin_Page_ScheduleReminders extends CRM_Core_Page_Basic { * @param null $action * * @return void - * @static */ public function browse($action = NULL) { // Get list of configured reminders diff --git a/CRM/Admin/Page/Tag.php b/CRM/Admin/Page/Tag.php index f572fe3286..fe2d55c6e7 100644 --- a/CRM/Admin/Page/Tag.php +++ b/CRM/Admin/Page/Tag.php @@ -44,7 +44,6 @@ class CRM_Admin_Page_Tag extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php index c5752a8ce0..183a7e74b3 100644 --- a/CRM/Badge/BAO/Badge.php +++ b/CRM/Badge/BAO/Badge.php @@ -412,7 +412,6 @@ class CRM_Badge_BAO_Badge { * @param CRM_Core_Form $form * * @return void - * @static */ public static function buildBadges(&$params, &$form) { // get name badge layout info diff --git a/CRM/Badge/BAO/Layout.php b/CRM/Badge/BAO/Layout.php index 7da955a1c9..bfd3ef58af 100644 --- a/CRM/Badge/BAO/Layout.php +++ b/CRM/Badge/BAO/Layout.php @@ -53,7 +53,6 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel { * * @return CRM_Core_DAO_PrintLabel|null * object on success, null otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $printLabel = new CRM_Core_DAO_PrintLabel(); @@ -76,7 +75,6 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel { * @return Object * DAO object on success, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_PrintLabel', $id, 'is_active', $is_active); @@ -88,7 +86,6 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel { * @param array $params * Reference array contains the values submitted by the form. * - * @static * * @return object */ @@ -130,7 +127,6 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel { * @param int $printLabelId * ID of the name label to be deleted. * - * @static */ public static function del($printLabelId) { $printLabel = new CRM_Core_DAO_PrintLabel(); @@ -143,7 +139,6 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel { * * @return array * list of labels - * @static */ public static function getList() { $printLabel = new CRM_Core_DAO_PrintLabel(); @@ -183,7 +178,6 @@ class CRM_Badge_BAO_Layout extends CRM_Core_DAO_PrintLabel { * * @return array * associated array of decoded elements - * @static */ static public function getDecodedData($jsonData) { return json_decode($jsonData, TRUE); diff --git a/CRM/Badge/Page/Layout.php b/CRM/Badge/Page/Layout.php index 4402684f52..a33fef2442 100644 --- a/CRM/Badge/Page/Layout.php +++ b/CRM/Badge/Page/Layout.php @@ -42,7 +42,6 @@ class CRM_Badge_Page_Layout extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php index b4779c6e4b..a3774a4bc7 100755 --- a/CRM/Batch/BAO/Batch.php +++ b/CRM/Batch/BAO/Batch.php @@ -86,7 +86,6 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { * * @return array * CRM_Batch_BAO_Batch object on success, null otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $batch = new CRM_Batch_DAO_Batch(); @@ -106,7 +105,6 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { * * @return int * $profileId profile id - * @static */ public static function getProfileId($batchTypeId) { //retrieve the profile specific to batch type @@ -132,7 +130,6 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { * * @return string * batch name - * @static */ public static function generateBatchName() { $sql = "SELECT max(id) FROM civicrm_batch"; @@ -582,7 +579,6 @@ class CRM_Batch_BAO_Batch extends CRM_Batch_DAO_Batch { * * @return void * - * @static */ public static function exportFinancialBatch($batchIds, $exportFormat) { if (empty($batchIds)) { diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php index 165ec1114d..0673689d44 100755 --- a/CRM/Batch/Form/Entry.php +++ b/CRM/Batch/Form/Entry.php @@ -276,7 +276,6 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($params, $files, $self) { $errors = array(); diff --git a/CRM/Batch/Page/Batch.php b/CRM/Batch/Page/Batch.php index 6192585550..98580cd708 100644 --- a/CRM/Batch/Page/Batch.php +++ b/CRM/Batch/Page/Batch.php @@ -42,7 +42,6 @@ class CRM_Batch_Page_Batch extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Campaign/BAO/Campaign.php b/CRM/Campaign/BAO/Campaign.php index 325a229d49..e9ab3a0e34 100644 --- a/CRM/Campaign/BAO/Campaign.php +++ b/CRM/Campaign/BAO/Campaign.php @@ -45,7 +45,6 @@ class CRM_Campaign_BAO_Campaign extends CRM_Campaign_DAO_Campaign { * (reference ) an assoc array of name/value pairs. * * @return CRM_Campaign_DAO_Campaign - * @static */ public static function create(&$params) { if (empty($params)) { @@ -339,7 +338,6 @@ Order By camp.title"; /** * Retrieve campaigns for dashboard. * - * @static */ public static function getCampaignSummary($params = array(), $onlyCount = FALSE) { $campaigns = array(); @@ -486,7 +484,6 @@ SELECT campaign.id as id, /** * Get the campaign count. * - * @static */ public static function getCampaignCount() { return (int) CRM_Core_DAO::singleValueQuery('SELECT COUNT(*) FROM civicrm_campaign'); @@ -499,7 +496,6 @@ SELECT campaign.id as id, * Campaign id. * * @return array - * @static */ public static function getCampaignGroups($campaignId) { static $campaignGroups; @@ -537,7 +533,6 @@ INNER JOIN civicrm_group grp ON ( grp.id = campgrp.entity_id ) * * @return CRM_Campaign_DAO_Campaign|null * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Campaign_DAO_Campaign', $id, 'is_active', $is_active); diff --git a/CRM/Campaign/BAO/Petition.php b/CRM/Campaign/BAO/Petition.php index 23072c0725..8258970aa4 100644 --- a/CRM/Campaign/BAO/Petition.php +++ b/CRM/Campaign/BAO/Petition.php @@ -44,7 +44,6 @@ class CRM_Campaign_BAO_Petition extends CRM_Campaign_BAO_Survey { /** * Get Petition Details for dashboard. * - * @static */ public static function getPetitionSummary($params = array(), $onlyCount = FALSE) { //build the limit and order clause. @@ -154,7 +153,6 @@ SELECT petition.id as id, /** * Get the petition count. * - * @static */ public static function getPetitionCount() { $whereClause = 'WHERE ( 1 )'; @@ -176,7 +174,6 @@ SELECT petition.id as id, * (reference ) an assoc array of name/value pairs. * * @return CRM_Campaign_BAO_Petition - * @static */ public function createSignature(&$params) { if (empty($params)) { @@ -283,7 +280,6 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; * @param int $surveyId * * @return array - * @static */ public static function getPetitionSignatureTotalbyCountry($surveyId) { $countries = array(); @@ -326,7 +322,6 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; * @param int $surveyId * * @return array - * @static */ public static function getPetitionSignatureTotal($surveyId) { $surveyInfo = CRM_Campaign_BAO_Petition::getSurveyInfo((int) $surveyId); @@ -388,7 +383,6 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; * @param int $status_id * * @return array - * @static */ public static function getPetitionSignature($surveyId, $status_id = NULL) { @@ -487,7 +481,6 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; * @param int $contactId * * @return array - * @static */ public static function checkSignature($surveyId, $contactId) { @@ -544,7 +537,6 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )"; * @throws Exception * @return void * @access public - * @static */ public static function sendEmail($params, $sendEmailMode) { diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php index 67f3d1e002..0e6b778a66 100755 --- a/CRM/Campaign/BAO/Query.php +++ b/CRM/Campaign/BAO/Query.php @@ -43,7 +43,6 @@ class CRM_Campaign_BAO_Query { * Static field for all the campaign fields * * @var array - * @static */ static $_campaignFields = NULL; @@ -54,7 +53,6 @@ class CRM_Campaign_BAO_Query { * * @return array * self::$_campaignFields an associative array of campaign fields - * @static */ public static function &getFields() { if (!isset(self::$_campaignFields)) { @@ -342,7 +340,6 @@ civicrm_activity_assignment.record_type_id = $assigneeID ) "; * * @param CRM_Core_Form $form * @return void - * @static */ public static function buildSearchForm(&$form) { @@ -455,7 +452,6 @@ INNER JOIN civicrm_custom_group grp on fld.custom_group_id = grp.id * @param array $criteria * An array. * @return $voterClause as a string - * @static */ /** * @param array $params diff --git a/CRM/Campaign/BAO/Survey.php b/CRM/Campaign/BAO/Survey.php index 6e22770067..96661f31b2 100644 --- a/CRM/Campaign/BAO/Survey.php +++ b/CRM/Campaign/BAO/Survey.php @@ -80,7 +80,6 @@ class CRM_Campaign_BAO_Survey extends CRM_Campaign_DAO_Survey { * @param array $params * * @return CRM_Survey_DAO_Survey - * @static */ public static function create(&$params) { if (empty($params)) { @@ -118,7 +117,6 @@ class CRM_Campaign_BAO_Survey extends CRM_Campaign_DAO_Survey { /** * Retrieve surveys for dashboard. * - * @static */ public static function getSurveySummary($params = array(), $onlyCount = FALSE) { //build the limit and order clause. @@ -242,7 +240,6 @@ SELECT survey.id as id, /** * Get the survey count. * - * @static */ public static function getSurveyCount() { return (int) CRM_Core_DAO::singleValueQuery('SELECT COUNT(*) FROM civicrm_survey'); @@ -260,7 +257,6 @@ SELECT survey.id as id, * @param bool $includePetition * Include or exclude petitions. * - * @static */ public static function getSurveys($onlyActive = TRUE, $onlyDefault = FALSE, $forceAll = FALSE, $includePetition = FALSE) { $cacheKey = 0; @@ -313,7 +309,6 @@ SELECT survey.id as id, * Get Surveys activity types * * - * @static */ static function getSurveyActivityType( $returnColumn = 'label', @@ -352,7 +347,6 @@ SELECT survey.id as id, * an array of survey type id. * * @return array - * @static */ public static function getSurveyCustomGroups($surveyTypes = array()) { $customGroups = array(); @@ -396,7 +390,6 @@ SELECT survey.id as id, * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Campaign_DAO_Survey', $id, 'is_active', $is_active); @@ -409,7 +402,6 @@ SELECT survey.id as id, * Survey id. * * @return mixed|null - * @static */ public static function del($id) { if (!$id) { @@ -433,7 +425,6 @@ SELECT survey.id as id, * * @return array * array of contact info. - * @static */ public static function voterDetails($voterIds, $returnProperties = array()) { $voterDetails = array(); @@ -530,7 +521,6 @@ Group By contact.id"; * * @return array * array of survey activity. - * @static */ static function voterActivityDetails( $surveyId, $voterIds, $interviewerId = NULL, @@ -594,7 +584,6 @@ INNER JOIN civicrm_activity_contact activityAssignment * * @return array * An array of survey activity. - * @static */ static function getSurveyActivities( $surveyId, @@ -701,7 +690,6 @@ INNER JOIN civicrm_contact contact_a ON ( activityTarget.contact_id = contact_a * * @return array * Survey related contact ids. - * @static */ public static function getSurveyVoterInfo($surveyId, $interviewerId = NULL, $statusIds = array()) { $voterIds = array(); @@ -735,7 +723,6 @@ INNER JOIN civicrm_contact contact_a ON ( activityTarget.contact_id = contact_a * @param string $valueColumnName * @return array * an array of option groups. - * @static */ public static function getResultSets($valueColumnName = 'title') { $resultSets = array(); @@ -756,7 +743,6 @@ INNER JOIN civicrm_contact contact_a ON ( activityTarget.contact_id = contact_a * @param int $activityId * Activity id. * @return boolean - * @static */ public static function isSurveyActivity($activityId) { $isSurveyActivity = FALSE; @@ -786,7 +772,6 @@ INNER JOIN civicrm_contact contact_a ON ( activityTarget.contact_id = contact_a * Survey id. * @return array * an array of option values - * @static */ public static function getResponsesOptions($surveyId) { $responseOptions = array(); @@ -810,7 +795,6 @@ INNER JOIN civicrm_contact contact_a ON ( activityTarget.contact_id = contact_a * @param string $extraULName * @return array|string * $url array of permissioned links - * @static */ public static function buildPermissionLinks($surveyId, $enclosedInUL = FALSE, $extraULName = 'more') { $menuLinks = array(); diff --git a/CRM/Campaign/Form/SurveyType.php b/CRM/Campaign/Form/SurveyType.php index feef600885..2d57b2298e 100644 --- a/CRM/Campaign/Form/SurveyType.php +++ b/CRM/Campaign/Form/SurveyType.php @@ -44,7 +44,6 @@ class CRM_Campaign_Form_SurveyType extends CRM_Admin_Form { * The option group name * * @var string - * @static */ protected $_gName; diff --git a/CRM/Campaign/Form/Task/Reserve.php b/CRM/Campaign/Form/Task/Reserve.php index 05cc122df6..06c5384653 100644 --- a/CRM/Campaign/Form/Task/Reserve.php +++ b/CRM/Campaign/Form/Task/Reserve.php @@ -212,7 +212,6 @@ class CRM_Campaign_Form_Task_Reserve extends CRM_Campaign_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Campaign/Page/Petition/Confirm.php b/CRM/Campaign/Page/Petition/Confirm.php index 50a95f43f1..e1a78ee074 100644 --- a/CRM/Campaign/Page/Petition/Confirm.php +++ b/CRM/Campaign/Page/Petition/Confirm.php @@ -105,7 +105,6 @@ class CRM_Campaign_Page_Petition_Confirm extends CRM_Core_Page { * * @return boolean * True on success - * @static */ public static function confirm($contact_id, $subscribe_id, $hash, $activity_id, $petition_id) { $se = CRM_Mailing_Event_BAO_Subscribe::verify($contact_id, $subscribe_id, $hash); diff --git a/CRM/Campaign/Page/SurveyType.php b/CRM/Campaign/Page/SurveyType.php index 44456cd1b4..9dbfcc4903 100644 --- a/CRM/Campaign/Page/SurveyType.php +++ b/CRM/Campaign/Page/SurveyType.php @@ -44,7 +44,6 @@ class CRM_Campaign_Page_SurveyType extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -52,7 +51,6 @@ class CRM_Campaign_Page_SurveyType extends CRM_Core_Page_Basic { * The option group name * * @var array - * @static */ protected $_gName; @@ -60,7 +58,6 @@ class CRM_Campaign_Page_SurveyType extends CRM_Core_Page_Basic { * The option group name in display format (capitalized, without underscores...etc) * * @var array - * @static */ protected $_GName; @@ -68,7 +65,6 @@ class CRM_Campaign_Page_SurveyType extends CRM_Core_Page_Basic { * The option group id * * @var array - * @static */ protected $_gid = NULL; @@ -153,7 +149,6 @@ class CRM_Campaign_Page_SurveyType extends CRM_Core_Page_Basic { * * * @return void - * @static */ public function browse() { $campaingCompId = CRM_Core_Component::getComponentID('CiviCampaign'); diff --git a/CRM/Campaign/PseudoConstant.php b/CRM/Campaign/PseudoConstant.php index 0ce3f80f3f..6f1c5c74b0 100755 --- a/CRM/Campaign/PseudoConstant.php +++ b/CRM/Campaign/PseudoConstant.php @@ -42,27 +42,23 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant { /** * Activity types * @var array - * @static */ private static $activityType; /** * Campaign Type * @var array - * @static */ private static $campaignType = array(); /** * Campaign Status * @var array - * @static */ private static $campaignStatus = array(); /** * Engagement Level - * @static */ private static $engagementLevel; @@ -75,7 +71,6 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all survey activity types. - * @static */ public static function &activityType($returnColumn = 'name') { $cacheKey = $returnColumn; @@ -99,7 +94,6 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant { * * The static array campaignType is returned * - * @static * * @return array * array reference of all campaign types. @@ -118,7 +112,6 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant { * * The static array campaignStatus is returned * - * @static * * @return array * array reference of all campaign status. @@ -137,7 +130,6 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant { * * The static array Engagement Level is returned * - * @static * * @return array * array reference of all Engagement Level. @@ -154,7 +146,6 @@ class CRM_Campaign_PseudoConstant extends CRM_Core_PseudoConstant { * Flush given pseudoconstant so it can be reread from db * next time it's requested. * - * @static * * @param bool|string $name pseudoconstant to be flushed */ diff --git a/CRM/Campaign/Selector/Search.php b/CRM/Campaign/Selector/Search.php index d18176eb9c..d246c2e9b4 100755 --- a/CRM/Campaign/Selector/Search.php +++ b/CRM/Campaign/Selector/Search.php @@ -45,7 +45,6 @@ class CRM_Campaign_Selector_Search extends CRM_Core_Selector_Base implements CRM * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Campaign_Selector_Search extends CRM_Core_Selector_Base implements CRM * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( 'contact_id', diff --git a/CRM/Campaign/Task.php b/CRM/Campaign/Task.php index a453dee24a..5e0d703dd5 100755 --- a/CRM/Campaign/Task.php +++ b/CRM/Campaign/Task.php @@ -46,7 +46,6 @@ class CRM_Campaign_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -54,7 +53,6 @@ class CRM_Campaign_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -64,7 +62,6 @@ class CRM_Campaign_Task { * * @return array * the set of tasks for a group of voters. - * @static */ public static function &tasks() { if (!(self::$_tasks)) { @@ -112,7 +109,6 @@ class CRM_Campaign_Task { * * @return array * the set of task titles - * @static */ public static function &taskTitles() { self::tasks(); @@ -147,7 +143,6 @@ class CRM_Campaign_Task { * * @return array * the set of tasks for a group of voters. - * @static */ public static function getTask($value) { self::tasks(); diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 877907b6da..fade780f00 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -43,7 +43,6 @@ class CRM_Case_BAO_Case extends CRM_Case_DAO_Case { * Static field for all the case information that we can potentially export * * @var array - * @static */ static $_exportableFields = NULL; @@ -74,7 +73,6 @@ class CRM_Case_BAO_Case extends CRM_Case_DAO_Case { * (reference ) an assoc array of name/value pairs. * * @return CRM_Case_BAO_Case - * @static */ public static function add(&$params) { $caseDAO = new CRM_Case_DAO_Case(); @@ -94,7 +92,6 @@ class CRM_Case_BAO_Case extends CRM_Case_DAO_Case { * The array that holds all the db ids. * * @return CRM_Case_BAO_Case|null the found object or null - * @static */ public static function &getValues(&$params, &$values, &$ids) { $case = new CRM_Case_BAO_Case(); @@ -116,7 +113,6 @@ class CRM_Case_BAO_Case extends CRM_Case_DAO_Case { * (reference ) an assoc array of name/value pairs. * * @return CRM_Case_BAO_Case - * @static */ public static function &create(&$params) { $transaction = new CRM_Core_Transaction(); @@ -260,7 +256,6 @@ class CRM_Case_BAO_Case extends CRM_Case_DAO_Case { * (reference) the array that holds all the db ids. * * @return CRM_Case_BAO_Case - * @static */ public static function retrieve(&$params, &$defaults, &$ids) { $case = CRM_Case_BAO_Case::getValues($params, $defaults, $ids); @@ -274,7 +269,6 @@ class CRM_Case_BAO_Case extends CRM_Case_DAO_Case { * @param array $params * (reference ) an assoc array of name/value pairs. * - * @static */ public static function processCaseActivity(&$params) { $caseActivityDAO = new CRM_Case_DAO_CaseActivity(); @@ -292,7 +286,6 @@ class CRM_Case_BAO_Case extends CRM_Case_DAO_Case { * Activity id. * * @return string|null - * @static */ public static function getCaseSubject($activityId) { $caseActivity = new CRM_Case_DAO_CaseActivity(); @@ -311,7 +304,6 @@ class CRM_Case_BAO_Case extends CRM_Case_DAO_Case { * * @return string * case type - * @static */ public static function getCaseType($caseId, $colName = 'title') { $query = " @@ -336,7 +328,6 @@ WHERE civicrm_case.id = %1"; * * @return bool * is successful - * @static */ public static function deleteCase($caseId, $moveToTrash = FALSE) { CRM_Utils_Hook::pre('delete', 'Case', $caseId, CRM_Core_DAO::$_nullArray); @@ -390,7 +381,6 @@ WHERE civicrm_case.id = %1"; * Action. * * @return void - * @static */ public static function enableDisableCaseRelationships($caseId, $enable) { $contactIds = self::retrieveContactIdsByCaseId($caseId); @@ -415,7 +405,6 @@ WHERE civicrm_case.id = %1"; * Id of the activity. * * @return void - * @static */ public static function deleteCaseActivity($activityId) { $case = new CRM_Case_DAO_CaseActivity(); @@ -975,7 +964,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c * @return array * case role / relationships * - * @static */ public static function getCaseRoles($contactID, $caseID, $relationshipID = NULL) { $query = ' @@ -1039,7 +1027,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c * @return array * Array of case activities * - * @static */ public static function getCaseActivity($caseID, &$params, $contactID, $context = NULL, $userID = NULL, $type = NULL) { $values = array(); @@ -1380,7 +1367,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c * @return array * array of return properties * - * @static */ public static function getRelatedContacts($caseID, $skipDetails = FALSE) { $values = array(); @@ -1696,7 +1682,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c * Array of scheduled activity type and date * * - * @static */ public static function getNextScheduledActivity($cases, $type = 'upcoming') { $session = CRM_Core_Session::singleton(); @@ -1734,7 +1719,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c * * @return array * array of exportable Fields - * @static */ public static function &exportableFields() { if (!self::$_exportableFields) { @@ -1765,7 +1749,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c * Id of the case to restore. * * @return bool - * @static */ public static function restoreCase($caseId) { //restore activities @@ -1867,7 +1850,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c * @return array * case activities due dates * - * @static */ public static function getCaseActivityDates($caseID, $criteriaParams = array(), $latestDate = FALSE) { $values = array(); @@ -1922,7 +1904,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c * @return void * on success creates activity and case activity * - * @static */ public static function createCaseRoleActivity($caseId, $relationshipId, $relContactId = NULL, $contactId = NULL) { if (!$caseId || !$relationshipId || empty($relationshipId)) { @@ -2017,7 +1998,6 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c * @return array * array of contact on success otherwise empty * - * @static */ public static function getCaseManagerContact($caseType, $caseId) { if (!$caseType || !$caseId) { @@ -2361,7 +2341,6 @@ INNER JOIN civicrm_case_contact ON ( civicrm_case.id = civicrm_case_contact.cas * @param bool $changeClient * * @return int|NULL - * @static */ static function mergeCases( $mainContactId, $mainCaseId = NULL, $otherContactId = NULL, @@ -2777,7 +2756,6 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')'; * Info of the activity. * * @return void - * @static */ public static function buildPermissionLinks(&$tplParams, $activityParams) { $activityTypeId = CRM_Core_DAO::getFieldValue('CRM_Activity_DAO_Activity', $activityParams['source_record_id'], @@ -2824,7 +2802,6 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')'; * Do we need to check component enabled. * * @return boolean - * @static */ public static function checkPermission($activityId, $operation, $actTypeId = NULL, $contactId = NULL, $checkComponent = TRUE) { $allow = FALSE; @@ -3382,7 +3359,6 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')'; * * @return array * associated array with client ids - * @static */ public static function getCaseClients($caseId) { $clients = array(); diff --git a/CRM/Case/BAO/CaseType.php b/CRM/Case/BAO/CaseType.php index e946624237..d8787510fb 100644 --- a/CRM/Case/BAO/CaseType.php +++ b/CRM/Case/BAO/CaseType.php @@ -43,7 +43,6 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { * Static field for all the case information that we can potentially export * * @var array - * @static */ static $_exportableFields = NULL; @@ -60,7 +59,6 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { * @throws CRM_Core_Exception * * @return CRM_Case_BAO_CaseType - * @static */ public static function add(&$params) { $caseTypeDAO = new CRM_Case_DAO_CaseType(); @@ -106,7 +104,6 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { * The case-type defintion expressed as an array-tree. * @return string * XML - * @static */ public static function convertDefinitionToXML($name, $definition) { $xmlFile = '' . "\n\n\n"; @@ -190,7 +187,6 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { * * @return array * the definition of the case-type, expressed as PHP array-tree - * @static */ public static function convertXmlToDefinition($xml) { // build PHP array based on definition @@ -254,7 +250,6 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { * Output values of the object. * * @return CRM_Case_BAO_CaseType|null the found object or null - * @static */ public static function &getValues(&$params, &$values) { $caseType = new CRM_Case_BAO_CaseType(); @@ -275,7 +270,6 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { * (reference ) an assoc array of name/value pairs. * * @return CRM_Case_BAO_CaseType - * @static */ public static function &create(&$params) { $transaction = new CRM_Core_Transaction(); @@ -319,7 +313,6 @@ class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType { * in a hierarchical manner * * @return CRM_Case_BAO_CaseType - * @static */ public static function retrieve(&$params, &$defaults) { $caseType = CRM_Case_BAO_CaseType::getValues($params, $defaults); diff --git a/CRM/Case/BAO/Query.php b/CRM/Case/BAO/Query.php index 53d3b52817..b6c518d76c 100644 --- a/CRM/Case/BAO/Query.php +++ b/CRM/Case/BAO/Query.php @@ -699,7 +699,6 @@ case_relation_type.id = case_relationship.relationship_type_id )"; * @param CRM_Core_Form $form * * @return void - * @static */ public static function buildSearchForm(&$form) { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Case/Form/Activity.php b/CRM/Case/Form/Activity.php index cddb9da2de..9a3407d48b 100644 --- a/CRM/Case/Form/Activity.php +++ b/CRM/Case/Form/Activity.php @@ -363,7 +363,6 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { // skip form rule if deleting diff --git a/CRM/Case/Form/Activity/ChangeCaseStartDate.php b/CRM/Case/Form/Activity/ChangeCaseStartDate.php index cf626fa3c4..ac4c8530dd 100644 --- a/CRM/Case/Form/Activity/ChangeCaseStartDate.php +++ b/CRM/Case/Form/Activity/ChangeCaseStartDate.php @@ -111,7 +111,6 @@ class CRM_Case_Form_Activity_ChangeCaseStartDate { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $form) { return TRUE; diff --git a/CRM/Case/Form/Activity/ChangeCaseStatus.php b/CRM/Case/Form/Activity/ChangeCaseStatus.php index d82f8c354f..9ea9f782bd 100644 --- a/CRM/Case/Form/Activity/ChangeCaseStatus.php +++ b/CRM/Case/Form/Activity/ChangeCaseStatus.php @@ -111,7 +111,6 @@ class CRM_Case_Form_Activity_ChangeCaseStatus { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $form) { return TRUE; diff --git a/CRM/Case/Form/Activity/ChangeCaseType.php b/CRM/Case/Form/Activity/ChangeCaseType.php index 7820a9583b..22c8145a08 100644 --- a/CRM/Case/Form/Activity/ChangeCaseType.php +++ b/CRM/Case/Form/Activity/ChangeCaseType.php @@ -108,7 +108,6 @@ class CRM_Case_Form_Activity_ChangeCaseType { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $form) { return TRUE; diff --git a/CRM/Case/Form/Activity/LinkCases.php b/CRM/Case/Form/Activity/LinkCases.php index 153f1cab37..163374925a 100644 --- a/CRM/Case/Form/Activity/LinkCases.php +++ b/CRM/Case/Form/Activity/LinkCases.php @@ -100,7 +100,6 @@ class CRM_Case_Form_Activity_LinkCases { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $form) { $errors = array(); diff --git a/CRM/Case/Form/Activity/OpenCase.php b/CRM/Case/Form/Activity/OpenCase.php index afca55a490..eab4ac7855 100644 --- a/CRM/Case/Form/Activity/OpenCase.php +++ b/CRM/Case/Form/Activity/OpenCase.php @@ -259,7 +259,6 @@ class CRM_Case_Form_Activity_OpenCase { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $form) { if ($form->_context == 'caseActivity') { diff --git a/CRM/Case/Form/Case.php b/CRM/Case/Form/Case.php index ce75a40b6e..c065454fee 100644 --- a/CRM/Case/Form/Case.php +++ b/CRM/Case/Form/Case.php @@ -322,7 +322,6 @@ class CRM_Case_Form_Case extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $form) { return TRUE; diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php index 74cd7ba4b7..c75997630c 100644 --- a/CRM/Case/Form/Search.php +++ b/CRM/Case/Form/Search.php @@ -327,7 +327,6 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search { * Posted values of the form. * * @return void - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Case/Page/Tab.php b/CRM/Case/Page/Tab.php index dfdaa28282..d76d17c880 100644 --- a/CRM/Case/Page/Tab.php +++ b/CRM/Case/Page/Tab.php @@ -43,7 +43,6 @@ class CRM_Case_Page_Tab extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; public $_permission = NULL; @@ -225,7 +224,6 @@ class CRM_Case_Page_Tab extends CRM_Core_Page { * * @return array * (reference) of action links - * @static */ static public function &links() { diff --git a/CRM/Case/PseudoConstant.php b/CRM/Case/PseudoConstant.php index 871593773a..26fdd21fa4 100644 --- a/CRM/Case/PseudoConstant.php +++ b/CRM/Case/PseudoConstant.php @@ -42,35 +42,30 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { /** * Case statues * @var array - * @static */ static $caseStatus = array(); /** * Redaction rules * @var array - * @static */ static $redactionRule; /** * Case type * @var array - * @static */ static $caseType = array(); /** * Encounter Medium * @var array - * @static */ static $encounterMedium = array(); /** * Activity type * @var array - * @static */ static $activityTypeList = array(); @@ -85,7 +80,6 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all case statues - * @static */ public static function caseStatus($column = 'label', $onlyActive = TRUE, $condition = NULL, $fresh = FALSE) { $cacheKey = "{$column}_" . (int) $onlyActive; @@ -111,7 +105,6 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all redaction rules - * @static */ public static function redactionRule($filter = NULL) { @@ -142,7 +135,6 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all case type - * @static */ public static function caseType($column = 'title', $onlyActive = TRUE) { if ($onlyActive) { @@ -176,7 +168,6 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all Encounter Medium. - * @static */ public static function encounterMedium($column = 'label', $onlyActive = TRUE) { $cacheKey = "{$column}_" . (int) $onlyActive; @@ -201,7 +192,6 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { * * @param bool $all * - * @static * * @return array * array reference of all activity types. @@ -256,7 +246,6 @@ class CRM_Case_PseudoConstant extends CRM_Core_PseudoConstant { * Flush given pseudoconstant so it can be reread from db * next time it's requested. * - * @static * * @param bool|string $name pseudoconstant to be flushed */ diff --git a/CRM/Case/Selector/Search.php b/CRM/Case/Selector/Search.php index 01463d3f03..611107dc40 100644 --- a/CRM/Case/Selector/Search.php +++ b/CRM/Case/Selector/Search.php @@ -45,7 +45,6 @@ class CRM_Case_Selector_Search extends CRM_Core_Selector_Base { * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Case_Selector_Search extends CRM_Core_Selector_Base { * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( 'contact_id', diff --git a/CRM/Case/Task.php b/CRM/Case/Task.php index 261e28d16a..7775f7aa7b 100644 --- a/CRM/Case/Task.php +++ b/CRM/Case/Task.php @@ -45,7 +45,6 @@ class CRM_Case_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -53,7 +52,6 @@ class CRM_Case_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -63,7 +61,6 @@ class CRM_Case_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function &tasks() { if (!self::$_tasks) { @@ -108,7 +105,6 @@ class CRM_Case_Task { * * @return array * the set of task titles - * @static */ public static function &taskTitles() { self::tasks(); @@ -124,7 +120,6 @@ class CRM_Case_Task { * * @return array * the set of optional tasks for a group of contacts - * @static */ public static function &optionalTaskTitle() { $tasks = array(); @@ -167,7 +162,6 @@ class CRM_Case_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function getTask($value) { self::tasks(); diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php index c1c0f27b1b..bc43f7c1b5 100644 --- a/CRM/Contact/BAO/Contact.php +++ b/CRM/Contact/BAO/Contact.php @@ -77,7 +77,6 @@ class CRM_Contact_BAO_Contact extends CRM_Contact_DAO_Contact { * Static field for all the contact information that we can potentially import * * @var array - * @static */ static $_importableFields = array(); @@ -85,7 +84,6 @@ class CRM_Contact_BAO_Contact extends CRM_Contact_DAO_Contact { * Static field for all the contact information that we can potentially export * * @var array - * @static */ static $_exportableFields = NULL; @@ -111,7 +109,6 @@ class CRM_Contact_BAO_Contact extends CRM_Contact_DAO_Contact { * (reference ) an assoc array of name/value pairs. * * @return CRM_Contact_BAO_Contact - * @static */ public static function add(&$params) { $contact = new CRM_Contact_DAO_Contact(); @@ -277,7 +274,6 @@ class CRM_Contact_BAO_Contact extends CRM_Contact_DAO_Contact { * * @throws Exception * @return CRM_Contact_BAO_Contact - * @static */ public static function &create(&$params, $fixAddress = TRUE, $invokeHooks = TRUE, $skipDelete = FALSE) { $contact = NULL; @@ -472,7 +468,6 @@ class CRM_Contact_BAO_Contact extends CRM_Contact_DAO_Contact { * * @return array * the displayName and contactImage for this contact - * @static */ public static function getDisplayAndImage($id, $type = FALSE) { //CRM-14276 added the * on the civicrm_contact table so that we have all the contact info available @@ -560,7 +555,6 @@ WHERE civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer'); * True if we want to resolve the values in the reverse direction (value -> name). * * @return void - * @static */ public static function resolveDefaults(&$defaults, $reverse = FALSE) { // hack for birth_date @@ -695,7 +689,6 @@ WHERE civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer'); * For location in microformat. * * @return CRM_Contact_BAO_Contact - * @static */ public static function &retrieve(&$params, &$defaults, $microformat = FALSE) { if (array_key_exists('contact_id', $params)) { @@ -744,7 +737,6 @@ WHERE civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer'); * * @return null|string * display name of the contact if found - * @static */ public static function displayName($id) { $displayName = NULL; @@ -767,7 +759,6 @@ WHERE civicrm_contact.id = " . CRM_Utils_Type::escape($id, 'Integer'); * * @return boolean * true if contact deleted, false otherwise - * @static */ public static function deleteContact($id, $restore = FALSE, $skipUndelete = FALSE) { @@ -1065,7 +1056,6 @@ WHERE id={$id}; "; * i.e. is_delete = 0 * * @return void - * @static */ public static function contactTrashRestore($contact, $restore = FALSE) { $op = ($restore ? 'restore' : 'trash'); @@ -1098,7 +1088,6 @@ WHERE id={$id}; "; * contact_type if $id found else null "" * * - * @static */ public static function getContactType($id) { return CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $id, 'contact_type'); @@ -1116,7 +1105,6 @@ WHERE id={$id}; "; * contact_sub_type if $id found else null "" * * - * @static */ public static function getContactSubType($id, $implodeDelimiter = NULL) { $subtype = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $id, 'contact_sub_type'); @@ -1141,7 +1129,6 @@ WHERE id={$id}; "; * @return array * * - * @static */ public static function getContactTypes($id) { $params = array('id' => $id); @@ -1185,7 +1172,6 @@ WHERE id={$id}; "; * * @return array * array of importable Fields - * @static */ static function importableFields( $contactType = 'Individual', @@ -1385,7 +1371,6 @@ WHERE id={$id}; "; * * @return array * array of exportable Fields - * @static */ public static function &exportableFields($contactType = 'Individual', $status = FALSE, $export = FALSE, $search = FALSE, $withMultiRecord = FALSE) { if (empty($contactType)) { @@ -1619,7 +1604,6 @@ WHERE id={$id}; "; * Fields array. * * @return $values array contains the contact details - * @static */ public static function getHierContactDetails($contactId, &$fields) { $params = array(array('contact_id', '=', $contactId, 0, 0)); @@ -1647,7 +1631,6 @@ WHERE id={$id}; "; * * @return array * a hierarchical property tree if appropriate - * @static */ public static function &makeHierReturnProperties($fields, $contactId = NULL) { $locationTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id'); @@ -1723,7 +1706,6 @@ WHERE id={$id}; "; * * @return int * $locationType location_type_id - * @static */ public static function getPrimaryLocationType($contactId, $skipDefaultPriamry = FALSE, $block = NULL) { if ($block) { @@ -1787,7 +1769,6 @@ WHERE civicrm_contact.id = %1 "; * * @return array * Array of display_name, email if found, do_not_email or (null,null,null) - * @static */ public static function getContactDetails($id) { // check if the contact type @@ -1844,7 +1825,6 @@ ORDER BY civicrm_email.is_primary DESC"; * * @return int * contact id created/edited - * @static */ static function createProfileContact( &$params, @@ -2319,7 +2299,6 @@ ORDER BY civicrm_email.is_primary DESC"; * * @return object * $dao contact details - * @static */ public static function &matchContactOnEmail($mail, $ctype = NULL) { $strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower'; @@ -2372,7 +2351,6 @@ WHERE civicrm_email.email = %1 AND civicrm_contact.is_deleted=0"; * * @return object * $dao contact details - * @static */ public static function &matchContactOnOpenId($openId, $ctype = NULL) { $strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower'; @@ -2410,7 +2388,6 @@ WHERE civicrm_openid.openid = %1"; * * @return string * >email email address if present else null - * @static */ public static function getPrimaryEmail($contactID) { // fetch the primary email @@ -2439,7 +2416,6 @@ LEFT JOIN civicrm_email ON ( civicrm_contact.id = civicrm_email.contact_id ) * * @return string * >openid OpenID if present else null - * @static */ public static function getPrimaryOpenId($contactID) { // fetch the primary OpenID @@ -2470,7 +2446,6 @@ AND civicrm_openid.is_primary = 1"; * Output values of the object. * * @return CRM_Contact_BAO_Contact|null the found object or null - * @static */ public static function getValues(&$params, &$values) { $contact = new CRM_Contact_BAO_Contact(); @@ -2560,7 +2535,6 @@ AND civicrm_openid.is_primary = 1"; * * @return int * total number in database - * @static */ public static function getCountComponent($component, $contactId, $tableName = NULL) { $object = NULL; @@ -2638,7 +2612,6 @@ AND civicrm_openid.is_primary = 1"; * Use default greeting values. * * @return void - * @static */ public static function processGreetings(&$contact, $useDefaults = FALSE) { if ($useDefaults) { @@ -2794,7 +2767,6 @@ AND civicrm_openid.is_primary = 1"; * * @return array * loc block ids which fulfill condition. - * @static */ public static function getLocBlockIds($contactId, $criteria = array(), $condOperator = 'AND') { $locBlockIds = array(); @@ -2844,7 +2816,6 @@ AND civicrm_openid.is_primary = 1"; * * @return array * Array of context menu for logged in user. - * @static */ public static function contextMenu($contactId = NULL) { $menu = array( @@ -3117,7 +3088,6 @@ AND civicrm_openid.is_primary = 1"; * * @return string|null * the found display name or null. - * @static */ public static function getMasterDisplayName($masterAddressId = NULL, $contactId = NULL) { $masterDisplayName = NULL; @@ -3187,7 +3157,6 @@ LEFT JOIN civicrm_address add2 ON ( add1.master_id = add2.id ) * * @link https://issues.civicrm.org/jira/browse/CRM-15602 * @see triggerInfo - * @static */ public static function generateTimestampTriggers(&$info, $reqTableName, $relatedTableNames, $contactRefColumn) { // Safety @@ -3288,7 +3257,6 @@ LEFT JOIN civicrm_address add2 ON ( add1.master_id = add2.id ) * * @return bool * true if present else false. - * @static */ public static function checkDomainContact($contactId) { if (!$contactId) diff --git a/CRM/Contact/BAO/Contact/Location.php b/CRM/Contact/BAO/Contact/Location.php index a585cc856c..665dcd9969 100644 --- a/CRM/Contact/BAO/Contact/Location.php +++ b/CRM/Contact/BAO/Contact/Location.php @@ -45,7 +45,6 @@ class CRM_Contact_BAO_Contact_Location { * * @return array * Array of display_name, email, location type and location id if found, or (null,null,null, null) - * @static */ public static function getEmailDetails($id, $isPrimary = TRUE, $locationTypeID = NULL) { $primaryClause = NULL; @@ -86,7 +85,6 @@ WHERE civicrm_contact.id = %1"; * * @return array * tuple of display_name and sms if found, or (null,null) - * @static */ public static function getPhoneDetails($id, $type = NULL) { if (!$id) { @@ -127,7 +125,6 @@ LEFT JOIN civicrm_phone ON ( civicrm_phone.contact_id = civicrm_contact.id ) * * @return null|string * display name of the contact if found - * @static */ public static function &getMapInfo($ids, $locationTypeID = NULL, $imageUrlOnly = FALSE) { $idString = ' ( ' . implode(',', $ids) . ' ) '; diff --git a/CRM/Contact/BAO/Contact/Permission.php b/CRM/Contact/BAO/Contact/Permission.php index 6b540804f1..e9b4355b03 100644 --- a/CRM/Contact/BAO/Contact/Permission.php +++ b/CRM/Contact/BAO/Contact/Permission.php @@ -43,7 +43,6 @@ class CRM_Contact_BAO_Contact_Permission { * * @return boolean * true if the user has permission, false otherwise - * @static */ public static function allow($id, $type = CRM_Core_Permission::VIEW) { $tables = array(); @@ -90,7 +89,6 @@ WHERE contact_a.id = %1 AND $permission"; * Should we force a recompute. * * @return void - * @static */ public static function cache($userID, $type = CRM_Core_Permission::VIEW, $force = FALSE) { static $_processed = array(); @@ -157,7 +155,6 @@ ON DUPLICATE KEY UPDATE * Contact id. * * @return boolean - * @static */ static function hasContactsInCache( $type = CRM_Core_Permission::VIEW, @@ -252,7 +249,6 @@ AND $operationClause LIMIT 1"; * @return bool * true if logged in user has permission to view * selected contact record else false - * @static */ public static function relationship($selectedContactID, $contactID = NULL) { $session = CRM_Core_Session::singleton(); diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php index 17754049aa..0fc398c8c0 100644 --- a/CRM/Contact/BAO/Contact/Utils.php +++ b/CRM/Contact/BAO/Contact/Utils.php @@ -47,7 +47,6 @@ class CRM_Contact_BAO_Contact_Utils { * If profile overlay class should be added. * * @return string - * @static */ public static function getImage($contactType, $urlOnly = FALSE, $contactId = NULL, $addProfileOverlay = TRUE) { static $imageInfo = array(); @@ -123,7 +122,6 @@ class CRM_Contact_BAO_Contact_Utils { * @return bool * true if mix contact array else false * - * @static */ public static function checkContactType(&$contactIds) { if (empty($contactIds)) { @@ -158,7 +156,6 @@ WHERE id IN ( $idString ) * * @return array * ( $cs, $ts, $live ) - * @static */ public static function generateChecksum($entityId, $ts = NULL, $live = NULL, $hash = NULL, $entityType = 'contact', $hashSize = NULL) { // return a warning message if we dont get a entityId @@ -227,7 +224,6 @@ WHERE id IN ( $idString ) * * @return boolean * true if valid, else false - * @static */ public static function validChecksum($contactID, $inputCheck) { @@ -261,7 +257,6 @@ WHERE id IN ( $idString ) * * @return int * max locations for the contact - * @static */ public static function maxLocations($contactId) { $contactLocations = array(); @@ -291,7 +286,6 @@ UNION * @param int $previousEmployerID * @param bool $newContact * - * @static */ public static function createCurrentEmployerRelationship($contactID, $organization, $previousEmployerID = NULL, $newContact = FALSE) { //if organization name is passed. CRM-15368,CRM-15547 @@ -374,7 +368,6 @@ UNION * @param int $previousEmpID * * @throws CiviCRM_API3_Exception - * @static */ public static function currentEmployerRelatedMembership($contactID, $employerID, $relationshipParams, $duplicate = FALSE, $previousEmpID = NULL) { $ids = array(); @@ -492,7 +485,6 @@ WHERE id={$contactId}; "; * @param string $title * fieldset title. * - * @static */ public static function buildOnBehalfForm(&$form, $contactType, $countryID, $stateID, $title) { @@ -587,7 +579,6 @@ UPDATE civicrm_contact * * @return array * returns array with links to contact view - * @static */ public static function formatContactIDSToLinks($contactIDs, $addViewLink = TRUE, $addEditLink = TRUE, $originalId = NULL) { $contactLinks = array(); @@ -696,7 +687,6 @@ LEFT JOIN civicrm_email ce ON ( ce.contact_id=c.id AND ce.is_primary = 1 ) * * @return array * array of contact info. - * @static */ public static function contactDetails($componentIds, $componentName, $returnProperties = array()) { $contactDetails = array(); @@ -825,7 +815,6 @@ Group By componentId"; * This is associated array which contains submitted form values. * * @return void - * @static */ public static function processSharedAddress(&$address) { if (!is_array($address)) { @@ -878,7 +867,6 @@ Group By componentId"; * * @return array * associated array of contact names - * @static */ public static function getAddressShareContactNames(&$addresses) { $contactNames = array(); @@ -918,7 +906,6 @@ Group By componentId"; * The contactID that was edited / deleted. * * @return void - * @static */ public static function clearContactCaches($contactID = NULL) { // clear acl cache if any. @@ -1133,7 +1120,6 @@ WHERE id IN (" . implode(',', $contactIds) . ")"; * @param string $className * * @return void - * @static */ public static function processGreetingTemplate(&$templateString, $contactDetails, $contactID, $className) { CRM_Utils_Token::replaceGreetingTokens($templateString, $contactDetails, $contactID, $className, TRUE); diff --git a/CRM/Contact/BAO/ContactType.php b/CRM/Contact/BAO/ContactType.php index 6ebda66cf3..3be98214b7 100644 --- a/CRM/Contact/BAO/ContactType.php +++ b/CRM/Contact/BAO/ContactType.php @@ -44,7 +44,6 @@ class CRM_Contact_BAO_ContactType extends CRM_Contact_DAO_ContactType { * * @return CRM_Contact_BAO_ContactType|null * object on success, null otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $contactType = new CRM_Contact_DAO_ContactType(); @@ -74,7 +73,6 @@ class CRM_Contact_BAO_ContactType extends CRM_Contact_DAO_ContactType { * * @return array * Array of basic contact types information. - * @static */ public static function &basicTypeInfo($all = FALSE) { static $_cache = NULL; @@ -121,7 +119,6 @@ WHERE parent_id IS NULL * * @return array * Array of basic contact types - * @static */ public static function basicTypes($all = FALSE) { return array_keys(self::basicTypeInfo($all)); @@ -155,7 +152,6 @@ WHERE parent_id IS NULL * * @return array * Array of sub type information - * @static */ public static function &subTypeInfo($contactType = NULL, $all = FALSE, $ignoreCache = FALSE, $reset = FALSE) { static $_cache = NULL; @@ -226,7 +222,6 @@ WHERE subtype.name IS NOT NULL AND subtype.parent_id IS NOT NULL {$ctWHERE} * @return array * all subtypes OR list of subtypes associated to * a given basic contact type - * @static */ public static function subTypes($contactType = NULL, $all = FALSE, $columnName = 'name', $ignoreCache = FALSE) { if ($columnName == 'name') { @@ -248,7 +243,6 @@ WHERE subtype.name IS NOT NULL AND subtype.parent_id IS NOT NULL {$ctWHERE} * * @return array * list of subtypes with name as 'subtype-name' and 'label' as value - * @static */ public static function subTypePairs($contactType = NULL, $all = FALSE, $labelPrefix = '- ', $ignoreCache = FALSE) { $subtypes = self::subTypeInfo($contactType, $all, $ignoreCache); @@ -268,7 +262,6 @@ WHERE subtype.name IS NOT NULL AND subtype.parent_id IS NOT NULL {$ctWHERE} * * @return array * Array of basic types + all subtypes. - * @static */ public static function contactTypes($all = FALSE) { return array_keys(self::contactTypeInfo($all)); @@ -283,7 +276,6 @@ WHERE subtype.name IS NOT NULL AND subtype.parent_id IS NOT NULL {$ctWHERE} * * @return array * Array of basic types + all subtypes. - * @static */ public static function contactTypeInfo($all = FALSE, $reset = FALSE) { static $_cache = NULL; @@ -344,7 +336,6 @@ WHERE type.name IS NOT NULL * * @return array * Array of basictypes with name as 'built-in name' and 'label' as value - * @static */ public static function contactTypePairs($all = FALSE, $typeName = NULL, $delimiter = NULL) { $types = self::contactTypeInfo($all); @@ -461,7 +452,6 @@ AND ( p.is_active = 1 OR p.id IS NULL ) * * @return boolean * true if subType, false otherwise. - * @static */ public static function isaSubType($subType, $ignoreCache = FALSE) { return in_array($subType, self::subTypes(NULL, TRUE, 'name', $ignoreCache)); @@ -472,7 +462,6 @@ AND ( p.is_active = 1 OR p.id IS NULL ) * * @param array /string $subType contact subType. * @return array/string of basicTypes. - * @static */ public static function getBasicType($subType) { static $_cache = NULL; @@ -516,7 +505,6 @@ WHERE subtype.name IN ('" . implode("','", $subType) . "' )"; * * @return array * Array of suppressed subTypes. - * @static */ public static function suppressSubTypes(&$subTypes, $ignoreCache = FALSE) { $subTypes = array_diff($subTypes, self::subTypes(NULL, TRUE, 'name', $ignoreCache)); @@ -535,7 +523,6 @@ WHERE subtype.name IN ('" . implode("','", $subType) . "' )"; * * @return boolean * true if contact extends, false otherwise. - * @static */ public static function isExtendsContactType($subType, $contactType, $ignoreCache = FALSE, $columnName = 'name') { if (!is_array($subType)) { @@ -551,7 +538,6 @@ WHERE subtype.name IN ('" . implode("','", $subType) . "' )"; * * @return array * of contactTypes - * @static */ public static function getCreateNewList() { $shortCuts = array(); @@ -591,7 +577,6 @@ WHERE subtype.name IN ('" . implode("','", $subType) . "' )"; * ID of the Contact Subtype to be deleted. * * @return bool - * @static */ public static function del($contactTypeId) { @@ -644,7 +629,6 @@ WHERE name = %1"; * An assoc array of name/value pairs. * * @return object - * @static */ public static function add(&$params) { @@ -713,7 +697,6 @@ WHERE name = %1"; * * @return Object * DAO object on success, null otherwise - * @static */ public static function setIsActive($id, $is_active) { $params = array('id' => $id); @@ -752,7 +735,6 @@ WHERE name = %1"; * Subtype. * * @return boolean - * @static */ public static function isAllowEdit($contactId, $subType = NULL) { diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php index 0ff3c40a6b..1ad8a313b8 100644 --- a/CRM/Contact/BAO/Group.php +++ b/CRM/Contact/BAO/Group.php @@ -54,7 +54,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contact_BAO_Group - * @static */ public static function retrieve(&$params, &$defaults) { $group = new CRM_Contact_DAO_Group(); @@ -75,7 +74,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * Group id. * * @return NULL - * @static */ public static function discard($id) { CRM_Utils_Hook::pre('delete', 'Group', $id, CRM_Core_DAO::$_nullArray); @@ -207,7 +205,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * * @return array * this array contains the list of members for this group id - * @static */ public static function &getMember($groupID, $useCache = TRUE) { $params = array(array('group', 'IN', array($groupID => 1), 0, 0)); @@ -312,7 +309,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * * @return string * the permission that the user has (or NULL) - * @static */ public static function checkPermission($id) { $allGroups = CRM_Core_PseudoConstant::allGroup(); @@ -351,7 +347,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * * @return CRM_Contact_BAO_Group|NULL * The new group BAO (if created) - * @static */ public static function &create(&$params) { @@ -534,7 +529,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * * @return CRM_Contact_BAO_Group|NULL * The new group BAO (if created) - * @static */ public static function createSmartGroup(&$params) { if (!empty($params['formValues'])) { @@ -565,7 +559,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * * @return CRM_Core_DAO|null * DAO object on success, NULL otherwise - * @static */ public static function setIsActive($id, $isActive) { return CRM_Core_DAO::setFieldValue('CRM_Contact_DAO_Group', $id, 'is_active', $isActive); @@ -579,7 +572,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * @param bool $excludeHidden exclude hidden groups. * * @return string - * @static */ public static function groupTypeCondition($groupType = NULL, $excludeHidden = TRUE) { $value = NULL; @@ -653,7 +645,6 @@ class CRM_Contact_BAO_Group extends CRM_Contact_DAO_Group { * * @return array * ( smartGroupId, ssId ) smart group id and saved search id - * @static */ public static function createHiddenSmartGroup($params) { $ssId = CRM_Utils_Array::value('saved_search_id', $params); diff --git a/CRM/Contact/BAO/GroupContact.php b/CRM/Contact/BAO/GroupContact.php index 7823126291..bfadfc54b8 100644 --- a/CRM/Contact/BAO/GroupContact.php +++ b/CRM/Contact/BAO/GroupContact.php @@ -52,7 +52,6 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { * (reference ) an assoc array of name/value pairs. * * @return CRM_Contact_BAO_Group - * @static */ public static function add(&$params) { @@ -75,7 +74,6 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { * (reference ) an assoc array of name/value pairs. * * @return boolean - * @static */ public static function dataExists(&$params) { // return if no data present @@ -97,7 +95,6 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { * * @return array * (reference) the values that could be potentially assigned to smarty - * @static */ public static function getValues(&$params, &$values) { if (empty($params)) { @@ -131,7 +128,6 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { * * @return array * (total, added, notAdded) count of contacts added to group - * @static */ static function addContactsToGroup( $contactIds, @@ -182,7 +178,6 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { * * @return array * (total, removed, notRemoved) count of contacts removed to group - * @static */ static function removeContactsFromGroup( &$contactIds, @@ -282,7 +277,6 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { * * @return array * this array has key-> group id and value group title - * @static */ public static function getGroupList($contactId = 0, $visibility = FALSE) { $group = new CRM_Contact_DAO_Group(); @@ -465,7 +459,6 @@ class CRM_Contact_BAO_GroupContact extends CRM_Contact_DAO_GroupContact { * * @return object * of group contact - * @static */ public static function getMembershipDetail($contactId, $groupID, $method = 'Email') { $leftJoin = $where = $orderBy = NULL; @@ -506,7 +499,6 @@ SELECT * * * * @return groupID - * @static */ public static function getGroupId($groupContactID) { $dao = new CRM_Contact_DAO_GroupContact(); @@ -529,7 +521,6 @@ SELECT * * @param string $method * * @return void - * @static */ public static function create(&$params, $contactId, $visibility = FALSE, $method = 'Admin') { $contactIds = array(); @@ -619,7 +610,6 @@ SELECT * * * @return void * - * @static */ public static function mergeGroupContact($mainContactId, $otherContactId) { $params = array( @@ -729,7 +719,6 @@ AND group_id IN ( $groupIDString ) * * @return array * (total, added, notAdded) count of contacts added to group - * @static */ static function bulkAddContactsToGroup( $contactIDs, diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php index 32eef80a54..71f0986172 100644 --- a/CRM/Contact/BAO/GroupContactCache.php +++ b/CRM/Contact/BAO/GroupContactCache.php @@ -65,7 +65,6 @@ class CRM_Contact_BAO_GroupContactCache extends CRM_Contact_DAO_GroupContactCach * * @return string * the sql query which lists the groups that need to be refreshed - * @static */ public static function groupRefreshedClause($groupIDClause = NULL, $includeHiddenGroups = FALSE) { $smartGroupCacheTimeout = self::smartGroupCacheTimeout(); @@ -105,7 +104,6 @@ AND ( g.cache_date IS NULL OR * * @return string * the sql query which lists the groups that need to be refreshed - * @static */ public static function shouldGroupBeRefreshed($groupID, $includeHiddenGroups = FALSE) { $query = self::groupRefreshedClause("g.id = %1", $includeHiddenGroups); @@ -288,7 +286,6 @@ WHERE id IN ( $groupIDs ) * run the function exactly once for all groups. * * @return void - * @static */ public static function remove($groupID = NULL, $onceOnly = TRUE) { static $invoked = FALSE; diff --git a/CRM/Contact/BAO/GroupOrganization.php b/CRM/Contact/BAO/GroupOrganization.php index be5bf524ac..8da6664c57 100644 --- a/CRM/Contact/BAO/GroupOrganization.php +++ b/CRM/Contact/BAO/GroupOrganization.php @@ -48,7 +48,6 @@ class CRM_Contact_BAO_GroupOrganization extends CRM_Contact_DAO_GroupOrganizatio * (reference ) an assoc array of name/value pairs. * * @return CRM_Contact_DAO_GroupOrganization - * @static */ public static function add(&$params) { $formattedValues = array(); @@ -75,7 +74,6 @@ class CRM_Contact_BAO_GroupOrganization extends CRM_Contact_DAO_GroupOrganizatio * (reference ) an assoc array of name/value pairs. * * @return void - * @static */ public static function formatValues(&$params, &$formatedValues) { if (!empty($params['group_organization'])) { @@ -98,7 +96,6 @@ class CRM_Contact_BAO_GroupOrganization extends CRM_Contact_DAO_GroupOrganizatio * (reference ) an assoc array of name/value pairs. * * @return boolean - * @static */ public static function dataExists($params) { // return if no data present @@ -127,7 +124,6 @@ class CRM_Contact_BAO_GroupOrganization extends CRM_Contact_DAO_GroupOrganizatio * @param int $contactID * * @return boolean - * @static */ public static function hasGroupAssociated($contactID) { $orgID = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_GroupOrganization', diff --git a/CRM/Contact/BAO/Household.php b/CRM/Contact/BAO/Household.php index 1bf59f5687..c2548b6f10 100644 --- a/CRM/Contact/BAO/Household.php +++ b/CRM/Contact/BAO/Household.php @@ -51,7 +51,6 @@ class CRM_Contact_BAO_Household extends CRM_Contact_DAO_Contact { * * @return Object * DAO object on success - * @static */ public static function updatePrimaryContact($primaryContactId, $contactId) { $queryString = "UPDATE civicrm_contact diff --git a/CRM/Contact/BAO/Individual.php b/CRM/Contact/BAO/Individual.php index 8c43a2ed14..aa2b0c02f1 100644 --- a/CRM/Contact/BAO/Individual.php +++ b/CRM/Contact/BAO/Individual.php @@ -53,7 +53,6 @@ class CRM_Contact_BAO_Individual extends CRM_Contact_DAO_Contact { * Contact object. * * @return CRM_Contact_BAO_Contact - * @static */ public static function format(&$params, &$contact) { if (!self::dataExists($params)) { @@ -412,7 +411,6 @@ class CRM_Contact_BAO_Individual extends CRM_Contact_DAO_Contact { * (reference ) an assoc array of name/value pairs. * * @return boolean - * @static */ public static function dataExists(&$params) { if ($params['contact_type'] == 'Individual') { diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index a1b25ba7eb..5fd747d830 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -61,7 +61,6 @@ class CRM_Contact_BAO_Query { * The default set of return properties * * @var array - * @static */ static $_defaultReturnProperties = NULL; @@ -69,7 +68,6 @@ class CRM_Contact_BAO_Query { * The default set of hier return properties * * @var array - * @static */ static $_defaultHierReturnProperties; @@ -282,7 +280,6 @@ class CRM_Contact_BAO_Query { * The relationship type direction * * @var array - * @static */ static $_relType; @@ -290,7 +287,6 @@ class CRM_Contact_BAO_Query { * The activity role * * @var array - * @static */ static $_activityRole; @@ -299,7 +295,6 @@ class CRM_Contact_BAO_Query { * during activity search. * * @var array - * @static */ static $_considerCompActivities; @@ -308,7 +303,6 @@ class CRM_Contact_BAO_Query { * during activity search. * * @var array - * @static */ static $_withContactActivitiesOnly; @@ -332,7 +326,6 @@ class CRM_Contact_BAO_Query { * Track open panes, useful in advance search * * @var array - * @static */ public static $_openedPanes = array(); @@ -346,7 +339,6 @@ class CRM_Contact_BAO_Query { * The tables which have a dependency on location and/or address * * @var array - * @static */ static $_dependencies = array( 'civicrm_state_province' => 1, @@ -2386,7 +2378,6 @@ class CRM_Contact_BAO_Query { * @param bool $strict * * @return string - * @static */ public static function getWhereClause($params, $fields, &$tables, &$whereTables, $strict = FALSE) { $query = new CRM_Contact_BAO_Query($params, NULL, $fields, @@ -2415,7 +2406,6 @@ class CRM_Contact_BAO_Query { * * @return string * the from clause - * @static */ public static function fromClause(&$tables, $inner = NULL, $right = NULL, $primaryLocation = TRUE, $mode = 1) { @@ -5485,7 +5475,6 @@ AND displayRelType.is_active = 1 * @return bool|array * false if string does not match the pattern * array of numeric values if string does match the pattern - * @static */ public static function parseSearchBuilderString($string, $dataType = 'Integer') { $string = trim($string); diff --git a/CRM/Contact/BAO/Query/Hook.php b/CRM/Contact/BAO/Query/Hook.php index 6cca8c1acd..49f43c1591 100644 --- a/CRM/Contact/BAO/Query/Hook.php +++ b/CRM/Contact/BAO/Query/Hook.php @@ -47,7 +47,6 @@ class CRM_Contact_BAO_Query_Hook { * Singleton function used to manage this object * * @return object - * @static */ public static function singleton() { static $singleton = NULL; diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php index fe56dd3d9f..6dd71afc8a 100644 --- a/CRM/Contact/BAO/Relationship.php +++ b/CRM/Contact/BAO/Relationship.php @@ -82,7 +82,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * "we are moving away from the $ids param " * * @return CRM_Contact_BAO_Relationship - * @static */ public static function createMultiple(&$params, $ids = array()) { $valid = $invalid = $duplicate = $saved = 0; @@ -196,7 +195,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * The array that holds all the db ids. * * @return CRM_Contact_BAO_Relationship - * @static */ public static function add(&$params, $ids = array(), $contactId = NULL) { $relationshipId = @@ -354,7 +352,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * * @return array * array of defaults for creating relationship - * @static */ public static function getdefaults() { return array( @@ -376,7 +373,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * (reference ) an assoc array of name/value pairs. * * @return boolean - * @static */ public static function dataExists(&$params) { // return if no data present @@ -407,7 +403,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * If set only subtype which is passed by $contactSubType. * related relationshiptypes get return * - * @static * * @return array * array reference of all relationship types with context to current contact. @@ -539,7 +534,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * * @return null * - * @static */ public static function del($id) { // delete from relationship table @@ -589,7 +583,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * @param $action * * @return null - * @static */ public static function disableEnableRelationship($id, $action) { $relationship = self::clearCurrentEmployer($id, $action); @@ -631,7 +624,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * Id of the contact to delete. * * @return void - * @static */ public static function deleteContact($contactId) { $relationship = new CRM_Contact_DAO_Relationship(); @@ -654,7 +646,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * $returns returns the contact ids in the realtionship * * @return \CRM_Contact_DAO_Relationship - * @static */ public static function getContactIds($id) { $relationship = new CRM_Contact_DAO_Relationship(); @@ -679,7 +670,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * * @return boolean * true if it is valid relationship else false - * @static */ public static function checkRelationshipType($contact_a, $contact_b, $relationshipTypeId) { $relationshipType = new CRM_Contact_DAO_RelationshipType(); @@ -723,7 +713,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * * @return string * @access public - * @static */ public static function checkValidRelationship($params, $ids, $contactId) { $errors = ''; @@ -753,7 +742,6 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * * @return boolean * true if record exists else false - * @static */ public static function checkDuplicateRelationship(&$params, $id, $contactId = 0, $relationshipId = 0) { $relationshipTypeId = CRM_Utils_Array::value('relationship_type_id', $params); @@ -831,7 +819,6 @@ WHERE relationship_type_id = " . CRM_Utils_Type::escape($type, 'Integer'); * @throws CiviCRM_API3_Exception * @return Object * DAO object on success, null otherwise - * @static */ public static function setIsActive($id, $is_active) { // as both the create & add functions have a bunch of logic in them that @@ -867,7 +854,6 @@ WHERE relationship_type_id = " . CRM_Utils_Type::escape($type, 'Integer'); * * @return array * (reference) the values that could be potentially assigned to smarty - * @static */ public static function &getValues(&$params, &$values) { if (empty($params)) { @@ -913,7 +899,6 @@ WHERE relationship_type_id = " . CRM_Utils_Type::escape($type, 'Integer'); * return string the query for this diretion * * @return array - * @static */ public static function makeURLClause($contactId, $status, $numRelationship, $count, $relationshipId, $direction, $params = array()) { $select = $from = $where = ''; @@ -1063,7 +1048,6 @@ LEFT JOIN civicrm_country ON (civicrm_address.country_id = civicrm_country.id) * @param array $params * * @return array|int - * @static */ static function getRelationship( $contactId = NULL, @@ -1293,7 +1277,6 @@ LEFT JOIN civicrm_country ON (civicrm_address.country_id = civicrm_country.id) * * @param bool $active * - * @static */ public static function relatedMemberships($contactId, &$params, $ids, $action = CRM_Core_Action::ADD, $active = TRUE) { // Check the end date and set the status of the relationship @@ -1517,7 +1500,6 @@ SELECT count(*) * Helper function to check whether to delete the membership or * not. * - * @static */ public static function isDeleteRelatedMembership($relTypeIds, $contactId, $mainRelatedContactId, $relTypeId, $relIds) { if (in_array($relTypeId, $relTypeIds)) { @@ -1558,7 +1540,6 @@ SELECT count(*) * * @return array * array of the current employer - * @static */ public static function getCurrentEmployer($contactIds) { $contacts = implode(',', $contactIds); @@ -1588,7 +1569,6 @@ WHERE id IN ( {$contacts} ) * @param string $name * employers sort name. * - * @static * * @return array * array of employers. @@ -1612,7 +1592,6 @@ WHERE id IN ( {$contacts} ) * one or more relationship type id's. * @param string $name * - * @static * * @return array * Array of contacts @@ -1665,7 +1644,6 @@ AND cc.sort_name LIKE '%$name%'"; * * @see CRM_Dedupe_Merger::cpTables() * - * @static */ public static function mergeRelationships($mainId, $otherId, &$sqls) { // Delete circular relationships diff --git a/CRM/Contact/BAO/RelationshipType.php b/CRM/Contact/BAO/RelationshipType.php index da43573c7d..39b0e96512 100644 --- a/CRM/Contact/BAO/RelationshipType.php +++ b/CRM/Contact/BAO/RelationshipType.php @@ -50,7 +50,6 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contact_BAO_RelationshipType - * @static */ public static function retrieve(&$params, &$defaults) { $relationshipType = new CRM_Contact_DAO_RelationshipType(); @@ -73,7 +72,6 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Contact_DAO_RelationshipType', $id, 'is_active', $is_active); @@ -88,7 +86,6 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType * The array that holds all the db ids. * * @return CRM_Contact_DAO_RelationshipType - * @static */ public static function add(&$params, &$ids) { //to change name, CRM-3336 @@ -141,7 +138,6 @@ class CRM_Contact_BAO_RelationshipType extends CRM_Contact_DAO_RelationshipType * * @throws CRM_Core_Exception * @return mixed - * @static */ public static function del($relationshipTypeId) { // make sure relationshipTypeId is an integer diff --git a/CRM/Contact/BAO/SavedSearch.php b/CRM/Contact/BAO/SavedSearch.php index 3fdfcf8508..35818a5466 100644 --- a/CRM/Contact/BAO/SavedSearch.php +++ b/CRM/Contact/BAO/SavedSearch.php @@ -75,7 +75,6 @@ class CRM_Contact_BAO_SavedSearch extends CRM_Contact_DAO_SavedSearch { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contact_BAO_SavedSearch - * @static */ public static function retrieve(&$params, &$defaults) { $savedSearch = new CRM_Contact_DAO_SavedSearch(); @@ -95,7 +94,6 @@ class CRM_Contact_BAO_SavedSearch extends CRM_Contact_DAO_SavedSearch { * * @return array * the values of the posted saved search - * @static */ public static function &getFormValues($id) { $fv = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_SavedSearch', $id, 'form_values'); @@ -162,7 +160,6 @@ class CRM_Contact_BAO_SavedSearch extends CRM_Contact_DAO_SavedSearch { * * @return string * the where clause for this saved search - * @static */ public static function whereClause($id, &$tables, &$whereTables) { $params = self::getSearchParams($id); @@ -278,7 +275,6 @@ LEFT JOIN civicrm_email ON (contact_a.id = civicrm_email.contact_id AND civicrm_ * * @return string * the name of the saved search - * @static */ public static function getName($id, $value = 'name') { $group = new CRM_Contact_DAO_Group(); diff --git a/CRM/Contact/BAO/SubscriptionHistory.php b/CRM/Contact/BAO/SubscriptionHistory.php index b9cc900021..302fee8925 100644 --- a/CRM/Contact/BAO/SubscriptionHistory.php +++ b/CRM/Contact/BAO/SubscriptionHistory.php @@ -56,7 +56,6 @@ class CRM_Contact_BAO_SubscriptionHistory extends CRM_Contact_DAO_SubscriptionHi * * @return object * $history The new history object - * @static */ public static function &create(&$params) { $history = new CRM_Contact_BAO_SubscriptionHistory(); @@ -73,7 +72,6 @@ class CRM_Contact_BAO_SubscriptionHistory extends CRM_Contact_DAO_SubscriptionHi * The contact id. * * @return void - * @static */ public static function deleteContact($id) { $history = new CRM_Contact_BAO_SubscriptionHistory(); diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php index 2b9d536322..7e11455b8c 100644 --- a/CRM/Contact/Form/Contact.php +++ b/CRM/Contact/Form/Contact.php @@ -591,7 +591,6 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { * * @return bool * email/openId - * @static */ public static function formRule($fields, &$errors, $contactId = NULL) { $config = CRM_Core_Config::singleton(); @@ -1071,7 +1070,6 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { * * @return boolean * true if data exists, false otherwise - * @static */ public static function blockDataExists(&$fields) { if (!is_array($fields)) { @@ -1222,7 +1220,6 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { * * @return array * as array of sucess/fails for each address block - * @static */ public function parseAddress(&$params) { $parseSuccess = $parsedFields = array(); @@ -1319,7 +1316,6 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { * * @return null|string * $statusMsg string status message for all address blocks. - * @static */ public static function parseAddressStatusMsg($parseResult) { $statusMsg = NULL; @@ -1352,7 +1348,6 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { * * @return string * ordinal number for given number. - * @static */ public static function ordinalNumber($number) { if (empty($number)) { diff --git a/CRM/Contact/Form/DedupeRules.php b/CRM/Contact/Form/DedupeRules.php index d37cdf0d3f..a4b5f23190 100644 --- a/CRM/Contact/Form/DedupeRules.php +++ b/CRM/Contact/Form/DedupeRules.php @@ -150,7 +150,6 @@ class CRM_Contact_Form_DedupeRules extends CRM_Admin_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Contact/Form/Domain.php b/CRM/Contact/Form/Domain.php index e61db3fbd5..dbb1c5a02a 100644 --- a/CRM/Contact/Form/Domain.php +++ b/CRM/Contact/Form/Domain.php @@ -194,7 +194,6 @@ class CRM_Contact_Form_Domain extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { // check for state/country mapping diff --git a/CRM/Contact/Form/Edit/Address.php b/CRM/Contact/Form/Edit/Address.php index 9702e7aeea..aff4eb7d35 100644 --- a/CRM/Contact/Form/Edit/Address.php +++ b/CRM/Contact/Form/Edit/Address.php @@ -51,7 +51,6 @@ class CRM_Contact_Form_Edit_Address { * * @return void * - * @static */ public static function buildQuickForm(&$form, $addressBlockCount = NULL, $sharing = TRUE, $inlineEdit = FALSE) { // passing this via the session is AWFUL. we need to fix this @@ -282,7 +281,6 @@ class CRM_Contact_Form_Edit_Address { * @return array|bool * if no errors * - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); @@ -339,7 +337,6 @@ class CRM_Contact_Form_Edit_Address { * @param CRM_Core_Form $form * Form object. * - * @static */ public static function setDefaultValues(&$defaults, &$form) { $addressValues = array(); diff --git a/CRM/Contact/Form/Edit/CommunicationPreferences.php b/CRM/Contact/Form/Edit/CommunicationPreferences.php index 8fe1f5d158..4991df9072 100644 --- a/CRM/Contact/Form/Edit/CommunicationPreferences.php +++ b/CRM/Contact/Form/Edit/CommunicationPreferences.php @@ -41,7 +41,6 @@ class CRM_Contact_Form_Edit_CommunicationPreferences { /** * Greetings * @var array - * @static */ static $greetings = array(); @@ -52,7 +51,6 @@ class CRM_Contact_Form_Edit_CommunicationPreferences { * Reference to the form object. * * @return void - * @static */ public static function buildQuickForm(&$form) { // since the pcm - preferred comminication method is logically @@ -142,7 +140,6 @@ class CRM_Contact_Form_Edit_CommunicationPreferences { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { //CRM-4575 diff --git a/CRM/Contact/Form/Edit/CustomData.php b/CRM/Contact/Form/Edit/CustomData.php index e67424094a..2288f58eed 100644 --- a/CRM/Contact/Form/Edit/CustomData.php +++ b/CRM/Contact/Form/Edit/CustomData.php @@ -72,7 +72,6 @@ class CRM_Contact_Form_Edit_CustomData { * Reference to the form object. * * @return void - * @static */ public static function buildQuickForm(&$form) { if (!empty($form->_submitValues)) { diff --git a/CRM/Contact/Form/Edit/Demographics.php b/CRM/Contact/Form/Edit/Demographics.php index 358b76cfdb..f095eb0f7f 100644 --- a/CRM/Contact/Form/Edit/Demographics.php +++ b/CRM/Contact/Form/Edit/Demographics.php @@ -45,7 +45,6 @@ class CRM_Contact_Form_Edit_Demographics { * Reference to the form object. * * @return void - * @static */ public static function buildQuickForm(&$form) { // radio button for gender diff --git a/CRM/Contact/Form/Edit/Email.php b/CRM/Contact/Form/Edit/Email.php index d778fe6a03..003d1b6e1b 100644 --- a/CRM/Contact/Form/Edit/Email.php +++ b/CRM/Contact/Form/Edit/Email.php @@ -49,7 +49,6 @@ class CRM_Contact_Form_Edit_Email { * Is it block edit. * * @return void - * @static */ public static function buildQuickForm(&$form, $blockCount = NULL, $blockEdit = FALSE) { // passing this via the session is AWFUL. we need to fix this diff --git a/CRM/Contact/Form/Edit/Household.php b/CRM/Contact/Form/Edit/Household.php index c65f064766..95071a1b07 100644 --- a/CRM/Contact/Form/Edit/Household.php +++ b/CRM/Contact/Form/Edit/Household.php @@ -89,7 +89,6 @@ class CRM_Contact_Form_Edit_Household { * * @return array|bool * $error - * @static */ public static function formRule($fields, $files, $contactID = NULL) { $errors = array(); diff --git a/CRM/Contact/Form/Edit/IM.php b/CRM/Contact/Form/Edit/IM.php index d5176ea24b..755fc50335 100644 --- a/CRM/Contact/Form/Edit/IM.php +++ b/CRM/Contact/Form/Edit/IM.php @@ -49,7 +49,6 @@ class CRM_Contact_Form_Edit_IM { * Is it block edit. * * @return void - * @static */ public static function buildQuickForm(&$form, $blockCount = NULL, $blockEdit = FALSE) { if (!$blockCount) { diff --git a/CRM/Contact/Form/Edit/Individual.php b/CRM/Contact/Form/Edit/Individual.php index e3d52678e0..8e82a838df 100644 --- a/CRM/Contact/Form/Edit/Individual.php +++ b/CRM/Contact/Form/Edit/Individual.php @@ -154,7 +154,6 @@ class CRM_Contact_Form_Edit_Individual { * * @return bool * TRUE if no errors, else array of errors. - * @static */ public static function formRule($fields, $files, $contactID = NULL) { $errors = array(); diff --git a/CRM/Contact/Form/Edit/Lock.php b/CRM/Contact/Form/Edit/Lock.php index cc90e00866..f7e5d7d27d 100644 --- a/CRM/Contact/Form/Edit/Lock.php +++ b/CRM/Contact/Form/Edit/Lock.php @@ -62,7 +62,6 @@ class CRM_Contact_Form_Edit_Lock { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $contactID = NULL) { $errors = array(); diff --git a/CRM/Contact/Form/Edit/Notes.php b/CRM/Contact/Form/Edit/Notes.php index a65484adc3..eb49cecb06 100644 --- a/CRM/Contact/Form/Edit/Notes.php +++ b/CRM/Contact/Form/Edit/Notes.php @@ -38,7 +38,6 @@ class CRM_Contact_Form_Edit_Notes { * build form elements * params object $form object of the form * - * @static */ public static function buildQuickForm(&$form) { $form->applyFilter('__ALL__', 'trim'); diff --git a/CRM/Contact/Form/Edit/OpenID.php b/CRM/Contact/Form/Edit/OpenID.php index 4473bef0c0..9cb99bcbae 100644 --- a/CRM/Contact/Form/Edit/OpenID.php +++ b/CRM/Contact/Form/Edit/OpenID.php @@ -49,7 +49,6 @@ class CRM_Contact_Form_Edit_OpenID { * Is it block edit. * * @return void - * @static */ public static function buildQuickForm(&$form, $blockCount = NULL, $blockEdit = FALSE) { if (!$blockCount) { diff --git a/CRM/Contact/Form/Edit/Phone.php b/CRM/Contact/Form/Edit/Phone.php index 68da6e976f..71c48d2b27 100644 --- a/CRM/Contact/Form/Edit/Phone.php +++ b/CRM/Contact/Form/Edit/Phone.php @@ -49,7 +49,6 @@ class CRM_Contact_Form_Edit_Phone { * Is it block edit. * * @return void - * @static */ public static function buildQuickForm(&$form, $addressBlockCount = NULL, $blockEdit = FALSE) { // passing this via the session is AWFUL. we need to fix this diff --git a/CRM/Contact/Form/Edit/TagsAndGroups.php b/CRM/Contact/Form/Edit/TagsAndGroups.php index 81e20e53ed..65979724a9 100644 --- a/CRM/Contact/Form/Edit/TagsAndGroups.php +++ b/CRM/Contact/Form/Edit/TagsAndGroups.php @@ -63,7 +63,6 @@ class CRM_Contact_Form_Edit_TagsAndGroups { * * @param string $groupElementType * - * @static */ static function buildQuickForm( &$form, @@ -216,7 +215,6 @@ class CRM_Contact_Form_Edit_TagsAndGroups { * @param string $groupElementType * * @return void - * @static */ public static function setDefaults($id, &$defaults, $type = self::ALL, $fieldName = NULL, $groupElementType = 'checkbox') { $type = (int ) $type; diff --git a/CRM/Contact/Form/Edit/Website.php b/CRM/Contact/Form/Edit/Website.php index 5b9c8cdec8..2d8363ce34 100644 --- a/CRM/Contact/Form/Edit/Website.php +++ b/CRM/Contact/Form/Edit/Website.php @@ -47,7 +47,6 @@ class CRM_Contact_Form_Edit_Website { * Block number to build. * * @return void - * @static */ public static function buildQuickForm(&$form, $blockCount = NULL) { if (!$blockCount) { diff --git a/CRM/Contact/Form/Inline/Email.php b/CRM/Contact/Form/Inline/Email.php index a0efe9980b..00b9fa5ff6 100644 --- a/CRM/Contact/Form/Inline/Email.php +++ b/CRM/Contact/Form/Inline/Email.php @@ -104,7 +104,6 @@ class CRM_Contact_Form_Inline_Email extends CRM_Contact_Form_Inline { * List of errors to be posted back to the form. * * @return array - * @static */ public static function formRule($fields, $errors) { $hasData = $hasPrimary = $errors = array(); diff --git a/CRM/Contact/Form/Inline/IM.php b/CRM/Contact/Form/Inline/IM.php index 2bcb95c636..bc058a8509 100644 --- a/CRM/Contact/Form/Inline/IM.php +++ b/CRM/Contact/Form/Inline/IM.php @@ -104,7 +104,6 @@ class CRM_Contact_Form_Inline_IM extends CRM_Contact_Form_Inline { * List of errors to be posted back to the form. * * @return array - * @static */ public static function formRule($fields, $errors) { $hasData = $hasPrimary = $errors = array(); diff --git a/CRM/Contact/Form/Inline/Lock.php b/CRM/Contact/Form/Inline/Lock.php index 253c373b5a..9388ef025b 100644 --- a/CRM/Contact/Form/Inline/Lock.php +++ b/CRM/Contact/Form/Inline/Lock.php @@ -73,7 +73,6 @@ class CRM_Contact_Form_Inline_Lock { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $contactID = NULL) { $errors = array(); diff --git a/CRM/Contact/Form/Inline/OpenID.php b/CRM/Contact/Form/Inline/OpenID.php index c1d77bb93e..c80b3903d6 100644 --- a/CRM/Contact/Form/Inline/OpenID.php +++ b/CRM/Contact/Form/Inline/OpenID.php @@ -104,7 +104,6 @@ class CRM_Contact_Form_Inline_OpenID extends CRM_Contact_Form_Inline { * List of errors to be posted back to the form. * * @return array - * @static */ public static function formRule($fields, $errors) { $hasData = $hasPrimary = $errors = array(); diff --git a/CRM/Contact/Form/Inline/Phone.php b/CRM/Contact/Form/Inline/Phone.php index 544bf4872b..601d2e2052 100644 --- a/CRM/Contact/Form/Inline/Phone.php +++ b/CRM/Contact/Form/Inline/Phone.php @@ -104,7 +104,6 @@ class CRM_Contact_Form_Inline_Phone extends CRM_Contact_Form_Inline { * List of errors to be posted back to the form. * * @return array - * @static */ public static function formRule($fields, $errors) { $hasData = $hasPrimary = $errors = array(); diff --git a/CRM/Contact/Form/ProfileContact.php b/CRM/Contact/Form/ProfileContact.php index b860cf7c0b..d322d192d4 100644 --- a/CRM/Contact/Form/ProfileContact.php +++ b/CRM/Contact/Form/ProfileContact.php @@ -78,7 +78,6 @@ class CRM_Contact_Form_ProfileContact { * * @param CRM_Core_Form $form * - * @static */ public static function buildQuickForm(&$form) { $ufGroup = new CRM_Core_DAO_UFGroup(); diff --git a/CRM/Contact/Form/Relationship.php b/CRM/Contact/Form/Relationship.php index a32f421a64..37b02fc4fc 100644 --- a/CRM/Contact/Form/Relationship.php +++ b/CRM/Contact/Form/Relationship.php @@ -561,7 +561,6 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form { * * @return bool|array * mixed true or array of errors - * @static */ public static function dateRule($params) { $errors = array(); diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php index e733553e70..a0f849701e 100644 --- a/CRM/Contact/Form/Search.php +++ b/CRM/Contact/Form/Search.php @@ -47,7 +47,6 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { * list of valid contexts * * @var array - * @static */ static $_validContext = NULL; @@ -55,7 +54,6 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { * List of values used when we want to display other objects * * @var array - * @static */ static $_modeValues = NULL; @@ -137,7 +135,6 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { * Csv - common search values * * @var array - * @static */ static $csv = array('contact_type', 'group', 'tag'); @@ -168,7 +165,6 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { * * @return array * the valid context set and the titles - * @static */ public static function &validContext() { if (!(self::$_validContext)) { diff --git a/CRM/Contact/Form/Search/Basic.php b/CRM/Contact/Form/Search/Basic.php index fdce0fb1fb..7823d4c21d 100644 --- a/CRM/Contact/Form/Search/Basic.php +++ b/CRM/Contact/Form/Search/Basic.php @@ -47,7 +47,6 @@ class CRM_Contact_Form_Search_Basic extends CRM_Contact_Form_Search { * csv - common search values * * @var array - * @static */ static $csv = array('contact_type', 'group', 'tag'); diff --git a/CRM/Contact/Form/Search/Builder.php b/CRM/Contact/Form/Search/Builder.php index 5dbb773d0b..1101237727 100644 --- a/CRM/Contact/Form/Search/Builder.php +++ b/CRM/Contact/Form/Search/Builder.php @@ -141,7 +141,6 @@ class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $self) { if (!empty($values['addMore']) || !empty($values['addBlock'])) { diff --git a/CRM/Contact/Form/Task/AddToGroup.php b/CRM/Contact/Form/Task/AddToGroup.php index 7430df1926..1f643851c0 100644 --- a/CRM/Contact/Form/Task/AddToGroup.php +++ b/CRM/Contact/Form/Task/AddToGroup.php @@ -181,7 +181,6 @@ class CRM_Contact_Form_Task_AddToGroup extends CRM_Contact_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($params) { $errors = array(); diff --git a/CRM/Contact/Form/Task/Batch.php b/CRM/Contact/Form/Task/Batch.php index 13789d7dd0..9b9dc78c9c 100644 --- a/CRM/Contact/Form/Task/Batch.php +++ b/CRM/Contact/Form/Task/Batch.php @@ -199,7 +199,6 @@ class CRM_Contact_Form_Task_Batch extends CRM_Contact_Form_Task { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Contact/Form/Task/Delete.php b/CRM/Contact/Form/Task/Delete.php index d705aa93c5..61a4bb795c 100644 --- a/CRM/Contact/Form/Task/Delete.php +++ b/CRM/Contact/Form/Task/Delete.php @@ -190,7 +190,6 @@ class CRM_Contact_Form_Task_Delete extends CRM_Contact_Form_Task { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { // CRM-12929 diff --git a/CRM/Contact/Form/Task/PickProfile.php b/CRM/Contact/Form/Task/PickProfile.php index 6cc7c4c171..b2f46d3c5b 100644 --- a/CRM/Contact/Form/Task/PickProfile.php +++ b/CRM/Contact/Form/Task/PickProfile.php @@ -139,7 +139,6 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { if (CRM_Core_BAO_UFField::checkProfileType($fields['uf_group_id'])) { diff --git a/CRM/Contact/Form/Task/ProximityCommon.php b/CRM/Contact/Form/Task/ProximityCommon.php index ff829546d9..82ba7bb35a 100644 --- a/CRM/Contact/Form/Task/ProximityCommon.php +++ b/CRM/Contact/Form/Task/ProximityCommon.php @@ -114,7 +114,6 @@ class CRM_Contact_Form_Task_ProximityCommon extends CRM_Contact_Form_Task { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $form) { $errors = array(); diff --git a/CRM/Contact/Form/Task/Useradd.php b/CRM/Contact/Form/Task/Useradd.php index 1a015edc1d..b6a2262e13 100755 --- a/CRM/Contact/Form/Task/Useradd.php +++ b/CRM/Contact/Form/Task/Useradd.php @@ -132,7 +132,6 @@ class CRM_Contact_Form_Task_Useradd extends CRM_Core_Form { /** * Validation Rule * - * @static */ public static function usernameRule($params) { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php index ec64bea512..92535b3d26 100644 --- a/CRM/Contact/Import/Form/MapField.php +++ b/CRM/Contact/Import/Form/MapField.php @@ -628,7 +628,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php index f09c2528f3..cd916b6636 100644 --- a/CRM/Contact/Import/Form/Preview.php +++ b/CRM/Contact/Import/Form/Preview.php @@ -209,7 +209,6 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php index 4b0b4e5387..0e00b30a59 100644 --- a/CRM/Contact/Import/Parser/Contact.php +++ b/CRM/Contact/Import/Parser/Contact.php @@ -1619,7 +1619,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser { * @param string $errorMessage * A string containing all the error-fields, where the new errorName is concatenated. * - * @static */ public static function addToErrorMsg($errorName, &$errorMessage) { if ($errorMessage) { @@ -1811,7 +1810,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser { * Type of date. * @param string $dateParam * Index of params. - * @static */ public function formatCustomDate(&$params, &$formatted, $dateType, $dateParam) { //fix for CRM-2687 @@ -1828,7 +1826,6 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Contact_Import_Parser { * Array of formatted data. * @param array $contactFields * Contact DAO fields. - * @static */ public function formatCommonData($params, &$formatted, &$contactFields) { $csType = array( diff --git a/CRM/Contact/Page/CustomSearch.php b/CRM/Contact/Page/CustomSearch.php index 001bfeb775..ba71aa9205 100644 --- a/CRM/Contact/Page/CustomSearch.php +++ b/CRM/Contact/Page/CustomSearch.php @@ -43,7 +43,6 @@ class CRM_Contact_Page_CustomSearch extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Contact/Page/DedupeRules.php b/CRM/Contact/Page/DedupeRules.php index 2e33abe12b..3bc58c7fb1 100644 --- a/CRM/Contact/Page/DedupeRules.php +++ b/CRM/Contact/Page/DedupeRules.php @@ -38,7 +38,6 @@ class CRM_Contact_Page_DedupeRules extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Contact/Page/SavedSearch.php b/CRM/Contact/Page/SavedSearch.php index 8e0da75bff..59d29df832 100644 --- a/CRM/Contact/Page/SavedSearch.php +++ b/CRM/Contact/Page/SavedSearch.php @@ -43,7 +43,6 @@ class CRM_Contact_Page_SavedSearch extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -150,7 +149,6 @@ class CRM_Contact_Page_SavedSearch extends CRM_Core_Page { * * @return array * (reference) of action links - * @static */ public static function &links() { diff --git a/CRM/Contact/Page/View/CustomData.php b/CRM/Contact/Page/View/CustomData.php index 7f0f8b8817..d85593a627 100644 --- a/CRM/Contact/Page/View/CustomData.php +++ b/CRM/Contact/Page/View/CustomData.php @@ -86,7 +86,6 @@ class CRM_Contact_Page_View_CustomData extends CRM_Core_Page { * * * @return void - * @static */ public function run() { $this->preProcess(); diff --git a/CRM/Contact/Page/View/Note.php b/CRM/Contact/Page/View/Note.php index 2906018d68..f3039e474b 100644 --- a/CRM/Contact/Page/View/Note.php +++ b/CRM/Contact/Page/View/Note.php @@ -43,7 +43,6 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page { * The action links for notes that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -51,7 +50,6 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page { * The action links for comments that we need to display for the browse screen * * @var array - * @static */ static $_commentLinks = NULL; @@ -251,7 +249,6 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page { * * @return array * (reference) of action links - * @static */ public static function &links() { if (!(self::$_links)) { @@ -292,7 +289,6 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page { * * @return array * (reference) of action links - * @static */ public static function &commentLinks() { if (!(self::$_commentLinks)) { diff --git a/CRM/Contact/Page/View/Relationship.php b/CRM/Contact/Page/View/Relationship.php index 2fdd80530d..5043d37f47 100644 --- a/CRM/Contact/Page/View/Relationship.php +++ b/CRM/Contact/Page/View/Relationship.php @@ -38,7 +38,6 @@ class CRM_Contact_Page_View_Relationship extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -273,7 +272,6 @@ class CRM_Contact_Page_View_Relationship extends CRM_Core_Page { * * @return array * (reference) of action links - * @static */ public static function &links() { if (!(self::$_links)) { diff --git a/CRM/Contact/Page/View/UserDashBoard.php b/CRM/Contact/Page/View/UserDashBoard.php index fdc49338e2..a14f730d4c 100644 --- a/CRM/Contact/Page/View/UserDashBoard.php +++ b/CRM/Contact/Page/View/UserDashBoard.php @@ -53,7 +53,6 @@ class CRM_Contact_Page_View_UserDashBoard extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -214,7 +213,6 @@ class CRM_Contact_Page_View_UserDashBoard extends CRM_Core_Page { * * @return array * (reference) of action links - * @static */ static public function &links() { diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php index 79136236e7..ec73b2aa94 100644 --- a/CRM/Contact/Selector.php +++ b/CRM/Contact/Selector.php @@ -45,7 +45,6 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( 'contact_id', diff --git a/CRM/Contact/Selector/Custom.php b/CRM/Contact/Selector/Custom.php index 726d747e7d..5f5fde7b5f 100644 --- a/CRM/Contact/Selector/Custom.php +++ b/CRM/Contact/Selector/Custom.php @@ -45,7 +45,6 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector { * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Contact_Selector_Custom extends CRM_Contact_Selector { * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array('contact_id', 'contact_type', 'display_name'); diff --git a/CRM/Contact/Task.php b/CRM/Contact/Task.php index 4a7ac57eea..080daaf7c7 100644 --- a/CRM/Contact/Task.php +++ b/CRM/Contact/Task.php @@ -70,7 +70,6 @@ class CRM_Contact_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -78,7 +77,6 @@ class CRM_Contact_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -281,7 +279,6 @@ class CRM_Contact_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function &taskTitles() { self::initTasks(); @@ -361,7 +358,6 @@ class CRM_Contact_Task { * * @return array * the set of optional tasks for a group of contacts - * @static */ public static function &optionalTaskTitle() { $tasks = array( diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 396194b45f..41b9b61890 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -38,7 +38,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { * Static field for all the contribution information that we can potentially import * * @var array - * @static */ static $_importableFields = NULL; @@ -46,7 +45,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { * Static field for all the contribution information that we can potentially export * * @var array - * @static */ static $_exportableFields = NULL; @@ -90,7 +88,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { * The array that holds all the db ids. * * @return CRM_Contribute_BAO_Contribution - * @static */ public static function add(&$params, $ids = array()) { if (empty($params)) { @@ -223,7 +220,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { * The array that holds all the db ids. * * @return CRM_Contribute_BAO_Contribution|null the found object or null - * @static */ public static function &getValues($params, &$values, &$ids) { if (empty($params)) { @@ -295,7 +291,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { * The array that holds all the db ids. * * @return CRM_Contribute_BAO_Contribution - * @static */ public static function create(&$params, $ids = array()) { $dateFields = array('receive_date', 'cancel_date', 'receipt_date', 'thankyou_date'); @@ -485,7 +480,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { * True if we want to resolve the values in the reverse direction (value -> name). * * @return void - * @static */ public static function resolveDefaults(&$defaults, $reverse = FALSE) { self::lookupValue($defaults, 'financial_type', CRM_Contribute_PseudoConstant::financialType(), $reverse); @@ -538,7 +532,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { * (reference) the array that holds all the db ids. * * @return CRM_Contribute_BAO_Contribution - * @static */ public static function retrieve(&$params, &$defaults, &$ids) { $contribution = CRM_Contribute_BAO_Contribution::getValues($params, $defaults, $ids); @@ -557,7 +550,6 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { * * @return array * array of importable Fields - * @static */ public static function &importableFields($contactType = 'Individual', $status = TRUE) { if (!self::$_importableFields) { @@ -779,7 +771,6 @@ INNER JOIN civicrm_contact contact ON ( contact.id = civicrm_contribution.conta * @return mixed|null * $results no of deleted Contribution on success, false otherwise * @access public - * @static */ public static function deleteContribution($id) { CRM_Utils_Hook::pre('delete', 'Contribution', $id, CRM_Core_DAO::$_nullArray); @@ -856,7 +847,6 @@ INNER JOIN civicrm_contact contact ON ( contact.id = civicrm_contribution.conta * * @return boolean * true if duplicate, false otherwise - * @static */ public static function checkDuplicate($input, &$duplicates, $id = NULL) { if (!$id) { @@ -909,7 +899,6 @@ INNER JOIN civicrm_contact contact ON ( contact.id = civicrm_contribution.conta * (reference) an assoc array of name/value pairs. * * @return CRM_Contribute_DAO_ContributionProduct - * @static */ public static function addPremium(&$params) { $contributionProduct = new CRM_Contribute_DAO_ContributionProduct(); @@ -927,7 +916,6 @@ INNER JOIN civicrm_contact contact ON ( contact.id = civicrm_contribution.conta * * @return array * the list of contribution fields - * @static */ public static function getContributionFields($addExtraFields = TRUE) { $contributionFields = CRM_Contribute_DAO_Contribution::export(); @@ -956,7 +944,6 @@ INNER JOIN civicrm_contact contact ON ( contact.id = civicrm_contribution.conta /** * Add extra fields specific to contribtion * - * @static */ public static function getSpecialContributionFields() { $extraFields = array( @@ -1026,7 +1013,6 @@ GROUP BY p.id * @return array * list of contribution fields * - * @static */ public static function getHonorContacts($honorId) { $params = array(); @@ -1064,7 +1050,6 @@ GROUP BY p.id * * @return null|string * sort name of the contact if found - * @static */ public static function sortName($id) { $id = CRM_Utils_Type::escape($id, 'Integer'); @@ -1165,7 +1150,6 @@ WHERE civicrm_contribution.contact_id = civicrm_contact.id * * @return array * contribution id if success else NULL - * @static */ public static function checkDuplicateIds($params) { $dao = new CRM_Contribute_DAO_Contribution(); @@ -1199,7 +1183,6 @@ WHERE civicrm_contribution.contact_id = civicrm_contact.id * @return array * associated array * - * @static */ public static function getContributionDetails($exportMode, $componentIds) { $paymentDetails = array(); @@ -1262,7 +1245,6 @@ LEFT JOIN civicrm_option_value contribution_status ON (civicrm_contribution.cont * * @return int * address id - * @static */ public static function createAddress(&$params, $billingLocationTypeID) { $billingFields = array( @@ -1298,7 +1280,6 @@ LEFT JOIN civicrm_option_value contribution_status ON (civicrm_contribution.cont * @param int $contributionId * @param int $contactId * - * @static */ public static function deleteAddress($contributionId = NULL, $contactId = NULL) { $clauses = array(); @@ -1345,7 +1326,6 @@ WHERE $condition * * @return int * pending contribution id. - * @static */ public static function checkOnlinePendingContribution($componentId, $componentName) { $contributionId = NULL; @@ -1921,7 +1901,6 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac /** * @return array - * @static */ public static function getContributionDates() { $config = CRM_Core_Config::singleton(); @@ -2593,7 +2572,6 @@ WHERE contribution_id = %1 "; * @param bool $isNotCancelled * * @return boolean - * @static */ public static function isCancelSubscriptionSupported($contributionId, $isNotCancelled = TRUE) { $cacheKeyString = "$contributionId"; @@ -2625,7 +2603,6 @@ WHERE contribution_id = %1 "; * * @return string * contribution status - * @static */ public static function isSubscriptionCancelled($contributionId) { $sql = " @@ -2652,7 +2629,6 @@ WHERE contribution_id = %1 "; * @param array $financialTrxnValues * * @return null|object - * @static */ public static function recordFinancialAccounts(&$params, $financialTrxnValues = NULL) { $skipRecords = $update = $return = $isRelatedId = FALSE; @@ -2954,7 +2930,6 @@ WHERE contribution_id = %1 "; * * @param null $skipTrxn * - * @static */ public static function updateFinancialAccounts(&$params, $context = NULL, $skipTrxn = NULL) { $itemAmount = $trxnID = NULL; @@ -3129,7 +3104,6 @@ WHERE contribution_id = %1 "; * List of errors. * * @return bool - * @static */ public static function checkStatusValidation($values, &$fields, &$errors) { if (CRM_Utils_System::isNull($values) && !empty($fields['id'])) { @@ -3163,7 +3137,6 @@ WHERE contribution_id = %1 "; * @param int $contactId * Contact id. * - * @static */ public static function deleteContactContribution($contactId) { $contribution = new CRM_Contribute_DAO_Contribution(); @@ -3225,7 +3198,6 @@ WHERE contribution_id = %1 "; * @param string $relationName * * @return array|bool - * @static */ public static function validateFinancialType($financialTypeId, $relationName = 'Expense Account is') { $expenseTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE '{$relationName}' ")); diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php index 2d427e8fa8..8a99a5aa22 100644 --- a/CRM/Contribute/BAO/Contribution/Utils.php +++ b/CRM/Contribute/BAO/Contribution/Utils.php @@ -60,7 +60,6 @@ class CRM_Contribute_BAO_Contribution_Utils { * @return array * associated array * - * @static */ static function processConfirm( &$form, @@ -385,7 +384,6 @@ class CRM_Contribute_BAO_Contribution_Utils { * @return array * associated array * - * @static */ public static function contributionChartMonthly($param) { if ($param) { @@ -426,7 +424,6 @@ INNER JOIN civicrm_contact AS contact ON ( contact.id = contrib.contact_id ) * @return array * associated array * - * @static */ public static function contributionChartYearly() { $config = CRM_Core_Config::singleton(); @@ -905,7 +902,6 @@ LIMIT 1 * @return array * array of tax amount * - * @static */ public static function calculateTaxAmount($amount, $taxRate) { $taxAmount = array(); diff --git a/CRM/Contribute/BAO/ContributionPage.php b/CRM/Contribute/BAO/ContributionPage.php index 1a13287d36..979a181bbb 100644 --- a/CRM/Contribute/BAO/ContributionPage.php +++ b/CRM/Contribute/BAO/ContributionPage.php @@ -45,7 +45,6 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio * (reference ) an assoc array of name/value pairs. * * @return CRM_Contribute_DAO_ContributionPage - * @static */ public static function &create(&$params) { $financialTypeId = NULL; @@ -74,7 +73,6 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio * * @return Object * DAO object on success, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Contribute_DAO_ContributionPage', $id, 'is_active', $is_active); @@ -126,7 +124,6 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio * @param null $fieldTypes * * @return void - * @static */ public static function sendMail($contactID, $values, $isTest = FALSE, $returnMessageText = FALSE, $fieldTypes = NULL) { $gIds = $params = array(); @@ -475,7 +472,6 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio * @param bool|object $autoRenewMembership is it a auto renew membership. * * @return void - * @static */ public static function recurringNotify($type, $contactID, $pageID, $recur, $autoRenewMembership = FALSE) { $value = array(); @@ -577,7 +573,6 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio * @param null $fieldTypes * * @return void - * @static */ public static function buildCustomDisplay($gid, $name, $cid, &$template, &$params, $fieldTypes = NULL) { if ($gid) { @@ -624,7 +619,6 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio * The contribution page id to copy. * * @return CRM_Contribute_DAO_ContributionPage - * @static */ public static function copy($id) { $fieldsFix = array( @@ -722,7 +716,6 @@ WHERE entity_table = 'civicrm_contribution_page' * true if payment processor supports recurring * else false * - * @static */ public static function checkRecurPaymentProcessor($contributionPageId) { //FIXME @@ -746,7 +739,6 @@ WHERE entity_table = 'civicrm_contribution_page' * @param array $contribPageIds * @return array * info regarding all sections. - * @static */ public static function getSectionInfo($contribPageIds = array()) { $info = array(); diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php index 35abe09e93..106091bf28 100644 --- a/CRM/Contribute/BAO/ContributionRecur.php +++ b/CRM/Contribute/BAO/ContributionRecur.php @@ -58,7 +58,6 @@ class CRM_Contribute_BAO_ContributionRecur extends CRM_Contribute_DAO_Contributi * (reference ) an assoc array of name/value pairs. * * @return CRM_Contribute_BAO_Contribution - * @static * @todo move hook calls / extended logic to create - requires changing calls to call create not add */ public static function add(&$params) { @@ -114,7 +113,6 @@ class CRM_Contribute_BAO_ContributionRecur extends CRM_Contribute_DAO_Contributi * * @return boolean * true if duplicate, false otherwise - * @static */ public static function checkDuplicate($params, &$duplicates) { $id = CRM_Utils_Array::value('id', $params); @@ -185,7 +183,6 @@ SELECT r.payment_processor_id * * @return array * an array of recurring ids count - * @static */ public static function getCount(&$ids) { $recurID = implode(',', $ids); @@ -211,7 +208,6 @@ SELECT r.payment_processor_id * @param int $recurId * * @return bool - * @static */ public static function deleteRecurContribution($recurId) { $result = FALSE; @@ -238,7 +234,6 @@ SELECT r.payment_processor_id * @param array $activityParams * * @return bool - * @static */ public static function cancelRecurContribution($recurId, $objects, $activityParams = array()) { if (!$recurId) { @@ -334,7 +329,6 @@ SELECT r.payment_processor_id * @return array * list of recurring contribution fields * - * @static */ public static function getRecurContributions($contactId) { $params = array(); diff --git a/CRM/Contribute/BAO/ContributionSoft.php b/CRM/Contribute/BAO/ContributionSoft.php index 908c939f1a..2e8d49da0e 100644 --- a/CRM/Contribute/BAO/ContributionSoft.php +++ b/CRM/Contribute/BAO/ContributionSoft.php @@ -71,7 +71,6 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contribute_BAO_ContributionSoft - * @static */ public static function retrieve(&$params, &$defaults) { $contributionSoft = new CRM_Contribute_DAO_ContributionSoft(); @@ -88,7 +87,6 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio * * @param array $params * - * @static */ public static function del($params) { //delete from contribution soft table @@ -151,7 +149,6 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio * * @return array * Array of soft contribution ids, amounts, and associated contact ids - * @static */ public static function getSoftContribution($contributionID, $all = FALSE) { $pcpFields = array( @@ -245,7 +242,6 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio * Additional filter criteria, later used in where clause. * * @return array - * @static */ public static function getSoftContributionList($contact_id, $filter = NULL, $isTest = 0) { $query = ' diff --git a/CRM/Contribute/BAO/ManagePremiums.php b/CRM/Contribute/BAO/ManagePremiums.php index 77236132fb..28da593c42 100644 --- a/CRM/Contribute/BAO/ManagePremiums.php +++ b/CRM/Contribute/BAO/ManagePremiums.php @@ -55,7 +55,6 @@ class CRM_Contribute_BAO_ManagePremiums extends CRM_Contribute_DAO_Product { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contribute_BAO_ManagePremium - * @static */ public static function retrieve(&$params, &$defaults) { $premium = new CRM_Contribute_DAO_Product(); @@ -78,7 +77,6 @@ class CRM_Contribute_BAO_ManagePremiums extends CRM_Contribute_DAO_Product { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { if (!$is_active) { @@ -97,7 +95,6 @@ class CRM_Contribute_BAO_ManagePremiums extends CRM_Contribute_DAO_Product { * @param array $ids * Reference array contains the id. * - * @static * * @return object */ @@ -135,7 +132,6 @@ class CRM_Contribute_BAO_ManagePremiums extends CRM_Contribute_DAO_Product { * Delete premium Types * * @param int $productID - * @static */ public static function del($productID) { diff --git a/CRM/Contribute/BAO/Premium.php b/CRM/Contribute/BAO/Premium.php index d338d30cb9..e1b2e15976 100644 --- a/CRM/Contribute/BAO/Premium.php +++ b/CRM/Contribute/BAO/Premium.php @@ -37,7 +37,6 @@ class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium { /** * Product information * @var array - * @static */ private static $productInfo; @@ -57,7 +56,6 @@ class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contribute_BAO_ManagePremium - * @static */ public static function retrieve(&$params, &$defaults) { $premium = new CRM_Contribute_DAO_Product(); @@ -79,7 +77,6 @@ class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Contribute_DAO_Premium', $id, 'premiums_active ', $is_active); @@ -90,7 +87,6 @@ class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium { * * @param int $premiumID * - * @static */ public static function del($premiumID) { //check dependencies @@ -110,7 +106,6 @@ class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium { * @param int $selectedProductID * @param null $selectedOption * - * @static */ public static function buildPremiumBlock(&$form, $pageID, $formItems = FALSE, $selectedProductID = NULL, $selectedOption = NULL) { $form->add('hidden', "selectProduct", $selectedProductID, array('id' => 'selectProduct')); @@ -177,7 +172,6 @@ class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium { * @param int $productID * @param int $premiumProductID * - * @static */ public function buildPremiumPreviewBlock($form, $productID, $premiumProductID = NULL) { if ($premiumProductID) { @@ -216,7 +210,6 @@ class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium { * * @param int $contributionPageID * - * @static */ public static function deletePremium($contributionPageID) { if (!$contributionPageID) { @@ -250,7 +243,6 @@ class CRM_Contribute_BAO_Premium extends CRM_Contribute_DAO_Premium { * * @return array * product and option arrays - * @static */ public static function getPremiumProductInfo() { if (!self::$productInfo) { diff --git a/CRM/Contribute/BAO/Query.php b/CRM/Contribute/BAO/Query.php index c026ac5f73..88e97572a1 100644 --- a/CRM/Contribute/BAO/Query.php +++ b/CRM/Contribute/BAO/Query.php @@ -38,7 +38,6 @@ class CRM_Contribute_BAO_Query { * Static field for all the export/import contribution fields * * @var array - * @static */ static $_contributionFields = NULL; @@ -49,7 +48,6 @@ class CRM_Contribute_BAO_Query { * * @return array * self::$_contributionFields associative array of contribution fields - * @static */ public static function &getFields() { if (!self::$_contributionFields) { @@ -860,7 +858,6 @@ class CRM_Contribute_BAO_Query { * @param CRM_Core_Form $form * * @return void - * @static */ public static function buildSearchForm(&$form) { diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 74e4d44c5d..66cf5f3cb7 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -945,7 +945,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 33f632bb0b..43105ba5fb 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -1741,7 +1741,6 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr * @param object $contribution * Contribution object. * - * @static */ public static function processPcpSoft(&$params, &$contribution) { //add soft contribution due to pcp or Submit Credit / Debit Card Contribution by admin. @@ -1779,7 +1778,6 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr * @param array $params * * @return array - * @static */ public static function processPcp(&$page, $params) { $params['pcp_made_through_id'] = $page->_pcpId; diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 41cd198020..4ddf9a9e58 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -735,7 +735,6 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Contribute/Form/Contribution/OnBehalfOf.php b/CRM/Contribute/Form/Contribution/OnBehalfOf.php index 1a1f11059c..18d2914fa2 100644 --- a/CRM/Contribute/Form/Contribution/OnBehalfOf.php +++ b/CRM/Contribute/Form/Contribution/OnBehalfOf.php @@ -127,7 +127,6 @@ class CRM_Contribute_Form_Contribution_OnBehalfOf { * * @param CRM_Core_Form $form * - * @static */ public static function buildQuickForm(&$form) { $form->assign('fieldSetTitle', ts('Organization Details')); diff --git a/CRM/Contribute/Form/ContributionPage/Amount.php b/CRM/Contribute/Form/ContributionPage/Amount.php index 8ff6172cc5..7a5ceec45d 100644 --- a/CRM/Contribute/Form/ContributionPage/Amount.php +++ b/CRM/Contribute/Form/ContributionPage/Amount.php @@ -285,7 +285,6 @@ SELECT id * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Contribute/Form/ContributionPage/Custom.php b/CRM/Contribute/Form/ContributionPage/Custom.php index 7da86bd7ab..c561cc308b 100644 --- a/CRM/Contribute/Form/ContributionPage/Custom.php +++ b/CRM/Contribute/Form/ContributionPage/Custom.php @@ -174,7 +174,6 @@ class CRM_Contribute_Form_ContributionPage_Custom extends CRM_Contribute_Form_Co * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $contributionPageId) { $errors = array(); diff --git a/CRM/Contribute/Form/ContributionPage/Premium.php b/CRM/Contribute/Form/ContributionPage/Premium.php index 50c4ade490..6bd26565cb 100644 --- a/CRM/Contribute/Form/ContributionPage/Premium.php +++ b/CRM/Contribute/Form/ContributionPage/Premium.php @@ -116,7 +116,6 @@ class CRM_Contribute_Form_ContributionPage_Premium extends CRM_Contribute_Form_C * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params) { $errors = array(); diff --git a/CRM/Contribute/Form/ContributionPage/Settings.php b/CRM/Contribute/Form/ContributionPage/Settings.php index d62d54edda..f1e4efee12 100644 --- a/CRM/Contribute/Form/ContributionPage/Settings.php +++ b/CRM/Contribute/Form/ContributionPage/Settings.php @@ -238,7 +238,6 @@ class CRM_Contribute_Form_ContributionPage_Settings extends CRM_Contribute_Form_ * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $self) { $errors = array(); diff --git a/CRM/Contribute/Form/ContributionPage/ThankYou.php b/CRM/Contribute/Form/ContributionPage/ThankYou.php index 9404da1f83..7c85db2c8e 100644 --- a/CRM/Contribute/Form/ContributionPage/ThankYou.php +++ b/CRM/Contribute/Form/ContributionPage/ThankYou.php @@ -101,7 +101,6 @@ class CRM_Contribute_Form_ContributionPage_ThankYou extends CRM_Contribute_Form_ * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $options) { $errors = array(); diff --git a/CRM/Contribute/Form/ContributionPage/Widget.php b/CRM/Contribute/Form/ContributionPage/Widget.php index d562b2eb79..60410b3aa7 100644 --- a/CRM/Contribute/Form/ContributionPage/Widget.php +++ b/CRM/Contribute/Form/ContributionPage/Widget.php @@ -228,7 +228,6 @@ class CRM_Contribute_Form_ContributionPage_Widget extends CRM_Contribute_Form_Co * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params, $files, $self) { $errors = array(); diff --git a/CRM/Contribute/Form/ManagePremiums.php b/CRM/Contribute/Form/ManagePremiums.php index fbe83b9eaf..7662738b93 100644 --- a/CRM/Contribute/Form/ManagePremiums.php +++ b/CRM/Contribute/Form/ManagePremiums.php @@ -218,7 +218,6 @@ class CRM_Contribute_Form_ManagePremiums extends CRM_Contribute_Form { * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params, $files) { if (isset($params['imageOption'])) { diff --git a/CRM/Contribute/Form/SoftCredit.php b/CRM/Contribute/Form/SoftCredit.php index c5af928ed4..f63f076f24 100644 --- a/CRM/Contribute/Form/SoftCredit.php +++ b/CRM/Contribute/Form/SoftCredit.php @@ -204,7 +204,6 @@ class CRM_Contribute_Form_SoftCredit { * * @return array * Array of errors - * @static */ public static function formRule($fields, $errors, $self) { $errors = array(); diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php index 73b30e31c6..3964720c61 100644 --- a/CRM/Contribute/Form/Task/Invoice.php +++ b/CRM/Contribute/Form/Task/Invoice.php @@ -209,7 +209,6 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values) { $errors = array(); @@ -245,7 +244,6 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task { * Contact Id. * @param CRM_Core_Form $form * Form object. - * @static */ public static function printPDF($contribIDs, &$params, $contactIds, &$form) { // get all the details needed to generate a invoice @@ -588,7 +586,6 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task { * @param array $params * For invoices. * - * @static */ static public function addActivities($subject, $contactIds, $fileName, $params) { $session = CRM_Core_Session::singleton(); diff --git a/CRM/Contribute/Form/Task/PDF.php b/CRM/Contribute/Form/Task/PDF.php index 3affd3bfcf..75260e9e2a 100644 --- a/CRM/Contribute/Form/Task/PDF.php +++ b/CRM/Contribute/Form/Task/PDF.php @@ -248,7 +248,6 @@ AND {$this->_componentClause}"; * @return array * array of common elements * - * @static */ static public function getElements($contribIds, $params, $contactIds) { $pdfElements = array(); diff --git a/CRM/Contribute/Form/Task/PickProfile.php b/CRM/Contribute/Form/Task/PickProfile.php index b89a96adda..5e263e65d6 100644 --- a/CRM/Contribute/Form/Task/PickProfile.php +++ b/CRM/Contribute/Form/Task/PickProfile.php @@ -126,7 +126,6 @@ class CRM_Contribute_Form_Task_PickProfile extends CRM_Contribute_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { return TRUE; diff --git a/CRM/Contribute/Form/Task/Status.php b/CRM/Contribute/Form/Task/Status.php index 911c23a1ab..8c2ea27f39 100644 --- a/CRM/Contribute/Form/Task/Status.php +++ b/CRM/Contribute/Form/Task/Status.php @@ -187,7 +187,6 @@ AND co.id IN ( $contribIDs )"; * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { $seen = $errors = array(); diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php index 9e7004efc0..10a8b7c4d6 100644 --- a/CRM/Contribute/Form/UpdateBilling.php +++ b/CRM/Contribute/Form/UpdateBilling.php @@ -229,7 +229,6 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Contribute/Import/Form/MapField.php b/CRM/Contribute/Import/Form/MapField.php index 1f98ebf986..3ee66a3ae9 100644 --- a/CRM/Contribute/Import/Form/MapField.php +++ b/CRM/Contribute/Import/Form/MapField.php @@ -352,7 +352,6 @@ class CRM_Contribute_Import_Form_MapField extends CRM_Import_Form_MapField { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Contribute/Page/ContributionPage.php b/CRM/Contribute/Page/ContributionPage.php index f5c9f504c7..dd04b55cce 100644 --- a/CRM/Contribute/Page/ContributionPage.php +++ b/CRM/Contribute/Page/ContributionPage.php @@ -392,7 +392,6 @@ AND cp.page_type = 'contribute' * * @param mixed $action * Unused parameter. - * @static */ public function browse($action = NULL) { $this->_sortByCharacter = CRM_Utils_Request::retrieve('sortByCharacter', diff --git a/CRM/Contribute/Page/ManagePremiums.php b/CRM/Contribute/Page/ManagePremiums.php index 139d38c3ad..17cf09472d 100644 --- a/CRM/Contribute/Page/ManagePremiums.php +++ b/CRM/Contribute/Page/ManagePremiums.php @@ -44,7 +44,6 @@ class CRM_Contribute_Page_ManagePremiums extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -139,7 +138,6 @@ class CRM_Contribute_Page_ManagePremiums extends CRM_Core_Page_Basic { * * * @return void - * @static */ public function browse() { // get all custom groups sorted by weight diff --git a/CRM/Contribute/Page/Premium.php b/CRM/Contribute/Page/Premium.php index b669f78960..abc2c0f87a 100644 --- a/CRM/Contribute/Page/Premium.php +++ b/CRM/Contribute/Page/Premium.php @@ -42,7 +42,6 @@ class CRM_Contribute_Page_Premium extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -128,7 +127,6 @@ class CRM_Contribute_Page_Premium extends CRM_Core_Page_Basic { /** * @return void - * @static */ public function browse() { // get all custom groups sorted by weight diff --git a/CRM/Contribute/Page/Tab.php b/CRM/Contribute/Page/Tab.php index e65a924812..8335bc3f85 100644 --- a/CRM/Contribute/Page/Tab.php +++ b/CRM/Contribute/Page/Tab.php @@ -38,7 +38,6 @@ class CRM_Contribute_Page_Tab extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; static $_recurLinks = NULL; diff --git a/CRM/Contribute/PseudoConstant.php b/CRM/Contribute/PseudoConstant.php index 386975cb40..8019c33849 100644 --- a/CRM/Contribute/PseudoConstant.php +++ b/CRM/Contribute/PseudoConstant.php @@ -42,14 +42,12 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { /** * Financial types * @var array - * @static */ private static $financialType; /** * Financial types * @var array - * @static */ private static $financialTypeAccount; @@ -57,21 +55,18 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { /** * Financial types * @var array - * @static */ private static $financialAccount; /** * Contribution pages * @var array - * @static */ private static $contributionPageActive = NULL; /** * Contribution pages * @var array - * @static */ private static $contributionPageAll = NULL; @@ -79,7 +74,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * Payment instruments * * @var array - * @static */ private static $paymentInstrument; @@ -87,28 +81,24 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * Contribution status * * @var array - * @static */ private static $contributionStatus; /** * Personal campaign pages * @var array - * @static */ private static $pcPage; /** * Status of personal campaign page * @var array - * @static */ private static $pcpStatus; /** * Contribution / financial batches * @var array - * @static */ private static $batch; @@ -122,7 +112,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all financial types if any - * @static */ public static function &financialType($id = NULL) { if (!self::$financialType) { @@ -157,7 +146,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all financial accounts if any - * @static */ public static function &financialAccount($id = NULL, $financialAccountTypeId = NULL, $retrieveColumn = 'name', $key = 'id') { $condition = NULL; @@ -189,7 +177,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * Flush given pseudoconstant so it can be reread from db * nex time it's requested. * - * @static * * @param bool|string $name pseudoconstant to be flushed */ @@ -212,7 +199,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all contribution pages if any - * @static */ public static function &contributionPage($id = NULL, $all = FALSE) { if ($all) { @@ -245,7 +231,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all payment instruments if any - * @static */ public static function &paymentInstrument($columnName = 'label') { if (!isset(self::$paymentInstrument[$columnName])) { @@ -263,7 +248,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all payment instruments if any - * @static */ public static function &creditCard() { return CRM_Core_OptionGroup::values('accept_creditcard', FALSE, FALSE, FALSE, NULL, 'label', TRUE, FALSE, 'name'); @@ -276,7 +260,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * @param int $pageID * @return array * array of all Premiums if any - * @static */ public static function products($pageID = NULL) { $products = array(); @@ -325,7 +308,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * @param string $columnName * @return array * array reference of all contribution statuses - * @static */ public static function &contributionStatus($id = NULL, $columnName = 'label') { $cacheKey = $columnName; @@ -351,7 +333,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all pcp if any - * @static */ public static function &pcPage($pageType = NULL, $id = NULL) { if (!isset(self::$pcPage[$pageType])) { @@ -379,7 +360,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * * The static array pcpStatus is returned * - * @static * * @param string $column * @return array @@ -404,7 +384,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * * The static array $financialTypeAccount is returned * - * @static * * @param int $financialTypeId * @param int $relationTypeId @@ -440,7 +419,6 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant { * @param int $id * @return array * array reference of all batches if any - * @static */ public static function &batch($id = NULL) { if (!self::$batch) { diff --git a/CRM/Contribute/Selector/Search.php b/CRM/Contribute/Selector/Search.php index 919a617669..e409697f61 100644 --- a/CRM/Contribute/Selector/Search.php +++ b/CRM/Contribute/Selector/Search.php @@ -45,7 +45,6 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( 'contact_id', diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php index 1a707c61b0..354589fbaf 100644 --- a/CRM/Contribute/Task.php +++ b/CRM/Contribute/Task.php @@ -45,7 +45,6 @@ class CRM_Contribute_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -53,7 +52,6 @@ class CRM_Contribute_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -63,7 +61,6 @@ class CRM_Contribute_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function &tasks() { if (!(self::$_tasks)) { @@ -149,7 +146,6 @@ class CRM_Contribute_Task { * * @return array * the set of task titles - * @static */ public static function &taskTitles() { self::tasks(); @@ -204,7 +200,6 @@ class CRM_Contribute_Task { * * @return array * the set of tasks for a group of contributors - * @static */ public static function getTask($value) { self::tasks(); diff --git a/CRM/Core/Action.php b/CRM/Core/Action.php index c896074049..a31f1883a9 100644 --- a/CRM/Core/Action.php +++ b/CRM/Core/Action.php @@ -76,7 +76,6 @@ class CRM_Core_Action { * * @var array $_names type of variable name to action constant * - * @static */ static $_names = array( 'add' => self::ADD, @@ -102,7 +101,6 @@ class CRM_Core_Action { * The flipped version of the names array, initialized when used * * @var array - * @static */ static $_description; @@ -114,7 +112,6 @@ class CRM_Core_Action { * * @return int * the action mask corresponding to the input string - * @static */ public static function resolve($str) { $action = 0; @@ -134,7 +131,6 @@ class CRM_Core_Action { * * @return int * the action mask corresponding to the input args - * @static */ public static function map($item) { $mask = 0; @@ -158,7 +154,6 @@ class CRM_Core_Action { * * @return int * the action mask corresponding to the input string - * @static */ public static function mapItem($item) { $mask = CRM_Utils_Array::value(trim($item), self::$_names); @@ -174,7 +169,6 @@ class CRM_Core_Action { * * @return string * the corresponding action description - * @static */ public static function description($mask) { if (!isset($_description)) { @@ -205,7 +199,6 @@ class CRM_Core_Action { * * @return string * the html string - * @static */ static function formLink( $links, @@ -317,7 +310,6 @@ class CRM_Core_Action { * * @return string * the substituted string - * @static */ public static function &replace(&$str, &$values) { foreach ($values as $n => $v) { @@ -333,7 +325,6 @@ class CRM_Core_Action { * * @return int * the mask for the above permission - * @static */ public static function mask($permissions) { $mask = NULL; diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php index 8f59642a54..fe62f46a39 100644 --- a/CRM/Core/BAO/ActionSchedule.php +++ b/CRM/Core/BAO/ActionSchedule.php @@ -91,7 +91,6 @@ class CRM_Core_BAO_ActionSchedule extends CRM_Core_DAO_ActionSchedule { * * @return array * associated array of all the drop downs in the form - * @static */ public static function getSelection($id = NULL) { $mapping = self::getMapping(); @@ -325,7 +324,6 @@ class CRM_Core_BAO_ActionSchedule extends CRM_Core_DAO_ActionSchedule { * * @return array * (reference) reminder list - * @static */ public static function &getList($namesOnly = FALSE, $entityValue = NULL, $id = NULL) { $activity_type = CRM_Core_PseudoConstant::activityType(TRUE, TRUE); @@ -597,7 +595,6 @@ AND cas.entity_value = $id AND * The array that holds all the db ids. * * @return CRM_Core_DAO_ActionSchedule - * @static */ public static function add(&$params, $ids = array()) { $actionSchedule = new CRM_Core_DAO_ActionSchedule(); @@ -618,7 +615,6 @@ AND cas.entity_value = $id AND * * @return CRM_Core_DAO_ActionSchedule|null * object on success, null otherwise - * @static */ public static function retrieve(&$params, &$values) { if (empty($params)) { @@ -644,7 +640,6 @@ AND cas.entity_value = $id AND * @param int $id * ID of the Reminder to be deleted. * - * @static */ public static function del($id) { if ($id) { @@ -668,7 +663,6 @@ AND cas.entity_value = $id AND * * @return Object * DAO object on success, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_ActionSchedule', $id, 'is_active', $is_active); diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php index 662b62175d..db83737a2d 100644 --- a/CRM/Core/BAO/Address.php +++ b/CRM/Core/BAO/Address.php @@ -51,7 +51,6 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address { * * @return array * array of created address - * @static */ public static function create(&$params, $fixAddress = TRUE, $entity = NULL) { if (!isset($params['address']) || !is_array($params['address'])) { @@ -144,7 +143,6 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address { * * @return object * CRM_Core_BAO_Address object on success, null otherwise - * @static */ public static function add(&$params, $fixAddress) { static $customFields = NULL; @@ -206,7 +204,6 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address { * (reference ) an assoc array of name/value pairs. * * @return void - * @static */ public static function fixAddress(&$params) { if (!empty($params['billing_street_address'])) { @@ -411,7 +408,6 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address { * * @return boolean * - * @static */ public static function dataExists(&$params) { //check if location type is set if not return false @@ -478,7 +474,6 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address { * * @return array * array with address fields - * @static */ public static function &getValues($entityBlock, $microformat = FALSE, $fieldName = 'contact_id') { if (empty($entityBlock)) { @@ -609,7 +604,6 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address { * * @return array * the array of adrress data - * @static */ public static function allAddress($id, $updateBlankLocInfo = FALSE) { if (!$id) { @@ -646,7 +640,6 @@ ORDER BY civicrm_address.is_primary DESC, address_id ASC"; * * @return array * the array of adrress data - * @static */ public static function allEntityAddress(&$entityElements) { $addresses = array(); @@ -725,7 +718,6 @@ ORDER BY civicrm_address.is_primary DESC, civicrm_address.location_type_id DESC, * * @return array * parsed fields values. - * @static */ public static function parseStreetAddress($streetAddress, $locale = NULL) { $config = CRM_Core_Config::singleton(); @@ -899,7 +891,6 @@ ORDER BY civicrm_address.is_primary DESC, civicrm_address.location_type_id DESC, * * @return array * an array of contact fields and only the enabled address options - * @static */ public static function validateAddressOptions($fields) { static $addressOptions = NULL; @@ -929,7 +920,6 @@ ORDER BY civicrm_address.is_primary DESC, civicrm_address.location_type_id DESC, * * @return int * count of contacts that use this shared address - * @static */ public static function checkContactSharedAddress($addressId) { $query = 'SELECT count(id) FROM civicrm_address WHERE master_id = %1'; @@ -944,7 +934,6 @@ ORDER BY civicrm_address.is_primary DESC, civicrm_address.location_type_id DESC, * @param int $contactId * Contact id. * - * @static */ public static function checkContactSharedAddressFields(&$fields, $contactId) { if (!$contactId || !is_array($fields) || empty($fields)) { @@ -1017,7 +1006,6 @@ SELECT is_primary, * Associated array of address params. * * @return void - * @static */ public static function processSharedAddress($addressId, $params) { $query = 'SELECT id FROM civicrm_address WHERE master_id = %1'; @@ -1120,7 +1108,6 @@ SELECT is_primary, * Associated array of submitted values. * * @return void - * @static */ public static function processSharedAddressRelationship($masterAddressId, $params) { if (!$masterAddressId) { @@ -1194,7 +1181,6 @@ SELECT is_primary, * By default false. * * @return string - * @static */ public static function setSharedAddressDeleteStatus($addressId = NULL, $contactId = NULL, $returnStatus = FALSE) { // check if address that is being deleted has any shared diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php index 014298563f..c3478a8be3 100644 --- a/CRM/Core/BAO/Block.php +++ b/CRM/Core/BAO/Block.php @@ -58,7 +58,6 @@ class CRM_Core_BAO_Block { * * @return array * Array of $block objects. - * @static */ public static function &getValues($blockName, $params) { if (empty($params)) { @@ -105,7 +104,6 @@ class CRM_Core_BAO_Block { * * @return array * Array of $block objects. - * @static */ public static function retrieveBlock(&$block, $blockName) { // we first get the primary location due to the order by clause @@ -137,7 +135,6 @@ class CRM_Core_BAO_Block { * * @return boolean * true if the block has data, otherwise false - * @static */ public static function dataExists($blockFields, &$params) { foreach ($blockFields as $field) { @@ -158,7 +155,6 @@ class CRM_Core_BAO_Block { * * @return boolean * true if the block exits, otherwise false - * @static */ public static function blockExists($blockName, &$params) { // return if no data present @@ -183,7 +179,6 @@ class CRM_Core_BAO_Block { * @return array * formatted array of block ids * - * @static */ public static function getBlockIds($blockName, $contactId = NULL, $entityElements = NULL, $updateBlankLocInfo = FALSE) { $allBlocks = array(); @@ -226,7 +221,6 @@ class CRM_Core_BAO_Block { * * @return object * CRM_Core_BAO_Block object on success, null otherwise - * @static */ public static function create($blockName, &$params, $entity = NULL, $contactId = NULL) { if (!self::blockExists($blockName, $params)) { @@ -406,7 +400,6 @@ class CRM_Core_BAO_Block { * Associates array. * * @return void - * @static */ public static function blockDelete($blockName, $params) { $name = ucfirst($blockName); @@ -446,7 +439,6 @@ class CRM_Core_BAO_Block { * @param $class * * @throws API_Exception - * @static */ public static function handlePrimary(&$params, $class) { $table = CRM_Core_DAO_AllCoreTables::getTableForClass($class); diff --git a/CRM/Core/BAO/CMSUser.php b/CRM/Core/BAO/CMSUser.php index 11fc59dad2..16499f1123 100644 --- a/CRM/Core/BAO/CMSUser.php +++ b/CRM/Core/BAO/CMSUser.php @@ -55,7 +55,6 @@ class CRM_Core_BAO_CMSUser { * * @return void * - * @static */ public static function synchronize($is_interactive = TRUE) { //start of schronization code @@ -231,7 +230,6 @@ class CRM_Core_BAO_CMSUser { * * @return int * contact id that has been created - * @static */ public static function create(&$params, $mail) { $config = CRM_Core_Config::singleton(); @@ -265,7 +263,6 @@ class CRM_Core_BAO_CMSUser { * @return FALSE|void * WTF * - * @static */ public static function buildForm(&$form, $gid, $emailPresent, $action = CRM_Core_Action::NONE) { $config = CRM_Core_Config::singleton(); @@ -430,7 +427,6 @@ class CRM_Core_BAO_CMSUser { * @return int|bool * uid if user exists, false otherwise * - * @static */ public static function userExists(&$contact) { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Core/BAO/Cache.php b/CRM/Core/BAO/Cache.php index b9cf8013f8..d3e5dfd8b2 100644 --- a/CRM/Core/BAO/Cache.php +++ b/CRM/Core/BAO/Cache.php @@ -63,7 +63,6 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache { * * @return object * The data if present in cache, else null - * @static */ public static function &getItem($group, $path, $componentID = NULL) { if (self::$_cache === NULL) { @@ -103,7 +102,6 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache { * * @return object * The data if present in cache, else null - * @static */ public static function &getItems($group, $componentID = NULL) { if (self::$_cache === NULL) { @@ -148,7 +146,6 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache { * The optional component ID (so componenets can share the same name space). * * @return void - * @static */ public static function setItem(&$data, $group, $path, $componentID = NULL) { if (self::$_cache === NULL) { @@ -203,7 +200,6 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache { * @param bool|\booleab $clearAll clear all caches * * @return void - * @static */ public static function deleteGroup($group = NULL, $path = NULL, $clearAll = TRUE) { $dao = new CRM_Core_DAO_Cache(); @@ -245,7 +241,6 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache { * Should session state be reset on completion of DB store?. * * @return void - * @static */ public static function storeSessionToCache($names, $resetSession = TRUE) { foreach ($names as $key => $sessionName) { @@ -284,7 +279,6 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache { * (in the case of profile) * * @return void - * @static */ /** @@ -320,7 +314,6 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache { * @param bool $prevNext * * @return void - * @static */ public static function cleanup($session = FALSE, $table = FALSE, $prevNext = FALSE) { // clean up the session cache every $cacheCleanUpNumber probabilistically diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php index f29952bdba..546b145ac7 100644 --- a/CRM/Core/BAO/ConfigSetting.php +++ b/CRM/Core/BAO/ConfigSetting.php @@ -48,7 +48,6 @@ class CRM_Core_BAO_ConfigSetting { * Associated array of civicrm variables. * * @return null - * @static */ public static function create($params) { self::add($params); @@ -65,7 +64,6 @@ class CRM_Core_BAO_ConfigSetting { * Associated array of civicrm variables. * * @return null - * @static */ public static function add(&$params) { self::fixParams($params); @@ -147,7 +145,6 @@ class CRM_Core_BAO_ConfigSetting { * Associated array of civicrm variables. * * @return null - * @static */ public static function fixParams(&$params) { // in our old civicrm.settings.php we were using ISO code for country and @@ -182,7 +179,6 @@ class CRM_Core_BAO_ConfigSetting { * Associated array of civicrm variables stored in db. * * @return null - * @static */ public static function formatParams(&$params, &$values) { if (empty($params) || @@ -206,7 +202,6 @@ class CRM_Core_BAO_ConfigSetting { * @param $defaults * * @return array - * @static */ public static function retrieve(&$defaults) { $domain = new CRM_Core_DAO_Domain(); @@ -663,7 +658,6 @@ WHERE option_group_id = ( * * @return boolean * true if valid component name and enabling succeeds, else false - * @static */ public static function enableComponent($componentName) { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index 2d910bd981..51a86aa7fd 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -43,7 +43,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * Array for valid combinations of data_type & descriptions * * @var array - * @static */ public static $_dataType = NULL; @@ -51,7 +50,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * Array for valid combinations of data_type & html_type * * @var array - * @static */ public static $_dataToHtml = NULL; @@ -59,7 +57,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * Array to hold (formatted) fields for import * * @var array - * @static */ public static $_importFields = NULL; @@ -70,7 +67,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * * @return array * Data type => Description - * @static */ public static function &dataType() { if (!(self::$_dataType)) { @@ -132,7 +128,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * (reference) an assoc array of name/value pairs. * * @return CRM_Core_DAO_CustomField - * @static */ public static function create(&$params) { $origParams = array_merge(array(), $params); @@ -328,7 +323,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_DAO_CustomField - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_CustomField', $params, $defaults); @@ -345,7 +339,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * @return Object * DAO object on sucess, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { @@ -365,7 +358,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * @return string * name * - * @static */ public static function getTitle($id) { return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $id, 'label'); @@ -394,7 +386,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * @return array * an array of active custom fields. * - * @static */ public static function &getFields( $customDataType = 'Individual', @@ -618,7 +609,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * @return array * * - * @static */ public static function &getFieldsForImport( $contactType = 'Individual', @@ -686,7 +676,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * @param bool $all * @return int|null * The id (if exists) - * @static */ public static function getKeyID($key, $all = FALSE) { $match = array(); @@ -712,7 +701,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * * @return CRM_Core_DAO_CustomField * $field the field object - * @static * public */ public static function getFieldObject($fieldID) { @@ -757,7 +745,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * @param string $label * Label for custom field. * - * @static */ public static function addQuickFormElement( &$qf, @@ -1099,7 +1086,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * * @return boolean * - * @static */ public static function deleteField($field) { CRM_Utils_System::flushCache(); @@ -1138,7 +1124,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * @return string * the display value * - * @static */ public static function getDisplayValue($value, $id, &$options, $contactID = NULL, $fieldID = NULL) { $option = &$options[$id]; @@ -1380,7 +1365,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * If passed - dont fetch value from db,. * just format the given value * - * @static */ static function setProfileDefaults( $customFieldId, @@ -1595,7 +1579,6 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { * * @return array * formatted custom field array - * @static */ static function formatCustomField( $customFieldId, &$customFormatted, $value, @@ -2077,7 +2060,6 @@ WHERE id IN ( %1, %2 ) * * @return array * fatal is fieldID does not exists, else array of tableName, columnName - * @static */ public static function getTableColumnGroup($fieldID, $force = FALSE) { $cacheKey = "CRM_Core_DAO_CustomField_CustomGroup_TableColumn_{$fieldID}"; @@ -2115,7 +2097,6 @@ AND cf.id = %1"; * * * @return mixed - * @static */ public static function &customOptionGroup($includeFieldIds = NULL) { static $customOptionGroup = NULL; @@ -2160,7 +2141,6 @@ INNER JOIN civicrm_custom_field f ON ( g.id = f.option_group_id ) * Option group id. * * @return void - * @static */ public static function fixOptionGroups($customFieldId, $optionGroupId) { // check if option group belongs to any custom Field else delete @@ -2187,7 +2167,6 @@ INNER JOIN civicrm_custom_field f ON ( g.id = f.option_group_id ) * Option group id. * * @return void - * @static */ public static function checkOptionGroup($optionGroupId) { $query = " @@ -2421,7 +2400,6 @@ WHERE f.id IN ($ids)"; * * @return array * validation errors. - * @static */ public static function validateCustomData($params) { $errors = array(); diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php index f4aacdee5c..f6114148e1 100644 --- a/CRM/Core/BAO/CustomGroup.php +++ b/CRM/Core/BAO/CustomGroup.php @@ -55,7 +55,6 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup { * (reference) an assoc array of name/value pairs. * * @return CRM_Core_DAO_CustomGroup - * @static */ public static function create(&$params) { // create custom group dao, populate fields and then save. @@ -232,7 +231,6 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_DAO_CustomGroup - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_CustomGroup', $params, $defaults); @@ -248,7 +246,6 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { // reset the cache @@ -339,7 +336,6 @@ class CRM_Core_BAO_CustomGroup extends CRM_Core_DAO_CustomGroup { * The reason for the info array in unclear and it could be determined from parsing the group tree after creation * With caching the performance impact would be small & the function would be cleaner * - * @static */ public static function &getTree( $entityType, @@ -880,7 +876,6 @@ ORDER BY civicrm_custom_group.weight, * @return string * title * - * @static */ public static function getTitle($id) { return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $id, 'title'); @@ -904,7 +899,6 @@ ORDER BY civicrm_custom_group.weight, * array consisting of all group and field details * * - * @static */ public static function &getGroupDetail($groupId = NULL, $searchable = NULL, &$extends = NULL, $inSelector = NULL) { // create a new tree @@ -1103,7 +1097,6 @@ ORDER BY civicrm_custom_group.weight, * * @return string * - * @static * * @see _apachesolr_civiAttachments_dereference_file_parent */ @@ -1185,7 +1178,6 @@ ORDER BY civicrm_custom_group.weight, * * @return void * - * @static */ private static function _addWhereAdd(&$customGroupDAO, $entityType, $entityID = NULL, $allSubtypes = FALSE) { $addSubtypeClause = FALSE; @@ -1253,7 +1245,6 @@ ORDER BY civicrm_custom_group.weight, * @return boolean * false if field exists for this group, true if group gets deleted. * - * @static */ public static function deleteGroup($group, $force = FALSE) { @@ -1563,7 +1554,6 @@ ORDER BY civicrm_custom_group.weight, * Prefix for custom grouptree assigned to template. * * @return void - * @static */ public static function buildQuickForm(&$form, &$groupTree, $inactiveNeeded = FALSE, $prefix = '') { $form->assign_by_ref("{$prefix}groupTree", $groupTree); @@ -1599,7 +1589,6 @@ ORDER BY civicrm_custom_group.weight, * The type of custom group we are using. * * @return array - * @static */ public static function extractGetParams(&$form, $type) { if (empty($_GET)) { @@ -1709,7 +1698,6 @@ ORDER BY civicrm_custom_group.weight, * * @return boolean * false if it matches else true - * @static */ public static function checkCustomField($customFieldId, &$removeCustomFieldTypes) { $query = "SELECT cg.extends as extends diff --git a/CRM/Core/BAO/CustomOption.php b/CRM/Core/BAO/CustomOption.php index e91613b812..54bcf9dc11 100644 --- a/CRM/Core/BAO/CustomOption.php +++ b/CRM/Core/BAO/CustomOption.php @@ -48,7 +48,6 @@ class CRM_Core_BAO_CustomOption { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_BAO_CustomOption - * @static */ public static function retrieve(&$params, &$defaults) { $customOption = new CRM_Core_DAO_OptionValue(); @@ -70,7 +69,6 @@ class CRM_Core_BAO_CustomOption { * * @return array * all active options for fieldId - * @static */ static function getCustomOption( $fieldID, @@ -122,7 +120,6 @@ class CRM_Core_BAO_CustomOption { * * @return string * the label to display for this custom field - * @static */ public static function getOptionLabel($fieldId, $value, $htmlType = NULL, $dataType = NULL) { if (!$fieldId) { @@ -176,7 +173,6 @@ WHERE id = %1 * @param $optionId integer * option id * - * @static */ public static function del($optionId) { // get the customFieldID diff --git a/CRM/Core/BAO/CustomQuery.php b/CRM/Core/BAO/CustomQuery.php index bb656e8b1a..4e0c1c9fe8 100644 --- a/CRM/Core/BAO/CustomQuery.php +++ b/CRM/Core/BAO/CustomQuery.php @@ -107,7 +107,6 @@ class CRM_Core_BAO_CustomQuery { * This stores custom data group types and tables that it extends * * @var array - * @static */ static $extendsMap = array( 'Contact' => 'civicrm_contact', diff --git a/CRM/Core/BAO/CustomValue.php b/CRM/Core/BAO/CustomValue.php index 8d79caf6db..156b962203 100644 --- a/CRM/Core/BAO/CustomValue.php +++ b/CRM/Core/BAO/CustomValue.php @@ -49,7 +49,6 @@ class CRM_Core_BAO_CustomValue extends CRM_Core_DAO { * * @return boolean * True if the value is of the specified type - * @static */ public static function typecheck($type, $value) { switch ($type) { @@ -127,7 +126,6 @@ class CRM_Core_BAO_CustomValue extends CRM_Core_DAO { * * @return string|null * the mysql data store placeholder - * @static */ public static function typeToField($type) { switch ($type) { @@ -202,7 +200,6 @@ class CRM_Core_BAO_CustomValue extends CRM_Core_DAO { * Custom group ID. * * @return void - * @static */ public static function deleteCustomValue($customValueID, $customGroupID) { // first we need to find custom value table, from custom group ID diff --git a/CRM/Core/BAO/CustomValueTable.php b/CRM/Core/BAO/CustomValueTable.php index 3dc36b3bf5..f22fd2b201 100644 --- a/CRM/Core/BAO/CustomValueTable.php +++ b/CRM/Core/BAO/CustomValueTable.php @@ -258,7 +258,6 @@ class CRM_Core_BAO_CustomValueTable { * * @return string * the mysql data store placeholder - * @static */ public static function fieldToSQLType($type, $maxLength = 255) { if (!isset($maxLength) || @@ -392,7 +391,6 @@ class CRM_Core_BAO_CustomValueTable { * Array of custom values for the entity with key=>value * pairs specified as civicrm_custom_field.id => custom value. * Empty array if no custom values found. - * @static */ public static function &getEntityValues($entityID, $entityType = NULL, $fieldIDs = NULL, $formatMultiRecordField = FALSE) { if (!$entityID) { @@ -498,7 +496,6 @@ AND $cond * * @throws Exception * @return array - * @static */ public static function setValues(&$params) { @@ -643,7 +640,6 @@ AND cf.id IN ( $fieldIDList ) * * @throws Exception * @return array - * @static */ public static function &getValues(&$params) { if (empty($params)) { diff --git a/CRM/Core/BAO/Dashboard.php b/CRM/Core/BAO/Dashboard.php index 31bf6680b5..a8e4068bc9 100644 --- a/CRM/Core/BAO/Dashboard.php +++ b/CRM/Core/BAO/Dashboard.php @@ -43,7 +43,6 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { * @param array $params * Values. * - * @static * * @return object */ @@ -65,7 +64,6 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { * * @return array * array of dashlets - * @static */ public static function getDashlets($all = TRUE, $checkPermission = TRUE) { $dashlets = array(); @@ -107,7 +105,6 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { * * @return array * array of dashlets - * @static */ public static function getContactDashlets($flatFormat = FALSE, $contactID = NULL) { $dashlets = array(); @@ -281,7 +278,6 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { * * @return array * associted array title and content - * @static */ public static function getDashletInfo($dashletID) { $dashletInfo = array(); @@ -352,7 +348,6 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { * * @throws RuntimeException * @return void - * @static */ public static function saveDashletChanges($columns, $contactID = NULL) { $session = CRM_Core_Session::singleton(); @@ -418,7 +413,6 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { * * @return object * $dashlet returns dashlet object - * @static */ public static function addDashlet(&$params) { @@ -486,7 +480,6 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { * @param object : $dashlet * * @return void - * @static */ public static function addContactDashlet($dashlet) { $admin = CRM_Core_Permission::check('administer CiviCRM'); @@ -555,7 +548,6 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { * Reset cache only for specific contact. * * @return void - * @static */ public static function resetDashletCache($contactID = NULL) { $whereClause = NULL; @@ -574,7 +566,6 @@ class CRM_Core_BAO_Dashboard extends CRM_Core_DAO_Dashboard { * @param int $dashletID * * @return void - * @static */ public static function deleteDashlet($dashletID) { $dashlet = new CRM_Core_DAO_Dashboard(); diff --git a/CRM/Core/BAO/Discount.php b/CRM/Core/BAO/Discount.php index b0a79ff84f..447af20e1c 100644 --- a/CRM/Core/BAO/Discount.php +++ b/CRM/Core/BAO/Discount.php @@ -48,7 +48,6 @@ class CRM_Core_BAO_Discount extends CRM_Core_DAO_Discount { * @param string $entityTable * * @return boolean - * @static */ public static function del($entityId, $entityTable) { // delete all discount records with the selected discounted id @@ -72,7 +71,6 @@ class CRM_Core_BAO_Discount extends CRM_Core_DAO_Discount { * * @return object * CRM_Core_DAO_Discount object on success, otherwise null - * @static */ public static function add(&$params) { $discount = new CRM_Core_DAO_Discount(); diff --git a/CRM/Core/BAO/Domain.php b/CRM/Core/BAO/Domain.php index 94d0af354c..e137c04976 100644 --- a/CRM/Core/BAO/Domain.php +++ b/CRM/Core/BAO/Domain.php @@ -57,7 +57,6 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_DAO_Domain - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_Domain', $params, $defaults); @@ -69,7 +68,6 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { * @param null $reset * * @return CRM_Core_BAO_Domain|null - * @static */ public static function &getDomain($reset = NULL) { static $domain = NULL; diff --git a/CRM/Core/BAO/Email.php b/CRM/Core/BAO/Email.php index 7b459fbfe5..33ff4babd7 100644 --- a/CRM/Core/BAO/Email.php +++ b/CRM/Core/BAO/Email.php @@ -66,7 +66,6 @@ class CRM_Core_BAO_Email extends CRM_Core_DAO_Email { * * @return object * CRM_Core_BAO_Email object on success, null otherwise - * @static */ public static function add(&$params) { $hook = empty($params['id']) ? 'create' : 'edit'; @@ -119,7 +118,6 @@ WHERE contact_id = {$params['contact_id']} * Input parameters to find object. * * @return boolean - * @static */ public static function &getValues($entityBlock) { return CRM_Core_BAO_Block::getValues('email', $entityBlock); @@ -135,7 +133,6 @@ WHERE contact_id = {$params['contact_id']} * * @return array * the array of email id's - * @static */ public static function allEmails($id, $updateBlankLocInfo = FALSE) { if (!$id) { @@ -193,7 +190,6 @@ ORDER BY civicrm_email.is_primary DESC, email_id ASC "; * * @return array * the array of email id's - * @static */ public static function allEntityEmails(&$entityElements) { if (empty($entityElements)) { @@ -241,7 +237,6 @@ ORDER BY e.is_primary DESC, email_id ASC "; * Email object. * * @return void - * @static */ public static function holdEmail(&$email) { //check for update mode @@ -288,7 +283,6 @@ AND reset_date IS NULL * * @return array * an array of email ids - * @static */ public static function getFromEmail() { $session = CRM_Core_Session::singleton(); diff --git a/CRM/Core/BAO/EntityTag.php b/CRM/Core/BAO/EntityTag.php index 058dc1473a..c0ef14f1f3 100644 --- a/CRM/Core/BAO/EntityTag.php +++ b/CRM/Core/BAO/EntityTag.php @@ -48,7 +48,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag { * @return array( * ) reference $tag array of category id's the contact belongs to. * - * @static */ public static function &getTag($entityID, $entityTable = 'civicrm_contact') { $tags = array(); @@ -75,7 +74,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag { * (reference ) an assoc array of name/value pairs. * * @return CRM_Core_BAO_EntityTag - * @static */ public static function add(&$params) { $dataExists = self::dataExists($params); @@ -106,7 +104,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag { * An assoc array of name/value pairs. * * @return boolean - * @static */ public static function dataExists($params) { return !($params['tag_id'] == 0); @@ -119,7 +116,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag { * (reference ) an assoc array of name/value pairs. * * @return CRM_Core_BAO_EntityTag - * @static */ public static function del(&$params) { $entityTag = new CRM_Core_BAO_EntityTag(); @@ -143,7 +139,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag { * * @return array * (total, added, notAdded) count of enities added to tag - * @static */ public static function addEntitiesToTag(&$entityIds, $tagId, $entityTable = 'civicrm_contact') { $numEntitiesAdded = 0; @@ -189,7 +184,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag { * * @return array * (total, removed, notRemoved) count of entities removed from tags - * @static */ public static function removeEntitiesFromTag(&$entityIds, $tagId, $entityTable = 'civicrm_contact') { $numEntitiesRemoved = 0; @@ -232,7 +226,6 @@ class CRM_Core_BAO_EntityTag extends CRM_Core_DAO_EntityTag { * @param int $entityID * * @return void - * @static */ public static function create(&$params, $entityTable, $entityID) { // get categories for the entity id diff --git a/CRM/Core/BAO/Extension.php b/CRM/Core/BAO/Extension.php index c6f90cf24b..035952f78b 100644 --- a/CRM/Core/BAO/Extension.php +++ b/CRM/Core/BAO/Extension.php @@ -49,7 +49,6 @@ class CRM_Core_BAO_Extension extends CRM_Core_DAO_Extension { * * @return CRM_Core_BAO_LocationType|null * object on success, null otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $extension = new CRM_Core_DAO_Extension(); @@ -69,7 +68,6 @@ class CRM_Core_BAO_Extension extends CRM_Core_DAO_Extension { * * @return void * - * @static */ public static function del($id) { $extension = new CRM_Core_DAO_Extension(); diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php index 4022915dc1..f78231f258 100644 --- a/CRM/Core/BAO/File.php +++ b/CRM/Core/BAO/File.php @@ -472,7 +472,6 @@ AND CEF.entity_id = %2"; * * @return array * An array with 2 elements. The string and the number of attachments - * @static */ public static function attachmentInfo($entityTable, $entityID, $separator = '
') { if (!$entityID) { @@ -630,7 +629,6 @@ AND CEF.entity_id = %2"; /** * Delete a file attachment from an entity table / entity ID * - * @static */ public static function deleteAttachment() { $params = array(); @@ -661,7 +659,6 @@ AND CEF.entity_id = %2"; * @return array|NULL * list of HTML snippets; one HTML snippet for each attachment. If none found, then NULL * - * @static */ public static function paperIconAttachment($entityTable, $entityID) { if (empty($entityTable) || !$entityID) { diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php index c2c062c10e..836a1b252f 100644 --- a/CRM/Core/BAO/FinancialTrxn.php +++ b/CRM/Core/BAO/FinancialTrxn.php @@ -54,7 +54,6 @@ class CRM_Core_BAO_FinancialTrxn extends CRM_Financial_DAO_FinancialTrxn { * Entity_table. * * @return CRM_Core_BAO_FinancialTrxn - * @static */ public static function create(&$params, $trxnEntityTable = NULL) { $trxn = new CRM_Financial_DAO_FinancialTrxn(); @@ -126,7 +125,6 @@ class CRM_Core_BAO_FinancialTrxn extends CRM_Financial_DAO_FinancialTrxn { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contribute_BAO_ContributionType - * @static */ public static function retrieve(&$params, &$defaults) { $financialItem = new CRM_Financial_DAO_FinancialTrxn(); @@ -151,7 +149,6 @@ class CRM_Core_BAO_FinancialTrxn extends CRM_Financial_DAO_FinancialTrxn { * @return array * array of category id's the contact belongs to. * - * @static */ public static function getFinancialTrxnId($entity_id, $orderBy = 'ASC', $newTrxn = FALSE) { $ids = array('entityFinancialTrxnId' => NULL, 'financialTrxnId' => NULL); @@ -195,7 +192,6 @@ LIMIT 1;"; * @return array * array of catagory id's the contact belongs to. * - * @static */ public static function getFinancialTrxnTotal($entity_id) { $query = " @@ -219,7 +215,6 @@ WHERE ft.entity_table = 'civicrm_contribution' AND ft.entity_id = %1 * @return array * array of previous payments * - * @static */ public static function getPayments($financial_trxn_id) { $query = " @@ -273,7 +268,6 @@ WHERE ef2.financial_trxn_id =%1 * @return array * array of catagory id's the contact belongs to. * - * @static */ public static function getFinancialTrxnLineTotal($entity_id, $entity_table = 'civicrm_contribution') { $query = "SELECT lt.price_field_value_id AS id, ft.financial_trxn_id,ft.amount AS amount FROM civicrm_entity_financial_trxn AS ft @@ -300,7 +294,6 @@ WHERE lt.entity_id = %1 "; * @param int $entity_id * @return bool * TRUE on success, FALSE otherwise. - * @static */ public static function deleteFinancialTrxn($entity_id) { $query = "DELETE ceft1, cfi, ceft, cft FROM `civicrm_financial_trxn` cft @@ -318,7 +311,6 @@ WHERE ceft.entity_id = %1"; /** * Create financial transaction for premium * - * @static */ public static function createPremiumTrxn($params) { if ((empty($params['financial_type_id']) || empty($params['contributionId'])) && empty($params['oldPremium'])) { @@ -368,7 +360,6 @@ WHERE ceft.entity_id = %1"; * @param array $params * To create trxn entries. * - * @static */ public static function recordFees($params) { $expenseTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Expense Account is' ")); diff --git a/CRM/Core/BAO/IM.php b/CRM/Core/BAO/IM.php index 5656bd703b..9e5b1788fb 100644 --- a/CRM/Core/BAO/IM.php +++ b/CRM/Core/BAO/IM.php @@ -46,7 +46,6 @@ class CRM_Core_BAO_IM extends CRM_Core_DAO_IM { * * @return object * CRM_Core_BAO_IM object on success, null otherwise - * @static */ public static function add(&$params) { $hook = empty($params['id']) ? 'create' : 'edit'; @@ -67,7 +66,6 @@ class CRM_Core_BAO_IM extends CRM_Core_DAO_IM { * @param array entityBlock input parameters to find object * * @return boolean - * @static */ public static function &getValues($entityBlock) { return CRM_Core_BAO_Block::getValues('im', $entityBlock); @@ -83,7 +81,6 @@ class CRM_Core_BAO_IM extends CRM_Core_DAO_IM { * * @return array * the array of im details - * @static */ public static function allIMs($id, $updateBlankLocInfo = FALSE) { if (!$id) { @@ -135,7 +132,6 @@ ORDER BY * * @return array * the array of im details - * @static */ public static function allEntityIMs(&$entityElements) { if (empty($entityElements)) { diff --git a/CRM/Core/BAO/Job.php b/CRM/Core/BAO/Job.php index 57f6d00aec..fcc1e2365a 100644 --- a/CRM/Core/BAO/Job.php +++ b/CRM/Core/BAO/Job.php @@ -52,7 +52,6 @@ class CRM_Core_BAO_Job extends CRM_Core_DAO_Job { * An assoc array of name/value pairs. * * @return CRM_Financial_DAO_PaymentProcessorType - * @static */ public static function create($params) { $job = new CRM_Core_DAO_Job(); @@ -72,7 +71,6 @@ class CRM_Core_BAO_Job extends CRM_Core_DAO_Job { * * @return CRM_Core_DAO_Job|null * object on success, null otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $job = new CRM_Core_DAO_Job(); @@ -95,7 +93,6 @@ class CRM_Core_BAO_Job extends CRM_Core_DAO_Job { * @return Object * DAO object on sucess, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_Job', $id, 'is_active', $is_active); @@ -108,7 +105,6 @@ class CRM_Core_BAO_Job extends CRM_Core_DAO_Job { * ID of the job to be deleted. * * @return bool|null - * @static */ public static function del($jobID) { if (!$jobID) { diff --git a/CRM/Core/BAO/LabelFormat.php b/CRM/Core/BAO/LabelFormat.php index d828eab3c2..0de74960ee 100644 --- a/CRM/Core/BAO/LabelFormat.php +++ b/CRM/Core/BAO/LabelFormat.php @@ -161,7 +161,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * * @return array * array of page orientations - * @static */ public static function getPageOrientations() { return array( @@ -178,7 +177,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * * @return array * array of font names - * @static */ public static function getFontNames($name = 'label_format') { $label = new CRM_Utils_PDF_Label(self::getDefaultValues($name)); @@ -192,7 +190,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * * @return array * array of font sizes - * @static */ public static function getFontSizes() { $fontSizes = array(); @@ -210,7 +207,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * * @return array * array of measurement units - * @static */ public static function getUnits() { return array( @@ -228,7 +224,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * * @return array * array of alignments - * @static */ public static function getTextAlignments() { return array( @@ -245,7 +240,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * * @return array * array of alignments - * @static */ public static function getFontStyles() { return array( @@ -282,7 +276,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * * @return array * (reference) List of Label Formats - * @static */ public static function addOrder(&$list, $returnURL) { $filter = "option_group_id = " . self::_getGid(); @@ -299,7 +292,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * * @return array * (reference) label format list - * @static */ public static function &getList($namesOnly = FALSE, $groupName = 'label_format') { static $list = array(); @@ -330,7 +322,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * * @return array * Name/value pairs containing the default Label Format values. - * @static */ public static function &getDefaultValues($groupName = 'label_format') { $params = array('is_active' => 1, 'is_default' => 1); @@ -408,7 +399,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * @param null $default * * @return value - * @static */ public static function getValue($field, &$values, $default = NULL) { if (array_key_exists($field, self::$optionValueFields)) { @@ -442,7 +432,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * @param string $groupName * * @return CRM_Core_DAO_OptionValue - * @static */ public static function retrieve(&$params, &$values, $groupName = 'label_format') { $optionValue = new CRM_Core_DAO_OptionValue(); @@ -558,7 +547,6 @@ class CRM_Core_BAO_LabelFormat extends CRM_Core_DAO_OptionValue { * ID of the label format to be deleted. * @param string $groupName * Group name. - * @static */ public static function del($id, $groupName) { if ($id) { diff --git a/CRM/Core/BAO/Location.php b/CRM/Core/BAO/Location.php index 693d5e81c5..aed679ab98 100644 --- a/CRM/Core/BAO/Location.php +++ b/CRM/Core/BAO/Location.php @@ -55,7 +55,6 @@ class CRM_Core_BAO_Location extends CRM_Core_DAO { * @param null $entity * * @return array - * @static */ public static function create(&$params, $fixAddress = TRUE, $entity = NULL) { $location = array(); @@ -135,7 +134,6 @@ class CRM_Core_BAO_Location extends CRM_Core_DAO { /** * Takes an entity array and finds the existing location block - * @static */ public static function findExisting($entityElements) { $eid = $entityElements['entity_id']; @@ -161,7 +159,6 @@ WHERE e.id = %1"; * * @return object * CRM_Core_BAO_locBlock object on success, null otherwise - * @static */ public static function addLocBlock(&$params) { $locBlock = new CRM_Core_DAO_LocBlock(); @@ -178,7 +175,6 @@ WHERE e.id = %1"; * Id of the Location Block. * * @return void - * @static */ public static function deleteLocBlock($locBlockId) { if (!$locBlockId) { @@ -221,7 +217,6 @@ WHERE e.id = %1"; * (reference ) an assoc array of name/value pairs. * * @return boolean - * @static */ public static function dataExists(&$params) { // return if no data present @@ -242,7 +237,6 @@ WHERE e.id = %1"; * * @return array * array of objects(CRM_Core_BAO_Location) - * @static */ public static function &getValues($entityBlock, $microformat = FALSE) { if (empty($entityBlock)) { @@ -277,7 +271,6 @@ WHERE e.id = %1"; * Id of the location to delete. * * @return void - * @static */ public static function deleteLocationBlocks($contactId, $locationTypeId) { // ensure that contactId has a value @@ -360,7 +353,6 @@ WHERE e.id = %1"; * @param int $contactId * Contact id. * - * @static */ public static function checkPrimaryBlocks($contactId) { if (!$contactId) { diff --git a/CRM/Core/BAO/LocationType.php b/CRM/Core/BAO/LocationType.php index 268c94286b..87848be35c 100644 --- a/CRM/Core/BAO/LocationType.php +++ b/CRM/Core/BAO/LocationType.php @@ -57,7 +57,6 @@ class CRM_Core_BAO_LocationType extends CRM_Core_DAO_LocationType { * * @return CRM_Core_BAO_LocaationType|null * object on success, null otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $locationType = new CRM_Core_DAO_LocationType(); @@ -80,7 +79,6 @@ class CRM_Core_BAO_LocationType extends CRM_Core_DAO_LocationType { * @return Object * DAO object on sucess, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_LocationType', $id, 'is_active', $is_active); @@ -94,7 +92,6 @@ class CRM_Core_BAO_LocationType extends CRM_Core_DAO_LocationType { * @return object * The default location type object on success, * null otherwise - * @static */ public static function &getDefault() { if (self::$_defaultLocationType == NULL) { @@ -124,7 +121,6 @@ class CRM_Core_BAO_LocationType extends CRM_Core_DAO_LocationType { * @param array $params * Reference array contains the values submitted by the form. * - * @static * * @return object */ @@ -152,7 +148,6 @@ class CRM_Core_BAO_LocationType extends CRM_Core_DAO_LocationType { * @param int $locationTypeId * ID of the location type to be deleted. * - * @static */ public static function del($locationTypeId) { $entity = array('address', 'phone', 'email', 'im'); diff --git a/CRM/Core/BAO/Log.php b/CRM/Core/BAO/Log.php index 21ce541512..c7b29965a8 100644 --- a/CRM/Core/BAO/Log.php +++ b/CRM/Core/BAO/Log.php @@ -72,7 +72,6 @@ class CRM_Core_BAO_Log extends CRM_Core_DAO_Log { * @param array $params * Array of name-value pairs of log table. * - * @static */ public static function add(&$params) { @@ -159,7 +158,6 @@ UPDATE civicrm_log * * @return int * count of log records - * @static */ public static function getContactLogCount($contactID) { $query = "SELECT count(*) FROM civicrm_log @@ -173,7 +171,6 @@ UPDATE civicrm_log * * @return int * report id of Contact Logging Report (Summary) / false - * @static */ public static function useLoggingReport() { // first check if logging is enabled diff --git a/CRM/Core/BAO/MailSettings.php b/CRM/Core/BAO/MailSettings.php index f9d1a5001a..692a08dd75 100644 --- a/CRM/Core/BAO/MailSettings.php +++ b/CRM/Core/BAO/MailSettings.php @@ -119,7 +119,6 @@ class CRM_Core_BAO_MailSettings extends CRM_Core_DAO_MailSettings { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_BAO_MailSettings - * @static */ public static function retrieve(&$params, &$defaults) { $mailSettings = new CRM_Core_DAO_MailSettings(); @@ -140,7 +139,6 @@ class CRM_Core_BAO_MailSettings extends CRM_Core_DAO_MailSettings { * @param array $params * Reference array contains the values submitted by the form. * - * @static * * @return object */ @@ -176,7 +174,6 @@ class CRM_Core_BAO_MailSettings extends CRM_Core_DAO_MailSettings { * (reference ) an assoc array of name/value pairs. * * @return CRM_Core_BAO_MailSettings - * @static */ public static function create(&$params) { $transaction = new CRM_Core_Transaction(); @@ -199,7 +196,6 @@ class CRM_Core_BAO_MailSettings extends CRM_Core_DAO_MailSettings { * Mail settings id. * * @return mixed|null - * @static */ public static function deleteMailSettings($id) { $results = NULL; diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php index 7aa4d98ce6..243e496746 100644 --- a/CRM/Core/BAO/Mapping.php +++ b/CRM/Core/BAO/Mapping.php @@ -51,7 +51,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * * @return object * CRM_Core_DAO_Mapping object on success, otherwise NULL - * @static */ public static function retrieve(&$params, &$defaults) { $mapping = new CRM_Core_DAO_Mapping(); @@ -70,7 +69,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * Mapping id. * * @return boolean - * @static */ public static function del($id) { // delete from mapping_field table @@ -102,7 +100,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * * @return object * CRM_Core_DAO_Mapper object on success, otherwise NULL - * @static */ public static function add($params) { $mapping = new CRM_Core_DAO_Mapping(); @@ -120,7 +117,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * * @return array * array of mapping name - * @static */ public static function getMappings($mappingTypeId) { $mapping = array(); @@ -143,7 +139,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * * @return array * array of mapping fields - * @static */ public static function getMappingFields($mappingId) { //mapping is to be loaded from database @@ -226,7 +221,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * * @return array * associated array of elements - * @static */ public static function getFormattedFields($smartGroupId) { $returnFields = array(); @@ -263,7 +257,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * @param NULL $exportMode * * @return void - * @static */ public static function buildMappingForm(&$form, $mappingType = 'Export', $mappingId = NULL, $columnNo, $blockCount = 3, $exportMode = NULL) { if ($mappingType == 'Export') { @@ -966,7 +959,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * * @return null|string * $customGroupName all custom group names - * @static */ public static function getCustomGroupName($customfieldId) { if ($customFieldId = CRM_Core_BAO_CustomField::getKeyID($customfieldId)) { @@ -992,7 +984,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * * @return array * formatted associated array of elements - * @static */ public static function formattedFields(&$params, $row = FALSE) { $fields = array(); @@ -1191,7 +1182,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { * Mapping id. * * @return NULL - * @static */ public static function saveMappingFields(&$params, $mappingId) { //delete mapping fields records for exixting mapping diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php index 10101d6d66..eeb4f5448f 100644 --- a/CRM/Core/BAO/MessageTemplate.php +++ b/CRM/Core/BAO/MessageTemplate.php @@ -49,7 +49,6 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_BAO_MessageTemplate - * @static */ public static function retrieve(&$params, &$defaults) { $messageTemplates = new CRM_Core_DAO_MessageTemplate(); @@ -71,7 +70,6 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { * * @return Object * DAO object on sucess, NULL otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_MessageTemplate', $id, 'is_active', $is_active); @@ -83,7 +81,6 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { * @param array $params * Reference array contains the values submitted by the form. * - * @static * * @return object */ @@ -102,7 +99,6 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { /** * Delete the Message Templates * - * @static * * @param int $messageTemplatesID * @@ -131,7 +127,6 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate { /** * Get the Message Templates * - * @static * * @param bool $all * diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php index 8382350686..28b1f5b448 100644 --- a/CRM/Core/BAO/Navigation.php +++ b/CRM/Core/BAO/Navigation.php @@ -55,7 +55,6 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation { * @return Object * DAO object on sucess, NULL otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_Navigation', $id, 'is_active', $is_active); @@ -64,7 +63,6 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation { /** * Get existing / build navigation for CiviCRM Admin Menu * - * @static * @return array * associated array */ @@ -90,7 +88,6 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation { * * @return object * navigation object - * @static */ public static function add(&$params) { $navigation = new CRM_Core_DAO_Navigation(); @@ -135,7 +132,6 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation { * * @return CRM_Core_BAO_Navigation|null * object on success, NULL otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $navigation = new CRM_Core_DAO_Navigation(); @@ -160,7 +156,6 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation { * * @return int * $weight string - * @static */ public static function calculateWeight($parentID = NULL, $menuID = NULL) { $domainID = CRM_Core_Config::domainID(); @@ -186,7 +181,6 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation { * * @return array * returns associated array - * @static */ public static function getNavigationList() { $cacheKeyString = "navigationList"; @@ -280,7 +274,6 @@ FROM civicrm_navigation WHERE domain_id = $domainID {$whereClause} ORDER BY pare * * @return array * nested array of menus - * @static */ public static function buildNavigationTree(&$navigationTree, $parentID, $navigationMenu = TRUE) { $whereClause = " parent_id IS NULL"; @@ -337,7 +330,6 @@ ORDER BY parent_id, weight"; * * @return string * html or json string - * @static */ public static function buildNavigation($json = FALSE, $navigationMenu = TRUE) { $navigations = array(); @@ -593,7 +585,6 @@ ORDER BY parent_id, weight"; * * @return string * returns navigation html - * @static */ public static function createNavigation($contactID) { $config = CRM_Core_Config::singleton(); @@ -695,7 +686,6 @@ ORDER BY parent_id, weight"; * Associated array, $_GET. * * @return void - * @static */ public static function processNavigation(&$params) { $nodeID = (int) str_replace("node_", "", $params['id']); @@ -734,7 +724,6 @@ ORDER BY parent_id, weight"; * New position of the nod, it starts with 0 - n. * * @return void - * @static */ public static function processMove($nodeID, $referenceID, $position) { // based on the new position we need to get the weight of the node after moved node @@ -817,7 +806,6 @@ ORDER BY parent_id, weight"; * * @return array * associated array - * @static */ public static function getNavigationInfo($navigationID) { $query = "SELECT parent_id, weight FROM civicrm_navigation WHERE id = %1"; @@ -836,7 +824,6 @@ ORDER BY parent_id, weight"; * @param array $params * @param array $newParams * New value of params. - * @static */ public static function processUpdate($params, $newParams) { $dao = new CRM_Core_DAO_Navigation(); diff --git a/CRM/Core/BAO/Note.php b/CRM/Core/BAO/Note.php index 8df2a67a70..b127223cfd 100644 --- a/CRM/Core/BAO/Note.php +++ b/CRM/Core/BAO/Note.php @@ -53,7 +53,6 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * @return string * the note text or NULL if note not found * - * @static */ public static function getNoteText($id) { return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Note', $id, 'note'); @@ -68,7 +67,6 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * @return string * the note subject or NULL if note not found * - * @static */ public static function getNoteSubject($id) { return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Note', $id, 'subject'); @@ -83,7 +81,6 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * @return boolean * TRUE if the note should be displayed, otherwise FALSE * - * @static */ public static function getNotePrivacyHidden($note) { if (CRM_Core_Permission::check('view all notes')) { @@ -141,7 +138,6 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * * @return object * $note CRM_Core_BAO_Note object - * @static */ public static function &add(&$params, $ids = array()) { $dataExists = self::dataExists($params); @@ -228,7 +224,6 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * (reference ) an assoc array of name/value pairs. * * @return boolean - * @static */ public static function dataExists(&$params) { // return if no data present @@ -251,7 +246,6 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * * @return object * $notes Object of CRM_Core_BAO_Note - * @static */ public static function &getValues(&$params, &$values, $numNotes = self::MAX_NOTES) { if (empty($params)) { @@ -297,7 +291,6 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * @return int|NULL * no of deleted notes on success, null otherwise * @access public - * @static */ public static function del($id, $showStatus = TRUE) { $return = NULL; @@ -347,7 +340,6 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * * @return void * - * @static */ public static function deleteContact($id) { // need to delete for both entity_id @@ -373,7 +365,6 @@ class CRM_Core_BAO_Note extends CRM_Core_DAO_Note { * @return array * array of note properties * - * @static */ public static function &getNote($id, $entityTable = 'civicrm_relationship') { $viewNote = array(); @@ -405,7 +396,6 @@ ORDER BY modified_date desc"; * @return int * $count count of log records * - * @static */ public static function getContactNoteCount($contactID) { $note = new CRM_Core_DAO_Note(); @@ -434,7 +424,6 @@ ORDER BY modified_date desc"; * @return array * Nested associative array beginning with direct children of given note. * - * @static */ public static function getNoteTree($parentId, $maxDepth = 0, $snippet = FALSE) { return self::buildNoteTree($parentId, $maxDepth, $snippet); @@ -449,7 +438,6 @@ ORDER BY modified_date desc"; * @return int * $count Number of notes having the give note as parent * - * @static */ public static function getChildCount($id) { $note = new CRM_Core_DAO_Note(); @@ -481,7 +469,6 @@ ORDER BY modified_date desc"; * * @return array * Nested associative array beginning with direct children of given note. - * @static */ private static function buildNoteTree($parentId, $maxDepth = 0, $snippet = FALSE, &$tree = array(), $depth = 0) { if ($maxDepth && $depth > $maxDepth) { @@ -568,7 +555,6 @@ ORDER BY modified_date desc"; * Contact id whose notes to be deleted. * * @return void - * @static */ public static function cleanContactNotes($contactID) { $params = array(1 => array($contactID, 'Integer')); diff --git a/CRM/Core/BAO/OpenID.php b/CRM/Core/BAO/OpenID.php index 7615f5bfc1..73eca2856c 100644 --- a/CRM/Core/BAO/OpenID.php +++ b/CRM/Core/BAO/OpenID.php @@ -46,7 +46,6 @@ class CRM_Core_BAO_OpenID extends CRM_Core_DAO_OpenID { * * @return object * CRM_Core_BAO_OpenID object on success, null otherwise - * @static */ public static function add(&$params) { $hook = empty($params['id']) ? 'create' : 'edit'; @@ -68,7 +67,6 @@ class CRM_Core_BAO_OpenID extends CRM_Core_DAO_OpenID { * Input parameters to find object. * * @return mixed - * @static */ public static function &getValues($entityBlock) { return CRM_Core_BAO_Block::getValues('openid', $entityBlock); @@ -81,7 +79,6 @@ class CRM_Core_BAO_OpenID extends CRM_Core_DAO_OpenID { * The OpenID to check. * * @return boolean - * @static */ public static function isAllowedToLogin($identity_url) { $openId = new CRM_Core_DAO_OpenID(); @@ -102,7 +99,6 @@ class CRM_Core_BAO_OpenID extends CRM_Core_DAO_OpenID { * * @return array * the array of openid's - * @static */ public static function allOpenIDs($id, $updateBlankLocInfo = FALSE) { if (!$id) { diff --git a/CRM/Core/BAO/OptionGroup.php b/CRM/Core/BAO/OptionGroup.php index c03ed0e4df..03a04f4e2e 100644 --- a/CRM/Core/BAO/OptionGroup.php +++ b/CRM/Core/BAO/OptionGroup.php @@ -50,7 +50,6 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_BAO_OptionGroup - * @static */ public static function retrieve(&$params, &$defaults) { $optionGroup = new CRM_Core_DAO_OptionGroup(); @@ -72,7 +71,6 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_OptionGroup', $id, 'is_active', $is_active); @@ -86,7 +84,6 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup { * @param array $ids * Reference array contains the id. * - * @static * * @return object */ @@ -119,7 +116,6 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup { * * @return void * - * @static */ public static function del($optionGroupId) { // need to delete all option value field before deleting group @@ -141,7 +137,6 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup { * @return String * title * - * @static */ public static function getTitle($optionGroupId) { $optionGroup = new CRM_Core_DAO_OptionGroup(); diff --git a/CRM/Core/BAO/OptionValue.php b/CRM/Core/BAO/OptionValue.php index 3eb2b944a8..3a1659451e 100644 --- a/CRM/Core/BAO/OptionValue.php +++ b/CRM/Core/BAO/OptionValue.php @@ -133,7 +133,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_BAO_OptionValue - * @static */ public static function retrieve(&$params, &$defaults) { $optionValue = new CRM_Core_DAO_OptionValue(); @@ -155,7 +154,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_OptionValue', $id, 'is_active', $is_active); @@ -169,7 +167,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * @param array $ids * Reference array contains the id. * - * @static * * @return CRM_Core_DAO_OptionValue */ @@ -236,7 +233,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * * @return boolean * - * @static */ public static function del($optionValueId) { $optionValue = new CRM_Core_DAO_OptionValue(); @@ -256,7 +252,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * * @return array * label and description - * @static */ public static function getActivityTypeDetails($activityTypeId) { $query = "SELECT civicrm_option_value.label, civicrm_option_value.description @@ -281,7 +276,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * @return string * title * - * @static */ public static function getTitle($id) { return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue', $id, 'label'); @@ -427,7 +421,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * Options value , weight pair. * * @return void - * @static */ public static function updateOptionWeights($opGroupId, $opWeights) { if (!is_array($opWeights) || empty($opWeights)) { @@ -456,7 +449,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * * @return array * an array of array of values for this option group - * @static */ public static function getOptionValuesArray($optionGroupID) { // check if we can get the field values from the system cache @@ -490,7 +482,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * * @return array * an associative array of label, value pairs - * @static */ public static function getOptionValuesAssocArray($optionGroupID) { $optionValues = self::getOptionValuesArray($optionGroupID); @@ -511,7 +502,6 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { * * @return array * an associative array of label, value pairs - * @static */ public static function getOptionValuesAssocArrayFromName($optionGroupName) { $dao = new CRM_Core_DAO_OptionGroup(); diff --git a/CRM/Core/BAO/PaperSize.php b/CRM/Core/BAO/PaperSize.php index f63c8dabb4..8a323498a6 100644 --- a/CRM/Core/BAO/PaperSize.php +++ b/CRM/Core/BAO/PaperSize.php @@ -94,7 +94,6 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue { * * @return array * (reference) List of Paper Sizes - * @static */ public static function &addOrder(&$list, $returnURL) { $filter = "option_group_id = " . self::_getGid(); @@ -109,7 +108,6 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue { * * @return array * (reference) Paper Size list - * @static */ public static function &getList($namesOnly = FALSE) { static $list = array(); @@ -139,7 +137,6 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue { * * @return array * Name/value pairs containing the default Paper Size values. - * @static */ public static function &getDefaultValues() { $params = array('is_active' => 1, 'is_default' => 1); @@ -213,7 +210,6 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue { * @param null $default * * @return value - * @static */ public static function getValue($field, &$values, $default = NULL) { if (array_key_exists($field, self::$optionValueFields)) { @@ -245,7 +241,6 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_DAO_OptionValue - * @static */ public static function retrieve(&$params, &$values) { $optionValue = new CRM_Core_DAO_OptionValue(); @@ -339,7 +334,6 @@ class CRM_Core_BAO_PaperSize extends CRM_Core_DAO_OptionValue { * @param int $id * ID of the Paper Size to be deleted. * - * @static */ public static function del($id) { if ($id) { diff --git a/CRM/Core/BAO/PdfFormat.php b/CRM/Core/BAO/PdfFormat.php index dfe69b9373..166bf8a406 100644 --- a/CRM/Core/BAO/PdfFormat.php +++ b/CRM/Core/BAO/PdfFormat.php @@ -152,7 +152,6 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue { * URL of page calling this function. * * @return void - * @static */ public static function addOrder(&$list, $returnURL) { $filter = "option_group_id = " . self::_getGid(); @@ -167,7 +166,6 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue { * * @return array * (reference) PDF Page Format list - * @static */ public static function &getList($namesOnly = FALSE) { static $list = array(); @@ -197,7 +195,6 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue { * * @return array * Name/value pairs containing the default PDF Page Format values. - * @static */ public static function &getDefaultValues() { $params = array('is_active' => 1, 'is_default' => 1); @@ -274,7 +271,6 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue { * @param null $default * * @return value - * @static */ public static function getValue($field, &$values, $default = NULL) { if (array_key_exists($field, self::$optionValueFields)) { @@ -306,7 +302,6 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_DAO_OptionValue - * @static */ public static function retrieve(&$params, &$values) { $optionValue = new CRM_Core_DAO_OptionValue(); @@ -396,7 +391,6 @@ class CRM_Core_BAO_PdfFormat extends CRM_Core_DAO_OptionValue { * @param int $id * ID of the PDF Page Format to be deleted. * - * @static */ public static function del($id) { if ($id) { diff --git a/CRM/Core/BAO/Persistent.php b/CRM/Core/BAO/Persistent.php index 818cb78e11..998e29aac4 100644 --- a/CRM/Core/BAO/Persistent.php +++ b/CRM/Core/BAO/Persistent.php @@ -43,7 +43,6 @@ class CRM_Core_BAO_Persistent extends CRM_Core_DAO_Persistent { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_BAO_Persistent - * @static */ public static function retrieve(&$params, &$defaults) { $dao = new CRM_Core_DAO_Persistent(); @@ -67,7 +66,6 @@ class CRM_Core_BAO_Persistent extends CRM_Core_DAO_Persistent { * @param array $ids * Reference array contains the id. * - * @static * * @return object */ diff --git a/CRM/Core/BAO/Phone.php b/CRM/Core/BAO/Phone.php index 68965acca8..0eee6ce539 100644 --- a/CRM/Core/BAO/Phone.php +++ b/CRM/Core/BAO/Phone.php @@ -70,7 +70,6 @@ class CRM_Core_BAO_Phone extends CRM_Core_DAO_Phone { * * @return object * CRM_Core_BAO_Phone object on success, null otherwise - * @static */ public static function add(&$params) { // Ensure mysql phone function exists @@ -95,7 +94,6 @@ class CRM_Core_BAO_Phone extends CRM_Core_DAO_Phone { * * @return array * array of phone objects - * @static */ public static function &getValues($entityBlock) { $getValues = CRM_Core_BAO_Block::getValues('phone', $entityBlock); @@ -114,7 +112,6 @@ class CRM_Core_BAO_Phone extends CRM_Core_DAO_Phone { * * @return array * the array of phone ids which are potential numbers - * @static */ public static function allPhones($id, $updateBlankLocInfo = FALSE, $type = NULL, $filters = array()) { if (!$id) { @@ -187,7 +184,6 @@ ORDER BY civicrm_phone.is_primary DESC, phone_id ASC "; * * @return array * the array of phone ids which are potential numbers - * @static */ public static function allEntityPhones($entityElements, $type = NULL) { if (empty($entityElements)) { @@ -241,7 +237,6 @@ ORDER BY ph.is_primary DESC, phone_id ASC "; * Value of option to be deleted. * * return void - * @static */ public static function setOptionToNull($optionId) { if (!$optionId) { diff --git a/CRM/Core/BAO/PreferencesDate.php b/CRM/Core/BAO/PreferencesDate.php index 5157b0a361..7d173f81db 100644 --- a/CRM/Core/BAO/PreferencesDate.php +++ b/CRM/Core/BAO/PreferencesDate.php @@ -56,7 +56,6 @@ class CRM_Core_BAO_PreferencesDate extends CRM_Core_DAO_PreferencesDate { * * @return CRM_Core_BAO_PreferencesDate|null * object on success, null otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $dao = new CRM_Core_DAO_PreferencesDate(); @@ -79,7 +78,6 @@ class CRM_Core_BAO_PreferencesDate extends CRM_Core_DAO_PreferencesDate { * @return Object * DAO object on sucess, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { CRM_Core_Error::fatal(); @@ -90,7 +88,6 @@ class CRM_Core_BAO_PreferencesDate extends CRM_Core_DAO_PreferencesDate { * * @param int $id * - * @static */ public static function del($id) { CRM_Core_Error::fatal(); diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php index 8ae0cf69c5..c0bd54019d 100644 --- a/CRM/Core/BAO/RecurringEntity.php +++ b/CRM/Core/BAO/RecurringEntity.php @@ -139,7 +139,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param array $params * Reference array contains the values submitted by the form . * - * @static * * @return object */ @@ -175,7 +174,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param string $entityTable * Name of the entity table . * - * @static * * @return object */ @@ -404,7 +402,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param int $initiatorId * The instance where this function is invoked from . * - * @static * * @return array * an array of child ids @@ -473,7 +470,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param int $mode * 1. retrieve only one entity. 2. retrieve all future entities in the repeating set. 3. all entities in the repeating set. . * - * @static * * @return array * array of connected ids @@ -496,7 +492,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param bool $includeParent * Include parent in result set . * - * @static * * @return int * unsigned $parentId Parent ID @@ -535,7 +530,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param bool $createRecurringEntity * If to create a record in recurring_entity table . * - * @static * * @return object */ @@ -565,7 +559,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param object $event * An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just updated . * - * @static * * @return void */ @@ -638,7 +631,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param object $event * An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just inserted . * - * @static * * @return void */ @@ -749,7 +741,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param object $event * An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just deleted . * - * @static * * @return void */ @@ -793,7 +784,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param string $entityTable * Name of the entity table * - * @static * * @return boolean|CRM_Core_DAO_RecurringEntity */ @@ -913,7 +903,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param int $scheduleReminderId * Primary key of civicrm_action_schedule table . * - * @static * * @return object */ @@ -1069,7 +1058,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param DateTime $endDate * End Date . * - * @static * * @return object * DateTime object which contain time difference @@ -1090,7 +1078,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity { * @param string $used_for * Specifies for which entity type it's used for . * - * @static * * @return object */ diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php index dad408318d..5e0e52eea2 100644 --- a/CRM/Core/BAO/SchemaHandler.php +++ b/CRM/Core/BAO/SchemaHandler.php @@ -69,7 +69,6 @@ class CRM_Core_BAO_SchemaHandler { * @return bool * TRUE if successfully created, FALSE otherwise * - * @static */ public static function createTable(&$params) { $sql = self::buildTableSQL($params); @@ -370,7 +369,6 @@ ALTER TABLE {$tableName} * @return bool * TRUE if successfully deleted, FALSE otherwise. * - * @static */ public static function dropTable($tableName) { $sql = "DROP TABLE $tableName"; diff --git a/CRM/Core/BAO/Setting.php b/CRM/Core/BAO/Setting.php index 0665028422..aca2dbbf1f 100644 --- a/CRM/Core/BAO/Setting.php +++ b/CRM/Core/BAO/Setting.php @@ -81,7 +81,6 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { * * @return boolean * true if item is already in cache - * @static */ static function inCache( $group, @@ -219,7 +218,6 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { * * @return mixed * The data if present in the setting table, else null - * @static */ static function getItem( $group, @@ -271,7 +269,6 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { * * @domains array an array of domains to get settings for. Default is the current domain * @return void - * @static */ public static function getItems(&$params, $domains = NULL, $settingsToReturn) { $originalDomain = CRM_Core_Config::domainID(); @@ -348,7 +345,6 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { * @param int $domainID * * @return void - * @static */ static function setItem( $value, @@ -464,7 +460,6 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { * @throws api_Exception * @domains array an array of domains to get settings for. Default is the current domain * @return array - * @static */ public static function setItems(&$params, $domains = NULL) { $originalDomain = CRM_Core_Config::domainID(); diff --git a/CRM/Core/BAO/Tag.php b/CRM/Core/BAO/Tag.php index 3fb43ecee8..fd82d7fb01 100644 --- a/CRM/Core/BAO/Tag.php +++ b/CRM/Core/BAO/Tag.php @@ -51,7 +51,6 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag { * * @return object * CRM_Core_DAO_Tag object on success, otherwise null - * @static */ public static function retrieve(&$params, &$defaults) { $tag = new CRM_Core_DAO_Tag(); @@ -322,7 +321,6 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag { * Tag id. * * @return boolean - * @static */ public static function del($id) { // since this is a destructive operation, lets make sure @@ -362,7 +360,6 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag { * * @return object * CRM_Core_DAO_Tag object on success, otherwise null - * @static */ public static function add(&$params, $ids = array()) { $id = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('tag', $ids)); @@ -413,7 +410,6 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag { * (reference ) an assoc array of name/value pairs. * * @return boolean - * @static */ public static function dataExists(&$params) { // Disallow empty values except for the number zero. @@ -433,7 +429,6 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag { * * @return array * array of tag sets - * @static */ public static function getTagSet($entityTable) { $tagSets = array(); @@ -458,7 +453,6 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag { * @return array * associated array of tag name and id * @access public - * @static */ public static function getTagsNotInTagset() { $tags = $tagSets = array(); diff --git a/CRM/Core/BAO/UFField.php b/CRM/Core/BAO/UFField.php index 7659094aac..0781e9e554 100644 --- a/CRM/Core/BAO/UFField.php +++ b/CRM/Core/BAO/UFField.php @@ -55,7 +55,6 @@ class CRM_Core_BAO_UFField extends CRM_Core_DAO_UFField { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_BAO_UFField - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_UFField', $params, $defaults); @@ -70,7 +69,6 @@ class CRM_Core_BAO_UFField extends CRM_Core_DAO_UFField { * @return string * title * - * @static */ public static function getTitle($id) { return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_UFField', $groupId, 'title'); @@ -86,7 +84,6 @@ class CRM_Core_BAO_UFField extends CRM_Core_DAO_UFField { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { //check if custom data profile field is disabled @@ -111,7 +108,6 @@ class CRM_Core_BAO_UFField extends CRM_Core_DAO_UFField { * * @return boolean * - * @static */ public static function del($id) { //delete field field @@ -131,7 +127,6 @@ class CRM_Core_BAO_UFField extends CRM_Core_DAO_UFField { * @return mixed * @ids array $ids array that containd ids * - * @static */ public static function duplicateField($params, $ids) { $ufField = new CRM_Core_DAO_UFField(); @@ -205,7 +200,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * * @return CRM_Core_BAO_UFField * - * @static */ public static function add(&$params, $ids = array()) { // set values for uf field properties and save @@ -279,7 +273,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * Set the is_active field. * * @return void - * @static */ public static function setUFField($customFieldId, $is_active) { //find the profile id given custom field @@ -303,7 +296,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * In which to copy. * * @return void - * @static */ public static function copy($old_id, $new_id) { $ufField = new CRM_Core_DAO_UFField(); @@ -325,7 +317,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * * @return void * - * @static */ public static function delUFField($customFieldId) { //find the profile id given custom field id @@ -348,7 +339,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * Value we want to set the is_active field. * * @return void - * @static */ public static function setUFFieldStatus($customGroupId, $is_active) { //find the profile id given custom group id @@ -372,7 +362,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * * @return boolean * false if custom field are disabled else true - * @static */ public static function checkUFStatus($UFFieldId) { $fieldName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_UFField', $UFFieldId, 'field_name'); @@ -462,7 +451,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * Array of types those are optional. * * @return boolean - * @static */ public static function checkValidProfileType($ufGroupId, $required, $optional = NULL) { if (!is_array($required) || empty($required)) { @@ -510,7 +498,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * * @return bool * true for mix profile else false - * @static */ public static function checkProfileType($ufGroupId) { $ufGroup = new CRM_Core_DAO_UFGroup(); @@ -581,7 +568,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * * @return string * profile group_type - * @static * * TODO Why is this function in this class? It seems to be about the UFGroup. */ @@ -606,7 +592,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * * @return string * profile group_type - * @static * * TODO Why is this function in this class? It seems to be about the UFGroup. */ @@ -710,7 +695,6 @@ WHERE cf.id IN (" . $customFieldIds . ") AND is_multiple = 1 LIMIT 0,1"; * * @return bool * true for mix profile group else false - * @static */ public static function checkProfileGroupType($ctype) { $ufGroup = new CRM_Core_DAO_UFGroup(); @@ -877,7 +861,6 @@ SELECT id * @param int $gid : UF group ID * @param array $defaults : Form defaults * @return array, multidimensional; e.g. $result['FieldGroup']['field_name']['label'] - * @static */ public static function getAvailableFields($gid = NULL, $defaults = array()) { $fields = array( @@ -1068,7 +1051,6 @@ SELECT id * @param bool $force * * @return array, multidimensional; e.g. $result['field_name']['label'] - * @static */ public static function getAvailableFieldsFlat($force = FALSE) { // FIXME reset when data model changes diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php index 74d81d7d40..0f1e6fdaa2 100644 --- a/CRM/Core/BAO/UFGroup.php +++ b/CRM/Core/BAO/UFGroup.php @@ -58,7 +58,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * * @return object * CRM_Core_DAO_UFGroup object - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_UFGroup', $params, $defaults); @@ -106,7 +105,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * @return string * title * - * @static */ public static function getTitle($id) { return CRM_Core_DAO::getFieldValue('CRM_Core_DAO_UFGroup', $id, 'title'); @@ -122,7 +120,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * * @return Object * CRM_Core_DAO_UFGroup object on success, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_UFGroup', $id, 'is_active', $is_active); @@ -140,7 +137,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * * @return array * the fields that are needed for registration - * @static */ public static function getRegistrationFields($action, $mode, $ctype = NULL) { if ($mode & CRM_Profile_Form::MODE_REGISTER) { @@ -202,7 +198,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * @param int $permissionType * @return array * the fields that are listings related - * @static */ static function getListingFields( $action, @@ -282,7 +277,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * * @return array * the fields that belong to this ufgroup(s) - * @static */ static function getFields( $id, @@ -719,7 +713,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * @pram boolean $register is this the registrtion form * @return boolean * true if form is valid - * @static */ public static function isValid($userID, $title, $register = FALSE, $action = NULL) { if ($register) { @@ -771,7 +764,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * * @return string * the html for the form on success, otherwise empty string - * @static */ static function getEditHTML( $userID, @@ -920,7 +912,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * * @return int|null * contact_id if found, null otherwise - * @static */ public static function findContact(&$params, $id = NULL, $contactType = 'Individual') { $dedupeParams = CRM_Dedupe_Finder::formatParams($params, $contactType); @@ -952,7 +943,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * @param null $additionalWhereClause * * @return void - * @static */ public static function getValues( $cid, &$fields, &$values, @@ -1388,7 +1378,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * * @return boolean * - * @static */ public static function usedByModule($id) { //check whether this group is used by any module(check uf join records) @@ -1414,7 +1403,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * * @return boolean * - * @static */ public static function del($id) { //check whether this group contains any profile fields @@ -1445,7 +1433,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * @param array $ids * Reference array contains the id. * - * @static * * @return object */ @@ -1498,7 +1485,6 @@ class CRM_Core_BAO_UFGroup extends CRM_Core_DAO_UFGroup { * Ufgroup id. * * @return void - * @static */ public static function createUFJoin(&$params, $ufGroupId) { $groupTypes = CRM_Utils_Array::value('uf_group_type', $params); @@ -1573,7 +1559,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * * @return array * - * @static */ public static function getUFJoinRecord($ufGroupId = NULL, $displayName = NULL, $status = NULL) { if ($displayName) { @@ -1618,7 +1603,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * (reference) an assoc array of name/value pairs. * * @return CRM_Core_BAO_UFJoin - * @static */ public static function addUFJoin(&$params) { $ufJoin = new CRM_Core_DAO_UFJoin(); @@ -1634,7 +1618,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * (reference) an assoc array of name/value pairs. * * @return void - * @static */ public static function delUFJoin(&$params) { $ufJoin = new CRM_Core_DAO_UFJoin(); @@ -1650,7 +1633,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * * @return int * weight of the UFGroup - * @static */ public static function getWeight($ufGroupId = NULL) { //calculate the weight @@ -1687,7 +1669,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * * @return array * array of ufgroups for a module - * @static */ public static function getModuleUFGroup($moduleName = NULL, $count = 0, $skipPermission = TRUE, $op = CRM_Core_Permission::VIEW, $returnFields = NULL) { $selectFields = array('id', 'title', 'created_id', 'is_active', 'is_reserved', 'group_type'); @@ -1760,7 +1741,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * * @return boolean * true or false - * @static */ public static function filterUFGroups($ufGroupId, $contactID = NULL) { if (!$contactID) { @@ -1810,7 +1790,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * @param string $prefix * * @return null - * @static */ static function buildProfile( &$form, @@ -2352,7 +2331,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * @param null $component * * @return null - * @static */ static function setProfileDefaults( $contactId, &$fields, &$defaults, @@ -2606,7 +2584,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * * @return array * associative array of profiles - * @static */ public static function getProfiles($types, $onlyPure = FALSE) { $profiles = array(); @@ -2637,7 +2614,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * * @return array * associative array of profiles - * @static */ public static function getValidProfiles($required, $optional = NULL) { if (!is_array($required) || empty($required)) { @@ -2670,7 +2646,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * * @return array * associative array of profiles - * @static */ public static function checkValidProfile($ufId, $required = NULL) { $validProfile = FALSE; @@ -2711,7 +2686,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * @param array $defaults * * @return array - * @static */ public static function setRegisterDefaults(&$fields, &$defaults) { $config = CRM_Core_Config::singleton(); @@ -2912,7 +2886,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * * @return array * assoicated formatted array - * @static */ public static function formatFields($params, $contactId = NULL) { if ($contactId) { @@ -3433,7 +3406,6 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) * * @return array * returns array - * @static */ public static function profileGroups($profileID) { $groupTypes = array(); @@ -3530,7 +3502,6 @@ SELECT group_id * * @return boolean * true if profile is mixed - * @static */ public static function checkForMixProfiles($profileIds) { $mixProfile = FALSE; @@ -3581,7 +3552,6 @@ SELECT group_id * * @return boolean * true if profile should be shown else false - * @static */ public static function showOverlayProfile() { $showOverlay = TRUE; @@ -3609,7 +3579,6 @@ SELECT group_id * * @return Array * group type values - * @static */ public static function groupTypeValues($profileId, $groupType = NULL) { $groupTypeValue = array(); @@ -3683,7 +3652,6 @@ SELECT group_id * * @return array * profileIds profile ids - * @static */ public static function getBatchProfiles() { $query = "SELECT id @@ -3730,7 +3698,6 @@ SELECT group_id * @param array $fields * Associated array of profile fields. * - * @static */ public static function reformatProfileFields(&$fields) { //reformat fields array diff --git a/CRM/Core/BAO/UFJoin.php b/CRM/Core/BAO/UFJoin.php index b795fe56be..f69b263c40 100644 --- a/CRM/Core/BAO/UFJoin.php +++ b/CRM/Core/BAO/UFJoin.php @@ -45,7 +45,6 @@ class CRM_Core_BAO_UFJoin extends CRM_Core_DAO_UFJoin { * (reference) an assoc array of name/value pairs. * * @return CRM_Core_DAO_UFJoin - * @static */ public static function &create($params) { // see if a record exists with the same weight @@ -97,7 +96,6 @@ class CRM_Core_BAO_UFJoin extends CRM_Core_DAO_UFJoin { * * @return int * or null - * @static */ public static function findJoinEntryId(&$params) { if (!empty($params['id'])) { @@ -135,7 +133,6 @@ class CRM_Core_BAO_UFJoin extends CRM_Core_DAO_UFJoin { * * @return int * or null - * @static */ public static function findUFGroupId(&$params) { diff --git a/CRM/Core/BAO/UFMatch.php b/CRM/Core/BAO/UFMatch.php index bd215c4002..dc3dbd4b1d 100644 --- a/CRM/Core/BAO/UFMatch.php +++ b/CRM/Core/BAO/UFMatch.php @@ -72,7 +72,6 @@ class CRM_Core_BAO_UFMatch extends CRM_Core_DAO_UFMatch { * @param bool $isLogin * * @return void - * @static */ public static function synchronize(&$user, $update, $uf, $ctype, $isLogin = FALSE) { $userSystem = CRM_Core_Config::singleton()->userSystem; @@ -182,7 +181,6 @@ class CRM_Core_BAO_UFMatch extends CRM_Core_DAO_UFMatch { * @param bool $isLogin * * @return CRM_Core_DAO_UFMatch|bool - * @static */ public static function &synchronizeUFMatch(&$user, $userKey, $uniqId, $uf, $status = NULL, $ctype = NULL, $isLogin = FALSE) { $config = CRM_Core_Config::singleton(); @@ -362,7 +360,6 @@ AND domain_id = %4 * Id of the contact to update. * * @return void - * @static */ public static function updateUFName($contactId) { if (!$contactId) { @@ -418,7 +415,6 @@ AND domain_id = %4 * Email to be modified for the user. * * @return void - * @static */ public static function updateContactEmail($contactId, $emailAddress) { $strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower'; @@ -473,7 +469,6 @@ AND domain_id = %4 * Id of the user to delete. * * @return void - * @static */ public static function deleteUser($ufID) { $ufmatch = new CRM_Core_DAO_UFMatch(); @@ -491,7 +486,6 @@ AND domain_id = %4 * * @return int * contact_id on success, null otherwise - * @static */ public static function getContactId($ufID) { if (!isset($ufID)) { @@ -516,7 +510,6 @@ AND domain_id = %4 * * @return int * uf_id of the given contact_id on success, null otherwise - * @static */ public static function getUFId($contactID) { if (!isset($contactID)) { @@ -547,7 +540,6 @@ AND domain_id = %4 * * @return int * contact_id on success, null otherwise - * @static */ public static function getContactIDs() { $id = array(); @@ -567,7 +559,6 @@ AND domain_id = %4 * * @return bool * true if allowed to login, false otherwise - * @static */ public static function getAllowedToLogin($openId) { $ufmatch = new CRM_Core_DAO_UFMatch(); @@ -586,7 +577,6 @@ AND domain_id = %4 * * @return int * next highest unused value for uf_id - * @static */ public static function getNextUfIdValue() { $query = "SELECT MAX(uf_id)+1 AS next_uf_id FROM civicrm_uf_match"; diff --git a/CRM/Core/BAO/Website.php b/CRM/Core/BAO/Website.php index 41f2abf850..c47b4aa3ef 100644 --- a/CRM/Core/BAO/Website.php +++ b/CRM/Core/BAO/Website.php @@ -46,7 +46,6 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website { * * @return object * CRM_Core_BAO_Website object on success, null otherwise - * @static */ public static function add(&$params) { $hook = empty($params['id']) ? 'create' : 'edit'; @@ -70,7 +69,6 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website { * @param $skipDelete * * @return void - * @static */ public static function create(&$params, $contactID, $skipDelete) { if (empty($params)) { @@ -118,7 +116,6 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website { * Website ids. * * @return void - * @static */ public static function del($ids) { $query = 'DELETE FROM civicrm_website WHERE id IN ( ' . implode(',', $ids) . ')'; @@ -135,7 +132,6 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website { * @param $values * * @return boolean - * @static */ public static function &getValues(&$params, &$values) { $websites = array(); @@ -165,7 +161,6 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website { * * @return array * the array of website details - * @static */ public static function allWebsites($id, $updateBlankLocInfo = FALSE) { if (!$id) { diff --git a/CRM/Core/BAO/WordReplacement.php b/CRM/Core/BAO/WordReplacement.php index 0a27a81855..82527f3b7f 100644 --- a/CRM/Core/BAO/WordReplacement.php +++ b/CRM/Core/BAO/WordReplacement.php @@ -59,7 +59,6 @@ class CRM_Core_BAO_WordReplacement extends CRM_Core_DAO_WordReplacement { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_DAO_WordRepalcement - * @static */ public static function retrieve(&$params, &$defaults) { @@ -72,7 +71,6 @@ class CRM_Core_BAO_WordReplacement extends CRM_Core_DAO_WordReplacement { * @param null $reset * * @return null|CRM_Core_BAO_WordRepalcement - * @static */ public static function getWordReplacement($reset = NULL) { static $wordReplacement = NULL; @@ -133,7 +131,6 @@ class CRM_Core_BAO_WordReplacement extends CRM_Core_DAO_WordReplacement { * WordReplacement id. * * @return object - * @static */ public static function del($id) { $dao = new CRM_Core_DAO_WordReplacement(); diff --git a/CRM/Core/ClassLoader.php b/CRM/Core/ClassLoader.php index 4ec6230e47..a85c973e2c 100644 --- a/CRM/Core/ClassLoader.php +++ b/CRM/Core/ClassLoader.php @@ -39,7 +39,6 @@ class CRM_Core_ClassLoader { * We only need one instance of this object. So we use the singleton * pattern and cache the instance in this variable * @var object - * @static */ private static $_singleton = NULL; diff --git a/CRM/Core/Component.php b/CRM/Core/Component.php index a244145818..aab1d99894 100644 --- a/CRM/Core/Component.php +++ b/CRM/Core/Component.php @@ -424,7 +424,6 @@ class CRM_Core_Component { * Array of tables. * * @return null - * @static */ public static function tableNames(&$tables) { $info = self::_info(); diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php index c836083567..984d4dbd3f 100644 --- a/CRM/Core/Config.php +++ b/CRM/Core/Config.php @@ -193,7 +193,6 @@ class CRM_Core_Config extends CRM_Core_Config_Variables { * whether to force a reconstruction. * * @return CRM_Core_Config - * @static */ public static function &singleton($loadFromDB = TRUE, $force = FALSE) { if (self::$_singleton === NULL || $force) { @@ -674,7 +673,6 @@ class CRM_Core_Config extends CRM_Core_Config_Variables { * @param array (reference ) the parameters that need a value * * @return boolean - * @static */ public static function check(&$config, &$required) { foreach ($required as $name) { diff --git a/CRM/Core/Config/Defaults.php b/CRM/Core/Config/Defaults.php index 3bfa82a5ee..75ad06c4bc 100644 --- a/CRM/Core/Config/Defaults.php +++ b/CRM/Core/Config/Defaults.php @@ -77,7 +77,6 @@ class CRM_Core_Config_Defaults { /** * Format size * - * @static */ public static function formatUnitSize($size, $checkForPostMax = FALSE) { @@ -120,7 +119,6 @@ class CRM_Core_Config_Defaults { * this variable is set true for GUI * mode (eg: Global setting >> Components) * - * @static */ public static function setValues(&$defaults, $formMode = FALSE) { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php index aa29909f07..e374d15e74 100644 --- a/CRM/Core/DAO.php +++ b/CRM/Core/DAO.php @@ -102,7 +102,6 @@ class CRM_Core_DAO extends DB_DataObject { * The database connection string. * * @return void - * @static */ public static function init($dsn) { $options = &PEAR::getStaticProperty('DB_DataObject', 'options'); @@ -334,7 +333,6 @@ class CRM_Core_DAO extends DB_DataObject { * The factory application object. * * @return void - * @static */ public static function setFactory(&$factory) { self::$_factory = &$factory; @@ -398,7 +396,6 @@ class CRM_Core_DAO extends DB_DataObject { /** * Returns list of FK relationships * - * @static * * @return array * Array of CRM_Core_Reference_Interface @@ -553,7 +550,6 @@ class CRM_Core_DAO extends DB_DataObject { * (reference ) associative array of name/value pairs. * * @return void - * @static */ public static function storeValues(&$object, &$values) { $fields = &$object->fields(); @@ -576,7 +572,6 @@ class CRM_Core_DAO extends DB_DataObject { * * @return array|null * the attributes for the object - * @static */ public static function makeAttribute($field) { if ($field) { @@ -630,7 +625,6 @@ class CRM_Core_DAO extends DB_DataObject { * * @return array * assoc array of name => attribute pairs - * @static */ public static function getAttribute($class, $fieldName = NULL) { $object = new $class(); @@ -679,7 +673,6 @@ class CRM_Core_DAO extends DB_DataObject { * * @return boolean * true if object exists - * @static */ public static function objectExists($value, $daoName, $daoID, $fieldName = 'name') { $object = new $daoName(); @@ -705,7 +698,6 @@ class CRM_Core_DAO extends DB_DataObject { * * @return boolean * true if exists, else false - * @static */ public static function checkFieldExists($tableName, $columnName, $i18nRewrite = TRUE) { $query = " @@ -731,7 +723,6 @@ LIKE %1 * @param string $fieldName * * @return array - * @static */ public static function getStorageValues($tableName = NULL, $maxTablesToCheck = 10, $fieldName = 'Engine') { $values = array(); @@ -791,7 +782,6 @@ LIKE %1 * * @return boolean * true if constraint exists, false otherwise - * @static */ public static function checkConstraintExists($tableName, $constraint) { static $show = array(); @@ -856,7 +846,6 @@ LIKE %1 * * @return boolean * true if in format, false otherwise - * @static */ public static function checkFKConstraintInFormat($tableName, $columnName) { static $show = array(); @@ -886,7 +875,6 @@ LIKE %1 * * @return boolean * true if the value is always $columnValue, false otherwise - * @static */ public static function checkFieldHasAlwaysValue($tableName, $columnName, $columnValue) { $query = "SELECT * FROM $tableName WHERE $columnName != '$columnValue'"; @@ -904,7 +892,6 @@ LIKE %1 * * @return boolean * true if if the value is always NULL, false otherwise - * @static */ public static function checkFieldIsAlwaysNull($tableName, $columnName) { $query = "SELECT * FROM $tableName WHERE $columnName IS NOT NULL"; @@ -921,7 +908,6 @@ LIKE %1 * * @return boolean * true if exists, else false - * @static */ public static function checkTableExists($tableName) { $query = " @@ -984,7 +970,6 @@ FROM civicrm_domain * * @return string|null * Value of $returnColumn in the retrieved record - * @static */ public static function getFieldValue($daoName, $searchValue, $returnColumn = 'name', $searchColumn = 'id', $force = FALSE) { if ( @@ -1035,7 +1020,6 @@ FROM civicrm_domain * * @return boolean * true if we found and updated the object, else false - * @static */ public static function setFieldValue($daoName, $searchValue, $setColumn, $setValue, $searchColumn = 'id') { $object = new $daoName(); @@ -1062,7 +1046,6 @@ FROM civicrm_domain * * @return string * sortString - * @static */ public static function getSortString($sort, $default = NULL) { // check if sort is of type CRM_Utils_Sort @@ -1094,7 +1077,6 @@ FROM civicrm_domain * * @return object * an object of type referenced by daoName - * @static */ public static function commonRetrieve($daoName, &$params, &$defaults, $returnProperities = NULL) { $object = new $daoName(); @@ -1122,7 +1104,6 @@ FROM civicrm_domain * Id of the contact to delete. * * @return void - * @static */ public static function deleteEntityContact($daoName, $contactId) { $object = new $daoName(); @@ -1147,7 +1128,6 @@ FROM civicrm_domain * * @return CRM_Core_DAO * object that holds the results of the query - * @static */ static function &executeQuery( $query, @@ -1198,7 +1178,6 @@ FROM civicrm_domain * @return string|null * the result of the query if any * - * @static */ static function &singleValueQuery( $query, @@ -1482,7 +1461,6 @@ SELECT contact_id * * @return object * an object of type referenced by daoName - * @static */ public static function commonRetrieveAll($daoName, $fieldIdName = 'id', $fieldId, &$details, $returnProperities = NULL) { require_once(str_replace('_', DIRECTORY_SEPARATOR, $daoName) . ".php"); diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php index 7d21a983dd..896e5146a1 100644 --- a/CRM/Core/Error.php +++ b/CRM/Core/Error.php @@ -83,20 +83,17 @@ class CRM_Core_Error extends PEAR_ErrorStack { * We only need one instance of this object. So we use the singleton * pattern and cache the instance in this variable * @var object - * @static */ private static $_singleton = NULL; /** * The logger object for this application * @var object - * @static */ private static $_log = NULL; /** * If modeException == true, errors are raised as exception instead of returning civicrm_errors - * @static */ public static $modeException = NULL; @@ -110,7 +107,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { * @param string $stackClass * * @return object - * @static */ public static function &singleton($package = NULL, $msgCallback = FALSE, $contextCallback = FALSE, $throwPEAR_Error = FALSE, $stackClass = 'PEAR_ErrorStack') { if (self::$_singleton === NULL) { @@ -307,7 +303,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { * @throws Exception * * @return void - * @static */ public static function fatal($message = NULL, $code = NULL, $email = NULL) { $vars = array( @@ -394,7 +389,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { * @param Exception $exception * * @return void - * @static */ public static function handleUnhandledException($exception) { try { @@ -477,7 +471,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { * * @return string * the generated output - * @static */ public static function debug($name, $variable = NULL, $log = TRUE, $html = TRUE, $checkPermission = TRUE) { $error = self::singleton(); @@ -529,7 +522,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { * the generated output * * - * @static * * @see CRM_Core_Error::debug() * @see CRM_Core_Error::debug_log_message() @@ -579,7 +571,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { * format of the backtrace * * - * @static */ public static function debug_log_message($message, $out = FALSE, $comp = '') { $config = CRM_Core_Config::singleton(); @@ -861,7 +852,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { * @param null $redirect * @param string $title * @return void - * @static */ public static function statusBounce($status, $redirect = NULL, $title = NULL) { $session = CRM_Core_Session::singleton(); @@ -881,7 +871,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { /** * Reset the error stack * - * @static */ public static function reset() { $error = self::singleton(); @@ -907,7 +896,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { * The PEAR_ERROR object. * @return object * $obj - * @static */ public static function nullHandler($obj) { CRM_Core_Error::debug_log_message("Ignoring exception thrown by nullHandler: {$obj->code}, {$obj->message}"); diff --git a/CRM/Core/Form/Date.php b/CRM/Core/Form/Date.php index f52e21afef..5ddb2a6592 100644 --- a/CRM/Core/Form/Date.php +++ b/CRM/Core/Form/Date.php @@ -45,7 +45,6 @@ class CRM_Core_Form_Date { * @param CRM_Core_Form $form * The form object that we are operating on. * - * @static */ public static function buildAllowedDateFormats(&$form) { @@ -88,7 +87,6 @@ class CRM_Core_Form_Date { * @param bool|string $displayTime * * - * @static */ static function buildDateRange( diff --git a/CRM/Core/Form/RecurringEntity.php b/CRM/Core/Form/RecurringEntity.php index 3683e5a5f3..9e1d5ee733 100644 --- a/CRM/Core/Form/RecurringEntity.php +++ b/CRM/Core/Form/RecurringEntity.php @@ -240,7 +240,6 @@ class CRM_Core_Form_RecurringEntity { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values) { $errors = array(); diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php index 3d129acabe..992a03e5b3 100644 --- a/CRM/Core/Form/Renderer.php +++ b/CRM/Core/Form/Renderer.php @@ -45,7 +45,6 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; @@ -53,7 +52,6 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty { * The converter from array size to css class * * @var array - * @static */ static $_sizeMapper = array( 2 => 'two', @@ -150,7 +148,6 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty { * Error associated with the element. * * @return array - * @static */ public static function updateAttributes(&$element, $required, $error) { // lets create an id for all input elements, so we can generate nice label tags diff --git a/CRM/Core/Form/Tag.php b/CRM/Core/Form/Tag.php index 77bb8736a3..50c182feea 100644 --- a/CRM/Core/Form/Tag.php +++ b/CRM/Core/Form/Tag.php @@ -59,7 +59,6 @@ class CRM_Core_Form_Tag { * If you need to create tagsetlist with specific name. * * @return void - * @static */ static function buildQuickForm( &$form, $parentNames, $entityTable, $entityId = NULL, $skipTagCreate = FALSE, @@ -134,7 +133,6 @@ class CRM_Core_Form_Tag { * Form object. * * @return void - * @static */ public static function postProcess(&$params, $entityId, $entityTable = 'civicrm_contact', &$form) { if ($form && !empty($form->_entityTagValues)) { diff --git a/CRM/Core/IDS.php b/CRM/Core/IDS.php index 8737ed3b64..c65a417d87 100644 --- a/CRM/Core/IDS.php +++ b/CRM/Core/IDS.php @@ -102,7 +102,6 @@ class CRM_Core_IDS { * * @return string * the full path to the config file - * @static */ public static function createConfigFile($force = FALSE) { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php index 78c1af6963..c5056fa2a0 100644 --- a/CRM/Core/Invoke.php +++ b/CRM/Core/Invoke.php @@ -48,7 +48,6 @@ class CRM_Core_Invoke { * @return string * HTML. For non-HTML content, invoke() may call print() and exit(). * - * @static */ public static function invoke($args) { try { @@ -325,7 +324,6 @@ class CRM_Core_Invoke { * @param $contact_type * @param $contact_sub_type * - * @static */ public static function form($action, $contact_type, $contact_sub_type) { CRM_Utils_System::setUserContext(array('civicrm/contact/search/basic', 'civicrm/contact/view')); diff --git a/CRM/Core/Joomla.php b/CRM/Core/Joomla.php index a56ff1d0e8..f8a0d50c76 100644 --- a/CRM/Core/Joomla.php +++ b/CRM/Core/Joomla.php @@ -43,7 +43,6 @@ class CRM_Core_Joomla { * to the smarty instance * * @return void - * @static */ public static function sidebarLeft() { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Core/Key.php b/CRM/Core/Key.php index 6f8aaabac1..0076431be7 100644 --- a/CRM/Core/Key.php +++ b/CRM/Core/Key.php @@ -42,7 +42,6 @@ class CRM_Core_Key { * * @return string * private key for this session - * @static */ public static function privateKey() { if (!self::$_key) { @@ -81,7 +80,6 @@ class CRM_Core_Key { * * @return string * valid formID - * @static */ public static function get($name, $addSequence = FALSE) { $privateKey = self::privateKey(); @@ -105,7 +103,6 @@ class CRM_Core_Key { * * @return string * if valid, else null - * @static */ public static function validate($key, $name, $addSequence = FALSE) { if (!is_string($key)) { diff --git a/CRM/Core/Menu.php b/CRM/Core/Menu.php index 65d8c1ceae..93288ee3ca 100644 --- a/CRM/Core/Menu.php +++ b/CRM/Core/Menu.php @@ -45,7 +45,6 @@ class CRM_Core_Menu { * The list of menu items * * @var array - * @static */ static $_items = NULL; @@ -53,7 +52,6 @@ class CRM_Core_Menu { * The list of permissioned menu items * * @var array - * @static */ static $_permissionedItems = NULL; @@ -166,7 +164,6 @@ class CRM_Core_Menu { * @param boolen $fetchFromXML * Fetch the menu items from xml and not from cache. * - * @static */ public static function &items($fetchFromXML = FALSE) { return self::xmlItems($fetchFromXML); @@ -490,7 +487,6 @@ class CRM_Core_Menu { * @return array * The breadcrumb for this path * - * @static */ public static function buildBreadcrumb(&$menu, $path) { $crumbs = array(); diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php index ff6037dcab..596450b398 100644 --- a/CRM/Core/OptionGroup.php +++ b/CRM/Core/OptionGroup.php @@ -113,7 +113,6 @@ class CRM_Core_OptionGroup { * * @return array * the values as specified by the above params - * @static * @void */ static function &values( @@ -220,7 +219,6 @@ WHERE v.option_group_id = g.id * * @return array * Array of values as specified by the above params - * @static * @void */ public static function &valuesByID($id, $flip = FALSE, $grouping = FALSE, $localize = FALSE, $labelColumnName = 'label', $onlyActive = TRUE, $fresh = FALSE) { @@ -277,7 +275,6 @@ WHERE v.option_group_id = g.id * * @return void * - * @static */ public static function lookupValues(&$params, &$names, $flip = FALSE) { foreach ($names as $postName => $value) { @@ -418,7 +415,6 @@ WHERE v.option_group_id = g.id * @param string $groupName * The name of the option group. * - * @static * * @return string * the value from the row where is_default = true @@ -467,7 +463,6 @@ WHERE v.option_group_id = g.id * @param null $groupTitle * The optional label of the option group else set to group name. * - * @static * * @return int * the option group ID diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php index a0bad747ed..e8627b2418 100644 --- a/CRM/Core/OptionValue.php +++ b/CRM/Core/OptionValue.php @@ -38,7 +38,6 @@ class CRM_Core_OptionValue { * Static field for all the option value information that we can potentially export * * @var array - * @static */ static $_exportableFields = NULL; @@ -46,7 +45,6 @@ class CRM_Core_OptionValue { * Static field for all the option value information that we can potentially export * * @var array - * @static */ static $_importableFields = NULL; @@ -54,7 +52,6 @@ class CRM_Core_OptionValue { * Static field for all the option value information that we can potentially export * * @var array - * @static */ static $_fields = NULL; @@ -71,7 +68,6 @@ class CRM_Core_OptionValue { * @return array * Array of option-values * - * @static */ public static function getRows($groupParams, $links, $orderBy = 'weight') { $optionValue = array(); @@ -185,7 +181,6 @@ class CRM_Core_OptionValue { * * @return CRM_Core_DAO_OptionValue * - * @static */ public static function addOptionValue(&$params, &$groupParams, &$action, &$optionValueID) { $params['is_active'] = CRM_Utils_Array::value('is_active', $params, FALSE); @@ -257,7 +252,6 @@ class CRM_Core_OptionValue { * * @return boolean * true if object exists - * @static */ public static function optionExists($value, $daoName, $daoID, $optionGroupID, $fieldName = 'name') { $object = new $daoName(); @@ -280,7 +274,6 @@ class CRM_Core_OptionValue { * * @return boolean * true if object exists - * @static */ public static function getFields($mode = '', $contactType = 'Individual') { $key = "$mode $contactType"; @@ -394,7 +387,6 @@ class CRM_Core_OptionValue { * @return array * Array of option-values * - * @static */ public static function getValues($groupParams, &$values, $orderBy = 'weight', $isActive = FALSE) { if (empty($groupParams)) { diff --git a/CRM/Core/Page.php b/CRM/Core/Page.php index d9de5db6bd..521cd824d9 100644 --- a/CRM/Core/Page.php +++ b/CRM/Core/Page.php @@ -85,7 +85,6 @@ class CRM_Core_Page { * Cache the smarty template for efficiency reasons * * @var CRM_Core_Smarty - * @static */ static protected $_template; @@ -93,7 +92,6 @@ class CRM_Core_Page { * Cache the session for efficiency reasons * * @var CRM_Core_Session - * @static */ static protected $_session; diff --git a/CRM/Core/Page/AJAX.php b/CRM/Core/Page/AJAX.php index 4b3564a2fe..74fbc48a3b 100644 --- a/CRM/Core/Page/AJAX.php +++ b/CRM/Core/Page/AJAX.php @@ -41,7 +41,6 @@ class CRM_Core_Page_AJAX { /** * Call generic ajax forms * - * @static */ public static function run() { $className = CRM_Utils_Type::escape($_REQUEST['class_name'], 'String'); @@ -92,7 +91,6 @@ class CRM_Core_Page_AJAX { /** * Change is_quick_config priceSet to complex * - * @static */ public static function setIsQuickConfig() { $id = $context = NULL; diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php index 163971fd19..ab50f68298 100644 --- a/CRM/Core/Payment.php +++ b/CRM/Core/Payment.php @@ -86,7 +86,6 @@ abstract class CRM_Core_Payment { * * @return CRM_Core_Payment * @throws \CRM_Core_Exception - * @static */ public static function &singleton($mode = 'test', &$paymentProcessor, &$paymentForm = NULL, $force = FALSE) { // make sure paymentProcessor is not empty diff --git a/CRM/Core/Payment/AuthorizeNet.php b/CRM/Core/Payment/AuthorizeNet.php index 25d5f298b3..a62030a185 100644 --- a/CRM/Core/Payment/AuthorizeNet.php +++ b/CRM/Core/Payment/AuthorizeNet.php @@ -34,7 +34,6 @@ class CRM_Core_Payment_AuthorizeNet extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/Dummy.php b/CRM/Core/Payment/Dummy.php index a5ae736c30..7d7b10a65b 100644 --- a/CRM/Core/Payment/Dummy.php +++ b/CRM/Core/Payment/Dummy.php @@ -37,7 +37,6 @@ class CRM_Core_Payment_Dummy extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/Elavon.php b/CRM/Core/Payment/Elavon.php index 33115214fd..1ba3d48227 100644 --- a/CRM/Core/Payment/Elavon.php +++ b/CRM/Core/Payment/Elavon.php @@ -33,7 +33,6 @@ class CRM_Core_Payment_Elavon extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var CRM_Core_Payment_Elavon - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/FirstData.php b/CRM/Core/Payment/FirstData.php index 4dff25c42d..4fb9aa912d 100644 --- a/CRM/Core/Payment/FirstData.php +++ b/CRM/Core/Payment/FirstData.php @@ -60,7 +60,6 @@ class CRM_Core_Payment_FirstData extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php index 4556e3676b..edf530427c 100644 --- a/CRM/Core/Payment/Form.php +++ b/CRM/Core/Payment/Form.php @@ -365,7 +365,6 @@ class CRM_Core_Payment_Form { * @param bool $reverse * * @return void - * @static */ public static function mapParams($id, &$src, &$dst, $reverse = FALSE) { static $map = NULL; @@ -406,7 +405,6 @@ class CRM_Core_Payment_Form { * @param $src * * @return int - * @static */ public static function getCreditCardExpirationMonth($src) { if ($month = CRM_Utils_Array::value('M', $src['credit_card_exp_date'])) { @@ -424,7 +422,6 @@ class CRM_Core_Payment_Form { * @param $src * * @return int - * @static */ public static function getCreditCardExpirationYear($src) { return CRM_Utils_Array::value('Y', $src['credit_card_exp_date']); diff --git a/CRM/Core/Payment/Google.php b/CRM/Core/Payment/Google.php index 09c0b3bf49..ae8cbf9fbe 100644 --- a/CRM/Core/Payment/Google.php +++ b/CRM/Core/Payment/Google.php @@ -55,7 +55,6 @@ class CRM_Core_Payment_Google extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/GoogleIPN.php b/CRM/Core/Payment/GoogleIPN.php index 0326dda87b..2c2fa54d7f 100644 --- a/CRM/Core/Payment/GoogleIPN.php +++ b/CRM/Core/Payment/GoogleIPN.php @@ -45,7 +45,6 @@ class CRM_Core_Payment_GoogleIPN extends CRM_Core_Payment_BaseIPN { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; @@ -410,7 +409,6 @@ WHERE contribution_recur_id = {$ids['contributionRecur']} * @param $paymentProcessor * * @return object - * @static */ public static function &singleton($mode, $component, &$paymentProcessor) { if (self::$_singleton === NULL) { @@ -453,7 +451,6 @@ WHERE contribution_recur_id = {$ids['contributionRecur']} * @internal param \xml $xml_response response send by google in xml format * @return array * context of this call (test, module, payment processor id) - * @static */ public function getContext($privateData, $orderNo, $root, $response, $serial) { $contributionID = CRM_Utils_Array::value('contributionID', $privateData); diff --git a/CRM/Core/Payment/IATS.php b/CRM/Core/Payment/IATS.php index b646542e07..88fa623cc5 100644 --- a/CRM/Core/Payment/IATS.php +++ b/CRM/Core/Payment/IATS.php @@ -44,7 +44,6 @@ class CRM_Core_Payment_IATS extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/Moneris.php b/CRM/Core/Payment/Moneris.php index 48372a2c5a..ff00ca429a 100644 --- a/CRM/Core/Payment/Moneris.php +++ b/CRM/Core/Payment/Moneris.php @@ -42,7 +42,6 @@ class CRM_Core_Payment_Moneris extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/PayJunction.php b/CRM/Core/Payment/PayJunction.php index 77f3174e31..3b8423a28e 100644 --- a/CRM/Core/Payment/PayJunction.php +++ b/CRM/Core/Payment/PayJunction.php @@ -24,7 +24,6 @@ class CRM_Core_Payment_PayJunction extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php index afab2f4f71..978bc514ed 100644 --- a/CRM/Core/Payment/PayPalImpl.php +++ b/CRM/Core/Payment/PayPalImpl.php @@ -42,7 +42,6 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/PayflowPro.php b/CRM/Core/Payment/PayflowPro.php index c62d3b0b14..b0e8ec19bb 100644 --- a/CRM/Core/Payment/PayflowPro.php +++ b/CRM/Core/Payment/PayflowPro.php @@ -22,7 +22,6 @@ class CRM_Core_Payment_PayflowPro extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/PaymentExpress.php b/CRM/Core/Payment/PaymentExpress.php index f4ef133eec..7b181db47f 100644 --- a/CRM/Core/Payment/PaymentExpress.php +++ b/CRM/Core/Payment/PaymentExpress.php @@ -46,7 +46,6 @@ class CRM_Core_Payment_PaymentExpress extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/PaymentExpressIPN.php b/CRM/Core/Payment/PaymentExpressIPN.php index a6ae745f95..b4d069393a 100644 --- a/CRM/Core/Payment/PaymentExpressIPN.php +++ b/CRM/Core/Payment/PaymentExpressIPN.php @@ -43,7 +43,6 @@ class CRM_Core_Payment_PaymentExpressIPN extends CRM_Core_Payment_BaseIPN { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; @@ -199,7 +198,6 @@ class CRM_Core_Payment_PaymentExpressIPN extends CRM_Core_Payment_BaseIPN { * * @return array * context of this call (test, component, payment processor id) - * @static */ public static function getContext($privateData, $orderNo) { diff --git a/CRM/Core/Payment/Realex.php b/CRM/Core/Payment/Realex.php index dd79992808..c47a9fc6ca 100644 --- a/CRM/Core/Payment/Realex.php +++ b/CRM/Core/Payment/Realex.php @@ -49,7 +49,6 @@ class CRM_Core_Payment_Realex extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Payment/eWAY.php b/CRM/Core/Payment/eWAY.php index 71457de839..ee118d5317 100644 --- a/CRM/Core/Payment/eWAY.php +++ b/CRM/Core/Payment/eWAY.php @@ -99,7 +99,6 @@ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php index 2fbb94e9cd..2aa52ba137 100644 --- a/CRM/Core/Permission.php +++ b/CRM/Core/Permission.php @@ -116,7 +116,6 @@ class CRM_Core_Permission { * * @return boolean * true if yes, else false - * @static */ public static function check($permissions) { $permissions = (array) $permissions; @@ -165,7 +164,6 @@ class CRM_Core_Permission { * * @return boolean * true if yes, else false - * @static */ public static function checkGroupRole($array) { $config = CRM_Core_Config::singleton(); @@ -199,7 +197,6 @@ class CRM_Core_Permission { * @param bool $excludeHidden * exclude hidden groups. * - * @static * * @return array * array reference of all groups. @@ -718,7 +715,6 @@ class CRM_Core_Permission { * return string $componentName the name of component. * * @return int|null|string - * @static */ public static function getComponentName($permission) { $componentName = NULL; diff --git a/CRM/Core/Permission/Joomla.php b/CRM/Core/Permission/Joomla.php index a1fcec6255..7110b890ff 100644 --- a/CRM/Core/Permission/Joomla.php +++ b/CRM/Core/Permission/Joomla.php @@ -106,7 +106,6 @@ class CRM_Core_Permission_Joomla extends CRM_Core_Permission_Base { * * @return boolean * true if yes, else false - * @static */ public function checkGroupRole($array) { return FALSE; diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php index 34eded7d3e..7a5665f452 100644 --- a/CRM/Core/PseudoConstant.php +++ b/CRM/Core/PseudoConstant.php @@ -52,7 +52,6 @@ class CRM_Core_PseudoConstant { /** * Static cache for pseudoconstant arrays * @var array - * @static */ private static $cache; @@ -61,42 +60,36 @@ class CRM_Core_PseudoConstant { * * activity type * @var array - * @static */ private static $activityType; /** * States, provinces * @var array - * @static */ private static $stateProvince; /** * Counties * @var array - * @static */ private static $county; /** * States/provinces abbreviations * @var array - * @static */ private static $stateProvinceAbbreviation; /** * Country * @var array - * @static */ private static $country; /** * CountryIsoCode * @var array - * @static */ private static $countryIsoCode; @@ -105,56 +98,48 @@ class CRM_Core_PseudoConstant { * * group * @var array - * @static */ private static $group; /** * GroupIterator * @var mixed - * @static */ private static $groupIterator; /** * RelationshipType * @var array - * @static */ private static $relationshipType; /** * Civicrm groups that are not smart groups * @var array - * @static */ private static $staticGroup; /** * Currency codes * @var array - * @static */ private static $currencyCode; /** * Payment processor * @var array - * @static */ private static $paymentProcessor; /** * Payment processor types * @var array - * @static */ private static $paymentProcessorType; /** * World Region * @var array - * @static */ private static $worldRegions; @@ -163,49 +148,42 @@ class CRM_Core_PseudoConstant { * * activity status * @var array - * @static */ private static $activityStatus; /** * Visibility * @var array - * @static */ private static $visibility; /** * Greetings * @var array - * @static */ private static $greeting; /** * Default Greetings * @var array - * @static */ private static $greetingDefaults; /** * Extensions of type module * @var array - * @static */ private static $extensions; /** * Financial Account Type * @var array - * @static */ private static $accountOptionValues; /** * Tax Rates * @var array - * @static */ private static $taxRates; @@ -233,7 +211,6 @@ class CRM_Core_PseudoConstant { * @return Array|bool * array on success, FALSE on error. * - * @static */ public static function get($daoName, $fieldName, $params = array(), $context = NULL) { CRM_Core_DAO::buildOptionsContext($context); @@ -557,7 +534,6 @@ class CRM_Core_PseudoConstant { * @param null $force * * @return void - * @static */ public static function populate( &$var, @@ -609,7 +585,6 @@ class CRM_Core_PseudoConstant { * Flush given pseudoconstant so it can be reread from db * nex time it's requested. * - * @static * * @param bool|string $name pseudoconstant to be flushed */ @@ -629,7 +604,6 @@ class CRM_Core_PseudoConstant { * * The static array activityType is returned * - * @static * * @return array * array reference of all activity types. @@ -704,7 +678,6 @@ class CRM_Core_PseudoConstant { * * Note: any database errors will be trapped by the DAO. * - * @static * * @param bool|int $id - Optional id to return * @@ -760,7 +733,6 @@ class CRM_Core_PseudoConstant { * * Same as above, except gets the abbreviations instead of the names. * - * @static * * @param bool|int $id - Optional id to return * @@ -828,7 +800,6 @@ WHERE id = %1"; * * Note: any database errors will be trapped by the DAO. * - * @static * * @param bool|int $id - Optional id to return * @@ -906,7 +877,6 @@ WHERE id = %1"; * * Note: any database errors will be trapped by the DAO. * - * @static * * @param bool $id * @@ -944,7 +914,6 @@ WHERE id = %1"; * @param bool $excludeHidden * Exclude hidden groups. * - * @static * * @return array * array reference of all groups. @@ -973,7 +942,6 @@ WHERE id = %1"; * called for the first time * * - * @static * * @param bool $styledLabels * @@ -1002,7 +970,6 @@ WHERE id = %1"; * @param bool $excludeHidden * Exclude hidden groups. * - * @static * * @return array * array reference of all groups. @@ -1032,7 +999,6 @@ WHERE id = %1"; * * Note: any database errors will be trapped by the DAO. * - * @static * * @param bool $onlyPublic * @param null $groupType @@ -1076,7 +1042,6 @@ WHERE id = %1"; * @param bool $reset * Reset relationship types if true. * - * @static * * @return array * array reference of all relationship types. @@ -1119,7 +1084,6 @@ WHERE id = %1"; * * @return array * array reference of all currency codes - * @static */ public static function ¤cyCode() { if (!self::$currencyCode) { @@ -1405,7 +1369,6 @@ WHERE id = %1"; * * Note: any database errors will be trapped by the DAO. * - * @static * * @param bool|int $id - Optional id to return * @@ -1436,7 +1399,6 @@ WHERE id = %1"; * * The static array paymentProcessor is returned * - * @static * * @param bool $all * Get payment processors - default is to get only active ones. @@ -1473,7 +1435,6 @@ WHERE id = %1"; * * The static array paymentProcessorType is returned * - * @static * * @param bool $all * Get payment processors - default is to get only active ones. @@ -1503,7 +1464,6 @@ WHERE id = %1"; * * @return array * array reference of all World Regions - * @static */ public static function &worldRegion($id = FALSE) { if (!self::$worldRegions) { @@ -1529,7 +1489,6 @@ WHERE id = %1"; * * The static array activityStatus is returned * - * @static * * @param string $column * @@ -1556,7 +1515,6 @@ WHERE id = %1"; * * The static array visibility is returned * - * @static * * @param string $column * @@ -1696,7 +1654,6 @@ ORDER BY name"; * * @return int * the country id that the state belongs to - * @static */ public static function countryIDForStateID($stateID) { if (empty($stateID)) { @@ -1718,7 +1675,6 @@ WHERE id = %1 * * The static array of greeting is returned * - * @static * * @param $filter * Get All Email Greetings - default is to get only active ones. @@ -1770,7 +1726,6 @@ WHERE id = %1 /** * Construct array of default greeting values for contact type * - * @static * * @return array * array reference of default greetings. @@ -1806,7 +1761,6 @@ WHERE id = %1 * FIXME: This is called by civix but not by any core code. We * should provide an API call which civix can use instead. * - * @static * * @return array * array($fullyQualifiedName => $label) list of extensions @@ -1833,7 +1787,6 @@ WHERE id = %1 * * The static array option values is returned * - * @static * * @param bool $optionGroupName * Get All Option Group values- default is to get only active ones. @@ -1861,7 +1814,6 @@ WHERE id = %1 * * @param bool $fresh * Whether to forcibly reload extensions list from canonical store. - * @static * * @return array * array(array('prefix' => $, 'file' => $)) @@ -1876,8 +1828,6 @@ WHERE id = %1 * * The static array tax rates is returned * - * @static - * * @return array * array list of tax rates with the financial type */ diff --git a/CRM/Core/Report/Excel.php b/CRM/Core/Report/Excel.php index d69f5ad091..f43d1abd66 100644 --- a/CRM/Core/Report/Excel.php +++ b/CRM/Core/Report/Excel.php @@ -51,7 +51,6 @@ class CRM_Core_Report_Excel { * @return mixed * empty if output is printed, else output * - * @static */ public static function makeCSVTable(&$header, &$rows, $titleHeader = NULL, $print = TRUE, $outputHeader = TRUE) { if ($titleHeader) { @@ -207,7 +206,6 @@ class CRM_Core_Report_Excel { * -. * * @return void - * @static */ public static function writeCSVFile($fileName, &$header, &$rows, $titleHeader = NULL, $outputHeader = TRUE, $saveFile = NULL) { if ($outputHeader && !$saveFile) { diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php index a2162a5e0c..dd0f937618 100644 --- a/CRM/Core/Resources.php +++ b/CRM/Core/Resources.php @@ -49,7 +49,6 @@ class CRM_Core_Resources { * We don't have a container or dependency-injection, so use singleton instead * * @var object - * @static */ private static $_singleton = NULL; diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php index f08f5fb8f0..7cd219f62c 100644 --- a/CRM/Core/SelectValues.php +++ b/CRM/Core/SelectValues.php @@ -39,7 +39,6 @@ class CRM_Core_SelectValues { /** * Preferred mail format - * @static */ public static function pmf() { return array( @@ -51,7 +50,6 @@ class CRM_Core_SelectValues { /** * Privacy options - * @static */ public static function privacy() { return array( @@ -66,7 +64,6 @@ class CRM_Core_SelectValues { /** * Various pre defined contact super types - * @static */ public static function contactType() { static $contactType = NULL; @@ -78,7 +75,6 @@ class CRM_Core_SelectValues { /** * Various pre defined unit list - * @static */ public static function unitList($unitType = NULL) { $unitList = array( @@ -94,7 +90,6 @@ class CRM_Core_SelectValues { /** * Membership type unit - * @static */ public static function membershipTypeUnitList() { return self::unitList('duration'); @@ -102,7 +97,6 @@ class CRM_Core_SelectValues { /** * Various pre defined period types - * @static */ public static function periodType() { return array( @@ -113,7 +107,6 @@ class CRM_Core_SelectValues { /** * Various pre defined email selection methods - * @static */ public static function emailSelectMethods() { return array( @@ -126,7 +119,6 @@ class CRM_Core_SelectValues { /** * Various pre defined member visibility options - * @static */ public static function memberVisibility() { return array( @@ -137,7 +129,6 @@ class CRM_Core_SelectValues { /** * Member auto-renew options - * @static */ public static function memberAutoRenew() { return array( @@ -149,7 +140,6 @@ class CRM_Core_SelectValues { /** * Various pre defined event dates - * @static */ public static function eventDate() { return array( @@ -161,7 +151,6 @@ class CRM_Core_SelectValues { /** * Custom form field types - * @static */ public static function customHtmlType() { return array( @@ -188,7 +177,6 @@ class CRM_Core_SelectValues { /** * Various pre defined extensions for dynamic properties and groups * - * @static */ public static function customGroupExtends() { $customGroupExtends = array( @@ -217,7 +205,6 @@ class CRM_Core_SelectValues { /** * Styles for displaying the custom data group * - * @static */ public static function customGroupStyle() { return array( @@ -230,7 +217,6 @@ class CRM_Core_SelectValues { /** * For displaying the uf group types * - * @static */ public static function ufGroupTypes() { $ufGroupType = array( @@ -250,7 +236,6 @@ class CRM_Core_SelectValues { /** * The status of a contact within a group * - * @static */ public static function groupContactStatus() { return array( @@ -262,7 +247,6 @@ class CRM_Core_SelectValues { /** * List of Group Types - * @static */ public static function groupType() { return array( @@ -282,7 +266,6 @@ class CRM_Core_SelectValues { * * @return array * the date array - * @static */ public static function date($type = NULL, $format = NULL, $minOffset = NULL, $maxOffset = NULL) { @@ -327,7 +310,6 @@ class CRM_Core_SelectValues { /** * Values for UF form visibility options * - * @static */ public static function ufVisibility() { return array( @@ -340,7 +322,6 @@ class CRM_Core_SelectValues { /** * Values for group form visibility options * - * @static */ public static function groupVisibility() { return array( @@ -352,7 +333,6 @@ class CRM_Core_SelectValues { /** * Different type of Mailing Components * - * @static * return array */ public static function mailingComponents() { @@ -372,7 +352,6 @@ class CRM_Core_SelectValues { * Get hours * * - * @static */ public function getHours() { $hours = array(); @@ -386,7 +365,6 @@ class CRM_Core_SelectValues { * Get minutes * * - * @static */ public function getMinutes() { $minutes = array(); @@ -401,7 +379,6 @@ class CRM_Core_SelectValues { * * @return array * array of map providers - * @static */ public static function mapProvider() { static $map = NULL; @@ -416,7 +393,6 @@ class CRM_Core_SelectValues { * * @return array * array of geocoder providers - * @static */ public static function geoProvider() { static $geo = NULL; @@ -432,7 +408,6 @@ class CRM_Core_SelectValues { * * @return array * array of address standardization providers - * @static */ public static function addressProvider() { static $addr = NULL; @@ -445,7 +420,6 @@ class CRM_Core_SelectValues { /** * Different type of Mailing Tokens * - * @static * return array */ public static function mailingTokens() { @@ -472,7 +446,6 @@ class CRM_Core_SelectValues { /** * Different type of Activity Tokens * - * @static * return array */ public static function activityTokens() { @@ -487,7 +460,6 @@ class CRM_Core_SelectValues { /** * Different type of Membership Tokens * - * @static * return array */ public static function membershipTokens() { @@ -505,7 +477,6 @@ class CRM_Core_SelectValues { /** * Different type of Event Tokens * - * @static * return array */ public static function eventTokens() { @@ -530,7 +501,6 @@ class CRM_Core_SelectValues { /** * Different type of Event Tokens * - * @static * return array */ public static function contributionTokens() { @@ -564,7 +534,6 @@ class CRM_Core_SelectValues { /** * Different type of Contact Tokens * - * @static * return array */ public static function contactTokens() { @@ -640,7 +609,6 @@ class CRM_Core_SelectValues { /** * Different type of Participant Tokens * - * @static * return array */ public static function participantTokens() { @@ -756,8 +724,6 @@ class CRM_Core_SelectValues { /** * Get numeric options * - * - * @static */ public static function getNumericOptions($start = 0, $end = 10) { $numericOptions = array(); @@ -769,7 +735,6 @@ class CRM_Core_SelectValues { /** * Barcode types - * @static */ public static function getBarcodeTypes() { return array( @@ -873,7 +838,6 @@ class CRM_Core_SelectValues { /** * Profile group types * - * @static */ public static function getProfileGroupType() { $profileGroupType = array( diff --git a/CRM/Core/Selector/Controller.php b/CRM/Core/Selector/Controller.php index 3d29005437..b3ade8e354 100644 --- a/CRM/Core/Selector/Controller.php +++ b/CRM/Core/Selector/Controller.php @@ -163,7 +163,6 @@ class CRM_Core_Selector_Controller { * Array of properties that the controller dumps into the output object * * @var array - * @static */ public static $_properties = array('columnHeaders', 'rows', 'rowsEmpty'); diff --git a/CRM/Core/Session.php b/CRM/Core/Session.php index 85f41d62e2..df162f25ad 100644 --- a/CRM/Core/Session.php +++ b/CRM/Core/Session.php @@ -64,7 +64,6 @@ class CRM_Core_Session { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; @@ -93,7 +92,6 @@ class CRM_Core_Session { * Singleton function used to manage this object * * @return CRM_Core_Session - * @static */ public static function &singleton() { if (self::$_singleton === NULL) { @@ -489,7 +487,6 @@ class CRM_Core_Session { * defaults to 10 seconds for most messages, 5 if it has a title but no body, * or 0 for errors or messages containing links * - * @static * * @return void */ diff --git a/CRM/Core/ShowHideBlocks.php b/CRM/Core/ShowHideBlocks.php index 1617329987..18607a7479 100644 --- a/CRM/Core/ShowHideBlocks.php +++ b/CRM/Core/ShowHideBlocks.php @@ -86,7 +86,6 @@ class CRM_Core_ShowHideBlocks { * Load icon vars used in hide and show links * * @return void - * @static */ public static function setIcons() { if (!isset(self::$_showIcon)) { @@ -187,7 +186,6 @@ class CRM_Core_ShowHideBlocks { * * @param bool $assign * - * @static * * @return void */ diff --git a/CRM/Core/Smarty.php b/CRM/Core/Smarty.php index 928036aadf..986d3ef8e6 100644 --- a/CRM/Core/Smarty.php +++ b/CRM/Core/Smarty.php @@ -69,7 +69,6 @@ class CRM_Core_Smarty extends Smarty { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Core/TableHierarchy.php b/CRM/Core/TableHierarchy.php index 249f522124..26a49e60a3 100644 --- a/CRM/Core/TableHierarchy.php +++ b/CRM/Core/TableHierarchy.php @@ -38,7 +38,6 @@ class CRM_Core_TableHierarchy { /** * This array defines weights for table, which are used to sort array of table in from clause * @var array - * @static */ static $info = array( 'civicrm_contact' => '01', diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php index 922246b88a..9bffda7c66 100644 --- a/CRM/Custom/Form/Field.php +++ b/CRM/Custom/Form/Field.php @@ -73,7 +73,6 @@ class CRM_Custom_Form_Field extends CRM_Core_Form { * Array for valid combinations of data_type & html_type * * @var array - * @static */ private static $_dataTypeValues = NULL; private static $_dataTypeKeys = NULL; @@ -578,7 +577,6 @@ class CRM_Custom_Form_Field extends CRM_Core_Form { * @return array * if errors then list of errors to be posted back to the form, * true otherwise - * @static */ public static function formRule($fields, $files, $self) { $default = CRM_Utils_Array::value('default_value', $fields); diff --git a/CRM/Custom/Form/Group.php b/CRM/Custom/Form/Group.php index 133430c4b2..674610f0f1 100644 --- a/CRM/Custom/Form/Group.php +++ b/CRM/Custom/Form/Group.php @@ -116,7 +116,6 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Custom/Form/Option.php b/CRM/Custom/Form/Option.php index e1da4cc6c2..ccb0e94cfd 100644 --- a/CRM/Custom/Form/Option.php +++ b/CRM/Custom/Form/Option.php @@ -247,7 +247,6 @@ class CRM_Custom_Form_Option extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $form) { $optionLabel = $fields['label']; diff --git a/CRM/Custom/Import/Form/MapField.php b/CRM/Custom/Import/Form/MapField.php index 2634b7dfc3..c65d3ccba4 100644 --- a/CRM/Custom/Import/Form/MapField.php +++ b/CRM/Custom/Import/Form/MapField.php @@ -63,7 +63,6 @@ class CRM_Custom_Import_Form_MapField extends CRM_Contact_Import_Form_MapField { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Custom/Import/Parser/Api.php b/CRM/Custom/Import/Parser/Api.php index a996ff586a..514847194f 100644 --- a/CRM/Custom/Import/Parser/Api.php +++ b/CRM/Custom/Import/Parser/Api.php @@ -222,7 +222,6 @@ class CRM_Custom_Import_Parser_Api extends CRM_Custom_Import_Parser { * * @return array * - * @static */ public function getGroupFieldsForImport($id) { $importableFields = array(); diff --git a/CRM/Dedupe/BAO/RuleGroup.php b/CRM/Dedupe/BAO/RuleGroup.php index 4f37b88322..680e609beb 100644 --- a/CRM/Dedupe/BAO/RuleGroup.php +++ b/CRM/Dedupe/BAO/RuleGroup.php @@ -438,7 +438,6 @@ class CRM_Dedupe_BAO_RuleGroup extends CRM_Dedupe_DAO_RuleGroup { * @param string $contactType * Individual, Household or Organization. * - * @static * * @return array * id => "nice name" of rule group diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 009e3858b3..1e208b170e 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -415,7 +415,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * Based on the provided two contact_ids and a set of tables, move the * belongings of the other contact to the main one. * - * @static */ public static function moveContactBelongings($mainId, $otherId, $tables = FALSE, $tableOperations = array()) { $cidRefs = self::cidRefs(); @@ -524,7 +523,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * Contact details. * * @return array - * @static */ public static function findDifferences($main, $other) { $result = array( @@ -570,7 +568,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * @param bool $redirectForPerformance * * @return array|bool - * @static */ public static function batchMerge($rgid, $gid = NULL, $mode = 'safe', $autoFlip = TRUE, $redirectForPerformance = FALSE) { $contactType = CRM_Core_DAO::getFieldValue('CRM_Dedupe_DAO_RuleGroup', $rgid, 'contact_type'); @@ -618,7 +615,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * @param bool $redirectForPerformance * * @return array|bool - * @static */ public static function merge($dupePairs = array(), $cacheParams = array(), $mode = 'safe', $autoFlip = TRUE, $redirectForPerformance = FALSE @@ -708,7 +704,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * Does a force merge otherwise (aggressive mode). * * @return bool - * @static */ public static function skipMerge($mainId, $otherId, &$migrationInfo, $mode = 'safe') { $conflicts = array(); @@ -819,7 +814,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * Duplicate contact which would be deleted after merge operation. * * @return array|bool|int - * @static */ public static function getRowsElementsAndInfo($mainId, $otherId) { $qfZeroBug = 'e8cddb72-a257-11dc-b9cc-0016d3330ee9'; @@ -1223,7 +1217,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * @param $migrationInfo * * @return bool - * @static */ public static function moveAllBelongings($mainId, $otherId, $migrationInfo) { if (empty($migrationInfo)) { diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php index 80e449da2e..64ebe160c7 100644 --- a/CRM/Event/BAO/Event.php +++ b/CRM/Event/BAO/Event.php @@ -50,7 +50,6 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Event_BAO_ManageEvent - * @static */ public static function retrieve(&$params, &$defaults) { $event = new CRM_Event_DAO_Event(); @@ -72,7 +71,6 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Event_DAO_Event', $id, 'is_active', $is_active); @@ -84,7 +82,6 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event { * @param array $params * Reference array contains the values submitted by the form. * - * @static * * @return object */ @@ -125,7 +122,6 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event { * Reference array contains the values submitted by the form. * * @return object - * @static */ public static function create(&$params) { $transaction = new CRM_Core_Transaction(); @@ -183,7 +179,6 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event { * Event id. * * @return mixed|null - * @static */ public static function del($id) { if (!$id) { @@ -235,7 +230,6 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event { * @param int $eventId * Event with which loc block is associated. * - * @static */ public static function deleteEventLocBlock($locBlockId, $eventId = NULL) { $query = "SELECT count(ce.id) FROM civicrm_event ce WHERE ce.loc_block_id = $locBlockId"; @@ -265,7 +259,6 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event { * true if you need to check permission else false. * * @return array - * @static */ static function getEvents( $all = 0, @@ -320,7 +313,6 @@ WHERE ( civicrm_event.is_template IS NULL OR civicrm_event.is_template = 0 )"; /** * Get events Summary * - * @static * * @return array * Array of event summary values @@ -657,7 +649,6 @@ $event_summary_limit * * @return null|string * title of the event - * @static */ public static function &getMapInfo(&$id) { @@ -733,7 +724,6 @@ WHERE civicrm_address.geo_code_1 IS NOT NULL * * @return array * array of all the events that are searched - * @static */ static function &getCompleteInfo( $start = NULL, @@ -1455,7 +1445,6 @@ WHERE civicrm_event.is_active = 1 * @param array $profileFields * * @return void - * @static */ public static function displayProfile(&$params, $gid, &$groupTitle, &$values, &$profileFields = array()) { if ($gid) { @@ -2010,7 +1999,6 @@ WHERE ce.loc_block_id = $locBlockId"; * * @return string * the permission that the user has (or null) - * @static */ public static function checkPermission($eventId = NULL, $type = CRM_Core_Permission::VIEW) { static $permissions = NULL; @@ -2075,7 +2063,6 @@ WHERE ce.loc_block_id = $locBlockId"; * * @return array * an array of email ids - * @static */ public static function getFromEmailIds($eventId = NULL) { $fromEmailValues['from_email_id'] = CRM_Core_BAO_Email::getFromEmail(); @@ -2112,7 +2099,6 @@ WHERE ce.loc_block_id = $locBlockId"; * * @return int * event total seats w/ given criteria. - * @static */ public static function eventTotalSeats($eventId, $extraWhereClause = NULL) { if (empty($eventId)) { diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php index 839e1d042f..4f34ffca4a 100644 --- a/CRM/Event/BAO/Participant.php +++ b/CRM/Event/BAO/Participant.php @@ -40,7 +40,6 @@ class CRM_Event_BAO_Participant extends CRM_Event_DAO_Participant { * Static field for all the participant information that we can potentially import * * @var array - * @static */ static $_importableFields = NULL; @@ -48,7 +47,6 @@ class CRM_Event_BAO_Participant extends CRM_Event_DAO_Participant { * Static field for all the participant information that we can potentially export * * @var array - * @static */ static $_exportableFields = NULL; @@ -56,7 +54,6 @@ class CRM_Event_BAO_Participant extends CRM_Event_DAO_Participant { * Static array for valid status transitions rules * * @var array - * @static */ static $_statusTransitionsRules = array( 'Pending from pay later' => array('Registered', 'Cancelled'), @@ -84,7 +81,6 @@ class CRM_Event_BAO_Participant extends CRM_Event_DAO_Participant { * (reference ) an assoc array of name/value pairs. * * @return CRM_Event_BAO_Participant - * @static */ public static function &add(&$params) { @@ -169,7 +165,6 @@ class CRM_Event_BAO_Participant extends CRM_Event_DAO_Participant { * @param $ids * * @return CRM_Event_BAO_Participant|null the found object or null - * @static */ public static function getValues(&$params, &$values, &$ids) { if (empty($params)) { @@ -194,7 +189,6 @@ class CRM_Event_BAO_Participant extends CRM_Event_DAO_Participant { * (reference ) an assoc array of name/value pairs. * * @return CRM_Event_BAO_Participant - * @static */ public static function create(&$params) { @@ -357,7 +351,6 @@ class CRM_Event_BAO_Participant extends CRM_Event_DAO_Participant { * * @return bool|int|null|string * 1. false => If event having some empty spaces. - * @static */ static function eventFull( $eventId, @@ -502,7 +495,6 @@ SELECT event.event_full_text, * * @return array * an array of each option id and total count - * @static */ static function priceSetOptionsCount( $eventId, @@ -581,7 +573,6 @@ INNER JOIN civicrm_price_field field ON ( value.price_field_id = field.id * * @return int * $spaces Number of Empty Seats/null. - * @static */ public static function pendingToConfirmSpaces($eventId) { $emptySeats = 0; @@ -631,7 +622,6 @@ GROUP BY participant.event_id * * @return array * array of importable Fields - * @static */ public static function &importableFields($contactType = 'Individual', $status = TRUE, $onlyParticipant = FALSE) { if (!self::$_importableFields) { @@ -744,7 +734,6 @@ GROUP BY participant.event_id * * @return array * array of exportable Fields - * @static */ public static function &exportableFields() { if (!self::$_exportableFields) { @@ -797,7 +786,6 @@ GROUP BY participant.event_id * * @return array * associated array with sort_name and event title - * @static */ public static function participantDetails($participantId) { $query = " @@ -828,7 +816,6 @@ WHERE civicrm_participant.id = {$participantId} * True if we want to resolve the values in the reverse direction (value -> name). * * @return void - * @static */ public static function resolveDefaults(&$defaults, $reverse = FALSE) { self::lookupValue($defaults, 'event', CRM_Event_PseudoConstant::event(), $reverse); @@ -872,7 +859,6 @@ WHERE civicrm_participant.id = {$participantId} * Id of the participation to delete. * * @return void - * @static */ public static function deleteParticipant($id) { CRM_Utils_Hook::pre('delete', 'Participant', $id, CRM_Core_DAO::$_nullArray); @@ -936,7 +922,6 @@ WHERE civicrm_participant.id = {$participantId} * from other function * * @return CRM_Contribute_BAO_Contribution - * @static */ public static function checkDuplicate($input, &$duplicates) { $eventId = CRM_Utils_Array::value('event_id', $input); @@ -981,7 +966,6 @@ WHERE civicrm_participant.id = {$participantId} * @param string $eventLevel * Event_leval string from db. * - * @static * * @return void */ @@ -1018,7 +1002,6 @@ WHERE civicrm_participant.id = {$participantId} * @param int $oldStatusId * * @return array - * @static */ public static function getAdditionalParticipantIds($primaryParticipantId, $excludeCancel = TRUE, $oldStatusId = NULL) { $additionalParticipantIds = array(); @@ -1060,7 +1043,6 @@ WHERE civicrm_participant.id = {$participantId} * Do fetch from line items. * * @return array - * @static */ public function getFeeDetails($participantIds, $hasLineItems = FALSE) { $feeDetails = array(); @@ -1136,7 +1118,6 @@ INNER JOIN civicrm_price_field_value value ON ( value.id = lineItem.price_field_ * * @return array * $displayName => $viewUrl - * @static */ public static function getAdditionalParticipants($primaryParticipantID) { $additionalParticipantIDs = array(); @@ -1168,7 +1149,6 @@ INNER JOIN civicrm_price_field_value value ON ( value.id = lineItem.price_field_ * @param bool $updatePrimaryStatus * * @return bool|void - * @static */ public static function updateParticipantStatus($participantID, $oldStatusID, $newStatusID = NULL, $updatePrimaryStatus = FALSE) { if (!$participantID || !$oldStatusID) { @@ -1205,7 +1185,6 @@ INNER JOIN civicrm_price_field_value value ON ( value.id = lineItem.price_field_ * * @return void * - * @static */ public static function updateStatus($participantIds, $statusId, $updateRegisterDate = FALSE) { if (!is_array($participantIds) || empty($participantIds) || !$statusId) { @@ -1247,7 +1226,6 @@ UPDATE civicrm_participant * @param bool $skipCascadeRule * * @return array - * @static */ static function transitionParticipants( $participantIds, $toStatusId, @@ -1486,7 +1464,6 @@ UPDATE civicrm_participant * return void * * @return bool - * @static */ static function sendTransitionParticipantMail( $participantId, @@ -1738,7 +1715,6 @@ UPDATE civicrm_participant * * @return int * count of participant records - * @static */ public static function getContactParticipantCount($contactID) { $query = "SELECT count(*) @@ -1757,7 +1733,6 @@ WHERE civicrm_participant.contact_id = {$contactID} AND * Exclude cancelled additional participant. * * @return array - * @static */ public static function getParticipantIds($contributionId, $excludeCancelled = FALSE) { @@ -1790,7 +1765,6 @@ WHERE civicrm_participant.contact_id = {$contactID} AND * * @return array * Array of Urls. - * @static */ public static function getAdditionalParticipantUrl($participantIds) { foreach ($participantIds as $value) { @@ -1818,7 +1792,6 @@ WHERE civicrm_participant.contact_id = {$contactID} AND * * @param $feeLevel * - * @static */ public static function createDiscountTrxn($eventID, $contributionParams, $feeLevel) { // CRM-11124 @@ -1857,7 +1830,6 @@ WHERE cpf.price_set_id = %1 AND cpfv.label LIKE %2"; * @param int $contactId * Contact id. * - * @static */ public static function deleteContactParticipant($contactId) { $participant = new CRM_Event_DAO_Participant(); diff --git a/CRM/Event/BAO/ParticipantPayment.php b/CRM/Event/BAO/ParticipantPayment.php index 1014483149..7f7749190b 100644 --- a/CRM/Event/BAO/ParticipantPayment.php +++ b/CRM/Event/BAO/ParticipantPayment.php @@ -45,7 +45,6 @@ class CRM_Event_BAO_ParticipantPayment extends CRM_Event_DAO_ParticipantPayment * * @return object * the partcipant payment record - * @static */ public static function create(&$params, &$ids) { if (isset($ids['id'])) { @@ -102,7 +101,6 @@ class CRM_Event_BAO_ParticipantPayment extends CRM_Event_DAO_ParticipantPayment * * @return boolean * true if deleted false otherwise - * @static */ public static function deleteParticipantPayment($params) { $participantPayment = new CRM_Event_DAO_ParticipantPayment(); diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php index f55382e811..0b88920f26 100644 --- a/CRM/Event/Form/ManageEvent/EventInfo.php +++ b/CRM/Event/Form/ManageEvent/EventInfo.php @@ -242,7 +242,6 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values) { $errors = array(); diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php index 4e25a57bb5..5b8a68bcdc 100644 --- a/CRM/Event/Form/ManageEvent/Fee.php +++ b/CRM/Event/Form/ManageEvent/Fee.php @@ -410,7 +410,6 @@ class CRM_Event_Form_ManageEvent_Fee extends CRM_Event_Form_ManageEvent { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values) { $errors = array(); diff --git a/CRM/Event/Form/ManageEvent/Location.php b/CRM/Event/Form/ManageEvent/Location.php index 25588f5cb2..1759544f7c 100644 --- a/CRM/Event/Form/ManageEvent/Location.php +++ b/CRM/Event/Form/ManageEvent/Location.php @@ -142,7 +142,6 @@ class CRM_Event_Form_ManageEvent_Location extends CRM_Event_Form_ManageEvent { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { // check for state/country mapping diff --git a/CRM/Event/Form/ManageEvent/Registration.php b/CRM/Event/Form/ManageEvent/Registration.php index 49008bc097..2583c06eae 100644 --- a/CRM/Event/Form/ManageEvent/Registration.php +++ b/CRM/Event/Form/ManageEvent/Registration.php @@ -318,7 +318,6 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent * * @param CRM_Core_Form $form * - * @static */ public function buildRegistrationBlock(&$form) { $attributes = CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event'); @@ -405,7 +404,6 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent * * @param CRM_Core_Form $form * - * @static */ public function buildConfirmationBlock(&$form) { $attributes = CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event'); @@ -433,7 +431,6 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent * * @param CRM_Core_Form $form * - * @static */ public function buildMailBlock(&$form) { $form->registerRule('emailList', 'callback', 'emailList', 'CRM_Utils_Rule'); @@ -489,7 +486,6 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $form) { if (!empty($values['is_online_registration'])) { diff --git a/CRM/Event/Form/ManageEvent/Repeat.php b/CRM/Event/Form/ManageEvent/Repeat.php index e06476aff5..781b65184e 100644 --- a/CRM/Event/Form/ManageEvent/Repeat.php +++ b/CRM/Event/Form/ManageEvent/Repeat.php @@ -164,7 +164,6 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent { * @param array $listOfRelatedEntities * List of related event ids . * - * @static * * @return array */ diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index fe3245b06f..9a39399402 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -803,7 +803,6 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $self) { // If $values['_qf_Participant_next'] is Delete or diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php index ba3f06d2df..35c11170be 100644 --- a/CRM/Event/Form/Registration/AdditionalParticipant.php +++ b/CRM/Event/Form/Registration/AdditionalParticipant.php @@ -386,7 +386,6 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php index 7754ff3351..a0c9fca334 100644 --- a/CRM/Event/Form/Registration/Register.php +++ b/CRM/Event/Form/Registration/Register.php @@ -557,7 +557,6 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration { * Discount id for the event. * * @return void - * @static */ static public function buildAmount(&$form, $required = TRUE, $discountId = NULL) { // build amount only when needed, skip incase of event full and waitlisting is enabled @@ -811,7 +810,6 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Event/Form/Task/AddToGroup.php b/CRM/Event/Form/Task/AddToGroup.php index 03379946b8..eabde5fb76 100644 --- a/CRM/Event/Form/Task/AddToGroup.php +++ b/CRM/Event/Form/Task/AddToGroup.php @@ -183,7 +183,6 @@ class CRM_Event_Form_Task_AddToGroup extends CRM_Event_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($params) { $errors = array(); diff --git a/CRM/Event/Form/Task/PickProfile.php b/CRM/Event/Form/Task/PickProfile.php index 1d73c1383f..f6c45b5e4e 100644 --- a/CRM/Event/Form/Task/PickProfile.php +++ b/CRM/Event/Form/Task/PickProfile.php @@ -123,7 +123,6 @@ class CRM_Event_Form_Task_PickProfile extends CRM_Event_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { return TRUE; diff --git a/CRM/Event/Import/Form/MapField.php b/CRM/Event/Import/Form/MapField.php index b34e74590a..e4ac8a1f39 100644 --- a/CRM/Event/Import/Form/MapField.php +++ b/CRM/Event/Import/Form/MapField.php @@ -294,7 +294,6 @@ class CRM_Event_Import_Form_MapField extends CRM_Import_Form_MapField { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php index a202ddd46b..484ad36e50 100644 --- a/CRM/Event/Page/ManageEvent.php +++ b/CRM/Event/Page/ManageEvent.php @@ -42,7 +42,6 @@ class CRM_Event_Page_ManageEvent extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_actionLinks = NULL; diff --git a/CRM/Event/PseudoConstant.php b/CRM/Event/PseudoConstant.php index b906f79b0f..02315f1fa0 100644 --- a/CRM/Event/PseudoConstant.php +++ b/CRM/Event/PseudoConstant.php @@ -43,7 +43,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * Event * * @var array - * @static */ private static $event; @@ -51,7 +50,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * Participant Status * * @var array - * @static */ private static $participantStatus; @@ -59,7 +57,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * Participant Role * * @var array - * @static */ private static $participantRole; @@ -67,7 +64,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * Participant Listing * * @var array - * @static */ private static $participantListing; @@ -75,7 +71,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * Event Type. * * @var array - * @static */ private static $eventType; @@ -88,7 +83,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { /** * Personal campaign pages * @var array - * @static */ private static $pcPage; @@ -102,7 +96,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array of all events if any - * @static */ public static function event($id = NULL, $all = FALSE, $condition = NULL) { $key = "{$id}_{$all}_{$condition}"; @@ -140,7 +133,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all participant statuses if any - * @static */ public static function &participantStatus($id = NULL, $cond = NULL, $retColumn = 'name') { if (self::$participantStatus === NULL) { @@ -198,7 +190,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all participant roles if any - * @static */ public static function &participantRole($id = NULL, $cond = NULL) { $index = $cond ? $cond : 'No Condition'; @@ -230,7 +221,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all participant listings if any - * @static */ public static function &participantListing($id = NULL) { if (!self::$participantListing) { @@ -252,7 +242,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * @param int $id * @return array * array reference of all event types. - * @static */ public static function &eventType($id = NULL) { if (!self::$eventType) { @@ -295,7 +284,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * Flush given pseudoconstant so it can be reread from db * nex time it's requested. * - * @static * * @param bool|string $name pseudoconstant to be flushed */ @@ -312,7 +300,6 @@ class CRM_Event_PseudoConstant extends CRM_Core_PseudoConstant { * @param int $id * @return array * array reference of all pcp if any - * @static */ public static function &pcPage($id = NULL) { if (!self::$pcPage) { diff --git a/CRM/Event/Selector/Search.php b/CRM/Event/Selector/Search.php index 954382d579..15c618b557 100644 --- a/CRM/Event/Selector/Search.php +++ b/CRM/Event/Selector/Search.php @@ -45,7 +45,6 @@ class CRM_Event_Selector_Search extends CRM_Core_Selector_Base implements CRM_Co * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Event_Selector_Search extends CRM_Core_Selector_Base implements CRM_Co * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( 'contact_id', diff --git a/CRM/Event/Task.php b/CRM/Event/Task.php index 72bd59245b..d46d7e1053 100644 --- a/CRM/Event/Task.php +++ b/CRM/Event/Task.php @@ -49,7 +49,6 @@ class CRM_Event_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -57,7 +56,6 @@ class CRM_Event_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -67,7 +65,6 @@ class CRM_Event_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function &tasks() { if (!(self::$_tasks)) { @@ -156,7 +153,6 @@ class CRM_Event_Task { * * @return array * the set of task titles - * @static */ public static function &taskTitles() { self::tasks(); @@ -175,7 +171,6 @@ class CRM_Event_Task { * * @return array * the set of optional tasks for a group of contacts - * @static */ public static function &optionalTaskTitle() { $tasks = array( @@ -222,7 +217,6 @@ class CRM_Event_Task { * * @return array * the set of tasks for a group of participants - * @static */ public static function getTask($value) { self::tasks(); diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php index 2870248123..152fc2bd2e 100644 --- a/CRM/Export/BAO/Export.php +++ b/CRM/Export/BAO/Export.php @@ -72,7 +72,6 @@ class CRM_Export_BAO_Export { * @param array $exportParams * @param string $queryOperator * - * @static */ static function exportComponents( $selectAll, diff --git a/CRM/Export/Form/Map.php b/CRM/Export/Form/Map.php index 45f9a95a8e..4fa7177542 100644 --- a/CRM/Export/Form/Map.php +++ b/CRM/Export/Form/Map.php @@ -114,7 +114,6 @@ class CRM_Export_Form_Map extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $values, $mappingTypeId) { $errors = array(); diff --git a/CRM/Export/Form/Select.php b/CRM/Export/Form/Select.php index 708de8b58a..9e4e7149ff 100644 --- a/CRM/Export/Form/Select.php +++ b/CRM/Export/Form/Select.php @@ -348,7 +348,6 @@ FROM {$this->_componentTable} * * @return bool|array * mixed true or array of errors - * @static */ static public function formRule($params, $files, $self) { $errors = array(); diff --git a/CRM/Financial/BAO/FinancialAccount.php b/CRM/Financial/BAO/FinancialAccount.php index 6d3eecfdc6..9a75609ed2 100644 --- a/CRM/Financial/BAO/FinancialAccount.php +++ b/CRM/Financial/BAO/FinancialAccount.php @@ -55,7 +55,6 @@ class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAcco * (reference ) an assoc array to hold the flattened values. * * @return CRM_Financial_BAO_FinancialAccount - * @static */ public static function retrieve(&$params, &$defaults) { $financialAccount = new CRM_Financial_DAO_FinancialAccount(); @@ -77,7 +76,6 @@ class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAcco * * @return CRM_Core_DAO|null * DAO object on success, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Financial_DAO_FinancialAccount', $id, 'is_active', $is_active); @@ -91,7 +89,6 @@ class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAcco * @param array $ids * Reference array contains the id. * - * @static * @return CRM_Financial_DAO_FinancialAccount */ public static function add(&$params, &$ids = array()) { @@ -122,7 +119,6 @@ class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAcco * Delete financial Types * * @param int $financialAccountId - * @static */ public static function del($financialAccountId) { //checking if financial type is present @@ -161,7 +157,6 @@ class CRM_Financial_BAO_FinancialAccount extends CRM_Financial_DAO_FinancialAcco * * @return int * accounting code - * @static */ public static function getAccountingCode($financialTypeId) { $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Income Account is' ")); @@ -192,7 +187,6 @@ WHERE cft.id = %1 * * @return int * count - * @static */ public static function getARAccounts($financialAccountId, $financialAccountTypeId = NULL, $accountTypeCode = 'ar') { if (!$financialAccountTypeId) { diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php index 20ab61f778..9c19f8f9f4 100644 --- a/CRM/Financial/BAO/FinancialItem.php +++ b/CRM/Financial/BAO/FinancialItem.php @@ -50,7 +50,6 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contribute_BAO_FinancialItem - * @static */ public static function retrieve(&$params, &$defaults) { $financialItem = new CRM_Financial_DAO_FinancialItem(); @@ -71,7 +70,6 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem { * Contribution object. * @param bool $taxTrxnID * - * @static * @return void */ public static function add($lineItem, $contribution, $taxTrxnID = FALSE) { @@ -139,7 +137,6 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem { * @param array $trxnIds * Financial item ids. * - * @static * @return object */ public static function create(&$params, $ids = NULL, $trxnIds = NULL) { @@ -189,7 +186,6 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem { * (reference ) an assoc array of name/value pairs. * * @return CRM_Core_BAO_FinancialTrxn - * @static */ public static function createEntityTrxn($params) { $entity_trxn = new CRM_Financial_DAO_EntityFinancialTrxn(); @@ -207,7 +203,6 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem { * To retrive max id. * * @return array - * @static */ public static function retrieveEntityFinancialTrxn($params, $maxId = FALSE) { $financialItem = new CRM_Financial_DAO_EntityFinancialTrxn(); @@ -247,7 +242,6 @@ class CRM_Financial_BAO_FinancialItem extends CRM_Financial_DAO_FinancialItem { * Error to display. * * @return array - * @static */ public static function checkContactPresent($contactIds, &$error) { if (empty($contactIds)) { diff --git a/CRM/Financial/BAO/FinancialType.php b/CRM/Financial/BAO/FinancialType.php index 49238f64d5..10a871cb2f 100644 --- a/CRM/Financial/BAO/FinancialType.php +++ b/CRM/Financial/BAO/FinancialType.php @@ -55,7 +55,6 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Contribute_BAO_ContributionType - * @static */ public static function retrieve(&$params, &$defaults) { $financialType = new CRM_Financial_DAO_FinancialType(); @@ -77,7 +76,6 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Financial_DAO_FinancialType', $id, 'is_active', $is_active); @@ -91,7 +89,6 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { * @param array $ids * Reference array contains the id. * - * @static * @return object */ public static function add(&$params, &$ids = array()) { @@ -122,7 +119,6 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { * @param int $financialTypeId * * @return array|bool - * @static */ public static function del($financialTypeId) { $financialType = new CRM_Financial_DAO_FinancialType(); @@ -169,7 +165,6 @@ class CRM_Financial_BAO_FinancialType extends CRM_Financial_DAO_FinancialType { * * @return array * all financial type with income account is relationship - * @static */ public static function getIncomeFinancialType() { // Financial Type diff --git a/CRM/Financial/BAO/FinancialTypeAccount.php b/CRM/Financial/BAO/FinancialTypeAccount.php index d2ceab977e..9a550a1410 100644 --- a/CRM/Financial/BAO/FinancialTypeAccount.php +++ b/CRM/Financial/BAO/FinancialTypeAccount.php @@ -44,7 +44,6 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin /** * Financial account * @var array - * @static */ private static $financialAccount; @@ -59,7 +58,6 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin * @param array $allValues * * @return CRM_Contribute_BAO_ContributionType - * @static */ public static function retrieve(&$params, &$defaults, &$allValues = array()) { $financialTypeAccount = new CRM_Financial_DAO_EntityFinancialAccount(); @@ -80,7 +78,6 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin * @param array $ids * Reference array contains the id. * - * @static * @return object */ public static function add(&$params, &$ids = NULL) { @@ -108,7 +105,6 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin * @param int $financialTypeAccountId * @param int $accountId * - * @static */ public static function del($financialTypeAccountId, $accountId = NULL) { //checking if financial type is present @@ -169,7 +165,6 @@ class CRM_Financial_BAO_FinancialTypeAccount extends CRM_Financial_DAO_EntityFin * Column to fetch. * * @return null|string - * @static */ public static function getFinancialAccount($entityId, $entityTable, $columnName = 'name') { $join = $columnName == 'name' ? 'LEFT JOIN civicrm_financial_account ON civicrm_entity_financial_account.financial_account_id = civicrm_financial_account.id' : NULL; @@ -194,7 +189,6 @@ AND entity_id = %2"; * Payment instrument value. * * @return array|null|string - * @static */ public static function getInstrumentFinancialAccount($paymentInstrumentValue = NULL) { if (!self::$financialAccount) { @@ -228,7 +222,6 @@ WHERE cog.name = 'payment_instrument' "; * @param $financialType * * @return array - * @static */ public static function createDefaultFinancialAccounts($financialType) { $titles = array(); diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php index d029da7106..1366ab75cd 100644 --- a/CRM/Financial/BAO/PaymentProcessor.php +++ b/CRM/Financial/BAO/PaymentProcessor.php @@ -103,7 +103,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces * * @return CRM_Financial_DAO_PaymentProcessor|null * object on success, null otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $paymentProcessor = new CRM_Financial_DAO_PaymentProcessor(); @@ -126,7 +125,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces * @return CRM_Financial_DAO_PaymentProcessor|null * DAO object on success, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Financial_DAO_PaymentProcessor', $id, 'is_active', $is_active); @@ -140,7 +138,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces * @return CRM_Financial_DAO_PaymentProcessor|null * The default payment processor object on success, * null otherwise - * @static */ public static function &getDefault() { if (self::$_defaultPaymentProcessor == NULL) { @@ -157,7 +154,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces * @param int $paymentProcessorID * * @return null - * @static */ public static function del($paymentProcessorID) { if (!$paymentProcessorID) { @@ -188,7 +184,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces * * @return array * associated array with payment processor related fields - * @static */ public static function getPayment($paymentProcessorID, $mode) { if (!$paymentProcessorID) { @@ -265,7 +260,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces * * @return array * associated array with payment processor related fields - * @static */ public static function buildPayment($dao, $mode) { $fields = array( @@ -418,7 +412,6 @@ class CRM_Financial_BAO_PaymentProcessor extends CRM_Financial_DAO_PaymentProces * Type of payment information to be retrieved. * * @return int|array|object - * @static */ public static function getProcessorForEntity($entityID, $component = 'contribute', $type = 'id') { $result = NULL; diff --git a/CRM/Financial/BAO/PaymentProcessorType.php b/CRM/Financial/BAO/PaymentProcessorType.php index b4b200cf40..4cf903e662 100644 --- a/CRM/Financial/BAO/PaymentProcessorType.php +++ b/CRM/Financial/BAO/PaymentProcessorType.php @@ -56,7 +56,6 @@ class CRM_Financial_BAO_PaymentProcessorType extends CRM_Financial_DAO_PaymentPr * * @return CRM_Core_BAO_LocaationType|null * object on success, null otherwise - * @static */ public static function retrieve(&$params, &$defaults) { $paymentProcessorType = new CRM_Financial_DAO_PaymentProcessorType(); @@ -79,7 +78,6 @@ class CRM_Financial_BAO_PaymentProcessorType extends CRM_Financial_DAO_PaymentPr * @return Object * DAO object on sucess, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Financial_DAO_PaymentProcessorType', $id, 'is_active', $is_active); @@ -93,7 +91,6 @@ class CRM_Financial_BAO_PaymentProcessorType extends CRM_Financial_DAO_PaymentPr * @return object * The default payment processor object on success, * null otherwise - * @static */ public static function &getDefault() { if (self::$_defaultPaymentProcessorType == NULL) { @@ -112,7 +109,6 @@ class CRM_Financial_BAO_PaymentProcessorType extends CRM_Financial_DAO_PaymentPr * * @throws Exception * @return CRM_Financial_DAO_PaymentProcessorType - * @static */ public static function create(&$params) { $paymentProcessorType = new CRM_Financial_DAO_PaymentProcessorType(); @@ -180,7 +176,6 @@ class CRM_Financial_BAO_PaymentProcessorType extends CRM_Financial_DAO_PaymentPr * ID of the processor to be deleted. * * @return bool - * @static */ public static function del($paymentProcessorTypeId) { $query = " diff --git a/CRM/Financial/Form/FinancialAccount.php b/CRM/Financial/Form/FinancialAccount.php index b9de52db6e..9f0c13ef02 100644 --- a/CRM/Financial/Form/FinancialAccount.php +++ b/CRM/Financial/Form/FinancialAccount.php @@ -140,7 +140,6 @@ class CRM_Financial_Form_FinancialAccount extends CRM_Contribute_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $self) { $errorMsg = array(); diff --git a/CRM/Financial/Form/FinancialBatch.php b/CRM/Financial/Form/FinancialBatch.php index 8967ce4bc8..406e862534 100644 --- a/CRM/Financial/Form/FinancialBatch.php +++ b/CRM/Financial/Form/FinancialBatch.php @@ -179,7 +179,6 @@ class CRM_Financial_Form_FinancialBatch extends CRM_Contribute_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $self) { $errors = array(); @@ -299,7 +298,6 @@ class CRM_Financial_Form_FinancialBatch extends CRM_Contribute_Form { * * @return array * list of errors to be posted back to the form - * @static */ public function checkPermissions($action, $permissions, $createdID, $userContactID, $actionName) { if ((CRM_Core_Permission::check($permissions[0]) || CRM_Core_Permission::check($permissions[1]))) { diff --git a/CRM/Financial/Form/FinancialTypeAccount.php b/CRM/Financial/Form/FinancialTypeAccount.php index 4aa650f3c1..4574abe3f0 100644 --- a/CRM/Financial/Form/FinancialTypeAccount.php +++ b/CRM/Financial/Form/FinancialTypeAccount.php @@ -239,7 +239,6 @@ class CRM_Financial_Form_FinancialTypeAccount extends CRM_Contribute_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($values, $files, $self) { $errorMsg = array(); diff --git a/CRM/Financial/Page/Batch.php b/CRM/Financial/Page/Batch.php index 4c86dedcbb..e85c6bb618 100644 --- a/CRM/Financial/Page/Batch.php +++ b/CRM/Financial/Page/Batch.php @@ -42,7 +42,6 @@ class CRM_Financial_Page_Batch extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Financial/Page/BatchTransaction.php b/CRM/Financial/Page/BatchTransaction.php index 57f55f8760..0b03eaf08b 100644 --- a/CRM/Financial/Page/BatchTransaction.php +++ b/CRM/Financial/Page/BatchTransaction.php @@ -42,7 +42,6 @@ class CRM_Financial_Page_BatchTransaction extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; static $_entityID; @@ -124,7 +123,6 @@ class CRM_Financial_Page_BatchTransaction extends CRM_Core_Page_Basic { * * * @return void - * @static */ public function browse() { } diff --git a/CRM/Financial/Page/FinancialAccount.php b/CRM/Financial/Page/FinancialAccount.php index 4cf2d9aab7..a9ad5f1cca 100644 --- a/CRM/Financial/Page/FinancialAccount.php +++ b/CRM/Financial/Page/FinancialAccount.php @@ -43,7 +43,6 @@ class CRM_Financial_Page_FinancialAccount extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -124,7 +123,6 @@ class CRM_Financial_Page_FinancialAccount extends CRM_Core_Page_Basic { * * * @return void - * @static */ public function browse() { // get all custom groups sorted by weight diff --git a/CRM/Financial/Page/FinancialBatch.php b/CRM/Financial/Page/FinancialBatch.php index afd44cafd0..9ed7bebbed 100644 --- a/CRM/Financial/Page/FinancialBatch.php +++ b/CRM/Financial/Page/FinancialBatch.php @@ -42,7 +42,6 @@ class CRM_Financial_Page_FinancialBatch extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Financial/Page/FinancialType.php b/CRM/Financial/Page/FinancialType.php index 56563405b8..a8c17c378a 100644 --- a/CRM/Financial/Page/FinancialType.php +++ b/CRM/Financial/Page/FinancialType.php @@ -43,7 +43,6 @@ class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -130,7 +129,6 @@ class CRM_Financial_Page_FinancialType extends CRM_Core_Page_Basic { * * * @return void - * @static */ public function browse() { // get all financial types sorted by weight diff --git a/CRM/Financial/Page/FinancialTypeAccount.php b/CRM/Financial/Page/FinancialTypeAccount.php index aa64938088..03de834056 100644 --- a/CRM/Financial/Page/FinancialTypeAccount.php +++ b/CRM/Financial/Page/FinancialTypeAccount.php @@ -41,7 +41,6 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -49,7 +48,6 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page { * The account id that we need to display for the browse screen * * @var array - * @static */ protected $_aid = NULL; @@ -123,7 +121,6 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page { * Browse all Financial Type Account data * * @return void - * @static */ public function browse() { // get all Financial Type Account data sorted by weight diff --git a/CRM/Friend/BAO/Friend.php b/CRM/Friend/BAO/Friend.php index 1dfac93403..f9062a3cbc 100644 --- a/CRM/Friend/BAO/Friend.php +++ b/CRM/Friend/BAO/Friend.php @@ -55,7 +55,6 @@ class CRM_Friend_BAO_Friend extends CRM_Friend_DAO_Friend { * (reference ) an assoc array of name/value pairs. * * @return CRM_Friend_BAO_Friend - * @static */ public static function add(&$params) { $friend = CRM_Contact_BAO_Contact::createProfileContact($params, CRM_Core_DAO::$_nullArray); @@ -73,7 +72,6 @@ class CRM_Friend_BAO_Friend extends CRM_Friend_DAO_Friend { * * @return array * values - * @static */ public static function retrieve(&$params, &$values) { $friend = new CRM_Friend_DAO_Friend(); @@ -94,7 +92,6 @@ class CRM_Friend_BAO_Friend extends CRM_Friend_DAO_Friend { * (reference ) an assoc array of name/value pairs. * * @return CRM_Contact_BAO_Contact - * @static */ public static function create(&$params) { $transaction = new CRM_Core_Transaction(); @@ -344,7 +341,6 @@ class CRM_Friend_BAO_Friend extends CRM_Friend_DAO_Friend { * (reference ) an assoc array of name/value pairs. * * @return CRM_Friend_BAO_Friend - * @static */ public static function addTellAFriend(&$params) { $friendDAO = new CRM_Friend_DAO_Friend(); diff --git a/CRM/Friend/Form.php b/CRM/Friend/Form.php index cd35fd6470..9607a3f046 100644 --- a/CRM/Friend/Form.php +++ b/CRM/Friend/Form.php @@ -233,7 +233,6 @@ class CRM_Friend_Form extends CRM_Core_Form { * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($fields) { diff --git a/CRM/Grant/BAO/Grant.php b/CRM/Grant/BAO/Grant.php index ee33e30a07..8a6a13d69b 100644 --- a/CRM/Grant/BAO/Grant.php +++ b/CRM/Grant/BAO/Grant.php @@ -37,7 +37,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { /** * Static field for all the grant information that we can potentially export * @var array - * @static */ static $_exportableFields = NULL; @@ -51,7 +50,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { /** * Get events Summary * - * @static * * @param bool $admin * @@ -92,7 +90,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { /** * Get events Summary * - * @static * * @return array * Array of event summary values @@ -115,7 +112,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { /** * Retrieve statistics for grants. * - * @static * * @param bool $admin * @@ -135,7 +131,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Grant_BAO_ManageGrant - * @static */ public static function retrieve(&$params, &$defaults) { $grant = new CRM_Grant_DAO_Grant(); @@ -155,7 +150,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { * @param array $ids * Reference array contains the id. * - * @static * * @return object */ @@ -258,7 +252,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { * Reference array contains the id. * * @return object - * @static */ public static function create(&$params, &$ids) { $transaction = new CRM_Core_Transaction(); @@ -320,7 +313,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { * * @return bool * - * @static */ public static function deleteContact($id) { $grant = new CRM_Grant_DAO_Grant(); @@ -336,7 +328,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { * Grant id. * * @return bool|mixed - * @static */ public static function del($id) { CRM_Utils_Hook::pre('delete', 'Grant', $id, CRM_Core_DAO::$_nullArray); @@ -366,7 +357,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { * * @return array * array of exportable Fields - * @static */ public static function &exportableFields() { if (!self::$_exportableFields) { @@ -426,7 +416,6 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant { * * @return int * count of grant records - * @static */ public static function getContactGrantCount($contactID) { $query = "SELECT count(*) FROM civicrm_grant WHERE civicrm_grant.contact_id = {$contactID} "; diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php index f5a9af4582..66f358afeb 100644 --- a/CRM/Grant/BAO/Query.php +++ b/CRM/Grant/BAO/Query.php @@ -362,7 +362,6 @@ class CRM_Grant_BAO_Query { * @param CRM_Core_Form $form * * @return void - * @static */ public static function buildSearchForm(&$form) { diff --git a/CRM/Grant/Page/Tab.php b/CRM/Grant/Page/Tab.php index 8feec27a85..0cd6e50f49 100644 --- a/CRM/Grant/Page/Tab.php +++ b/CRM/Grant/Page/Tab.php @@ -43,7 +43,6 @@ class CRM_Grant_Page_Tab extends CRM_Contact_Page_View { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; public $_permission = NULL; diff --git a/CRM/Grant/Selector/Search.php b/CRM/Grant/Selector/Search.php index 2e62a1716c..748109601e 100644 --- a/CRM/Grant/Selector/Search.php +++ b/CRM/Grant/Selector/Search.php @@ -45,7 +45,6 @@ class CRM_Grant_Selector_Search extends CRM_Core_Selector_Base implements CRM_Co * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Grant_Selector_Search extends CRM_Core_Selector_Base implements CRM_Co * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( 'contact_id', diff --git a/CRM/Grant/Task.php b/CRM/Grant/Task.php index e7d7490d18..a5ec0f4ac2 100644 --- a/CRM/Grant/Task.php +++ b/CRM/Grant/Task.php @@ -45,7 +45,6 @@ class CRM_Grant_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -53,7 +52,6 @@ class CRM_Grant_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -63,7 +61,6 @@ class CRM_Grant_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function &tasks() { if (!(self::$_tasks)) { @@ -106,7 +103,6 @@ class CRM_Grant_Task { * * @return array * the set of task titles - * @static */ public static function &taskTitles() { self::tasks(); @@ -152,7 +148,6 @@ class CRM_Grant_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function getTask($value) { self::tasks(); diff --git a/CRM/Group/Form/Edit.php b/CRM/Group/Form/Edit.php index a3783da2fe..0062ef2839 100644 --- a/CRM/Group/Form/Edit.php +++ b/CRM/Group/Form/Edit.php @@ -318,7 +318,6 @@ class CRM_Group_Form_Edit extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $fileParams, $options) { $errors = array(); @@ -445,7 +444,6 @@ WHERE title = %1 * * @return array * parent groups - * @static */ public static function buildParentGroups(&$form) { $groupNames = CRM_Core_PseudoConstant::group(); diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php index 1d00c41023..d6841e37f8 100644 --- a/CRM/Import/Parser.php +++ b/CRM/Import/Parser.php @@ -339,7 +339,6 @@ abstract class CRM_Import_Parser { * @param string $enclosure * * @return void - * @static */ public static function encloseScrub(&$values, $enclosure = "'") { if (empty($values)) { @@ -367,7 +366,6 @@ abstract class CRM_Import_Parser { * * @var $type error code constant * @return string - * @static */ public static function errorFileName($type) { $fileName = NULL; @@ -407,7 +405,6 @@ abstract class CRM_Import_Parser { * * @var $type error code constant * @return string - * @static */ public static function saveFileName($type) { $fileName = NULL; diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php index ae27e5818b..a4902c1461 100644 --- a/CRM/Logging/Schema.php +++ b/CRM/Logging/Schema.php @@ -659,7 +659,6 @@ COLS; * where we want to do a mass cleanup but dont want to bother with * an audit trail * - * @static */ public static function disableLoggingForThisConnection() { // do this only if logging is enabled diff --git a/CRM/Mailing/BAO/BouncePattern.php b/CRM/Mailing/BAO/BouncePattern.php index 6a1018efe4..acb01917fc 100644 --- a/CRM/Mailing/BAO/BouncePattern.php +++ b/CRM/Mailing/BAO/BouncePattern.php @@ -50,7 +50,6 @@ class CRM_Mailing_BAO_BouncePattern extends CRM_Mailing_DAO_BouncePattern { * Build the static pattern array * * @return void - * @static */ public static function buildPatterns() { self::$_patterns = array(); @@ -79,7 +78,6 @@ class CRM_Mailing_BAO_BouncePattern extends CRM_Mailing_DAO_BouncePattern { * * @return array * Tuple (bounce_type, bounce_reason) - * @static */ public static function &match(&$message) { // clean up $message and replace all white space by a single space, CRM-4767 diff --git a/CRM/Mailing/BAO/Component.php b/CRM/Mailing/BAO/Component.php index eb182b8260..441f9e2ccb 100644 --- a/CRM/Mailing/BAO/Component.php +++ b/CRM/Mailing/BAO/Component.php @@ -50,7 +50,6 @@ class CRM_Mailing_BAO_Component extends CRM_Mailing_DAO_Component { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Core_BAO_LocaationType - * @static */ public static function retrieve(&$params, &$defaults) { $component = new CRM_Mailing_DAO_Component(); @@ -72,7 +71,6 @@ class CRM_Mailing_BAO_Component extends CRM_Mailing_DAO_Component { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Mailing_DAO_Component', $id, 'is_active', $is_active); @@ -88,7 +86,6 @@ class CRM_Mailing_BAO_Component extends CRM_Mailing_DAO_Component { * * @return CRM_Mailing_BAO_Component * - * @static */ public static function add(&$params, $ids = array()) { $id = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('id', $ids)); diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 0c0b959a72..8d966f9040 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -1553,7 +1553,6 @@ ORDER BY civicrm_email.is_bulkmail DESC * @param array $ids * Reference array contains the id. * - * @static * * @return object */ @@ -1603,7 +1602,6 @@ ORDER BY civicrm_email.is_bulkmail DESC * * @return object * $mailing The new mailing object - * @static */ public static function create(&$params, $ids = array()) { @@ -1789,7 +1787,6 @@ ORDER BY civicrm_email.is_bulkmail DESC * * @return array * Associative array of reporting data - * @static */ public static function &report($id, $skipDetails = FALSE, $isSMS = FALSE) { $mailing_id = CRM_Utils_Type::escape($id, 'Integer'); @@ -2342,7 +2339,6 @@ ORDER BY civicrm_email.is_bulkmail DESC * * @return boolean * | array - TRUE if the user has access to all mailings, else array of mailing IDs (possibly empty) - * @static */ public static function mailingACLIDs() { // CRM-11633 @@ -2485,7 +2481,6 @@ LEFT JOIN civicrm_mailing_group g ON g.mailing_id = m.id * @param int $id * * @return string - * @static */ public static function showEmailDetails($id) { return CRM_Utils_System::url('civicrm/mailing/report', "mid=$id"); @@ -2498,7 +2493,6 @@ LEFT JOIN civicrm_mailing_group g ON g.mailing_id = m.id * Id of the mail to delete. * * @return void - * @static */ public static function del($id) { if (empty($id)) { @@ -2529,7 +2523,6 @@ LEFT JOIN civicrm_mailing_group g ON g.mailing_id = m.id * Id of the Job to delete. * * @return void - * @static */ public static function delJob($id) { if (empty($id)) { @@ -3059,7 +3052,6 @@ AND m.id = %1 * @return array * Array of mailings for a contact * - * @static */ static public function getContactMailings(&$params) { $params['version'] = 3; @@ -3079,7 +3071,6 @@ AND m.id = %1 * @return int * count of mailings for a contact * - * @static */ static public function getContactMailingsCount(&$params) { $params['version'] = 3; diff --git a/CRM/Mailing/BAO/MailingAB.php b/CRM/Mailing/BAO/MailingAB.php index b8492ebccb..59669461e0 100644 --- a/CRM/Mailing/BAO/MailingAB.php +++ b/CRM/Mailing/BAO/MailingAB.php @@ -56,7 +56,6 @@ class CRM_Mailing_BAO_MailingAB extends CRM_Mailing_DAO_MailingAB { * * @return object * $mailingab The new mailingab object - * @static */ public static function create(&$params, $ids = array()) { $transaction = new CRM_Core_Transaction(); @@ -79,7 +78,6 @@ class CRM_Mailing_BAO_MailingAB extends CRM_Mailing_DAO_MailingAB { * @param array $ids * Reference array contains the id. * - * @static * * @return object */ @@ -121,7 +119,6 @@ class CRM_Mailing_BAO_MailingAB extends CRM_Mailing_DAO_MailingAB { * Id of the mail to delete. * * @return void - * @static */ public static function del($id) { if (empty($id)) { diff --git a/CRM/Mailing/BAO/MailingJob.php b/CRM/Mailing/BAO/MailingJob.php index 9df531b71e..fd808f6b19 100644 --- a/CRM/Mailing/BAO/MailingJob.php +++ b/CRM/Mailing/BAO/MailingJob.php @@ -45,7 +45,6 @@ class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob { * (Dear God Why) Keep a global count of mails processed within the current * request. * - * @static * @var int */ static $mailsProcessed = 0; @@ -81,7 +80,6 @@ class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob { * @param null $mode * * @return void - * @static */ public static function runJobs($testParams = NULL, $mode = NULL) { $job = new CRM_Mailing_BAO_MailingJob(); @@ -817,7 +815,6 @@ VALUES (%1, %2, %3, %4, %5, %6, %7) * * @param int $mailingId * The id of the mailing to be canceled. - * @static */ public static function cancel($mailingId) { $sql = " @@ -868,7 +865,6 @@ AND status IN ( 'Scheduled', 'Running', 'Paused' ) * * @return string * The translated version - * @static */ public static function status($status) { static $translation = NULL; @@ -891,7 +887,6 @@ AND status IN ( 'Scheduled', 'Running', 'Paused' ) * * @return string * For use in a WHERE clause - * @static */ public static function workflowClause() { // add an additional check and only process diff --git a/CRM/Mailing/BAO/Query.php b/CRM/Mailing/BAO/Query.php index 1e934d63c9..ff803cde7a 100644 --- a/CRM/Mailing/BAO/Query.php +++ b/CRM/Mailing/BAO/Query.php @@ -383,7 +383,6 @@ class CRM_Mailing_BAO_Query { * * @param CRM_Core_Form $form * @return void - * @static */ public static function buildSearchForm(&$form) { // mailing selectors diff --git a/CRM/Mailing/BAO/TrackableURL.php b/CRM/Mailing/BAO/TrackableURL.php index dbb5fcfbd3..bef5c53467 100644 --- a/CRM/Mailing/BAO/TrackableURL.php +++ b/CRM/Mailing/BAO/TrackableURL.php @@ -54,7 +54,6 @@ class CRM_Mailing_BAO_TrackableURL extends CRM_Mailing_DAO_TrackableURL { * * @return string * The redirect/tracking url - * @static */ public static function getTrackerURL($url, $mailing_id, $queue_id) { diff --git a/CRM/Mailing/Event/BAO/Bounce.php b/CRM/Mailing/Event/BAO/Bounce.php index b8398395fe..4026d5181f 100755 --- a/CRM/Mailing/Event/BAO/Bounce.php +++ b/CRM/Mailing/Event/BAO/Bounce.php @@ -130,7 +130,6 @@ class CRM_Mailing_Event_BAO_Bounce extends CRM_Mailing_Event_DAO_Bounce { * * @return int * Number of rows in result set - * @static */ public static function getTotalCount($mailing_id, $job_id = NULL, $is_distinct = FALSE, $toDate = NULL) { $dao = new CRM_Core_DAO(); @@ -191,7 +190,6 @@ class CRM_Mailing_Event_BAO_Bounce extends CRM_Mailing_Event_DAO_Bounce { * * @return array * Result set - * @static */ public static function &getRows( $mailing_id, $job_id = NULL, diff --git a/CRM/Mailing/Event/BAO/Confirm.php b/CRM/Mailing/Event/BAO/Confirm.php index 78d696db3a..d4560698ba 100644 --- a/CRM/Mailing/Event/BAO/Confirm.php +++ b/CRM/Mailing/Event/BAO/Confirm.php @@ -59,7 +59,6 @@ class CRM_Mailing_Event_BAO_Confirm extends CRM_Mailing_Event_DAO_Confirm { * * @return boolean * True on success - * @static */ public static function confirm($contact_id, $subscribe_id, $hash) { $se = &CRM_Mailing_Event_BAO_Subscribe::verify( diff --git a/CRM/Mailing/Event/BAO/Delivered.php b/CRM/Mailing/Event/BAO/Delivered.php index aaba7aa147..fe2606c226 100755 --- a/CRM/Mailing/Event/BAO/Delivered.php +++ b/CRM/Mailing/Event/BAO/Delivered.php @@ -48,7 +48,6 @@ class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered { * Associative array of delivery event values. * * @return void - * @static */ public static function &create(&$params) { $q = &CRM_Mailing_Event_BAO_Queue::verify($params['job_id'], @@ -93,7 +92,6 @@ class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered { * * @return int * Number of rows in result set - * @static */ public static function getTotalCount($mailing_id, $job_id = NULL, $is_distinct = FALSE, $toDate = NULL) { $dao = new CRM_Core_DAO(); @@ -159,7 +157,6 @@ class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered { * * @return array * Result set - * @static */ public static function &getRows( $mailing_id, $job_id = NULL, @@ -283,7 +280,6 @@ class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered { * Consider mailings that were completed not more than $maxDays ago. * * @return void - * @static **/ public static function updateEmailResetDate($minDays = 3, $maxDays = 7) { $dao = new CRM_Core_Dao(); diff --git a/CRM/Mailing/Event/BAO/Forward.php b/CRM/Mailing/Event/BAO/Forward.php index c12916ed8b..b6bad18f96 100644 --- a/CRM/Mailing/Event/BAO/Forward.php +++ b/CRM/Mailing/Event/BAO/Forward.php @@ -225,7 +225,6 @@ class CRM_Mailing_Event_BAO_Forward extends CRM_Mailing_Event_DAO_Forward { * * @return int * Number of rows in result set - * @static */ public static function getTotalCount( $mailing_id, $job_id = NULL, @@ -286,7 +285,6 @@ class CRM_Mailing_Event_BAO_Forward extends CRM_Mailing_Event_DAO_Forward { * * @return array * Result set - * @static */ public static function &getRows( $mailing_id, $job_id = NULL, diff --git a/CRM/Mailing/Event/BAO/Opened.php b/CRM/Mailing/Event/BAO/Opened.php index 1ddd7f985a..c61dbbc901 100755 --- a/CRM/Mailing/Event/BAO/Opened.php +++ b/CRM/Mailing/Event/BAO/Opened.php @@ -48,7 +48,6 @@ class CRM_Mailing_Event_BAO_Opened extends CRM_Mailing_Event_DAO_Opened { * The Queue Event ID of the recipient. * * @return void - * @static */ public static function open($queue_id) { /* First make sure there's a matching queue event */ @@ -80,7 +79,6 @@ class CRM_Mailing_Event_BAO_Opened extends CRM_Mailing_Event_DAO_Opened { * * @return int * Number of rows in result set - * @static */ public static function getTotalCount( $mailing_id, @@ -137,7 +135,6 @@ class CRM_Mailing_Event_BAO_Opened extends CRM_Mailing_Event_DAO_Opened { * * @return array * Opened count per mailing ID - * @static */ public static function getMailingTotalCount($mailingIDs) { $dao = new CRM_Core_DAO(); @@ -178,7 +175,6 @@ class CRM_Mailing_Event_BAO_Opened extends CRM_Mailing_Event_DAO_Opened { * * @return array * Count per mailing ID - * @static */ public static function getMailingContactCount($mailingIDs, $contactID) { $dao = new CRM_Core_DAO(); @@ -231,7 +227,6 @@ class CRM_Mailing_Event_BAO_Opened extends CRM_Mailing_Event_DAO_Opened { * * @return array * Result set - * @static */ public static function &getRows( $mailing_id, $job_id = NULL, diff --git a/CRM/Mailing/Event/BAO/Queue.php b/CRM/Mailing/Event/BAO/Queue.php index 5b13e1592e..1ed0e54910 100644 --- a/CRM/Mailing/Event/BAO/Queue.php +++ b/CRM/Mailing/Event/BAO/Queue.php @@ -49,7 +49,6 @@ class CRM_Mailing_Event_BAO_Queue extends CRM_Mailing_Event_DAO_Queue { * * @return CRM_Mailing_Event_BAO_Queue * The new EventQueue - * @static */ public static function create($params) { $eq = new CRM_Mailing_Event_BAO_Queue(); @@ -68,7 +67,6 @@ class CRM_Mailing_Event_BAO_Queue extends CRM_Mailing_Event_DAO_Queue { * * @return int * The hash - * @static */ public static function hash($params) { $jobId = $params['job_id']; @@ -92,7 +90,6 @@ class CRM_Mailing_Event_BAO_Queue extends CRM_Mailing_Event_DAO_Queue { * * @return object|null * The queue event if verified, or null - * @static */ public static function &verify($job_id, $queue_id, $hash) { $success = NULL; @@ -116,7 +113,6 @@ class CRM_Mailing_Event_BAO_Queue extends CRM_Mailing_Event_DAO_Queue { * * @return string * The email address - * @static */ public static function getEmailAddress($queue_id) { $email = CRM_Core_BAO_Email::getTableName(); @@ -146,7 +142,6 @@ class CRM_Mailing_Event_BAO_Queue extends CRM_Mailing_Event_DAO_Queue { * * @return int * Number of matching events - * @static */ public static function getTotalCount($mailing_id, $job_id = NULL) { $dao = new CRM_Core_DAO(); @@ -188,7 +183,6 @@ class CRM_Mailing_Event_BAO_Queue extends CRM_Mailing_Event_DAO_Queue { * * @return array * Result set - * @static */ public static function &getRows( $mailing_id, $job_id = NULL, $offset = NULL, diff --git a/CRM/Mailing/Event/BAO/Reply.php b/CRM/Mailing/Event/BAO/Reply.php index 536cec33e4..24bff5a3d3 100644 --- a/CRM/Mailing/Event/BAO/Reply.php +++ b/CRM/Mailing/Event/BAO/Reply.php @@ -64,7 +64,6 @@ class CRM_Mailing_Event_BAO_Reply extends CRM_Mailing_Event_DAO_Reply { * * @return object|null * The mailing object, or null on failure - * @static */ public static function &reply($job_id, $queue_id, $hash, $replyto = NULL) { /* First make sure there's a matching queue event */ @@ -120,7 +119,6 @@ class CRM_Mailing_Event_BAO_Reply extends CRM_Mailing_Event_DAO_Reply { * Whole email to forward in one string. * * @return void - * @static */ public static function send($queue_id, &$mailing, &$bodyTxt, $replyto, &$bodyHTML = NULL, &$fullEmail = NULL) { $domain = CRM_Core_BAO_Domain::getDomain(); @@ -223,7 +221,6 @@ class CRM_Mailing_Event_BAO_Reply extends CRM_Mailing_Event_DAO_Reply { * Optional reply-to from the reply. * * @return void - * @static */ private static function autoRespond(&$mailing, $queue_id, $replyto) { $config = CRM_Core_Config::singleton(); @@ -316,7 +313,6 @@ class CRM_Mailing_Event_BAO_Reply extends CRM_Mailing_Event_DAO_Reply { * * @return int * Number of rows in result set - * @static */ public static function getTotalCount( $mailing_id, $job_id = NULL, @@ -377,7 +373,6 @@ class CRM_Mailing_Event_BAO_Reply extends CRM_Mailing_Event_DAO_Reply { * * @return array * Result set - * @static */ public static function &getRows( $mailing_id, $job_id = NULL, diff --git a/CRM/Mailing/Event/BAO/Resubscribe.php b/CRM/Mailing/Event/BAO/Resubscribe.php index 4c3258f2a9..de6ee6212a 100644 --- a/CRM/Mailing/Event/BAO/Resubscribe.php +++ b/CRM/Mailing/Event/BAO/Resubscribe.php @@ -52,7 +52,6 @@ class CRM_Mailing_Event_BAO_Resubscribe { * * @return array|null * $groups Array of all groups to which the contact was added, or null if the queue event could not be found. - * @static */ public static function &resub_to_mailing($job_id, $queue_id, $hash) { /* First make sure there's a matching queue event */ @@ -200,7 +199,6 @@ class CRM_Mailing_Event_BAO_Resubscribe { * The job ID. * * @return void - * @static */ public static function send_resub_response($queue_id, $groups, $is_domain = FALSE, $job) { // param is_domain is not supported as of now. diff --git a/CRM/Mailing/Event/BAO/Subscribe.php b/CRM/Mailing/Event/BAO/Subscribe.php index 7bd479d7ad..5cde2ff911 100644 --- a/CRM/Mailing/Event/BAO/Subscribe.php +++ b/CRM/Mailing/Event/BAO/Subscribe.php @@ -64,7 +64,6 @@ class CRM_Mailing_Event_BAO_Subscribe extends CRM_Mailing_Event_DAO_Subscribe { * * @return int|null * $se_id The id of the subscription event, null on failure - * @static */ public static function &subscribe($group_id, $email, $contactId = NULL, $context = NULL) { // CRM-1797 - allow subscription only to public groups @@ -188,7 +187,6 @@ SELECT civicrm_email.id as email_id * * @return object|null * The subscribe event object, or null on failure - * @static */ public static function &verify($contact_id, $subscribe_id, $hash) { $success = NULL; @@ -310,7 +308,6 @@ SELECT civicrm_email.id as email_id * * @return object * $domain The domain owning the event - * @static */ public static function &getDomain($subscribe_id) { return CRM_Core_BAO_Domain::getDomain(); @@ -381,7 +378,6 @@ SELECT civicrm_email.id as email_id * @param string $context * * @return void - * @static */ public static function commonSubscribe(&$groups, &$params, $contactId = NULL, $context = NULL) { $contactGroups = CRM_Mailing_Event_BAO_Subscribe::getContactGroups($params['email'], $contactId); diff --git a/CRM/Mailing/Event/BAO/TrackableURLOpen.php b/CRM/Mailing/Event/BAO/TrackableURLOpen.php index 1e3b52a08d..5e2cc31a32 100755 --- a/CRM/Mailing/Event/BAO/TrackableURLOpen.php +++ b/CRM/Mailing/Event/BAO/TrackableURLOpen.php @@ -52,7 +52,6 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track * * @return string * The redirection url, or base url on failure. - * @static */ public static function track($queue_id, $url_id) { @@ -110,7 +109,6 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track * * @return int * Number of rows in result set - * @static */ public static function getTotalCount( $mailing_id, $job_id = NULL, @@ -169,7 +167,6 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track * * @return array * trackable url count per mailing ID - * @static */ public static function getMailingTotalCount($mailingIDs) { $dao = new CRM_Core_DAO(); @@ -210,7 +207,6 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track * * @return array * Count per mailing ID - * @static */ public static function getMailingContactCount($mailingIDs, $contactID) { $dao = new CRM_Core_DAO(); @@ -265,7 +261,6 @@ class CRM_Mailing_Event_BAO_TrackableURLOpen extends CRM_Mailing_Event_DAO_Track * * @return array * Result set - * @static */ public static function &getRows( $mailing_id, $job_id = NULL, diff --git a/CRM/Mailing/Event/BAO/Unsubscribe.php b/CRM/Mailing/Event/BAO/Unsubscribe.php index 88fe0e16d5..a442d3ce31 100755 --- a/CRM/Mailing/Event/BAO/Unsubscribe.php +++ b/CRM/Mailing/Event/BAO/Unsubscribe.php @@ -59,7 +59,6 @@ class CRM_Mailing_Event_BAO_Unsubscribe extends CRM_Mailing_Event_DAO_Unsubscrib * * @return boolean * Was the contact successfully unsubscribed? - * @static */ public static function unsub_from_domain($job_id, $queue_id, $hash) { $q = CRM_Mailing_Event_BAO_Queue::verify($job_id, $queue_id, $hash); @@ -128,7 +127,6 @@ WHERE email = %2 * * @return array|null * $groups Array of all groups from which the contact was removed, or null if the queue event could not be found. - * @static */ public static function &unsub_from_mailing($job_id, $queue_id, $hash, $return = FALSE) { /* First make sure there's a matching queue event */ @@ -303,7 +301,6 @@ WHERE email = %2 * The job ID. * * @return void - * @static */ public static function send_unsub_response($queue_id, $groups, $is_domain = FALSE, $job) { $config = CRM_Core_Config::singleton(); @@ -428,7 +425,6 @@ WHERE email = %2 * * @return int * Number of rows in result set - * @static */ public static function getTotalCount( $mailing_id, $job_id = NULL, @@ -501,7 +497,6 @@ WHERE email = %2 * @param null $org_unsubscribe * @return array * Result set - * @static */ public static function &getRows( $mailing_id, $job_id = NULL, diff --git a/CRM/Mailing/Form/Component.php b/CRM/Mailing/Form/Component.php index ac9e3432c3..256057482a 100644 --- a/CRM/Mailing/Form/Component.php +++ b/CRM/Mailing/Form/Component.php @@ -160,7 +160,6 @@ class CRM_Mailing_Form_Component extends CRM_Core_Form { * * @return bool|array * mixed true or array of errors - * @static */ public static function dataRule($params, $files, $options) { if ($params['component_type'] == 'Header' || $params['component_type'] == 'Footer') { diff --git a/CRM/Mailing/Form/Group.php b/CRM/Mailing/Form/Group.php index c9930150a2..2a9a5c50e4 100644 --- a/CRM/Mailing/Form/Group.php +++ b/CRM/Mailing/Form/Group.php @@ -558,7 +558,6 @@ class CRM_Mailing_Form_Group extends CRM_Contact_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Mailing/Form/Schedule.php b/CRM/Mailing/Form/Schedule.php index a58d8da675..49028a4ced 100644 --- a/CRM/Mailing/Form/Schedule.php +++ b/CRM/Mailing/Form/Schedule.php @@ -199,7 +199,6 @@ class CRM_Mailing_Form_Schedule extends CRM_Core_Form { * @return boolean * True if either we deliver immediately, or the * date is properly set. - * @static */ public static function formRule($params, $files, $self) { if (!empty($params['_qf_Schedule_submit'])) { diff --git a/CRM/Mailing/Form/Upload.php b/CRM/Mailing/Form/Upload.php index ccafccc2bf..6d310f4ca8 100644 --- a/CRM/Mailing/Form/Upload.php +++ b/CRM/Mailing/Form/Upload.php @@ -514,7 +514,6 @@ class CRM_Mailing_Form_Upload extends CRM_Core_Form { * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params, $files, $self) { if (!empty($_POST['_qf_Import_refresh'])) { diff --git a/CRM/Mailing/Page/Component.php b/CRM/Mailing/Page/Component.php index ba5842afa0..879d1474e1 100644 --- a/CRM/Mailing/Page/Component.php +++ b/CRM/Mailing/Page/Component.php @@ -43,7 +43,6 @@ class CRM_Mailing_Page_Component extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Mailing/Page/Tab.php b/CRM/Mailing/Page/Tab.php index 08ada120c1..197aff8cd4 100644 --- a/CRM/Mailing/Page/Tab.php +++ b/CRM/Mailing/Page/Tab.php @@ -42,7 +42,6 @@ class CRM_Mailing_Page_Tab extends CRM_Contact_Page_View { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; public $_permission = NULL; diff --git a/CRM/Mailing/PseudoConstant.php b/CRM/Mailing/PseudoConstant.php index 120f507416..d38864c95b 100644 --- a/CRM/Mailing/PseudoConstant.php +++ b/CRM/Mailing/PseudoConstant.php @@ -42,21 +42,18 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant { /** * Mailing templates * @var array - * @static */ private static $template; /** * Completed mailings * @var array - * @static */ private static $completed; /** * Mailing components * @var array - * @static */ private static $component; @@ -73,7 +70,6 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all mailing components - * @static */ public static function &component($type = NULL) { $name = $type ? $type : 'ALL'; @@ -115,7 +111,6 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant { * * @return int * The ID of the default mailing component. - * @static */ public static function &defaultComponent($type, $undefined = NULL) { if (!self::$defaultComponent) { @@ -142,7 +137,6 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all mailing templates if any - * @static */ public static function &template() { if (!self::$template) { @@ -159,7 +153,6 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all mailing templates if any - * @static */ public static function &completed($mode = NULL) { if (!self::$completed) { @@ -217,7 +210,6 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant { * Flush given pseudoconstant so it can be reread from db * next time it's requested. * - * @static * * @param bool|string $name pseudoconstant to be flushed */ diff --git a/CRM/Mailing/Selector/Browse.php b/CRM/Mailing/Selector/Browse.php index 6bf6d31990..88507cc47a 100644 --- a/CRM/Mailing/Selector/Browse.php +++ b/CRM/Mailing/Selector/Browse.php @@ -42,7 +42,6 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ * Array of supported links, currenly null * * @var array - * @static */ static $_links = NULL; @@ -50,7 +49,6 @@ class CRM_Mailing_Selector_Browse extends CRM_Core_Selector_Base implements CRM_ * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; diff --git a/CRM/Mailing/Selector/Event.php b/CRM/Mailing/Selector/Event.php index c28b955e54..7b716f4734 100644 --- a/CRM/Mailing/Selector/Event.php +++ b/CRM/Mailing/Selector/Event.php @@ -45,7 +45,6 @@ class CRM_Mailing_Selector_Event extends CRM_Core_Selector_Base implements CRM_C * Array of supported links, currenly null * * @var array - * @static */ static $_links = NULL; @@ -110,7 +109,6 @@ class CRM_Mailing_Selector_Event extends CRM_Core_Selector_Base implements CRM_C * This method returns the links that are given for each search row. * * @return array - * @static */ public static function &links() { return self::$_links; diff --git a/CRM/Mailing/Selector/Search.php b/CRM/Mailing/Selector/Search.php index 8865f2a730..14314eb19d 100644 --- a/CRM/Mailing/Selector/Search.php +++ b/CRM/Mailing/Selector/Search.php @@ -45,7 +45,6 @@ class CRM_Mailing_Selector_Search extends CRM_Core_Selector_Base implements CRM_ * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Mailing_Selector_Search extends CRM_Core_Selector_Base implements CRM_ * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( 'contact_id', diff --git a/CRM/Mailing/Task.php b/CRM/Mailing/Task.php index d839a0a26d..96f882ee9f 100644 --- a/CRM/Mailing/Task.php +++ b/CRM/Mailing/Task.php @@ -43,7 +43,6 @@ class CRM_Mailing_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -51,7 +50,6 @@ class CRM_Mailing_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -61,7 +59,6 @@ class CRM_Mailing_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function &tasks() { if (!(self::$_tasks)) { @@ -86,7 +83,6 @@ class CRM_Mailing_Task { * * @return array * the set of task titles - * @static */ public static function &taskTitles() { return array(); @@ -114,7 +110,6 @@ class CRM_Mailing_Task { * * @return array * the set of tasks for a group of mailing recipients - * @static */ public static function getTask($value) { self::tasks(); diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index 396b7565e7..e4c4d4911c 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -38,7 +38,6 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { * Static field for all the membership information that we can potentially import * * @var array - * @static */ static $_importableFields = NULL; @@ -70,7 +69,6 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { * The array that holds all the db ids. * * @return CRM_Member_BAO_Membership - * @static */ public static function add(&$params, $ids = array()) { $oldStatus = $oldType = NULL; @@ -198,7 +196,6 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { * be returned * * @return CRM_Member_BAO_Membership|null the found object or null - * @static */ public static function &getValues(&$params, &$values, $active = FALSE) { if (empty($params)) { @@ -239,7 +236,6 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { * @throws CRM_Core_Exception * * @return CRM_Member_BAO_Membership - * @static */ public static function create(&$params, &$ids, $skipRedirect = FALSE, $activityType = 'Membership Signup') { // always calculate status if is_override/skipStatusCal is not true. @@ -452,7 +448,6 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { * * @return Array * array of contact_id of all related contacts. - * @static */ public static function checkMembershipRelationship($membershipId, $contactId, $action = CRM_Core_Action::ADD) { $contacts = array(); @@ -520,7 +515,6 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { * in a hierarchical manner * * @return CRM_Member_BAO_Membership - * @static */ public static function retrieve(&$params, &$defaults) { $membership = new CRM_Member_DAO_Membership(); @@ -602,7 +596,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * @param int $membershipId * Membership id that needs to be deleted. * - * @static * * @return $results no of deleted Membership on success, false otherwise */ @@ -618,7 +611,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * @param int $membershipId * Membership id that needs to be deleted. * - * @static * * @return $results no of deleted Membership on success, false otherwise */ @@ -682,7 +674,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * @param int $contactId * * @return null - * @static */ public static function deleteRelatedMemberships($ownerMembershipId, $contactId = NULL) { if (!$ownerMembershipId && !$contactId) { @@ -715,7 +706,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * * @return array * array of memberships based on status - * @static */ public static function activeMembers($memberships, $status = 'active') { $actives = array(); @@ -757,7 +747,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * @return bool * Is this a separate membership payment * - * @static */ static function buildMembershipBlock( &$form, @@ -952,7 +941,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * * @return array|null * - * @static */ public static function getMembershipBlock($pageID) { $membershipBlock = array(); @@ -998,7 +986,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * True if only Memberships with same parent org as the $memType wanted, false otherwise. * * @return array|bool - * @static */ public static function getContactMembership($contactID, $memType, $isTest, $membershipId = NULL, $onlySameParentOrg = FALSE) { $dao = new CRM_Member_DAO_Membership(); @@ -1092,7 +1079,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * * @return array * array of importable Fields - * @static */ public static function &importableFields($contactType = 'Individual', $status = TRUE) { if (!self::$_importableFields) { @@ -1153,7 +1139,6 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * Get all exportable fields * * @retun array return array of all exportable fields - * @static */ public static function &exportableFields() { $expFieldMembership = CRM_Member_DAO_Membership::export(); @@ -1485,7 +1470,6 @@ AND civicrm_membership.is_test = %2"; * @param \CRM_Contribute_BAO_Contribution|\CRM_Contribute_DAO_Contribution $contribution * * @return void - * @static */ static public function updateRecurMembership(CRM_Member_DAO_Membership $membership, CRM_Contribute_BAO_Contribution $contribution) { @@ -1534,7 +1518,6 @@ AND civicrm_membership.is_test = %2"; * * @throws CRM_Core_Exception * - * @static */ static function renewMembershipFormWrapper( $contactID, @@ -1593,7 +1576,6 @@ AND civicrm_membership.is_test = %2"; * to be customised, null otherwise * * @return void - * @static */ public static function fixMembershipStatusBeforeRenew(&$currentMembership, $changeToday) { $today = NULL; @@ -1677,7 +1659,6 @@ AND civicrm_membership.is_test = %2"; * * @return int * contribution page id - * @static */ public static function getContributionPageId($membershipID) { $query = " @@ -1700,7 +1681,6 @@ SELECT c.contribution_page_id as pageID * Owner Membership Id. * @param array $params * Formatted array of key => value. - * @static */ public static function updateRelatedMemberships($ownerMembershipId, $params) { $membership = new CRM_Member_DAO_Membership(); @@ -1728,7 +1708,6 @@ SELECT c.contribution_page_id as pageID * * @return array * the list of membership fields - * @static */ public static function getMembershipFields($mode = NULL) { $fields = CRM_Member_DAO_Membership::export(); @@ -1753,7 +1732,6 @@ SELECT c.contribution_page_id as pageID * * @return null|string * sort name of the contact if found - * @static */ public static function sortName($id) { $id = CRM_Utils_Type::escape($id, 'Integer'); @@ -1778,7 +1756,6 @@ WHERE civicrm_membership.contact_id = civicrm_contact.id * * @return null|array * array of memberships if created - * @static */ public static function createRelatedMemberships(&$params, &$dao, $reset = FALSE) { static $relatedContactIds = array(); @@ -2031,7 +2008,6 @@ FROM civicrm_membership_type * @param bool $activeOnly * * @return null|string - * @static */ public static function getContactMembershipCount($contactID, $activeOnly = FALSE) { $select = "SELECT count(*) FROM civicrm_membership "; @@ -2057,7 +2033,6 @@ FROM civicrm_membership_type * @param bool $isNotCancelled * * @return boolean - * @static */ public static function isCancelSubscriptionSupported($mid, $isNotCancelled = TRUE) { $cacheKeyString = "$mid"; @@ -2089,7 +2064,6 @@ FROM civicrm_membership_type * * @return string * contribution status - * @static */ public static function isSubscriptionCancelled($mid) { $sql = " @@ -2929,7 +2903,6 @@ WHERE civicrm_membership.is_test = 0"; * (param in process of being removed - try to use params) array of ids. * * @return CRM_Contribute_BAO_Contribution - * @static */ public static function recordMembershipContribution(&$params, $ids = array()) { $membershipId = $params['membership_id']; @@ -3018,7 +2991,6 @@ WHERE civicrm_membership.is_test = 0"; * Array with membership type and organization. * @param int $priceSetId * - * @static */ public static function createLineItems(&$qf, $membershipType, &$priceSetId) { $qf->_priceSetId = $priceSetId = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', 'default_membership_type_amount', 'id', 'name'); @@ -3072,7 +3044,6 @@ WHERE civicrm_membership.is_test = 0"; * * @return array * Array of membership type - * @static */ public static function getContactsCancelledMembership($contactID, $isTest = FALSE) { if (!$contactID) { diff --git a/CRM/Member/BAO/MembershipBlock.php b/CRM/Member/BAO/MembershipBlock.php index 9fb5efc5d5..a83886a951 100644 --- a/CRM/Member/BAO/MembershipBlock.php +++ b/CRM/Member/BAO/MembershipBlock.php @@ -46,7 +46,6 @@ class CRM_Member_BAO_MembershipBlock extends CRM_Member_DAO_MembershipBlock { * @param array $params * Reference array contains the values submitted by the form. * - * @static * * @return object */ @@ -67,7 +66,6 @@ class CRM_Member_BAO_MembershipBlock extends CRM_Member_DAO_MembershipBlock { * @param int $id * * @return bool - * @static */ public static function del($id) { $dao = new CRM_Member_DAO_MembershipBlock(); diff --git a/CRM/Member/BAO/MembershipLog.php b/CRM/Member/BAO/MembershipLog.php index 9a03c93b76..e34f6d1ab8 100644 --- a/CRM/Member/BAO/MembershipLog.php +++ b/CRM/Member/BAO/MembershipLog.php @@ -42,7 +42,6 @@ class CRM_Member_BAO_MembershipLog extends CRM_Member_DAO_MembershipLog { * @param array $ids * Reference array contains the id. * - * @static * * @return object */ @@ -62,7 +61,6 @@ class CRM_Member_BAO_MembershipLog extends CRM_Member_DAO_MembershipLog { * @param int $membershipID * * @return mixed - * @static */ public static function del($membershipID) { diff --git a/CRM/Member/BAO/MembershipPayment.php b/CRM/Member/BAO/MembershipPayment.php index 5236f414bd..1e7e31c7fd 100644 --- a/CRM/Member/BAO/MembershipPayment.php +++ b/CRM/Member/BAO/MembershipPayment.php @@ -48,7 +48,6 @@ class CRM_Member_BAO_MembershipPayment extends CRM_Member_DAO_MembershipPayment * @param array $params * Reference array contains the values submitted by the form. * - * @static * * @return object */ @@ -91,7 +90,6 @@ class CRM_Member_BAO_MembershipPayment extends CRM_Member_DAO_MembershipPayment * @param int $id * * @return bool - * @static */ public static function del($id) { $dao = new CRM_Member_DAO_MembershipPayment(); diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php index 954e440150..8d1521c7c5 100644 --- a/CRM/Member/BAO/MembershipStatus.php +++ b/CRM/Member/BAO/MembershipStatus.php @@ -55,7 +55,6 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Member_BAO_MembershipStatus - * @static */ public static function retrieve(&$params, &$defaults) { $membershipStatus = new CRM_Member_DAO_MembershipStatus(); @@ -77,7 +76,6 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Member_DAO_MembershipStatus', $id, 'is_active', $is_active); @@ -92,7 +90,6 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * * @throws Exception * @return CRM_Member_BAO_MembershipStatus - * @static */ public static function create($params) { $ids = array(); @@ -119,7 +116,6 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * @param array $ids * Array contains the id - this param is deprecated. * - * @static * * @return object */ @@ -174,7 +170,6 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * @param int $membershipStatusId * * @return array - * @static */ public static function getMembershipStatus($membershipStatusId) { $statusDetails = array(); @@ -192,7 +187,6 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * @param int $membershipStatusId * * @throws CRM_Core_Exception - * @static */ public static function del($membershipStatusId) { //check dependencies @@ -233,7 +227,6 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * Membership params as available to calling function - passed to the hook. * * @return array - * @static */ static function getMembershipStatusByDate( $startDate, $endDate, $joinDate, @@ -385,7 +378,6 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * Function that return the status ids whose is_current_member is set * * @return array - * @static */ public static function getMembershipStatusCurrent() { $statusIds = array(); diff --git a/CRM/Member/BAO/MembershipType.php b/CRM/Member/BAO/MembershipType.php index 0ffc195fa1..d03bb4b80f 100644 --- a/CRM/Member/BAO/MembershipType.php +++ b/CRM/Member/BAO/MembershipType.php @@ -57,7 +57,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Member_BAO_MembershipType - * @static */ public static function retrieve(&$params, &$defaults) { $membershipType = new CRM_Member_DAO_MembershipType(); @@ -79,7 +78,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Member_DAO_MembershipType', $id, 'is_active', $is_active); @@ -93,7 +91,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * @param array $ids * Array contains the id (deprecated). * - * @static * * @return object */ @@ -142,7 +139,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * * @throws CRM_Core_Exception * @return bool|mixed - * @static */ public static function del($membershipTypeId) { //check dependencies @@ -204,7 +200,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * * @param array $membershipType * An array of membershipType-details. - * @static */ public static function convertDayFormat(&$membershipType) { $periodDays = array( @@ -247,7 +242,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * @param bool $public * * @return array - * @static */ public static function getMembershipTypes($public = TRUE) { $membershipTypes = array(); @@ -271,7 +265,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * @param int $membershipTypeId * * @return array|null - * @static */ public static function getMembershipTypeDetails($membershipTypeId) { $membershipTypeDetails = array(); @@ -304,7 +297,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * * @return array * associated array with start date, end date and join date for the membership - * @static */ public static function getDatesForMembershipType($membershipTypeId, $joinDate = NULL, $startDate = NULL, $endDate = NULL, $numRenewTerms = 1) { $membershipTypeDetails = self::getMembershipTypeDetails($membershipTypeId); @@ -488,7 +480,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * * @return Array * array fo the start date, end date and join date of the membership - * @static */ public static function getRenewalDatesForMembershipType($membershipId, $changeToday = NULL, $membershipTypeID = NULL, $numRenewTerms = 1) { $params = array('id' => $membershipId); @@ -596,7 +587,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * * @return Array * array of the details of membership types - * @static */ public static function getMembershipTypesByOrg($orgID) { $membershipTypes = array(); @@ -617,7 +607,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * * @return Array * array of the details of membership types with Member of Contact id - * @static */ public static function getMemberOfContactByMemTypes($membershipTypes) { $memTypeOrgs = array(); @@ -663,7 +652,6 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * @return array * arrays of organization and membership types * - * @static */ public static function getMembershipTypeInfo() { if (!self::$_membershipTypeInfo) { diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index 74eff3ac5f..31f146fda9 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -761,7 +761,6 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; * @throws CiviCRM_API3_Exception * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params, $files, $self) { $errors = array(); @@ -1725,7 +1724,6 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; * * @return boolean * true if mail was sent successfully - * @static */ public static function emailReceipt(&$form, &$formValues, &$membership) { // retrieve 'from email id' for acknowledgement diff --git a/CRM/Member/Form/MembershipBlock.php b/CRM/Member/Form/MembershipBlock.php index a7173a70ce..624411003d 100644 --- a/CRM/Member/Form/MembershipBlock.php +++ b/CRM/Member/Form/MembershipBlock.php @@ -225,7 +225,6 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params, $files, $contributionPageId = NULL) { $errors = array(); diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index 2a7d80163c..a5c1ee6fcd 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -484,7 +484,6 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params) { $errors = array(); diff --git a/CRM/Member/Form/MembershipType.php b/CRM/Member/Form/MembershipType.php index a885d2d6e9..20039f06da 100644 --- a/CRM/Member/Form/MembershipType.php +++ b/CRM/Member/Form/MembershipType.php @@ -217,7 +217,6 @@ class CRM_Member_Form_MembershipType extends CRM_Member_Form_MembershipConfig { * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params) { $errors = array(); diff --git a/CRM/Member/Form/MembershipView.php b/CRM/Member/Form/MembershipView.php index 340ee64a1c..134bfe8a59 100644 --- a/CRM/Member/Form/MembershipView.php +++ b/CRM/Member/Form/MembershipView.php @@ -43,7 +43,6 @@ class CRM_Member_Form_MembershipView extends CRM_Core_Form { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Member/Form/Task/PickProfile.php b/CRM/Member/Form/Task/PickProfile.php index f2226da97b..91ae8b9529 100644 --- a/CRM/Member/Form/Task/PickProfile.php +++ b/CRM/Member/Form/Task/PickProfile.php @@ -125,7 +125,6 @@ class CRM_Member_Form_Task_PickProfile extends CRM_Member_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { return TRUE; diff --git a/CRM/Member/Import/Form/MapField.php b/CRM/Member/Import/Form/MapField.php index 4b97ca494e..c4818fb97b 100644 --- a/CRM/Member/Import/Form/MapField.php +++ b/CRM/Member/Import/Form/MapField.php @@ -43,7 +43,6 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField { * store contactType * * @var int - * @static */ static $_contactType = NULL; @@ -310,7 +309,6 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Member/Page/MembershipStatus.php b/CRM/Member/Page/MembershipStatus.php index 5246526ee1..e51724207f 100644 --- a/CRM/Member/Page/MembershipStatus.php +++ b/CRM/Member/Page/MembershipStatus.php @@ -44,7 +44,6 @@ class CRM_Member_Page_MembershipStatus extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -132,7 +131,6 @@ class CRM_Member_Page_MembershipStatus extends CRM_Core_Page_Basic { * * * @return void - * @static */ public function browse() { // get all custom groups sorted by weight diff --git a/CRM/Member/Page/MembershipType.php b/CRM/Member/Page/MembershipType.php index 7f8a6336b0..b66aef4709 100644 --- a/CRM/Member/Page/MembershipType.php +++ b/CRM/Member/Page/MembershipType.php @@ -42,7 +42,6 @@ class CRM_Member_Page_MembershipType extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -105,7 +104,6 @@ class CRM_Member_Page_MembershipType extends CRM_Core_Page { * * * @return void - * @static */ public function browse() { // get all membership types sorted by weight diff --git a/CRM/Member/Page/Tab.php b/CRM/Member/Page/Tab.php index a5fd7f1782..525f2b6529 100644 --- a/CRM/Member/Page/Tab.php +++ b/CRM/Member/Page/Tab.php @@ -38,7 +38,6 @@ class CRM_Member_Page_Tab extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; static $_membershipTypesLinks = NULL; @@ -465,7 +464,6 @@ class CRM_Member_Page_Tab extends CRM_Core_Page { * * @return array * (reference) of action links - * @static */ static function &links( $status = 'all', diff --git a/CRM/Member/PseudoConstant.php b/CRM/Member/PseudoConstant.php index 2a5f96bca5..66791c5dc4 100644 --- a/CRM/Member/PseudoConstant.php +++ b/CRM/Member/PseudoConstant.php @@ -42,14 +42,12 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant { /** * Membership types * @var array - * @static */ private static $membershipType; /** * Membership types * @var array - * @static */ private static $membershipStatus; @@ -62,7 +60,6 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all membership types if any - * @static */ public static function &membershipType($id = NULL, $force = FALSE) { if (!self::$membershipType || $force) { @@ -94,7 +91,6 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant { * * @return array * array reference of all membership statuss if any - * @static */ public static function &membershipStatus($id = NULL, $cond = NULL, $column = 'name', $force = FALSE, $allStatus = FALSE) { if (self::$membershipStatus === NULL) { @@ -127,7 +123,6 @@ class CRM_Member_PseudoConstant extends CRM_Core_PseudoConstant { * Flush given pseudoconstant so it can be reread from db * next time it's requested. * - * @static * * @param bool|string $name pseudoconstant to be flushed */ diff --git a/CRM/Member/Selector/Search.php b/CRM/Member/Selector/Search.php index e4927871bd..2e52f5c605 100644 --- a/CRM/Member/Selector/Search.php +++ b/CRM/Member/Selector/Search.php @@ -45,7 +45,6 @@ class CRM_Member_Selector_Search extends CRM_Core_Selector_Base implements CRM_C * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Member_Selector_Search extends CRM_Core_Selector_Base implements CRM_C * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( 'contact_id', diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php index 8b070b13f8..e578fa1d38 100644 --- a/CRM/Member/Task.php +++ b/CRM/Member/Task.php @@ -46,7 +46,6 @@ class CRM_Member_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -54,7 +53,6 @@ class CRM_Member_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -64,7 +62,6 @@ class CRM_Member_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function &tasks() { if (!(self::$_tasks)) { @@ -134,7 +131,6 @@ class CRM_Member_Task { * * @return array * the set of task titles - * @static */ public static function &taskTitles() { self::tasks(); @@ -182,7 +178,6 @@ class CRM_Member_Task { * * @return array * the set of tasks for a group of members - * @static */ public static function getTask($value) { self::tasks(); diff --git a/CRM/PCP/BAO/PCP.php b/CRM/PCP/BAO/PCP.php index 64f8c9615e..f602508865 100644 --- a/CRM/PCP/BAO/PCP.php +++ b/CRM/PCP/BAO/PCP.php @@ -38,7 +38,6 @@ class CRM_PCP_BAO_PCP extends CRM_PCP_DAO_PCP { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_pcpLinks = NULL; @@ -56,7 +55,6 @@ class CRM_PCP_BAO_PCP extends CRM_PCP_DAO_PCP { * @param bool $pcpBlock * If true, create or update PCPBlock, else PCP. * - * @static * * @return object */ @@ -96,7 +94,6 @@ class CRM_PCP_BAO_PCP extends CRM_PCP_DAO_PCP { * * @return null|string * Dispaly name of the contact if found - * @static */ public static function displayName($id) { $id = CRM_Utils_Type::escape($id, 'Integer'); @@ -117,7 +114,6 @@ WHERE civicrm_pcp.contact_id = civicrm_contact.id * * @return array * array of Pcp if found - * @static */ public static function getPcpDashboardInfo($contactId) { $links = self::pcpLinks(); @@ -235,7 +231,6 @@ ORDER BY target_entity_type, target_entity_id * @param array $pcpId * Contains the pcp ID. * - * @static * * @return total * amount @@ -258,7 +253,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * @param array $pcpId * Contains the pcp ID. * - * @static * * @return array */ @@ -287,7 +281,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * * @return array * (reference) of action links - * @static */ public static function &pcpLinks() { if (!(self::$_pcpLinks)) { @@ -358,7 +351,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * Campaign page id. * * @return null - * @static */ public static function deleteById($id) { CRM_Utils_Hook::pre('delete', 'Campaign', $id, CRM_Core_DAO::$_nullArray); @@ -591,7 +583,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * @param $is_active * * @return null - * @static */ public static function setIsActive($id, $is_active) { switch ($is_active) { @@ -640,7 +631,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * * @throws Exception * @return null - * @static */ public static function sendStatusUpdate($pcpId, $newStatus, $isInitial = FALSE, $component = 'contribute') { $pcpStatusName = CRM_Core_OptionGroup::values("pcp_status", FALSE, FALSE, FALSE, NULL, 'name'); @@ -733,7 +723,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * * @param $is_active * @return null - * @static */ public static function setDisable($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_PCP_DAO_PCP', $id, 'is_active', $is_active); @@ -746,7 +735,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * @param $component * * @return int - * @static */ public static function getStatus($pcpId, $component) { $query = " @@ -769,7 +757,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * @param $component * * @return string - * @static */ public static function getPcpBlockStatus($pageId, $component) { $query = " @@ -792,7 +779,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * Pcp block id. * * @return Boolean - * @static */ public static function getPcpBlockInUse($id) { $query = " @@ -812,7 +798,6 @@ WHERE pcp.id = %1 AND cc.contribution_status_id =1 AND cc.is_test = 0"; * Supporter's profile id. * * @return boolean - * @static */ public static function checkEmailProfile($profileId) { $query = " @@ -835,7 +820,6 @@ WHERE field_name like 'email%' And is_active = 1 And uf_group_id = %1"; * @param $component * * @return int - * @static */ public static function getPcpPageTitle($pcpId, $component) { if ($component == 'contribute') { @@ -864,7 +848,6 @@ WHERE field_name like 'email%' And is_active = 1 And uf_group_id = %1"; * @param $component * * @return String - * @static */ public static function getPcpBlockEntityId($pcpId, $component) { $entity_table = self::getPcpEntityTable($component); @@ -890,7 +873,6 @@ WHERE pcp.id = %1"; * @param $component * * @return String - * @static */ public static function getPcpEntityTable($component) { $entity_table_map = array( @@ -909,7 +891,6 @@ WHERE pcp.id = %1"; * @param string $component * * @return int - * @static */ public static function getSupporterProfileId($component_id, $component = 'contribute') { $entity_table = self::getPcpEntityTable($component); diff --git a/CRM/PCP/Form/Campaign.php b/CRM/PCP/Form/Campaign.php index d8c46c9108..2dc0b891d7 100644 --- a/CRM/PCP/Form/Campaign.php +++ b/CRM/PCP/Form/Campaign.php @@ -157,7 +157,6 @@ class CRM_PCP_Form_Campaign extends CRM_Core_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/PCP/Form/Contribute.php b/CRM/PCP/Form/Contribute.php index 4a354def57..9a05ef2d5c 100644 --- a/CRM/PCP/Form/Contribute.php +++ b/CRM/PCP/Form/Contribute.php @@ -107,7 +107,6 @@ class CRM_PCP_Form_Contribute extends CRM_Contribute_Form_ContributionPage { * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params, $files, $self) { $errors = array(); diff --git a/CRM/PCP/Form/Event.php b/CRM/PCP/Form/Event.php index d22eff1e2e..8024e067fa 100644 --- a/CRM/PCP/Form/Event.php +++ b/CRM/PCP/Form/Event.php @@ -142,7 +142,6 @@ class CRM_PCP_Form_Event extends CRM_Event_Form_ManageEvent { * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params, $files, $self) { $errors = array(); diff --git a/CRM/PCP/Form/PCP.php b/CRM/PCP/Form/PCP.php index 8072cff8aa..8510fc13f1 100644 --- a/CRM/PCP/Form/PCP.php +++ b/CRM/PCP/Form/PCP.php @@ -197,7 +197,6 @@ class CRM_PCP_Form_PCP extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $form) { } diff --git a/CRM/PCP/Form/PCPAccount.php b/CRM/PCP/Form/PCPAccount.php index a6900e2c9f..9c4447f06c 100644 --- a/CRM/PCP/Form/PCPAccount.php +++ b/CRM/PCP/Form/PCPAccount.php @@ -230,7 +230,6 @@ class CRM_PCP_Form_PCPAccount extends CRM_Core_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/PCP/Page/PCP.php b/CRM/PCP/Page/PCP.php index 0dcee85e39..3ce4ede20c 100644 --- a/CRM/PCP/Page/PCP.php +++ b/CRM/PCP/Page/PCP.php @@ -42,7 +42,6 @@ class CRM_PCP_Page_PCP extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -167,7 +166,6 @@ class CRM_PCP_Page_PCP extends CRM_Core_Page_Basic { * @param null $action * * @return void - * @static */ public function browse($action = NULL) { $this->_sortByCharacter = CRM_Utils_Request::retrieve('sortByCharacter', diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php index b1b55d7001..c60fa7fc91 100644 --- a/CRM/Pledge/BAO/Pledge.php +++ b/CRM/Pledge/BAO/Pledge.php @@ -38,7 +38,6 @@ class CRM_Pledge_BAO_Pledge extends CRM_Pledge_DAO_Pledge { * Static field for all the pledge information that we can potentially export * * @var array - * @static */ static $_exportableFields = NULL; @@ -62,7 +61,6 @@ class CRM_Pledge_BAO_Pledge extends CRM_Pledge_DAO_Pledge { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Pledge_BAO_Pledge - * @static */ public static function retrieve(&$params, &$defaults) { $pledge = new CRM_Pledge_DAO_Pledge(); @@ -80,7 +78,6 @@ class CRM_Pledge_BAO_Pledge extends CRM_Pledge_DAO_Pledge { * @param array $params * Reference array contains the values submitted by the form. * - * @static * * @return object */ @@ -132,7 +129,6 @@ class CRM_Pledge_BAO_Pledge extends CRM_Pledge_DAO_Pledge { * * @return array * associated array of field values - * @static */ public static function &getValues(&$params, &$values, $returnProperties = NULL) { if (empty($params)) { @@ -149,7 +145,6 @@ class CRM_Pledge_BAO_Pledge extends CRM_Pledge_DAO_Pledge { * (reference ) an assoc array of name/value pairs. * * @return CRM_Pledge_BAO_Pledge - * @static */ public static function &create(&$params) { //FIXME: a cludgy hack to fix the dates to MySQL format @@ -270,7 +265,6 @@ class CRM_Pledge_BAO_Pledge extends CRM_Pledge_DAO_Pledge { * Pledge id. * * @return mixed - * @static */ public static function deletePledge($id) { CRM_Utils_Hook::pre('delete', 'Pledge', $id, CRM_Core_DAO::$_nullArray); @@ -462,7 +456,6 @@ GROUP BY currency * @return array * return the list of pledge fields * - * @static */ public static function getHonorContacts($honorId) { $params = array(); @@ -709,7 +702,6 @@ GROUP BY currency * * @return array * array of exportable Fields - * @static */ public static function &exportableFields() { if (!self::$_exportableFields) { @@ -777,7 +769,6 @@ GROUP BY currency * * @return array * associated array of pledge id(s) - * @static */ public static function getContactPledges($contactID) { $pledgeDetails = array(); @@ -825,7 +816,6 @@ GROUP BY currency * * @return int * count of pledge records - * @static */ public static function getContactPledgeCount($contactID) { $query = "SELECT count(*) FROM civicrm_pledge WHERE civicrm_pledge.contact_id = {$contactID} AND civicrm_pledge.is_test = 0"; diff --git a/CRM/Pledge/BAO/PledgeBlock.php b/CRM/Pledge/BAO/PledgeBlock.php index ba801fb8a7..2544ef33a0 100644 --- a/CRM/Pledge/BAO/PledgeBlock.php +++ b/CRM/Pledge/BAO/PledgeBlock.php @@ -54,7 +54,6 @@ class CRM_Pledge_BAO_PledgeBlock extends CRM_Pledge_DAO_PledgeBlock { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Pledge_BAO_PledgeBlock - * @static */ public static function retrieve(&$params, &$defaults) { $pledgeBlock = new CRM_Pledge_DAO_PledgeBlock(); @@ -73,7 +72,6 @@ class CRM_Pledge_BAO_PledgeBlock extends CRM_Pledge_DAO_PledgeBlock { * (reference ) an assoc array of name/value pairs. * * @return CRM_Pledge_BAO_PledgeBlock - * @static */ public static function &create(&$params) { $transaction = new CRM_Core_Transaction(); @@ -97,7 +95,6 @@ class CRM_Pledge_BAO_PledgeBlock extends CRM_Pledge_DAO_PledgeBlock { * @param array $params * Reference array contains the values submitted by the form. * - * @static * * @return object */ @@ -154,7 +151,6 @@ class CRM_Pledge_BAO_PledgeBlock extends CRM_Pledge_DAO_PledgeBlock { * PledgeBlock id. * * @return mixed|null - * @static */ public static function deletePledgeBlock($id) { CRM_Utils_Hook::pre('delete', 'PledgeBlock', $id, CRM_Core_DAO::$_nullArray); @@ -181,7 +177,6 @@ class CRM_Pledge_BAO_PledgeBlock extends CRM_Pledge_DAO_PledgeBlock { * Contribution page id. * * @return array - * @static */ public static function getPledgeBlock($pageID) { $pledgeBlock = array(); @@ -200,7 +195,6 @@ class CRM_Pledge_BAO_PledgeBlock extends CRM_Pledge_DAO_PledgeBlock { * Build Pledge Block in Contribution Pages * * @param CRM_Core_Form $form - * @static */ public static function buildPledgeBlock($form) { //build pledge payment fields. diff --git a/CRM/Pledge/BAO/PledgePayment.php b/CRM/Pledge/BAO/PledgePayment.php index b6239cb8f4..268a04f80b 100644 --- a/CRM/Pledge/BAO/PledgePayment.php +++ b/CRM/Pledge/BAO/PledgePayment.php @@ -49,7 +49,6 @@ class CRM_Pledge_BAO_PledgePayment extends CRM_Pledge_DAO_PledgePayment { * * @return array * associated array of pledge payment details - * @static */ public static function getPledgePayments($pledgeId) { $query = " @@ -170,7 +169,6 @@ WHERE pledge_id = %1 * * @return int * pledge payment id - * @static */ public static function add($params) { if (!empty($params['id'])) { @@ -214,7 +212,6 @@ WHERE pledge_id = %1 * (reference ) an assoc array to hold the flattened values. * * @return CRM_Pledge_BAO_PledgePayment - * @static */ public static function retrieve(&$params, &$defaults) { $payment = new CRM_Pledge_BAO_PledgePayment; @@ -233,7 +230,6 @@ WHERE pledge_id = %1 * * @return int * pledge payment id - * @static */ public static function del($id) { $payment = new CRM_Pledge_DAO_PledgePayment(); @@ -261,7 +257,6 @@ WHERE pledge_id = %1 * Pledge id. * * @return bool - * @static */ public static function deletePayments($id) { if (!CRM_Utils_Rule::positiveInteger($id)) { @@ -295,7 +290,6 @@ WHERE pledge_id = %1 * Contribution id. * * @return bool - * @static */ public static function resetPledgePayment($contributionID) { //get all status @@ -521,7 +515,6 @@ WHERE civicrm_pledge.id = %2 * * @return array * Next scheduled date as an array - * @static */ public static function calculateBaseScheduleDate(&$params) { $date = array(); @@ -591,7 +584,6 @@ WHERE civicrm_pledge.id = %2 * * @return int * $statusId calculated status id of pledge - * @static */ public static function calculatePledgeStatus($pledgeId) { $paymentStatusTypes = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name'); @@ -639,7 +631,6 @@ WHERE civicrm_pledge.id = %2 * @param bool $isScriptUpdate * , is function being called from bin script?. * - * @static */ static function updatePledgePayments( $pledgeId, @@ -682,7 +673,6 @@ WHERE civicrm_pledge_payment.pledge_id = %1 * @param int $paymentId * Payment id. * - * @static */ public static function updateReminderDetails($paymentId) { $query = " @@ -704,7 +694,6 @@ WHERE civicrm_pledge_payment.id = {$paymentId} * * @return array * associated array of pledge details - * @static */ public static function getOldestPledgePayment($pledgeID, $limit = 1) { //get pending / overdue statuses diff --git a/CRM/Pledge/Form/Pledge.php b/CRM/Pledge/Form/Pledge.php index c93c8b3b4e..5376314ca1 100644 --- a/CRM/Pledge/Form/Pledge.php +++ b/CRM/Pledge/Form/Pledge.php @@ -459,7 +459,6 @@ class CRM_Pledge_Form_Pledge extends CRM_Core_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/Pledge/Form/Search.php b/CRM/Pledge/Form/Search.php index 1ec293c992..06deeeabfb 100644 --- a/CRM/Pledge/Form/Search.php +++ b/CRM/Pledge/Form/Search.php @@ -297,7 +297,6 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search { * Posted values of the form. * * @return void - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/Pledge/Selector/Search.php b/CRM/Pledge/Selector/Search.php index f6c4040db1..970bf0e9aa 100644 --- a/CRM/Pledge/Selector/Search.php +++ b/CRM/Pledge/Selector/Search.php @@ -45,7 +45,6 @@ class CRM_Pledge_Selector_Search extends CRM_Core_Selector_Base { * This defines two actions- View and Edit. * * @var array - * @static */ static $_links = NULL; @@ -53,14 +52,12 @@ class CRM_Pledge_Selector_Search extends CRM_Core_Selector_Base { * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; /** * Properties of contact we're interested in displaying * @var array - * @static */ static $_properties = array( 'contact_id', diff --git a/CRM/Pledge/Task.php b/CRM/Pledge/Task.php index 1bb57e9e6c..3548a5543d 100644 --- a/CRM/Pledge/Task.php +++ b/CRM/Pledge/Task.php @@ -45,7 +45,6 @@ class CRM_Pledge_Task { * The task array * * @var array - * @static */ static $_tasks = NULL; @@ -53,7 +52,6 @@ class CRM_Pledge_Task { * The optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -63,7 +61,6 @@ class CRM_Pledge_Task { * * @return array * the set of tasks for a group of contacts - * @static */ public static function &tasks() { if (!self::$_tasks) { @@ -103,7 +100,6 @@ class CRM_Pledge_Task { * * @return array * the set of task titles - * @static */ public static function &taskTitles() { self::tasks(); @@ -119,7 +115,6 @@ class CRM_Pledge_Task { * * @return array * the set of optional tasks for a group of contacts - * @static */ public static function &optionalTaskTitle() { $tasks = array(); @@ -162,7 +157,6 @@ class CRM_Pledge_Task { * * @return array * the set of tasks for a group of pledge holders - * @static */ public static function getTask($value) { self::tasks(); diff --git a/CRM/Price/BAO/LineItem.php b/CRM/Price/BAO/LineItem.php index b1078fac7a..e9a0a73db6 100644 --- a/CRM/Price/BAO/LineItem.php +++ b/CRM/Price/BAO/LineItem.php @@ -52,7 +52,6 @@ class CRM_Price_BAO_LineItem extends CRM_Price_DAO_LineItem { * (reference) an assoc array of name/value pairs. * * @return CRM_Price_DAO_LineItem - * @static */ public static function create(&$params) { $id = CRM_Utils_Array::value('id', $params); @@ -96,7 +95,6 @@ class CRM_Price_BAO_LineItem extends CRM_Price_DAO_LineItem { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Price_BAO_LineItem - * @static */ public static function retrieve(&$params, &$defaults) { $lineItem = new CRM_Price_BAO_LineItem(); @@ -340,7 +338,6 @@ AND li.entity_id = {$entityId} * @param int $entityTable * * @return bool - * @static */ public static function deleteLineItems($entityId, $entityTable) { if (!$entityId || !$entityTable) { @@ -369,7 +366,6 @@ AND li.entity_id = {$entityId} * @param bool $update * * @return void - * @static */ public static function processPriceSet($entityId, $lineItem, $contributionDetails = NULL, $entityTable = 'civicrm_contribution', $update = FALSE) { if (!$entityId || !is_array($lineItem) @@ -481,7 +477,6 @@ AND li.entity_id = {$entityId} * Entity Table. * * @return void - * @static */ public static function getLineItemArray(&$params, $entityId = NULL, $entityTable = 'contribution', $isRelatedID = FALSE) { @@ -543,7 +538,6 @@ AND li.entity_id = {$entityId} * @return number|void * tax rate * - * @static */ public static function calculateTaxRate($lineItemId) { if ($lineItemId['unit_price'] == 0) { diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php index a0fee57978..6e33a0b1da 100644 --- a/CRM/Price/BAO/PriceField.php +++ b/CRM/Price/BAO/PriceField.php @@ -52,7 +52,6 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField { * (reference) an assoc array of name/value pairs. * * @return CRM_Price_BAO_PriceField - * @static */ public static function add(&$params) { $priceFieldBAO = new CRM_Price_BAO_PriceField(); @@ -76,7 +75,6 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField { * (reference) an assoc array of name/value pairs. * * @return CRM_Price_DAO_PriceField - * @static */ public static function create(&$params) { if (empty($params['id']) && empty($params['name'])) { @@ -178,7 +176,6 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Price_DAO_PriceField - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Price_DAO_PriceField', $params, $defaults); @@ -195,7 +192,6 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField { * @return Object * DAO object on sucess, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Price_DAO_PriceField', $id, 'is_active', $is_active); @@ -217,7 +213,6 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField { * @return string * name * - * @static */ public static function getTitle($id) { return CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceField', $id, 'label'); @@ -242,7 +237,6 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField { * * @return null * @internal param bool $search true if used for search else false - * @static */ public static function addQuickFormElement( &$qf, @@ -644,7 +638,6 @@ WHERE * * @return boolean * - * @static */ public static function deleteField($id) { $field = new CRM_Price_DAO_PriceField(); @@ -694,7 +687,6 @@ WHERE * @param $error * @param bool $allowNoneSelection * - * @static */ public static function priceSetValidation($priceSetId, $fields, &$error, $allowNoneSelection = FALSE) { @@ -795,7 +787,6 @@ WHERE id IN (" . implode(',', array_keys($priceFields)) . ')'; * @return string * tax label for custom field * - * @static */ public static function getTaxLabel($opt, $valueFieldName, $displayOpt, $taxTerm) { if ($displayOpt == 'Do_not_show') { diff --git a/CRM/Price/BAO/PriceFieldValue.php b/CRM/Price/BAO/PriceFieldValue.php index ee92370a02..a0a9f5e171 100644 --- a/CRM/Price/BAO/PriceFieldValue.php +++ b/CRM/Price/BAO/PriceFieldValue.php @@ -48,7 +48,6 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * @param $ids * * @return CRM_Price_DAO_PriceFieldValue - * @static */ public static function add(&$params, $ids = array()) { @@ -77,7 +76,6 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * @param $ids * * @return CRM_Price_DAO_PriceFieldValue - * @static */ public static function create(&$params, $ids = array()) { $id = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('id', $ids)); @@ -134,7 +132,6 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Price_DAO_PriceFieldValue - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Price_DAO_PriceFieldValue', $params, $defaults); @@ -153,7 +150,6 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * * @return array * - * @static */ public static function getValues($fieldId, &$values, $orderBy = 'weight', $isActive = FALSE) { $fieldValueDAO = new CRM_Price_DAO_PriceFieldValue(); @@ -180,7 +176,6 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * @return string * name * - * @static */ public static function getOptionLabel($id) { return CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceFieldValue', $id, 'label'); @@ -197,7 +192,6 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * @return Object * DAO object on sucess, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Price_DAO_PriceFieldValue', $id, 'is_active', $is_active); @@ -210,7 +204,6 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * Price field id. * * - * @static */ public static function deleteValues($fieldId) { if (!$fieldId) { @@ -230,7 +223,6 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * * @return boolean * - * @static */ public static function del($id) { if (!$id) { @@ -253,7 +245,6 @@ class CRM_Price_BAO_PriceFieldValue extends CRM_Price_DAO_PriceFieldValue { * @param string $financialTypeIDFinancial type id. * Financial type id. * - * @static */ public static function updateFinancialType($entityId, $entityTable, $financialTypeID) { if (!$entityId || !$entityTable || !$financialTypeID) { diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php index f7a1c70b8b..18b0c2918a 100644 --- a/CRM/Price/BAO/PriceSet.php +++ b/CRM/Price/BAO/PriceSet.php @@ -43,7 +43,6 @@ class CRM_Price_BAO_PriceSet extends CRM_Price_DAO_PriceSet { * Static field for default price set details * * @var array - * @static */ static $_defaultPriceSet = NULL; @@ -61,7 +60,6 @@ class CRM_Price_BAO_PriceSet extends CRM_Price_DAO_PriceSet { * (reference) an assoc array of name/value pairs. * * @return CRM_Price_DAO_PriceSet - * @static */ public static function create(&$params) { if (empty($params['id']) && empty($params['name'])) { @@ -87,7 +85,6 @@ class CRM_Price_BAO_PriceSet extends CRM_Price_DAO_PriceSet { * (reference ) an assoc array to hold the flattened values. * * @return CRM_Price_DAO_PriceSet - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Price_DAO_PriceSet', $params, $defaults); @@ -104,7 +101,6 @@ class CRM_Price_BAO_PriceSet extends CRM_Price_DAO_PriceSet { * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $isActive) { return CRM_Core_DAO::setFieldValue('CRM_Price_DAO_PriceSet', $id, 'is_active', $isActive); @@ -119,7 +115,6 @@ class CRM_Price_BAO_PriceSet extends CRM_Price_DAO_PriceSet { * @return array * default price set * - * @static */ public static function getDefaultPriceSet($entity = 'contribution') { if (!empty(self::$_defaultPriceSet[$entity])) { @@ -165,7 +160,6 @@ WHERE ps.name = '{$entityName}' * @return string * title * - * @static */ public static function getTitle($id) { return CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $id, 'title'); @@ -289,7 +283,6 @@ WHERE ct.id = cp.financial_type_id AND * false if fields exist for this set, true if the * set could be deleted * - * @static */ public static function deleteSet($id) { // remove from all inactive forms @@ -415,7 +408,6 @@ WHERE ct.id = cp.financial_type_id AND * * @return int|NULL * price set id on success, null otherwise - * @static */ public static function getSetId(&$params) { $fid = NULL; @@ -1094,7 +1086,6 @@ WHERE id = %1"; * @return array * Array of the field ids * - * @static */ public static function getFieldIds($id) { $priceField = new CRM_Price_DAO_PriceField(); @@ -1113,7 +1104,6 @@ WHERE id = %1"; * The price set id to copy. * * @return CRM_Price_DAO_PriceSet - * @static */ public static function copy($id) { $maxId = CRM_Core_DAO::singleValueQuery("SELECT max(id) FROM civicrm_price_set"); @@ -1182,7 +1172,6 @@ WHERE id = %1"; * @param bool $onlyActive * * @return int|null|string - * @static */ public static function getPricesetCount($sid, $onlyActive = TRUE) { $count = 0; @@ -1292,7 +1281,6 @@ GROUP BY mt.member_of_contact_id"; * * @return array * associate array of frequency interval and unit - * @static */ public static function getRecurDetails($priceSetId) { $query = 'SELECT mt.duration_interval, mt.duration_unit @@ -1327,7 +1315,6 @@ GROUP BY mt.member_of_contact_id"; * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsQuickConfig($id, $isQuickConfig) { return CRM_Core_DAO::setFieldValue('CRM_Price_DAO_PriceSet', $id, 'is_quick_config', $isQuickConfig); @@ -1337,7 +1324,6 @@ GROUP BY mt.member_of_contact_id"; * Check if price set id provides option for * user to select both auto-renew and non-auto-renew memberships * - * @static */ public static function checkMembershipPriceSet($id) { $query = diff --git a/CRM/Price/Form/Field.php b/CRM/Price/Form/Field.php index 388e37e556..e4c82e6cac 100644 --- a/CRM/Price/Form/Field.php +++ b/CRM/Price/Form/Field.php @@ -395,7 +395,6 @@ class CRM_Price_Form_Field extends CRM_Core_Form { * @return array * if errors then list of errors to be posted back to the form, * true otherwise - * @static */ public static function formRule($fields, $files, $form) { diff --git a/CRM/Price/Form/Option.php b/CRM/Price/Form/Option.php index 7c633e60ae..f0dea450c5 100644 --- a/CRM/Price/Form/Option.php +++ b/CRM/Price/Form/Option.php @@ -279,7 +279,6 @@ class CRM_Price_Form_Option extends CRM_Core_Form { * @return array * if errors then list of errors to be posted back to the form, * true otherwise - * @static */ public static function formRule($fields, $files, $form) { $errors = array(); diff --git a/CRM/Price/Form/Set.php b/CRM/Price/Form/Set.php index 61506cde4e..8acde2685b 100644 --- a/CRM/Price/Form/Set.php +++ b/CRM/Price/Form/Set.php @@ -91,7 +91,6 @@ class CRM_Price_Form_Set extends CRM_Core_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $options) { $errors = array(); diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php index f4bd4bcf5e..8d4303359d 100644 --- a/CRM/Profile/Form.php +++ b/CRM/Profile/Form.php @@ -888,7 +888,6 @@ class CRM_Profile_Form extends CRM_Core_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $form) { CRM_Utils_Hook::validateProfile($form->_ufGroup['name']); diff --git a/CRM/Profile/Form/Dynamic.php b/CRM/Profile/Form/Dynamic.php index 17e851af1d..6bd7670b58 100644 --- a/CRM/Profile/Form/Dynamic.php +++ b/CRM/Profile/Form/Dynamic.php @@ -102,7 +102,6 @@ class CRM_Profile_Form_Dynamic extends CRM_Profile_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $form) { $errors = array(); diff --git a/CRM/Profile/Page/MultipleRecordFieldsListing.php b/CRM/Profile/Page/MultipleRecordFieldsListing.php index 018320fdf7..6fe5be7336 100644 --- a/CRM/Profile/Page/MultipleRecordFieldsListing.php +++ b/CRM/Profile/Page/MultipleRecordFieldsListing.php @@ -38,7 +38,6 @@ class CRM_Profile_Page_MultipleRecordFieldsListing extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; diff --git a/CRM/Profile/Page/Router.php b/CRM/Profile/Page/Router.php index c139b1bc81..36f1d9e093 100644 --- a/CRM/Profile/Page/Router.php +++ b/CRM/Profile/Page/Router.php @@ -45,7 +45,6 @@ class CRM_Profile_Page_Router extends CRM_Core_Page { * this array contains the arguments of the url. * * @return string|void - * @static */ public function run($args = NULL) { if ($args[1] !== 'profile') { diff --git a/CRM/Profile/Selector/Listings.php b/CRM/Profile/Selector/Listings.php index e46149dd3c..049b63bc32 100644 --- a/CRM/Profile/Selector/Listings.php +++ b/CRM/Profile/Selector/Listings.php @@ -45,7 +45,6 @@ class CRM_Profile_Selector_Listings extends CRM_Core_Selector_Base implements CR * Array of supported links, currenly view and edit * * @var array - * @static */ static $_links = NULL; @@ -53,7 +52,6 @@ class CRM_Profile_Selector_Listings extends CRM_Core_Selector_Base implements CR * We use desc to remind us what that column is, name is used in the tpl * * @var array - * @static */ static $_columnHeaders; diff --git a/CRM/Report/BAO/Hook.php b/CRM/Report/BAO/Hook.php index 2e538fae60..36256311c1 100644 --- a/CRM/Report/BAO/Hook.php +++ b/CRM/Report/BAO/Hook.php @@ -48,7 +48,6 @@ class CRM_Report_BAO_Hook { * Singleton function used to manage this object * * @return object - * @static */ public static function singleton() { static $singleton = NULL; diff --git a/CRM/Report/BAO/ReportInstance.php b/CRM/Report/BAO/ReportInstance.php index 2540841cab..a3a79df21b 100644 --- a/CRM/Report/BAO/ReportInstance.php +++ b/CRM/Report/BAO/ReportInstance.php @@ -45,7 +45,6 @@ class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance { * (reference ) an assoc array of name/value pairs. * * @return CRM_Report_DAO_ReportInstance - * @static */ public static function add(&$params) { $instance = new CRM_Report_DAO_ReportInstance(); @@ -128,7 +127,6 @@ class CRM_Report_BAO_ReportInstance extends CRM_Report_DAO_ReportInstance { * (reference ) an assoc array of name/value pairs. * * @return CRM_Report_BAO_ReportInstance - * @static */ public static function &create(&$params) { if (isset($params['report_header'])) { diff --git a/CRM/Report/Page/InstanceList.php b/CRM/Report/Page/InstanceList.php index 8252ac7086..7edf71f6ff 100644 --- a/CRM/Report/Page/InstanceList.php +++ b/CRM/Report/Page/InstanceList.php @@ -83,7 +83,6 @@ class CRM_Report_Page_InstanceList extends CRM_Core_Page { * or by component ($compID) * * @return array - * @static */ public function &info() { diff --git a/CRM/Report/Page/Options.php b/CRM/Report/Page/Options.php index 4c4dd5ac68..5d00af1b87 100644 --- a/CRM/Report/Page/Options.php +++ b/CRM/Report/Page/Options.php @@ -44,7 +44,6 @@ class CRM_Report_Page_Options extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -52,7 +51,6 @@ class CRM_Report_Page_Options extends CRM_Core_Page_Basic { * The option group name * * @var array - * @static */ static $_gName = NULL; @@ -60,7 +58,6 @@ class CRM_Report_Page_Options extends CRM_Core_Page_Basic { * The option group name in display format (capitalized, without underscores...etc) * * @var array - * @static */ static $_GName = NULL; @@ -68,7 +65,6 @@ class CRM_Report_Page_Options extends CRM_Core_Page_Basic { * The option group id * * @var array - * @static */ static $_gId = NULL; @@ -162,7 +158,6 @@ class CRM_Report_Page_Options extends CRM_Core_Page_Basic { * * * @return void - * @static */ public function browse() { $groupParams = array('name' => self::$_gName); diff --git a/CRM/Report/Utils/Report.php b/CRM/Report/Utils/Report.php index b18b49804f..65784d7e48 100644 --- a/CRM/Report/Utils/Report.php +++ b/CRM/Report/Utils/Report.php @@ -364,7 +364,6 @@ WHERE inst.report_id = %1"; * * @return boolean * true if yes, else false - * @static */ public static function isInstanceGroupRoleAllowed($instanceId) { if (!$instanceId) { diff --git a/CRM/SMS/Form/Group.php b/CRM/SMS/Form/Group.php index a919964f15..f65ee7629f 100644 --- a/CRM/SMS/Form/Group.php +++ b/CRM/SMS/Form/Group.php @@ -317,7 +317,6 @@ class CRM_SMS_Form_Group extends CRM_Contact_Form_Task { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields) { $errors = array(); diff --git a/CRM/SMS/Form/Schedule.php b/CRM/SMS/Form/Schedule.php index aaa7dfce77..83c285b007 100644 --- a/CRM/SMS/Form/Schedule.php +++ b/CRM/SMS/Form/Schedule.php @@ -124,7 +124,6 @@ class CRM_SMS_Form_Schedule extends CRM_Core_Form { * @return boolean * True if either we deliver immediately, or the * date is properly set. - * @static */ public static function formRule($params, $files, $self) { if (!empty($params['_qf_Schedule_submit'])) { diff --git a/CRM/SMS/Form/Upload.php b/CRM/SMS/Form/Upload.php index 4449e468ca..174a8047d1 100644 --- a/CRM/SMS/Form/Upload.php +++ b/CRM/SMS/Form/Upload.php @@ -301,7 +301,6 @@ class CRM_SMS_Form_Upload extends CRM_Core_Form { * * @return bool|array * mixed true or array of errors - * @static */ public static function formRule($params, $files, $self) { if (!empty($_POST['_qf_Import_refresh'])) { diff --git a/CRM/SMS/Page/Provider.php b/CRM/SMS/Page/Provider.php index b6cd521c6e..c57e0abfc5 100644 --- a/CRM/SMS/Page/Provider.php +++ b/CRM/SMS/Page/Provider.php @@ -44,7 +44,6 @@ class CRM_SMS_Page_Provider extends CRM_Core_Page_Basic { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_links = NULL; @@ -132,7 +131,6 @@ class CRM_SMS_Page_Provider extends CRM_Core_Page_Basic { * @param null $action * * @return void - * @static */ public function browse($action = NULL) { $providers = CRM_SMS_BAO_Provider::getProviders(); diff --git a/CRM/SMS/Provider.php b/CRM/SMS/Provider.php index 5988370858..200c8747e8 100644 --- a/CRM/SMS/Provider.php +++ b/CRM/SMS/Provider.php @@ -39,7 +39,6 @@ abstract class CRM_SMS_Provider { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = array(); const MAX_SMS_CHAR = 460; @@ -51,7 +50,6 @@ abstract class CRM_SMS_Provider { * @param bool $force * * @return object - * @static */ public static function &singleton($providerParams = array(), $force = FALSE) { $mailingID = CRM_Utils_Array::value('mailing_id', $providerParams); diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php index 1f6b9c7d4a..cc0fd4dd19 100644 --- a/CRM/UF/Form/Field.php +++ b/CRM/UF/Form/Field.php @@ -625,7 +625,6 @@ class CRM_UF_Form_Field extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRuleSubType($fieldType, $groupType, $errors) { if (in_array($fieldType, array( @@ -680,7 +679,6 @@ class CRM_UF_Form_Field extends CRM_Core_Form { * * @return Array * list of errors to be posted back to the form - * @static */ public static function formRuleCustomDataExtentColumnValue($customField, $gid, $fieldType, &$errors) { // fix me : check object $customField @@ -733,7 +731,6 @@ class CRM_UF_Form_Field extends CRM_Core_Form { * @param array $errors * Collect errors. * - * @static */ public static function formRulePrimaryCheck($fields, $profileFieldName, $groupFields, &$errors) { //FIXME: This may need to also apply to website fields if they are refactored to allow more than one per profile @@ -774,7 +771,6 @@ class CRM_UF_Form_Field extends CRM_Core_Form { * * @return array * list of errors to be posted back to the form - * @static */ public static function formRule($fields, $files, $self) { $is_required = CRM_Utils_Array::value('is_required', $fields, FALSE); diff --git a/CRM/UF/Form/Group.php b/CRM/UF/Form/Group.php index da6fbd15aa..77c3c3aa5c 100644 --- a/CRM/UF/Form/Group.php +++ b/CRM/UF/Form/Group.php @@ -296,7 +296,6 @@ class CRM_UF_Form_Group extends CRM_Core_Form { * * @return bool|array * true if no errors, else array of errors - * @static */ public static function formRule($fields, $files, $self) { $errors = array(); diff --git a/CRM/UF/Page/Field.php b/CRM/UF/Page/Field.php index 0f4e6ccdb8..18c160a25b 100644 --- a/CRM/UF/Page/Field.php +++ b/CRM/UF/Page/Field.php @@ -104,7 +104,6 @@ class CRM_UF_Page_Field extends CRM_Core_Page { * Browse all CiviCRM Profile group fields. * * @return void - * @static */ public function browse() { $resourceManager = CRM_Core_Resources::singleton(); diff --git a/CRM/UF/Page/Group.php b/CRM/UF/Page/Group.php index b7035e6fe0..f5c63382e4 100644 --- a/CRM/UF/Page/Group.php +++ b/CRM/UF/Page/Group.php @@ -290,7 +290,6 @@ class CRM_UF_Page_Group extends CRM_Core_Page { * @param * * @return void - * @static */ public function browse($action = NULL) { $ufGroup = array(); diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php index 81b6fe6215..1f0beca7ad 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php @@ -52,7 +52,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p * (reference ) an assoc array of name/value pairs. * * @return CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field - * @static */ public static function &add(&$params) { $priceFieldBAO = new CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field(); @@ -76,7 +75,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p * (reference) an assoc array of name/value pairs. * * @return CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field - * @static */ public static function create(&$params) { @@ -164,7 +162,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p * (reference ) an assoc array to hold the flattened values. * * @return CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field', $params, $defaults); @@ -181,7 +178,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p * @return Object * DAO object on sucess, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field', $id, 'is_active', $is_active); @@ -196,7 +192,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p * @return string * name * - * @static */ public static function getTitle($id) { return CRM_Core_DAO::getFieldValue('CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field', $id, 'label'); @@ -219,7 +214,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p * @param array $freezeOptions * * @return null - * @static */ public static function addQuickFormElement( &$qf, @@ -532,7 +526,6 @@ WHERE * * @return boolean * - * @static */ public static function deleteField($id) { $field = new CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field(); @@ -581,7 +574,6 @@ WHERE * @param $fields * @param $error * - * @static */ public static function priceSetValidation($priceSetId, $fields, &$error) { diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php index 9ef15d9ba1..35b597ad90 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/FieldValue.php @@ -48,7 +48,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue extends CRM_Upgrade_Snapsho * @param $ids * * @return CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue - * @static */ public static function &add(&$params, $ids) { @@ -77,7 +76,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue extends CRM_Upgrade_Snapsho * @param $ids * * @return CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue - * @static */ public static function create(&$params, $ids) { @@ -121,7 +119,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue extends CRM_Upgrade_Snapsho * (reference ) an assoc array to hold the flattened values. * * @return CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue', $params, $defaults); @@ -140,7 +137,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue extends CRM_Upgrade_Snapsho * * @return array * - * @static */ public static function getValues($fieldId, &$values, $orderBy = 'weight', $isActive = FALSE) { $fieldValueDAO = new CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue(); @@ -167,7 +163,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue extends CRM_Upgrade_Snapsho * @return string * name * - * @static */ public static function getOptionLabel($id) { return CRM_Core_DAO::getFieldValue('CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue', $id, 'label'); @@ -184,7 +179,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue extends CRM_Upgrade_Snapsho * @return Object * DAO object on sucess, null otherwise * - * @static */ public static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue', $id, 'is_active', $is_active); @@ -198,7 +192,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue extends CRM_Upgrade_Snapsho * * @return boolean * - * @static */ public static function deleteValues($fieldId) { if (!$fieldId) { @@ -218,7 +211,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue extends CRM_Upgrade_Snapsho * * @return boolean * - * @static */ public static function del($id) { if (!$id) { diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php index 1a5c6d6592..709886d7fe 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/LineItem.php @@ -52,7 +52,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_LineItem extends CRM_Upgrade_Snapshot_ * (reference) an assoc array of name/value pairs. * * @return CRM_Upgrade_Snapshot_V4p2_Price_DAO_LineItem - * @static */ public static function create(&$params) { //create mode only as we don't support editing line items @@ -81,7 +80,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_LineItem extends CRM_Upgrade_Snapshot_ * (reference ) an assoc array to hold the flattened values. * * @return CRM_Upgrade_Snapshot_V4p2_Price_BAO_LineItem - * @static */ public static function retrieve(&$params, &$defaults) { $lineItem = new CRM_Upgrade_Snapshot_V4p2_Price_BAO_LineItem(); @@ -243,7 +241,6 @@ WHERE %2.id = %1"; * @param int $entityTable * * @return bool - * @static */ public static function deleteLineItems($entityId, $entityTable) { $result = FALSE; diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php index 918dd8875c..52f9684ed0 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php @@ -53,7 +53,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Set extends CRM_Upgrade_Snapshot_V4p2_ * (reference) an assoc array of name/value pairs. * * @return CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set - * @static */ public static function create(&$params) { $priceSetBAO = new CRM_Upgrade_Snapshot_V4p2_Price_BAO_Set(); @@ -73,7 +72,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Set extends CRM_Upgrade_Snapshot_V4p2_ * (reference ) an assoc array to hold the flattened values. * * @return CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set - * @static */ public static function retrieve(&$params, &$defaults) { return CRM_Core_DAO::commonRetrieve('CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set', $params, $defaults); @@ -89,7 +87,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Set extends CRM_Upgrade_Snapshot_V4p2_ * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsActive($id, $isActive) { return CRM_Core_DAO::setFieldValue('CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set', $id, 'is_active', $isActive); @@ -104,7 +101,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Set extends CRM_Upgrade_Snapshot_V4p2_ * @return int * priceSetID * - * @static */ public static function getDefaultPriceSet($entity = 'contribution') { if ($entity == 'contribution') { @@ -143,7 +139,6 @@ WHERE ps.name = '{$entityName}' * @return string * title * - * @static */ public static function getTitle($id) { return CRM_Core_DAO::getFieldValue('CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set', $id, 'title'); @@ -261,7 +256,6 @@ WHERE ct.id = cp.contribution_type_id AND * false if fields exist for this set, true if the * set could be deleted * - * @static */ public static function deleteSet($id) { // remove from all inactive forms @@ -387,7 +381,6 @@ WHERE ct.id = cp.contribution_type_id AND * * @return int|null * price set id on success, null otherwise - * @static */ public static function getSetId(&$params) { $fid = NULL; @@ -913,7 +906,6 @@ WHERE id = %1"; * @return array * Array of the field ids * - * @static */ public static function getFieldIds($id) { $priceField = new CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field(); @@ -932,7 +924,6 @@ WHERE id = %1"; * The price set id to copy. * * @return CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field - * @static */ static function copy($id) { $maxId = CRM_Core_DAO::singleValueQuery("SELECT max(id) FROM civicrm_price_set"); @@ -1003,7 +994,6 @@ WHERE id = %1"; * @param bool $onlyActive * * @return int|null|string - * @static */ public static function getPricesetCount($sid, $onlyActive = TRUE) { $count = 0; @@ -1113,7 +1103,6 @@ GROUP BY mt.member_of_contact_id"; * * @return array * associate array of frequency interval and unit - * @static */ public static function getRecurDetails($priceSetId) { $query = 'SELECT mt.duration_interval, mt.duration_unit @@ -1148,7 +1137,6 @@ GROUP BY mt.member_of_contact_id"; * * @return Object * DAO object on sucess, null otherwise - * @static */ public static function setIsQuickConfig($id, $isQuickConfig) { return CRM_Core_DAO::setFieldValue('CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set', $id, 'is_quick_config', $isQuickConfig); diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php index 50b44136bd..b0f7e4b29b 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Field.php @@ -42,21 +42,18 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field extends CRM_Core_DAO { * static instance to hold the table name * * @var string - * @static */ static $_tableName = 'civicrm_price_field'; /** * static instance to hold the field values * * @var array - * @static */ static $_fields = NULL; /** * static instance to hold the FK relationships * * @var string - * @static */ static $_links = NULL; /** @@ -64,7 +61,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field extends CRM_Core_DAO { * be imported * * @var array - * @static */ static $_import = NULL; /** @@ -72,7 +68,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field extends CRM_Core_DAO { * be exported * * @var array - * @static */ static $_export = NULL; /** @@ -80,7 +75,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field extends CRM_Core_DAO { * this table in the civicrm_log table * * @var boolean - * @static */ static $_log = TRUE; /** @@ -328,7 +322,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field extends CRM_Core_DAO { /** * returns the names of this table * - * @static * @return string */ public static function getTableName() { @@ -348,7 +341,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field extends CRM_Core_DAO { * returns the list of fields that can be imported * * return array - * @static */ static function &import($prefix = FALSE) { if (!(self::$_import)) { @@ -372,7 +364,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Field extends CRM_Core_DAO { * returns the list of fields that can be exported * * return array - * @static */ static function &export($prefix = FALSE) { if (!(self::$_export)) { diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php index 23cc580447..08b1d3530e 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/FieldValue.php @@ -42,21 +42,18 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue extends CRM_Core_DAO { * static instance to hold the table name * * @var string - * @static */ static $_tableName = 'civicrm_price_field_value'; /** * static instance to hold the field values * * @var array - * @static */ static $_fields = NULL; /** * static instance to hold the FK relationships * * @var string - * @static */ static $_links = NULL; /** @@ -64,7 +61,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue extends CRM_Core_DAO { * be imported * * @var array - * @static */ static $_import = NULL; /** @@ -72,7 +68,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue extends CRM_Core_DAO { * be exported * * @var array - * @static */ static $_export = NULL; /** @@ -80,7 +75,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue extends CRM_Core_DAO { * this table in the civicrm_log table * * @var boolean - * @static */ static $_log = FALSE; /** @@ -271,7 +265,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue extends CRM_Core_DAO { /** * returns the names of this table * - * @static * @return string */ public static function getTableName() { @@ -291,7 +284,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue extends CRM_Core_DAO { * returns the list of fields that can be imported * * return array - * @static */ static function &import($prefix = FALSE) { if (!(self::$_import)) { @@ -315,7 +307,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_FieldValue extends CRM_Core_DAO { * returns the list of fields that can be exported * * return array - * @static */ static function &export($prefix = FALSE) { if (!(self::$_export)) { diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php index 2dd8580d20..0646cf4e02 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/LineItem.php @@ -42,21 +42,18 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_LineItem extends CRM_Core_DAO { * static instance to hold the table name * * @var string - * @static */ static $_tableName = 'civicrm_line_item'; /** * static instance to hold the field values * * @var array - * @static */ static $_fields = NULL; /** * static instance to hold the FK relationships * * @var string - * @static */ static $_links = NULL; /** @@ -64,7 +61,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_LineItem extends CRM_Core_DAO { * be imported * * @var array - * @static */ static $_import = NULL; /** @@ -72,7 +68,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_LineItem extends CRM_Core_DAO { * be exported * * @var array - * @static */ static $_export = NULL; /** @@ -80,7 +75,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_LineItem extends CRM_Core_DAO { * this table in the civicrm_log table * * @var boolean - * @static */ static $_log = TRUE; /** @@ -247,7 +241,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_LineItem extends CRM_Core_DAO { /** * returns the names of this table * - * @static * @return string */ public static function getTableName() { @@ -267,7 +260,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_LineItem extends CRM_Core_DAO { * returns the list of fields that can be imported * * return array - * @static */ static function &import($prefix = FALSE) { if (!(self::$_import)) { @@ -291,7 +283,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_LineItem extends CRM_Core_DAO { * returns the list of fields that can be exported * * return array - * @static */ static function &export($prefix = FALSE) { if (!(self::$_export)) { diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php index 42be0ca432..e39722dffa 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/Set.php @@ -42,21 +42,18 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set extends CRM_Core_DAO { * static instance to hold the table name * * @var string - * @static */ static $_tableName = 'civicrm_price_set'; /** * static instance to hold the field values * * @var array - * @static */ static $_fields = NULL; /** * static instance to hold the FK relationships * * @var string - * @static */ static $_links = NULL; /** @@ -64,7 +61,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set extends CRM_Core_DAO { * be imported * * @var array - * @static */ static $_import = NULL; /** @@ -72,7 +68,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set extends CRM_Core_DAO { * be exported * * @var array - * @static */ static $_export = NULL; /** @@ -80,7 +75,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set extends CRM_Core_DAO { * this table in the civicrm_log table * * @var boolean - * @static */ static $_log = TRUE; /** @@ -271,7 +265,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set extends CRM_Core_DAO { /** * returns the names of this table * - * @static * @return string */ public static function getTableName() { @@ -291,7 +284,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set extends CRM_Core_DAO { * returns the list of fields that can be imported * * return array - * @static */ static function &import($prefix = FALSE) { if (!(self::$_import)) { @@ -315,7 +307,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_Set extends CRM_Core_DAO { * returns the list of fields that can be exported * * return array - * @static */ static function &export($prefix = FALSE) { if (!(self::$_export)) { diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php index a718314335..6020b3a4da 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/DAO/SetEntity.php @@ -42,21 +42,18 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_SetEntity extends CRM_Core_DAO { * static instance to hold the table name * * @var string - * @static */ static $_tableName = 'civicrm_price_set_entity'; /** * static instance to hold the field values * * @var array - * @static */ static $_fields = NULL; /** * static instance to hold the FK relationships * * @var string - * @static */ static $_links = NULL; /** @@ -64,7 +61,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_SetEntity extends CRM_Core_DAO { * be imported * * @var array - * @static */ static $_import = NULL; /** @@ -72,7 +68,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_SetEntity extends CRM_Core_DAO { * be exported * * @var array - * @static */ static $_export = NULL; /** @@ -80,7 +75,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_SetEntity extends CRM_Core_DAO { * this table in the civicrm_log table * * @var boolean - * @static */ static $_log = TRUE; /** @@ -172,7 +166,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_SetEntity extends CRM_Core_DAO { /** * returns the names of this table * - * @static * @return string */ public static function getTableName() { @@ -192,7 +185,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_SetEntity extends CRM_Core_DAO { * returns the list of fields that can be imported * * return array - * @static */ static function &import($prefix = FALSE) { if (!(self::$_import)) { @@ -216,7 +208,6 @@ class CRM_Upgrade_Snapshot_V4p2_Price_DAO_SetEntity extends CRM_Core_DAO { * returns the list of fields that can be exported * * return array - * @static */ static function &export($prefix = FALSE) { if (!(self::$_export)) { diff --git a/CRM/Utils/Address.php b/CRM/Utils/Address.php index b6108b5e7d..b73f4e7664 100644 --- a/CRM/Utils/Address.php +++ b/CRM/Utils/Address.php @@ -54,7 +54,6 @@ class CRM_Utils_Address { * @return string * formatted address string * - * @static */ static function format( $fields, diff --git a/CRM/Utils/Cache.php b/CRM/Utils/Cache.php index 68c8862fcb..61bc10b2a9 100644 --- a/CRM/Utils/Cache.php +++ b/CRM/Utils/Cache.php @@ -43,7 +43,6 @@ class CRM_Utils_Cache { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; @@ -63,7 +62,6 @@ class CRM_Utils_Cache { * Singleton function used to manage this object * * @return object - * @static */ public static function &singleton() { if (self::$_singleton === NULL) { @@ -99,7 +97,6 @@ class CRM_Utils_Cache { * * @return array * associative array of settings for the cache - * @static */ public static function getCacheSettings($cachePlugin) { switch ($cachePlugin) { diff --git a/CRM/Utils/Cache/NoCache.php b/CRM/Utils/Cache/NoCache.php index 0d8906069a..693383cf59 100644 --- a/CRM/Utils/Cache/NoCache.php +++ b/CRM/Utils/Cache/NoCache.php @@ -39,7 +39,6 @@ class CRM_Utils_Cache_NoCache implements CRM_Utils_Cache_Interface { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Utils/Check.php b/CRM/Utils/Check.php index b246598894..5dcaff841a 100644 --- a/CRM/Utils/Check.php +++ b/CRM/Utils/Check.php @@ -42,7 +42,6 @@ class CRM_Utils_Check { * singleton pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php index d4ada62568..93c301e483 100644 --- a/CRM/Utils/Date.php +++ b/CRM/Utils/Date.php @@ -50,7 +50,6 @@ class CRM_Utils_Date { * @return string * formatted string for date * - * @static */ public static function format($date, $separator = '', $invalidDate = 0) { if (is_numeric($date) && @@ -172,7 +171,6 @@ class CRM_Utils_Date { * @return array * 0-based array with abbreviated weekday names * - * @static */ public static function &getAbbrWeekdayNames() { static $abbrWeekdayNames; @@ -194,7 +192,6 @@ class CRM_Utils_Date { * @return array * 0-based array with full weekday names * - * @static */ public static function &getFullWeekdayNames() { static $fullWeekdayNames; @@ -218,7 +215,6 @@ class CRM_Utils_Date { * @return array * 1-based array with abbreviated month names * - * @static */ public static function &getAbbrMonthNames($month = FALSE) { static $abbrMonthNames; @@ -242,7 +238,6 @@ class CRM_Utils_Date { * @return array * 1-based array with full month names * - * @static */ public static function &getFullMonthNames() { static $fullMonthNames; @@ -304,7 +299,6 @@ class CRM_Utils_Date { * * @return string * the $format-formatted $date - * @static */ public static function customFormat($dateString, $format = NULL, $dateParts = NULL) { // 1-based (January) month names arrays @@ -439,7 +433,6 @@ class CRM_Utils_Date { * * @return string * date/datetime in ISO format - * @static */ public static function mysqlToIso($mysql) { $year = substr($mysql, 0, 4); @@ -483,7 +476,6 @@ class CRM_Utils_Date { * * @return string * date/datetime in MySQL format - * @static */ public static function isoToMysql($iso) { $dropArray = array('-' => '', ':' => '', ' ' => ''); @@ -501,7 +493,6 @@ class CRM_Utils_Date { * Index of params. * * @return bool - * @static */ public static function convertToDefaultDate(&$params, $dateType, $dateParam) { $now = getdate(); @@ -737,7 +728,6 @@ class CRM_Utils_Date { * * @return string * Return the customized todays date (Y-m-d) - * @static */ public static function getToday($dayParams = NULL, $format = "Y-m-d") { if (is_null($dayParams) || empty($dayParams)) { @@ -765,7 +755,6 @@ class CRM_Utils_Date { * * @return bool * true if today's date is in the given date range - * @static */ public static function getRange($startDate, $endDate) { $today = date("Y-m-d"); @@ -797,7 +786,6 @@ class CRM_Utils_Date { * * @return array * start date, end date - * @static */ public static function getFromTo($relative, $from, $to) { if ($relative) { @@ -822,7 +810,6 @@ class CRM_Utils_Date { * * @return int * array $results contains years or months - * @static */ static public function calculateAge($birthDate) { $results = array(); @@ -980,7 +967,6 @@ class CRM_Utils_Date { * * @return array * start date and end date for the relative time frame - * @static */ public static function relativeToAbsolute($relativeTerm, $unit) { $now = getdate(); @@ -1655,7 +1641,6 @@ class CRM_Utils_Date { * * @return int * $fy Current Fiscl Year - * @static */ public static function calculateFiscalYear($fyDate, $fyMonth) { $date = date("Y-m-d"); @@ -1808,7 +1793,6 @@ class CRM_Utils_Date { * * @return string * the time in UTC - * @static */ public static function getUTCTime($offset = 0) { $originalTimezone = date_default_timezone_get(); diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php index fbd098235e..c1bd5c1f1b 100644 --- a/CRM/Utils/File.php +++ b/CRM/Utils/File.php @@ -106,7 +106,6 @@ class CRM_Utils_File { * Should we abort or just return an invalid code. * * @return void - * @static */ public static function createDir($path, $abort = TRUE) { if (is_dir($path) || empty($path)) { @@ -139,7 +138,6 @@ class CRM_Utils_File { * * @throws Exception * @return void - * @static */ public static function cleanDir($target, $rmdir = TRUE, $verbose = TRUE) { static $exceptions = array('.', '..'); @@ -253,7 +251,6 @@ class CRM_Utils_File { * @param string $slash * * @return string - * @static */ public static function addTrailingSlash($path, $slash = NULL) { if (!$slash) { diff --git a/CRM/Utils/Geocode/Google.php b/CRM/Utils/Geocode/Google.php index 2b33e63cc3..4bb160fc3c 100644 --- a/CRM/Utils/Geocode/Google.php +++ b/CRM/Utils/Geocode/Google.php @@ -42,7 +42,6 @@ class CRM_Utils_Geocode_Google { * Server to retrieve the lat/long * * @var string - * @static */ static protected $_server = 'maps.googleapis.com'; @@ -50,7 +49,6 @@ class CRM_Utils_Geocode_Google { * Uri of service * * @var string - * @static */ static protected $_uri = '/maps/api/geocode/xml?sensor=false&address='; @@ -64,7 +62,6 @@ class CRM_Utils_Geocode_Google { * * @return boolean * true if we modified the address, false otherwise - * @static */ public static function format(&$values, $stateName = FALSE) { // we need a valid country, else we ignore diff --git a/CRM/Utils/Geocode/Yahoo.php b/CRM/Utils/Geocode/Yahoo.php index 8f462a8604..3d808283db 100644 --- a/CRM/Utils/Geocode/Yahoo.php +++ b/CRM/Utils/Geocode/Yahoo.php @@ -43,7 +43,6 @@ class CRM_Utils_Geocode_Yahoo { * Server to retrieve the lat/long * * @var string - * @static */ static protected $_server = 'query.yahooapis.com'; @@ -51,7 +50,6 @@ class CRM_Utils_Geocode_Yahoo { * Uri of service * * @var string - * @static */ static protected $_uri = '/v1/public/yql'; @@ -67,7 +65,6 @@ class CRM_Utils_Geocode_Yahoo { * * @return boolean * true if we modified the address, false otherwise - * @static */ public static function format(&$values, $stateName = FALSE) { CRM_Utils_System::checkPHPVersion(5, TRUE); diff --git a/CRM/Utils/GlobalStack.php b/CRM/Utils/GlobalStack.php index 4d10fef21b..3f32cf799c 100644 --- a/CRM/Utils/GlobalStack.php +++ b/CRM/Utils/GlobalStack.php @@ -46,7 +46,6 @@ class CRM_Utils_GlobalStack { * We don't have a container or dependency-injection, so use singleton instead * * @var object - * @static */ private static $_singleton = NULL; diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php index 1d9505990f..1eed74bac6 100644 --- a/CRM/Utils/Hook.php +++ b/CRM/Utils/Hook.php @@ -56,7 +56,6 @@ abstract class CRM_Utils_Hook { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; diff --git a/CRM/Utils/JSON.php b/CRM/Utils/JSON.php index c099c7f171..20117a5886 100644 --- a/CRM/Utils/JSON.php +++ b/CRM/Utils/JSON.php @@ -60,7 +60,6 @@ class CRM_Utils_JSON { * * @return string * JSON array - * @static */ public static function encode($params, $identifier = 'id') { $buildObject = array(); diff --git a/CRM/Utils/Mail.php b/CRM/Utils/Mail.php index 08dd2c39a3..116224e558 100644 --- a/CRM/Utils/Mail.php +++ b/CRM/Utils/Mail.php @@ -262,7 +262,6 @@ class CRM_Utils_Mail { * * @return string * the plucked email address - * @static */ public static function pluckEmailFromHeader($header) { preg_match('/<([^<]*)>$/', $header, $matches); @@ -278,7 +277,6 @@ class CRM_Utils_Mail { * * @return boolean * true if valid outBound email configuration found, false otherwise - * @static */ public static function validOutBoundMail() { $mailingInfo = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME, diff --git a/CRM/Utils/Money.php b/CRM/Utils/Money.php index 328aa230b2..4bb1672441 100644 --- a/CRM/Utils/Money.php +++ b/CRM/Utils/Money.php @@ -62,7 +62,6 @@ class CRM_Utils_Money { * @return string * formatted monetary string * - * @static */ public static function format($amount, $currency = NULL, $format = NULL, $onlyNumber = FALSE, $valueFormat = NULL) { diff --git a/CRM/Utils/OpenFlashChart.php b/CRM/Utils/OpenFlashChart.php index 7e7049237c..5ca9f9f3af 100644 --- a/CRM/Utils/OpenFlashChart.php +++ b/CRM/Utils/OpenFlashChart.php @@ -43,7 +43,6 @@ class CRM_Utils_OpenFlashChart { /** * Colours. * @var array - * @static */ private static $_colours = array( "#C3CC38", @@ -68,7 +67,6 @@ class CRM_Utils_OpenFlashChart { * * @return object * $chart object of open flash chart. - * @static */ public static function &barChart(&$params) { $chart = NULL; @@ -199,7 +197,6 @@ class CRM_Utils_OpenFlashChart { * * @return object * $chart object of open flash chart. - * @static */ public static function &pieChart(&$params) { $chart = NULL; @@ -264,7 +261,6 @@ class CRM_Utils_OpenFlashChart { * * @return object * $chart object of open flash chart. - * @static */ public static function &bar_3dChart(&$params) { $chart = NULL; diff --git a/CRM/Utils/PagerAToZ.php b/CRM/Utils/PagerAToZ.php index ddbf0ed849..6496b0ee25 100644 --- a/CRM/Utils/PagerAToZ.php +++ b/CRM/Utils/PagerAToZ.php @@ -51,7 +51,6 @@ class CRM_Utils_PagerAToZ { * * @return string * The html formatted string - * @static */ public static function getAToZBar(&$query, $sortByCharacter, $isDAO = FALSE) { $AToZBar = self::createLinks($query, $sortByCharacter, $isDAO); @@ -63,7 +62,6 @@ class CRM_Utils_PagerAToZ { * * @return array * is a array of static characters - * @static */ public static function getStaticCharacters() { $staticAlphabets = array( @@ -105,7 +103,6 @@ class CRM_Utils_PagerAToZ { * * @return array * is a array of dynamic characters - * @static */ public static function getDynamicCharacters(&$query, $isDAO) { if ($isDAO) { @@ -137,7 +134,6 @@ class CRM_Utils_PagerAToZ { * * @return array * with links - * @static */ public static function createLinks(&$query, $sortByCharacter, $isDAO) { $AToZBar = self::getStaticCharacters(); diff --git a/CRM/Utils/PseudoConstant.php b/CRM/Utils/PseudoConstant.php index 8aee0d5dce..33224a346a 100644 --- a/CRM/Utils/PseudoConstant.php +++ b/CRM/Utils/PseudoConstant.php @@ -51,7 +51,6 @@ class CRM_Utils_PseudoConstant { * doesn't need to know which class the Pseudoconstant is on * (some are on the Contribute_Pseudoconsant Class etc * - * @static * * @param $constant * @@ -72,7 +71,6 @@ class CRM_Utils_PseudoConstant { * doesn't need to know which class the Pseudoconstant is on * (some are on the Contribute_Pseudoconsant Class etc * - * @static * * @param $constant * diff --git a/CRM/Utils/REST.php b/CRM/Utils/REST.php index 12723bce09..658a96a202 100644 --- a/CRM/Utils/REST.php +++ b/CRM/Utils/REST.php @@ -36,7 +36,6 @@ class CRM_Utils_REST { /** * Number of seconds we should let a REST process idle - * @static */ static $rest_timeout = 0; diff --git a/CRM/Utils/ReCAPTCHA.php b/CRM/Utils/ReCAPTCHA.php index 1cfca8a0b8..d99b398a9c 100644 --- a/CRM/Utils/ReCAPTCHA.php +++ b/CRM/Utils/ReCAPTCHA.php @@ -47,7 +47,6 @@ class CRM_Utils_ReCAPTCHA { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; @@ -57,7 +56,6 @@ class CRM_Utils_ReCAPTCHA { * @param string the key to permit session scope's * * @return object - * @static */ public static function &singleton() { if (self::$_singleton === NULL) { diff --git a/CRM/Utils/Recent.php b/CRM/Utils/Recent.php index cf47c1a563..012533eb9b 100644 --- a/CRM/Utils/Recent.php +++ b/CRM/Utils/Recent.php @@ -49,7 +49,6 @@ class CRM_Utils_Recent { * The list of recently viewed items * * @var array - * @static */ static private $_recent = NULL; @@ -57,7 +56,6 @@ class CRM_Utils_Recent { * Initialize this class and set the static variables * * @return void - * @static */ public static function initialize() { if (!self::$_recent) { @@ -74,7 +72,6 @@ class CRM_Utils_Recent { * * @return array * the recently viewed array - * @static */ public static function &get() { self::initialize(); @@ -96,7 +93,6 @@ class CRM_Utils_Recent { * @param array $others * * @return void - * @static */ static function add( $title, @@ -154,7 +150,6 @@ class CRM_Utils_Recent { * Array of the recent Item to be removed. * * @return void - * @static */ public static function del($recentItem) { self::initialize(); @@ -183,7 +178,6 @@ class CRM_Utils_Recent { * Contact id that had to be removed. * * @return void - * @static */ public static function delContact($id) { self::initialize(); diff --git a/CRM/Utils/Rule.php b/CRM/Utils/Rule.php index fbd45cedd2..6594451896 100644 --- a/CRM/Utils/Rule.php +++ b/CRM/Utils/Rule.php @@ -227,7 +227,6 @@ class CRM_Utils_Rule { * * @return bool * true if valid date - * @static */ public static function currentDate($date, $monthRequired = TRUE) { $config = CRM_Core_Config::singleton(); @@ -319,7 +318,6 @@ class CRM_Utils_Rule { * * @return bool * true if valid date - * @static */ public static function mysqlDate($date) { // allow date to be null @@ -628,7 +626,6 @@ class CRM_Utils_Rule { * * @return boolean * true if object exists - * @static */ public static function objectExists($value, $options) { $name = 'name'; @@ -756,7 +753,6 @@ class CRM_Utils_Rule { * * @return bool * true if valid date - * @static */ public static function qfDate($date) { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Utils/SoapServer.php b/CRM/Utils/SoapServer.php index 50bc968ab6..eecd779c23 100644 --- a/CRM/Utils/SoapServer.php +++ b/CRM/Utils/SoapServer.php @@ -45,7 +45,6 @@ class CRM_Utils_SoapServer { /** * Number of seconds we should let a soap process idle - * @static */ static $soap_timeout = 0; @@ -125,7 +124,6 @@ class CRM_Utils_SoapServer { * @throws SoapFault * @return string * The SOAP Client key - * @static */ public function authenticate($name, $pass, $loadCMSBootstrap = FALSE) { require_once str_replace('_', DIRECTORY_SEPARATOR, $this->ufClass) . '.php'; diff --git a/CRM/Utils/Sort.php b/CRM/Utils/Sort.php index d993c69de1..4023d53c24 100644 --- a/CRM/Utils/Sort.php +++ b/CRM/Utils/Sort.php @@ -179,7 +179,6 @@ class CRM_Utils_Sort { * * @return string * the string to append to the url - * @static */ public static function sortIDValue($index, $dir) { return ($dir == self::DESCENDING) ? $index . '_d' : $index . '_u'; diff --git a/CRM/Utils/String.php b/CRM/Utils/String.php index 8e8b1f9651..511b8caa67 100644 --- a/CRM/Utils/String.php +++ b/CRM/Utils/String.php @@ -57,7 +57,6 @@ class CRM_Utils_String { * * @return string * An equivalent variable name. - * @static */ public static function titleToVar($title, $maxLength = 31) { $variable = self::munge($title, '_', $maxLength); @@ -85,7 +84,6 @@ class CRM_Utils_String { * * @return string * returns the manipulated string - * @static */ public static function munge($name, $char = '_', $len = 63) { // replace all white space and non-alpha numeric with $char @@ -134,7 +132,6 @@ class CRM_Utils_String { * * @return string * Randomized Variable Name - * @static */ public static function rename($name, $len = 4) { $rand = substr(uniqid(), 0, $len); @@ -152,7 +149,6 @@ class CRM_Utils_String { * * @return string * the last component - * @static */ public static function getClassName($string, $char = '_') { $names = array(); @@ -176,7 +172,6 @@ class CRM_Utils_String { * The string (or array of strings) to append. * * @return void - * @static */ public static function append(&$str, $delim, $name) { if (empty($name)) { @@ -216,7 +211,6 @@ class CRM_Utils_String { * * @return boolean * true if string is ascii - * @static */ public static function isAscii($str, $utf8 = TRUE) { if (!function_exists('mb_detect_encoding')) { @@ -261,7 +255,6 @@ class CRM_Utils_String { * * @return array * array of strings w/ corresponding redacted outputs - * @static */ public static function regex($str, $regexRules) { //redact the regular expressions @@ -318,7 +311,6 @@ class CRM_Utils_String { * * @param string $str * Input string. - * @static * * @return boolean */ @@ -352,7 +344,6 @@ class CRM_Utils_String { * * @return boolean * true if the urls match, else false - * @static */ public static function match($url1, $url2) { $url1 = strtolower($url1); @@ -377,7 +368,6 @@ class CRM_Utils_String { * * @return mix * $v returns civicrm url (eg: civicrm/contact/search/...) - * @static */ public static function extractURLVarValue($query) { $config = CRM_Core_Config::singleton(); @@ -402,7 +392,6 @@ class CRM_Utils_String { * The string to be translated. * * @return boolean - * @static */ public static function strtobool($str) { if (!is_scalar($str)) { @@ -422,7 +411,6 @@ class CRM_Utils_String { * The string to be translated. * * @return boolean - * @static */ public static function strtoboolstr($str) { if (!is_scalar($str)) { @@ -448,7 +436,6 @@ class CRM_Utils_String { * * @return string * the converted string - * @static */ public static function htmlToText($html) { require_once 'packages/html2text/rcube_html2text.php'; @@ -565,7 +552,6 @@ class CRM_Utils_String { * * @return string * the cleaned string - * @static */ public static function stripSpaces($string) { return (empty($string)) ? $string : preg_replace("/\s{2,}/", " ", trim($string)); @@ -584,7 +570,6 @@ class CRM_Utils_String { * * @return string * the sanitized string - * @static */ static function stripPathChars( $string, @@ -643,7 +628,6 @@ class CRM_Utils_String { * * @return string * the cleaned up string - * @static */ public static function purifyHTML($string) { static $_filter = NULL; diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php index 4d0f995dd8..70c95607b6 100644 --- a/CRM/Utils/System/Base.php +++ b/CRM/Utils/System/Base.php @@ -141,7 +141,6 @@ abstract class CRM_Utils_System_Base { * * @return string * Formatted url. - * @static */ function languageNegotiationURL( $url, @@ -169,7 +168,6 @@ abstract class CRM_Utils_System_Base { * * @return string * loginURL for the current CMS - * @static */ public abstract function getLoginURL($destination = ''); diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php index 4fc6aab525..7af9cc6591 100644 --- a/CRM/Utils/System/Drupal.php +++ b/CRM/Utils/System/Drupal.php @@ -221,7 +221,6 @@ class CRM_Utils_System_Drupal extends CRM_Utils_System_DrupalBase { * * @return string * loginURL for the current CMS - * @static */ public function getLoginURL($destination = '') { $query = $destination ? array('destination' => $destination) : array(); @@ -855,7 +854,6 @@ AND u.status = 1 * * @return string * , formatted url. - * @static */ public function languageNegotiationURL($url, $addLanguagePart = TRUE, $removeLanguagePart = FALSE) { if (empty($url)) { diff --git a/CRM/Utils/System/Drupal6.php b/CRM/Utils/System/Drupal6.php index 1d2cf0fdd7..795b6541de 100644 --- a/CRM/Utils/System/Drupal6.php +++ b/CRM/Utils/System/Drupal6.php @@ -802,7 +802,6 @@ class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase { * * @return string * , formatted url. - * @static */ public function languageNegotiationURL($url, $addLanguagePart = TRUE, $removeLanguagePart = FALSE) { if (empty($url)) { @@ -914,7 +913,6 @@ class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase { * * @return string * loginURL for the current CMS - * @static */ public function getLoginURL($destination = '') { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php index 494bc73ccf..d233ca0cd3 100644 --- a/CRM/Utils/System/Drupal8.php +++ b/CRM/Utils/System/Drupal8.php @@ -229,7 +229,6 @@ class CRM_Utils_System_Drupal8 extends CRM_Utils_System_DrupalBase { * * @return string * loginURL for the current CMS - * @static */ public function getLoginURL($destination = '') { $query = $destination ? array('destination' => $destination) : array(); diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php index 32c841ec4c..e03ff71448 100644 --- a/CRM/Utils/System/DrupalBase.php +++ b/CRM/Utils/System/DrupalBase.php @@ -369,7 +369,6 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base { * * @return string * , formatted url. - * @static */ public function languageNegotiationURL($url, $addLanguagePart = TRUE, $removeLanguagePart = FALSE) { if (empty($url)) { diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php index ad04fd5206..b6037f93f8 100644 --- a/CRM/Utils/System/Joomla.php +++ b/CRM/Utils/System/Joomla.php @@ -783,7 +783,6 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base { * * @return string * loginURL for the current CMS - * @static */ public function getLoginURL($destination = '') { $config = CRM_Core_Config::singleton(); diff --git a/CRM/Utils/System/Soap.php b/CRM/Utils/System/Soap.php index 63c74e10bd..525aa5d974 100644 --- a/CRM/Utils/System/Soap.php +++ b/CRM/Utils/System/Soap.php @@ -67,7 +67,6 @@ class CRM_Utils_System_Soap extends CRM_Utils_System_Base { * * @return boolean * true if yes, else false - * @static */ public function checkPermission($str) { return TRUE; @@ -202,7 +201,6 @@ class CRM_Utils_System_Soap extends CRM_Utils_System_Base { * @throws Exception * @return string * loginURL for the current CMS - * @static */ public function getLoginURL($destination = '') { throw new Exception("Method not implemented: getLoginURL"); diff --git a/CRM/Utils/System/UnitTests.php b/CRM/Utils/System/UnitTests.php index 3d62a2abec..4c9002373b 100644 --- a/CRM/Utils/System/UnitTests.php +++ b/CRM/Utils/System/UnitTests.php @@ -317,7 +317,6 @@ class CRM_Utils_System_UnitTests extends CRM_Utils_System_Drupal { * @throws Exception * @return string * loginURL for the current CMS - * @static */ public function getLoginURL($destination = '') { throw new Exception("Method not implemented: getLoginURL"); diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php index 0350a9dc45..6f19973d5a 100644 --- a/CRM/Utils/System/WordPress.php +++ b/CRM/Utils/System/WordPress.php @@ -102,7 +102,6 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { * @internal param string $url * * @return void - * @static */ public function appendBreadCrumb($breadCrumbs) { $breadCrumb = wp_get_breadcrumb(); @@ -133,7 +132,6 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { * Reset an additional breadcrumb tag to the existing breadcrumb * * @return void - * @static */ public function resetBreadCrumb() { $bc = array(); @@ -147,7 +145,6 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { * The new string to be appended. * * @return void - * @static */ public function addHTMLHead($head) { static $registered = FALSE; @@ -243,7 +240,6 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { * @param null * * @return void - * @static */ public function mapConfigToSSL() { global $base_url; @@ -258,7 +254,6 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { * * @return string * the url to post the form - * @static */ public function postURL($action) { if (!empty($action)) { @@ -408,7 +403,6 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { * * @return array|bool * [contactID, ufID, uniqueString] if success else false if no auth - * @static */ public function authenticate($name, $password, $loadCMSBootstrap = FALSE, $realPath = NULL) { $config = CRM_Core_Config::singleton(); @@ -438,7 +432,6 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { * @param string $message * The message to set. * - * @static */ public function setMessage($message) { } diff --git a/CRM/Utils/Time.php b/CRM/Utils/Time.php index 88e709998d..3f44375572 100644 --- a/CRM/Utils/Time.php +++ b/CRM/Utils/Time.php @@ -51,7 +51,6 @@ class CRM_Utils_Time { * * @return date * - * @static */ public static function getTime($returnFormat = 'YmdHis') { return date($returnFormat, self::getTimeRaw()); @@ -76,7 +75,6 @@ class CRM_Utils_Time { * * @return date * - * @static */ public static function setTime($newDateTime, $returnFormat = 'YmdHis') { self::$_delta = strtotime($newDateTime) - time(); diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php index 77bc831b09..b62d93a479 100644 --- a/CRM/Utils/Token.php +++ b/CRM/Utils/Token.php @@ -99,7 +99,6 @@ class CRM_Utils_Token { * @return bool|array * true if all required tokens are found, * else an array of the missing tokens - * @static */ public static function requiredTokens(&$str) { if (self::$_requiredTokens == NULL) { @@ -154,7 +153,6 @@ class CRM_Utils_Token { * * @return boolean * Was there a match - * @static */ public static function token_match($type, $var, &$str) { $token = preg_quote('{' . "$type.$var") . '(\|.+?)?' . preg_quote('}'); @@ -176,7 +174,6 @@ class CRM_Utils_Token { * * @return string * The processed string - * @static */ public static function &token_replace($type, $var, $value, &$str, $escapeSmarty = FALSE) { $token = preg_quote('{' . "$type.$var") . '(\|([^\}]+?))?' . preg_quote('}'); @@ -198,7 +195,6 @@ class CRM_Utils_Token { * * @return string * regular expression sutiable for using in preg_replace - * @static */ private static function tokenRegex($token_type) { return '/(?