+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019 |
+ | Copyright CiviCRM LLC (c) 2004-2020 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC (c) 2004-2020
*/
class CRM_Utils_Check_Component_OptionGroups extends CRM_Utils_Check_Component {
* @return array
*/
public function checkOptionGroupValues() {
- $messages = array();
- $problemValues = array();
- $optionGroups = civicrm_api3('OptionGroup', 'get', array(
+ $messages = [];
+ $problemValues = [];
+ $optionGroups = civicrm_api3('OptionGroup', 'get', [
'sequential' => 1,
- 'data_type' => array('IS NOT NULL' => 1),
- 'options' => array('limit' => 0),
- ));
+ 'data_type' => ['IS NOT NULL' => 1],
+ 'options' => ['limit' => 0],
+ ]);
if ($optionGroups['count'] > 0) {
foreach ($optionGroups['values'] as $optionGroup) {
$values = CRM_Core_BAO_OptionValue::getOptionValuesArray($optionGroup['id']);
if (count($values) > 0) {
foreach ($values as $value) {
- $validate = CRM_Utils_Type::validate($value['value'], $optionGroup['data_type'], FALSE);
- if (is_null($validate)) {
- $problemValues[] = array(
+ try {
+ CRM_Utils_Type::validate($value['value'], $optionGroup['data_type'], FALSE, '', TRUE);
+ }
+ catch (Exception $e) {
+ $problemValues[] = [
'group_name' => $optionGroup['title'],
'value_name' => $value['label'],
- );
+ ];
}
}
}
if (!empty($problemValues)) {
$strings = '';
foreach ($problemValues as $problemValue) {
- $strings .= ts('<tr><td> "%1" </td><td> "%2" </td></tr>', array(
+ $strings .= ts('<tr><td> "%1" </td><td> "%2" </td></tr>', [
1 => $problemValue['group_name'],
2 => $problemValue['value_name'],
- ));
+ ]);
}
$messages[] = new CRM_Utils_Check_Message(