From b55cf2b280c9638bb7846813c5ec89a6de0c1055 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 16 Jul 2014 20:35:38 +1200 Subject: [PATCH] CRM-14995 tidyups --- CRM/Core/BAO/Domain.php | 1 + CRM/Core/Permission.php | 2 +- CRM/Pledge/BAO/Pledge.php | 12 ++++++++++-- CRM/Utils/Hook.php | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CRM/Core/BAO/Domain.php b/CRM/Core/BAO/Domain.php index 8a4a9de271..5b4a6a8198 100644 --- a/CRM/Core/BAO/Domain.php +++ b/CRM/Core/BAO/Domain.php @@ -207,6 +207,7 @@ class CRM_Core_BAO_Domain extends CRM_Core_DAO_Domain { /** * @param bool $skipFatal * + * @return array name & email for domain * @throws Exception */ static function getNameAndEmail($skipFatal = FALSE) { diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php index cca65ac93a..c6ff25a6ee 100644 --- a/CRM/Core/Permission.php +++ b/CRM/Core/Permission.php @@ -429,7 +429,7 @@ class CRM_Core_Permission { * check permissions for delete and edit actions * * @param string $module component name. - * @param $action action to be check across component + * @param integer $action action to be check across component * * * @return bool diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php index cd6319df1e..1aed6a8ae7 100644 --- a/CRM/Pledge/BAO/Pledge.php +++ b/CRM/Pledge/BAO/Pledge.php @@ -300,6 +300,12 @@ class CRM_Pledge_BAO_Pledge extends CRM_Pledge_DAO_Pledge { /** * function to get the amount details date wise. + * + * @param string $status + * @param string $startDate + * @param string $endDate + * + * @return array|null */ static function getTotalAmountAndCount($status = NULL, $startDate = NULL, $endDate = NULL) { $where = array(); @@ -441,7 +447,7 @@ GROUP BY currency * * @param int $honorId In Honor of Contact ID * - * @return return the list of pledge fields + * @return array return the list of pledge fields * * @access public * @static @@ -612,7 +618,7 @@ GROUP BY currency $receiptFrom = $params['from_email_id']; } elseif ($userID = $session->get('userID')) { - //check for loged in user. + //check for logged in user. list($userName, $userEmail) = CRM_Contact_BAO_Contact_Location::getEmailDetails($userID); } else { @@ -1080,6 +1086,7 @@ SELECT pledge.contact_id as contact_id, * & recreating so we want to block that if appropriate * * @param integer $pledgeID + * @param integer $pledgeStatusID * @return bool do financial transactions exist for this pledge? */ static function pledgeHasFinancialTransactions($pledgeID, $pledgeStatusID) { @@ -1105,6 +1112,7 @@ SELECT pledge.contact_id as contact_id, if (!in_array($statusID, self::getNonTransactionalStatus())) { return TRUE; } + return FALSE; } /** diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php index bf0b47f4b7..41f7746d33 100644 --- a/CRM/Utils/Hook.php +++ b/CRM/Utils/Hook.php @@ -253,7 +253,7 @@ abstract class CRM_Utils_Hook { * * @param string $op the type of operation being performed * @param string $objectName the name of the object - * @param object $id the object id if available + * @param int $id the object id if available * @param array $params the parameters used for object creation / editing * * @return null the return value is ignored -- 2.25.1