public static function currentDate($date, $monthRequired = TRUE) {
$config = CRM_Core_Config::singleton();
- $d = CRM_Utils_Array::value('d', $date);
- $m = CRM_Utils_Array::value('M', $date);
- $y = CRM_Utils_Array::value('Y', $date);
+ $d = $date['d'] ?? NULL;
+ $m = $date['M'] ?? NULL;
+ $y = $date['Y'] ?? NULL;
if (!$d && !$m && !$y) {
return TRUE;
// CRM-9017 CiviContribute/CiviMember form with expiration date format 'm Y'
if (!$m && !empty($date['m'])) {
- $m = CRM_Utils_Array::value('m', $date);
+ $m = $date['m'] ?? NULL;
}
$day = $mon = 1;
*/
public static function positiveInteger($value) {
if (is_int($value)) {
- return ($value < 0) ? FALSE : TRUE;
+ return !($value < 0);
}
// CRM-13460
return FALSE;
}
- if (preg_match('/^\d+$/', $value)) {
- return TRUE;
- }
-
- return FALSE;
+ return (bool) preg_match('/^\d+$/', $value);
}
/**
return FALSE;
}
- return preg_match('/(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/', $value) ? TRUE : FALSE;
+ return (bool) preg_match('/(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/', $value);
}
/**
* @return bool
*/
public static function alphanumeric($value) {
- return preg_match('/^[a-zA-Z0-9_-]*$/', $value) ? TRUE : FALSE;
+ return (bool) preg_match('/^[a-zA-Z0-9_-]*$/', $value);
}
/**
* @return bool
*/
public static function numberOfDigit($value, $noOfDigit) {
- return preg_match('/^\d{' . $noOfDigit . '}$/', $value) ? TRUE : FALSE;
+ return (bool) preg_match('/^\d{' . $noOfDigit . '}$/', $value);
}
/**
// Allow values such as -0, 1.024555, -.1
// We need to support multiple decimal places here, not just the number allowed by locale
// otherwise tax calculations break when you want the inclusive amount to be a round number (eg. £10 inc. VAT requires 8.333333333 here).
- return preg_match('/(^-?\d+\.?\d*$)|(^-?\.\d+$)/', $value) ? TRUE : FALSE;
+ return (bool) preg_match('/(^-?\d+\.?\d*$)|(^-?\.\d+$)/', $value);
}
/**
public static function qfDate($date) {
$config = CRM_Core_Config::singleton();
- $d = CRM_Utils_Array::value('d', $date);
- $m = CRM_Utils_Array::value('M', $date);
- $y = CRM_Utils_Array::value('Y', $date);
+ $d = $date['d'] ?? NULL;
+ $m = $date['M'] ?? NULL;
+ $y = $date['Y'] ?? NULL;
if (isset($date['h']) ||
isset($date['g'])
) {
- $m = CRM_Utils_Array::value('M', $date);
+ $m = $date['M'] ?? NULL;
}
if (!$d && !$m && !$y) {