From df8d3074c2e0ee1872a13e1b1ce60ce61adbbc91 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sun, 11 Jan 2015 20:40:52 -0500 Subject: [PATCH] INFRA-132 - Standardize integer to int --- CRM/Case/BAO/Case.php | 2 +- CRM/Contact/BAO/Contact.php | 4 ++-- CRM/Contact/Form/Search/Custom/ActivitySearch.php | 2 +- CRM/Core/BAO/Discount.php | 2 +- CRM/Core/BAO/LocationType.php | 2 +- CRM/Core/Session.php | 2 +- CRM/Financial/BAO/FinancialAccount.php | 2 +- CRM/Mailing/PseudoConstant.php | 2 +- CRM/Member/BAO/Membership.php | 6 +++--- CRM/Price/BAO/PriceSet.php | 4 ++-- CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php | 2 +- CRM/Utils/System/Drupal.php | 2 +- CRM/Utils/System/Drupal6.php | 2 +- CRM/Utils/Weight.php | 6 +++--- Civi/Payment/System.php | 2 +- api/v3/Generic.php | 8 ++++---- api/v3/Profile.php | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 8ced021457..877907b6da 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -2360,7 +2360,7 @@ INNER JOIN civicrm_case_contact ON ( civicrm_case.id = civicrm_case_contact.cas * * @param bool $changeClient * - * @return integer|NULL + * @return int|NULL * @static */ static function mergeCases( diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php index 998f7cbd46..c1c0f27b1b 100644 --- a/CRM/Contact/BAO/Contact.php +++ b/CRM/Contact/BAO/Contact.php @@ -957,10 +957,10 @@ WHERE id={$id}; "; /** * Return proportional height and width of the image * - * @param Integer $imageWidth + * @param int $imageWidth * Width of image. * - * @param Integer $imageHeight + * @param int $imageHeight * Height of image. * * @return Array diff --git a/CRM/Contact/Form/Search/Custom/ActivitySearch.php b/CRM/Contact/Form/Search/Custom/ActivitySearch.php index 2c9aeca5f0..a11cfc0049 100644 --- a/CRM/Contact/Form/Search/Custom/ActivitySearch.php +++ b/CRM/Contact/Form/Search/Custom/ActivitySearch.php @@ -360,7 +360,7 @@ ORDER BY contact_a.sort_name'; /** * Functions below generally don't need to be modified - * @return integer + * @return int */ public function count() { $sql = $this->all(); diff --git a/CRM/Core/BAO/Discount.php b/CRM/Core/BAO/Discount.php index 875e202c24..b0a79ff84f 100644 --- a/CRM/Core/BAO/Discount.php +++ b/CRM/Core/BAO/Discount.php @@ -113,7 +113,7 @@ class CRM_Core_BAO_Discount extends CRM_Core_DAO_Discount { * @param string $entityTable * Entity table to be searched. * - * @return integer + * @return int * $dao->id discount id of the set which matches * the date criteria */ diff --git a/CRM/Core/BAO/LocationType.php b/CRM/Core/BAO/LocationType.php index 004133f732..0a8bea79b3 100644 --- a/CRM/Core/BAO/LocationType.php +++ b/CRM/Core/BAO/LocationType.php @@ -107,7 +107,7 @@ class CRM_Core_BAO_LocationType extends CRM_Core_DAO_LocationType { /* * Get ID of billing location type - * @return integer + * @return int */ /** * @return mixed|null diff --git a/CRM/Core/Session.php b/CRM/Core/Session.php index 2f6746a5bc..85f41d62e2 100644 --- a/CRM/Core/Session.php +++ b/CRM/Core/Session.php @@ -557,7 +557,7 @@ class CRM_Core_Session { /** * Retrieve contact id of the logged in user - * @return integer|NULL + * @return int|NULL * contact ID of logged in user */ public static function getLoggedInContactID() { diff --git a/CRM/Financial/BAO/FinancialAccount.php b/CRM/Financial/BAO/FinancialAccount.php index 8af6227699..24e5b985c8 100644 --- a/CRM/Financial/BAO/FinancialAccount.php +++ b/CRM/Financial/BAO/FinancialAccount.php @@ -191,7 +191,7 @@ WHERE cft.id = %1 * @param string $accountTypeCode * account type code * - * @return integer + * @return int * count * @static */ diff --git a/CRM/Mailing/PseudoConstant.php b/CRM/Mailing/PseudoConstant.php index 1fcfba314e..120f507416 100644 --- a/CRM/Mailing/PseudoConstant.php +++ b/CRM/Mailing/PseudoConstant.php @@ -113,7 +113,7 @@ class CRM_Mailing_PseudoConstant extends CRM_Core_PseudoConstant { * @param $undefined * The value to use if no default is defined. * - * @return integer + * @return int * The ID of the default mailing component. * @static */ diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index 5edbfefe08..a840e575ee 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -1189,7 +1189,7 @@ INNER JOIN civicrm_membership_type type ON ( type.id = membership.membership_ty * @param bool|int $isTest if true, membership is for a test site * @param bool|int $isOwner if true, only retrieve membership records for owners //LCD * - * @return integer + * @return int * the number of members of type $membershipTypeId whose * start_date is between $startDate and $endDate */ @@ -2173,7 +2173,7 @@ INNER JOIN civicrm_contact contact ON ( contact.id = membership.contact_id AND * Date on which to end counting. * @param bool|int $isTest if true, membership is for a test site * - * @return integer + * @return int * returns the number of members of type $membershipTypeId * whose join_date is before $startDate and * whose start_date is between $startDate and $endDate @@ -2696,7 +2696,7 @@ INNER JOIN civicrm_contact contact ON ( contact.id = membership.contact_id AND * @param int $membershipId * Membership id. * - * @return integer + * @return int * contribution id */ public static function getMembershipContributionId($membershipId) { diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php index 166355e3db..2c9de659ee 100644 --- a/CRM/Price/BAO/PriceSet.php +++ b/CRM/Price/BAO/PriceSet.php @@ -375,7 +375,7 @@ WHERE ct.id = cp.financial_type_id AND * @param null $isQuickConfig * @param null $setName * - * @return integer|false + * @return int|false * price_set_id, or false if none found */ public static function getFor($entityTable, $entityId, $usedFor = NULL, $isQuickConfig = NULL, &$setName = NULL) { @@ -413,7 +413,7 @@ WHERE ct.id = cp.financial_type_id AND * array may contain either option id or * price field id * - * @return integer|NULL + * @return int|NULL * price set id on success, null otherwise * @static */ diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php index c2e3465ac7..918dd8875c 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Set.php @@ -347,7 +347,7 @@ WHERE ct.id = cp.contribution_type_id AND * @param null $isQuickConfig * @param null $setName * - * @return integer|false + * @return int|false * price_set_id, or false if none found */ public static function getFor($entityTable, $entityId, $usedFor = NULL, $isQuickConfig = NULL, &$setName = NULL) { diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php index ad429b150b..4b25dc9229 100644 --- a/CRM/Utils/System/Drupal.php +++ b/CRM/Utils/System/Drupal.php @@ -100,7 +100,7 @@ class CRM_Utils_System_Drupal extends CRM_Utils_System_DrupalBase { /* * Change user name in host CMS * - * @param integer $ufID User ID in CMS + * @param int $ufID User ID in CMS * @param string $ufName User name */ /** diff --git a/CRM/Utils/System/Drupal6.php b/CRM/Utils/System/Drupal6.php index 14f6f2f30c..35472c9d42 100644 --- a/CRM/Utils/System/Drupal6.php +++ b/CRM/Utils/System/Drupal6.php @@ -124,7 +124,7 @@ class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase { /* * Change user name in host CMS * - * @param integer $ufID User ID in CMS + * @param int $ufID User ID in CMS * @param string $ufName User name */ /** diff --git a/CRM/Utils/Weight.php b/CRM/Utils/Weight.php index aebc9a9695..7f823e6d2f 100644 --- a/CRM/Utils/Weight.php +++ b/CRM/Utils/Weight.php @@ -199,7 +199,7 @@ class CRM_Utils_Weight { * @param string $weightField * Field which used to get the wt, default to 'weight'. * - * @return integer + * @return int */ public static function getNewWeight($daoName, $fieldValues = NULL, $weightField = 'weight') { $selectField = "id AS fieldID, $weightField AS weight"; @@ -241,7 +241,7 @@ class CRM_Utils_Weight { * Field which contains the weight value,. * defaults to 'weight' * - * @return integer + * @return int */ public static function getMax($daoName, $fieldValues = NULL, $weightField = 'weight') { $selectField = "MAX(ROUND($weightField)) AS max_weight"; @@ -264,7 +264,7 @@ class CRM_Utils_Weight { * Field which contains the weight value,. * defaults to 'weight' * - * @return integer + * @return int */ public static function getDefaultWeight($daoName, $fieldValues = NULL, $weightField = 'weight') { $maxWeight = CRM_Utils_Weight::getMax($daoName, $fieldValues, $weightField); diff --git a/Civi/Payment/System.php b/Civi/Payment/System.php index f72aaab48d..9b1b9d491f 100644 --- a/Civi/Payment/System.php +++ b/Civi/Payment/System.php @@ -59,7 +59,7 @@ class System { } /** - * @param integer $id + * @param int $id * @throws \CiviCRM_API3_Exception */ public function getById($id) { diff --git a/api/v3/Generic.php b/api/v3/Generic.php index 7a6e998610..4de5a5db66 100644 --- a/api/v3/Generic.php +++ b/api/v3/Generic.php @@ -150,7 +150,7 @@ function civicrm_api3_generic_getfields($apiRequest) { * Api request as an array. Keys are. * * @throws API_Exception - * @return integer + * @return int * count of results */ function civicrm_api3_generic_getcount($apiRequest) { @@ -171,7 +171,7 @@ function civicrm_api3_generic_getcount($apiRequest) { * @param array $apiRequest * Api request as an array. Keys are. * - * @return integer + * @return int * count of results */ function civicrm_api3_generic_getsingle($apiRequest) { @@ -196,7 +196,7 @@ function civicrm_api3_generic_getsingle($apiRequest) { * @param array $apiRequest * Api request as an array. Keys are. * - * @return integer + * @return int * count of results */ function civicrm_api3_generic_getvalue($apiRequest) { @@ -264,7 +264,7 @@ function civicrm_api3_generic_getrefcount($apiRequest) { * @param array $apiRequest * Api request as an array. Keys are. * - * @return integer + * @return int * count of results */ function civicrm_api3_generic_replace($apiRequest) { diff --git a/api/v3/Profile.php b/api/v3/Profile.php index d9984bc160..75f5700761 100644 --- a/api/v3/Profile.php +++ b/api/v3/Profile.php @@ -697,7 +697,7 @@ function _civicrm_api3_map_profile_fields_to_entity(&$field) { * * @param int $profileID * - * @return integer|string + * @return int|string * @throws CiviCRM_API3_Exception */ function _civicrm_api3_profile_getProfileID($profileID) { -- 2.25.1