projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15142 from eileenmcnaughton/pradeep2
[civicrm-core.git]
/
CRM
/
Member
/
BAO
/
MembershipStatus.php
diff --git
a/CRM/Member/BAO/MembershipStatus.php
b/CRM/Member/BAO/MembershipStatus.php
index 0f7f8ae4197068520b9e722945925e56c940f27e..e6310ae68ee1dfde982bdc5832bbe9e45bce437c 100644
(file)
--- a/
CRM/Member/BAO/MembershipStatus.php
+++ b/
CRM/Member/BAO/MembershipStatus.php
@@
-36,8
+36,9
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
/**
* Static holder for the default LT.
/**
* Static holder for the default LT.
+ * @var int
*/
*/
- static $_defaultMembershipStatus = NULL;
+
public
static $_defaultMembershipStatus = NULL;
/**
* Class constructor.
/**
* Class constructor.
@@
-92,7
+93,7
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
* @return CRM_Member_BAO_MembershipStatus
*/
public static function create($params) {
* @return CRM_Member_BAO_MembershipStatus
*/
public static function create($params) {
- $ids =
array()
;
+ $ids =
[]
;
if (!empty($params['id'])) {
$ids['membershipStatus'] = $params['id'];
}
if (!empty($params['id'])) {
$ids['membershipStatus'] = $params['id'];
}
@@
-119,7
+120,7
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
*
* @return object
*/
*
* @return object
*/
- public static function add(&$params, $ids =
array()
) {
+ public static function add(&$params, $ids =
[]
) {
$id = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('membershipStatus', $ids));
if (!$id) {
CRM_Core_DAO::setCreateDefaults($params, self::getDefaults());
$id = CRM_Utils_Array::value('id', $params, CRM_Utils_Array::value('membershipStatus', $ids));
if (!$id) {
CRM_Core_DAO::setCreateDefaults($params, self::getDefaults());
@@
-136,9
+137,7
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
// set all other defaults to false.
if (!empty($params['is_default'])) {
$query = "UPDATE civicrm_membership_status SET is_default = 0";
// set all other defaults to false.
if (!empty($params['is_default'])) {
$query = "UPDATE civicrm_membership_status SET is_default = 0";
- CRM_Core_DAO::executeQuery($query,
- CRM_Core_DAO::$_nullArray
- );
+ CRM_Core_DAO::executeQuery($query);
}
// action is taken depending upon the mode
}
// action is taken depending upon the mode
@@
-157,12
+156,12
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
* @return array
*/
public static function getDefaults() {
* @return array
*/
public static function getDefaults() {
- return
array(
+ return
[
'is_active' => FALSE,
'is_current_member' => FALSE,
'is_admin' => FALSE,
'is_default' => FALSE,
'is_active' => FALSE,
'is_current_member' => FALSE,
'is_admin' => FALSE,
'is_default' => FALSE,
-
)
;
+
]
;
}
/**
}
/**
@@
-173,7
+172,7
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
* @return array
*/
public static function getMembershipStatus($membershipStatusId) {
* @return array
*/
public static function getMembershipStatus($membershipStatusId) {
- $statusDetails =
array()
;
+ $statusDetails =
[]
;
$membershipStatus = new CRM_Member_DAO_MembershipStatus();
$membershipStatus->id = $membershipStatusId;
if ($membershipStatus->find(TRUE)) {
$membershipStatus = new CRM_Member_DAO_MembershipStatus();
$membershipStatus->id = $membershipStatusId;
if ($membershipStatus->find(TRUE)) {
@@
-194,7
+193,7
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
//checking if membership status is present in some other table
$check = FALSE;
//checking if membership status is present in some other table
$check = FALSE;
- $dependency =
array('Membership', 'MembershipLog')
;
+ $dependency =
['Membership', 'MembershipLog']
;
foreach ($dependency as $name) {
$baoString = 'CRM_Member_BAO_' . $name;
$dao = new $baoString();
foreach ($dependency as $name) {
$baoString = 'CRM_Member_BAO_' . $name;
$dao = new $baoString();
@@
-234,9
+233,9
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
*/
public static function getMembershipStatusByDate(
$startDate, $endDate, $joinDate,
*/
public static function getMembershipStatusByDate(
$startDate, $endDate, $joinDate,
- $statusDate = 'today', $excludeIsAdmin = FALSE, $membershipTypeID, $membership =
array()
+ $statusDate = 'today', $excludeIsAdmin = FALSE, $membershipTypeID, $membership =
[]
) {
) {
- $membershipDetails =
array()
;
+ $membershipDetails =
[]
;
if (!$statusDate || $statusDate == 'today') {
$statusDate = getdate();
if (!$statusDate || $statusDate == 'today') {
$statusDate = getdate();
@@
-254,8
+253,8
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
$statusDate = CRM_Utils_Date::customFormat($statusDate, '%Y%m%d');
}
$statusDate = CRM_Utils_Date::customFormat($statusDate, '%Y%m%d');
}
- $dates =
array('start', 'end', 'join')
;
- $events =
array('start', 'end')
;
+ $dates =
['start', 'end', 'join']
;
+ $events =
['start', 'end']
;
foreach ($dates as $dat) {
if (${$dat . 'Date'} && ${$dat . 'Date'} != "null") {
foreach ($dates as $dat) {
if (${$dat . 'Date'} && ${$dat . 'Date'} != "null") {
@@
-362,7
+361,7
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
//we bundle the arguments into an array as we can't pass 8 variables to the hook otherwise
// the membership array might contain the pre-altered settings so we don't want to merge this
//we bundle the arguments into an array as we can't pass 8 variables to the hook otherwise
// the membership array might contain the pre-altered settings so we don't want to merge this
- $arguments =
array(
+ $arguments =
[
'start_date' => $startDate,
'end_date' => $endDate,
'join_date' => $joinDate,
'start_date' => $startDate,
'end_date' => $endDate,
'join_date' => $joinDate,
@@
-371,7
+370,7
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
'membership_type_id' => $membershipTypeID,
'start_event' => $startEvent,
'end_event' => $endEvent,
'membership_type_id' => $membershipTypeID,
'start_event' => $startEvent,
'end_event' => $endEvent,
-
)
;
+
]
;
CRM_Utils_Hook::alterCalculatedMembershipStatus($membershipDetails, $arguments, $membership);
return $membershipDetails;
}
CRM_Utils_Hook::alterCalculatedMembershipStatus($membershipDetails, $arguments, $membership);
return $membershipDetails;
}
@@
-382,7
+381,7
@@
class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
* @return array
*/
public static function getMembershipStatusCurrent() {
* @return array
*/
public static function getMembershipStatusCurrent() {
- $statusIds =
array()
;
+ $statusIds =
[]
;
$membershipStatus = new CRM_Member_DAO_MembershipStatus();
$membershipStatus->is_current_member = 1;
$membershipStatus->find();
$membershipStatus = new CRM_Member_DAO_MembershipStatus();
$membershipStatus->is_current_member = 1;
$membershipStatus->find();