From 500cfe81a695a102716dd243459f76b248930d42 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 14:56:56 -0800 Subject: [PATCH] INFRA-132 - CRM/Member - Misc --- CRM/Member/BAO/Membership.php | 9 ++++++--- CRM/Member/BAO/MembershipStatus.php | 3 ++- CRM/Member/BAO/Query.php | 3 ++- CRM/Member/Import/Parser.php | 3 ++- CRM/Member/Page/Tab.php | 3 ++- CRM/Member/Selector/Search.php | 6 ++++-- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index c0e0044c8e..1bac5735b6 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -756,7 +756,8 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * * @static */ - static function buildMembershipBlock(&$form, + static function buildMembershipBlock( + &$form, $pageID, $cid, $formItems = FALSE, @@ -1318,7 +1319,8 @@ AND civicrm_membership.is_test = %2"; * * @return void */ - public static function postProcessMembership($membershipParams, $contactID, &$form, $premiumParams, + public static function postProcessMembership( + $membershipParams, $contactID, &$form, $premiumParams, $customFieldsFormatted = NULL, $includeFieldTypes = NULL, $membershipDetails, $membershipTypeIDs, $isPaidMembership, $membershipID, $isProcessSeparateMembershipTransaction, $defaultContributionTypeID, $membershipLineItems, $isPayLater) { $result = $membershipContribution = NULL; @@ -1481,7 +1483,8 @@ AND civicrm_membership.is_test = %2"; * @return void * @static */ - static public function updateRecurMembership(CRM_Member_DAO_Membership $membership, + static public function updateRecurMembership( + CRM_Member_DAO_Membership $membership, CRM_Contribute_BAO_Contribution $contribution) { if (empty($contribution->contribution_recur_id)) { diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php index ef528a7d8b..d875889f40 100644 --- a/CRM/Member/BAO/MembershipStatus.php +++ b/CRM/Member/BAO/MembershipStatus.php @@ -233,7 +233,8 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { * @return array @static */ - static function getMembershipStatusByDate($startDate, $endDate, $joinDate, + static function getMembershipStatusByDate( + $startDate, $endDate, $joinDate, $statusDate = 'today', $excludeIsAdmin = FALSE, $membershipTypeID, $membership = array() ) { $membershipDetails = array(); diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php index 17b2a689eb..8583da38ce 100644 --- a/CRM/Member/BAO/Query.php +++ b/CRM/Member/BAO/Query.php @@ -392,7 +392,8 @@ class CRM_Member_BAO_Query { * * @return array|null */ - static function defaultReturnProperties($mode, + static function defaultReturnProperties( + $mode, $includeCustomFields = TRUE ) { $properties = NULL; diff --git a/CRM/Member/Import/Parser.php b/CRM/Member/Import/Parser.php index b40446903a..561710c3bb 100644 --- a/CRM/Member/Import/Parser.php +++ b/CRM/Member/Import/Parser.php @@ -76,7 +76,8 @@ abstract class CRM_Member_Import_Parser extends CRM_Import_Parser { * @return mixed * @throws Exception */ - function run($fileName, + function run( + $fileName, $seperator = ',', &$mapper, $skipColumnHeader = FALSE, diff --git a/CRM/Member/Page/Tab.php b/CRM/Member/Page/Tab.php index 96f634d1f9..5004305d44 100644 --- a/CRM/Member/Page/Tab.php +++ b/CRM/Member/Page/Tab.php @@ -464,7 +464,8 @@ class CRM_Member_Page_Tab extends CRM_Core_Page { * @return array (reference) of action links * @static */ - static function &links($status = 'all', + static function &links( + $status = 'all', $isPaymentProcessor = NULL, $accessContribution = NULL, $isCancelSupported = FALSE, diff --git a/CRM/Member/Selector/Search.php b/CRM/Member/Selector/Search.php index feeab4caa8..f2fe879425 100644 --- a/CRM/Member/Selector/Search.php +++ b/CRM/Member/Selector/Search.php @@ -147,7 +147,8 @@ class CRM_Member_Selector_Search extends CRM_Core_Selector_Base implements CRM_C * @return \CRM_Member_Selector_Search @access public */ - function __construct(&$queryParams, + function __construct( + &$queryParams, $action = CRM_Core_Action::NONE, $memberClause = NULL, $single = FALSE, @@ -194,7 +195,8 @@ class CRM_Member_Selector_Search extends CRM_Core_Selector_Base implements CRM_C * @return array */ static - function &links($status = 'all', + function &links( + $status = 'all', $isPaymentProcessor = NULL, $accessContribution = NULL, $qfKey = NULL, -- 2.25.1