whitespace fixes

diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index a6833db5cff648fe26df150bb23f9e1daedfd827..2b338af3054f88d23da6ce40f409617c57e8abbf 100755 (executable)
--- 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 8924401ad9fbbd85b4c446dfe8edb057fd185899..ec83a0b2a082c17c22ea855b80d0cc2abfaf6102 100644 (file)
--- 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 1c1957a897614d960cf263113a5e396979a2cd50..f971de8cc8a0b08100fce951ee32a7e0880f71c8 100644 (file)
--- 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 78ea5b4be72954a2a001a4d88f30e0d9af47e823..681671ed41717f7e136f7285fbf3daa391b670f8 100644 (file)
--- 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 6649f07709cf1ea78952bfb9ad5cc5d42321e63d..a99bd5e377c7b228a01682a3b865d8ff0f9a1085 100644 (file)
--- 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