From 3d0d359e75e08d01680f3c2ccd6d62ed4f81ed3a Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sat, 24 May 2014 16:47:46 +1200 Subject: [PATCH] comment fixes --- CRM/Case/BAO/Case.php | 4 ++-- CRM/Core/BAO/Setting.php | 2 +- CRM/Member/BAO/Membership.php | 2 +- CRM/Utils/Hook.php | 20 ++++++++++---------- api/v3/utils.php | 6 ++++++ 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 17a48a4179..74233ba5ed 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -327,7 +327,7 @@ WHERE civicrm_case.id = %1"; * * @param bool $moveToTrash * - * @return void + * @return bool is successful * @access public * @static */ @@ -2321,7 +2321,7 @@ INNER JOIN civicrm_case_contact ON ( civicrm_case.id = civicrm_case_contact.cas * * @param bool $changeClient * - * @return void. + * @return integer|NULL * @static */ static function mergeCases($mainContactId, $mainCaseId = NULL, $otherContactId = NULL, diff --git a/CRM/Core/BAO/Setting.php b/CRM/Core/BAO/Setting.php index efa9aa4564..e81110dc10 100644 --- a/CRM/Core/BAO/Setting.php +++ b/CRM/Core/BAO/Setting.php @@ -443,7 +443,7 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting { * * @throws api_Exception * @domains array an array of domains to get settings for. Default is the current domain - * @return void + * @return array * @static * @access public */ diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index de4711a1ec..3081848311 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -232,7 +232,7 @@ class CRM_Member_BAO_Membership extends CRM_Member_DAO_Membership { * @throws CRM_Core_Exception * @internal param bool $callFromAPI Is this function called from API? * - * @return object CRM_Member_BAO_Membership object + * @return CRM_Member_BAO_Membership object * @access public * @static */ diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php index 6405dbcf08..523b4020b4 100644 --- a/CRM/Utils/Hook.php +++ b/CRM/Utils/Hook.php @@ -1607,11 +1607,11 @@ abstract class CRM_Utils_Hook { /** * This hook is called before a case merge (or a case reassign) * - * @param type $mainContactId - * @param type $mainCaseId - * @param type $otherContactId - * @param type $otherCaseId - * @param bool|\type $changeClient + * @param integer $mainContactId + * @param integer $mainCaseId + * @param integer $otherContactId + * @param integer $otherCaseId + * @param bool $changeClient * * @return void */ @@ -1622,11 +1622,11 @@ abstract class CRM_Utils_Hook { /** * This hook is called after a case merge (or a case reassign) * - * @param type $mainContactId - * @param type $mainCaseId - * @param type $otherContactId - * @param type $otherCaseId - * @param bool|\type $changeClient + * @param integer $mainContactId + * @param integer $mainCaseId + * @param integer $otherContactId + * @param integer $otherCaseId + * @param bool $changeClient * * @return void */ diff --git a/api/v3/utils.php b/api/v3/utils.php index aa81220ba0..29ebc64b5d 100644 --- a/api/v3/utils.php +++ b/api/v3/utils.php @@ -1119,6 +1119,12 @@ function _civicrm_api3_basic_create_fallback($bao_name, &$params) { /** * Function to do a 'standard' api del - when the api is only doing a $bao::del then use this * if api::del doesn't exist it will try DAO delete method + * + * @param $bao_name + * @param $params + * + * @return array API result array + * @throws API_Exception */ function _civicrm_api3_basic_delete($bao_name, &$params) { -- 2.25.1