INFRA-132 - Standardize integer to int

diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 8ced021457af6ca94d5237c04c59902f9a2c3daa..877907b6dad0be0a8d5025374f1c1dd605ad3ea0 100644 (file)
--- 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 998f7cbd46e4147f5ccee138dc218660390c7cf9..c1c0f27b1bc87872a59294e9005d4355b21e0e4c 100644 (file)
--- 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 2c9aeca5f0bdd8aba3bd646c82e74eca3427f08e..a11cfc0049ce75554ceada97ccab891e890cc23e 100644 (file)
--- 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 875e202c24f1f4c7769e519b64eb365e1d088e77..b0a79ff84f426ecc9639f98a64bee66cae060741 100644 (file)
--- 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 004133f732ca977544aa96257019f6eef262469a..0a8bea79b39dfa5255588ad780459e87234e4719 100644 (file)
--- 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 2f6746a5bcd2a6ecc3feebb1152096301307f234..85f41d62e2a9ae40c56c9bc706c9c47046279352 100644 (file)
--- 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 8af62276999e9622ce25ab8728b033bf8ef03f5d..24e5b985c842cb9ebe4aa1e4d5b15c2337499267 100644 (file)
--- 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 1fcfba314e622d50819ac816e9e0d9153707987b..120f507416fd4443ac694a45bf95f6f18af2f52d 100644 (file)
--- 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 5edbfefe08f53bf596026385314c103ea00796a4..a840e575ee3f4a7a3023db5946bd5c01faf67746 100644 (file)
--- 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 166355e3db5c032e341910d20d2a9a64e1661c78..2c9de659ee75b9ed39ef066ae8f20ba2b31bec22 100644 (file)
--- 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 c2e3465ac7f0172c98fb315edf87f7c20add3be0..918dd8875ca2f67f450761aa037f56b6f17ab255 100644 (file)
--- 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 ad429b150bb7e3b77c2d284abfee2bea312cba7b..4b25dc92295b7768fb5a492faa004a7116ab9a51 100644 (file)
--- 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 14f6f2f30cddeb42502a839e530ad26232ccb837..35472c9d420accc20803555866be970dff94c92b 100644 (file)
--- 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 aebc9a9695a30c1a408b38bc0d61512469174e76..7f823e6d2f5624051deb992b86402d78cbe9a19b 100644 (file)
--- 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 f72aaab48d7a73662946480ad1449de66adb630f..9b1b9d491f2753070ed88fac7475a6c26948eb19 100644 (file)
--- 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 7a6e9986106e27bd4f78e78219f6c6e64d41ff2a..4de5a5db663b72c8df0ed491994f0d3f7e399fbb 100644 (file)
--- 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 d9984bc160afa6a90d8a291b6a9dd86cb6bfaadf..75f5700761003f3d6202e34564ecf90a3c152ce3 100644 (file)
--- 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) {