From 4c16123d9fac77eb6704aefc0b6cf6a91b46a650 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 5 Jan 2015 18:19:17 +1300
Subject: [PATCH] whitespace fixes

---
 CRM/Batch/Form/Entry.php                      |  2 +-
 CRM/Contact/Form/Task/Label.php               |  2 +-
 CRM/Member/BAO/Membership.php                 | 24 +++++++++----------
 api/v3/utils.php                              |  4 ++--
 .../WebTest/Case/CaseCustomFieldsTest.php     |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index a6833db5cf..2b338af305 100755
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -837,7 +837,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
    * then it probably means there is some functionality that needs to be moved
    * out of the form layer
    *
-   * @param unknown_type $params
+   * @param array $params
    *
    * @return bool
    */
diff --git a/CRM/Contact/Form/Task/Label.php b/CRM/Contact/Form/Task/Label.php
index 8924401ad9..ec83a0b2a0 100644
--- a/CRM/Contact/Form/Task/Label.php
+++ b/CRM/Contact/Form/Task/Label.php
@@ -398,7 +398,7 @@ class CRM_Contact_Form_Task_Label extends CRM_Contact_Form_Task {
   }
 
   /**
-   * @param $rows
+   * @param array $rows
    */
   public function mergeSameAddress(&$rows) {
     $uniqueAddress = array();
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 1c1957a897..f971de8cc8 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -977,12 +977,12 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
     if (!$membershipId) {
       // CRM-15475
       $statusIds[] = array_search(
-        'Cancelled', 
+        'Cancelled',
         CRM_Member_PseudoConstant::membershipStatus(
-          NULL, 
-          " name = 'Cancelled' ", 
-          'name', 
-          FALSE, 
+          NULL,
+          " name = 'Cancelled' ",
+          'name',
+          FALSE,
           TRUE
         )
       );
@@ -2714,7 +2714,7 @@ WHERE      civicrm_membership.is_test = 0";
         !in_array($dao->status_id, array(array_search('Pending', $allStatus),
             // CRM-15475
             array_search(
-              'Cancelled', 
+              'Cancelled',
               CRM_Member_PseudoConstant::membershipStatus(NULL, " name = 'Cancelled' ", 'name', FALSE, TRUE)
             ),
             array_search('Expired', $allStatus),
@@ -2952,15 +2952,15 @@ WHERE      civicrm_membership.is_test = 0";
       2 => array(
         // CRM-15475
         array_search(
-          'Cancelled', 
+          'Cancelled',
           CRM_Member_PseudoConstant::membershipStatus(
-            NULL, 
-            " name = 'Cancelled' ", 
-            'name', 
-            FALSE, 
+            NULL,
+            " name = 'Cancelled' ",
+            'name',
+            FALSE,
             TRUE
           )
-        ), 
+        ),
         'Integer'
       ),
       3 => array($isTest, 'Boolean'),
diff --git a/api/v3/utils.php b/api/v3/utils.php
index 78ea5b4be7..681671ed41 100644
--- a/api/v3/utils.php
+++ b/api/v3/utils.php
@@ -960,7 +960,7 @@ function _civicrm_api3_custom_format_params($params, &$values, $extends, $entity
       if ($checkCheckBoxField && !empty($fields['custom_' . $customFieldID]) && $fields['custom_' . $customFieldID]['html_type'] == 'CheckBox') {
         formatCheckBoxField($value, 'custom_' . $customFieldID, $entity);
       }
-      
+
       CRM_Core_BAO_CustomField::formatCustomField($customFieldID, $values['custom'],
         $value, $extends, $customValueID, $entityId, FALSE, FALSE, TRUE
       );
@@ -1723,7 +1723,7 @@ function _civicrm_api3_swap_out_aliases(&$apiRequest, $fields) {
 
 /**
  * Validate integer fields being passed into API.
- * It currently converts the incoming value 'user_contact_id' into the id of the currenty logged in user
+ * It currently converts the incoming value 'user_contact_id' into the id of the currently logged in user
  *
  * @param array $params params from civicrm_api
  * @param string $fieldName uniquename of field being checked
diff --git a/tests/phpunit/WebTest/Case/CaseCustomFieldsTest.php b/tests/phpunit/WebTest/Case/CaseCustomFieldsTest.php
index 6649f07709..a99bd5e377 100644
--- a/tests/phpunit/WebTest/Case/CaseCustomFieldsTest.php
+++ b/tests/phpunit/WebTest/Case/CaseCustomFieldsTest.php
@@ -246,7 +246,7 @@ class WebTest_Case_CaseCustomFieldsTest extends CiviSeleniumTestCase {
 
   /**
    * @param $customGrpId1
-   * @param int $customId
+   * @param array $customId
    */
   public function _testDeleteCustomData($customGrpId1, $customId) {
     // delete all custom data
-- 
2.25.1