From 4268623e3a18c8d8cc548e525a6a6a59ef1d6b3a Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 15 Dec 2015 22:41:51 -0500 Subject: [PATCH] Code format cleanup --- CRM/Core/BAO/CustomField.php | 2 +- CRM/Core/PseudoConstant.php | 4 ++-- tests/phpunit/CRM/Core/FieldOptionsTest.php | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index ff0fe52032..977298b499 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -401,7 +401,7 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { $options = $context == 'validate' ? array(0, 1) : CRM_Core_SelectValues::boolean(); } else { - return false; + return FALSE; } CRM_Utils_Hook::customFieldOptions($this->id, $options, FALSE); $entity = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->custom_group_id, 'extends'); diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php index 93a0ad2e73..ce2f161829 100644 --- a/CRM/Core/PseudoConstant.php +++ b/CRM/Core/PseudoConstant.php @@ -238,10 +238,10 @@ class CRM_Core_PseudoConstant { $dao = new $daoName(); $fieldSpec = $dao->getFieldSpec($fieldName); $dao->free(); - + // Ensure we have the canonical name for this field $fieldName = CRM_Utils_Array::value('name', $fieldSpec, $fieldName); - + // Return false if field doesn't exist. if (empty($fieldSpec)) { return FALSE; diff --git a/tests/phpunit/CRM/Core/FieldOptionsTest.php b/tests/phpunit/CRM/Core/FieldOptionsTest.php index 25613ba6a2..cfb39739dd 100644 --- a/tests/phpunit/CRM/Core/FieldOptionsTest.php +++ b/tests/phpunit/CRM/Core/FieldOptionsTest.php @@ -32,13 +32,19 @@ require_once 'CiviTest/CiviUnitTestCase.php'; */ class CRM_Core_FieldOptionsTest extends CiviUnitTestCase { - /** @var array */ + /** + * @var array + */ public $replaceOptions; - /** @var array */ + /** + * @var array + */ public $appendOptions; - /** @var string */ + /** + * @var string + */ public $targetField; public function setUp() { @@ -204,12 +210,7 @@ class CRM_Core_FieldOptionsTest extends CiviUnitTestCase { } /** - * Implements hook_civicrm_fieldOptions - * - * @param $entity - * @param $field - * @param $options - * @param $params + * Implements hook_civicrm_fieldOptions(). */ public function hook_civicrm_fieldOptions($entity, $field, &$options, $params) { if ($field == $this->targetField) { -- 2.25.1