INFRA-132 - Remove extra spaces around '.'

diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php
index 853d7880d7207a963af4aa1e6f0d63805ebd6ee6..7ae6a638da6bb127cd5599c348c18b5f8bd8ff56 100644 (file)
--- a/CRM/Activity/Page/AJAX.php
+++ b/CRM/Activity/Page/AJAX.php
@@ -92,7 +92,7 @@ class CRM_Activity_Page_AJAX {
     //CRM-14466 initialize variable to avoid php notice
     $sortSQL = "";
     if ($sort && $sortOrder) {
-      $sortSQL = $sort  . ' ' . $sortOrder;
+      $sortSQL = $sort . ' ' . $sortOrder;
     }
 
     // get the activities related to given case
@@ -129,7 +129,7 @@ class CRM_Activity_Page_AJAX {
 
     $params = $_POST;
     if ($sort && $sortOrder) {
-      $sortSQL = $sort  . ' ' . $sortOrder;
+      $sortSQL = $sort . ' ' . $sortOrder;
     }
 
     // Retrieve ALL client relationships
@@ -194,7 +194,7 @@ class CRM_Activity_Page_AJAX {
 
     $params = $_POST;
     if ($sort && $sortOrder) {
-      $sortSQL = $sort  . ' ' . $sortOrder;
+      $sortSQL = $sort . ' ' . $sortOrder;
     }
 
     $caseRelationships = CRM_Case_BAO_Case::getCaseRoles($contactID, $caseID);
@@ -270,12 +270,12 @@ class CRM_Activity_Page_AJAX {
       list($typeLabel) = explode('<', $row['relation']);
       // view user links
       if (!empty($row['cid'])) {
-        $row['name'] = '<a class="view-contact" title="' .  ts('View Contact')  . '" href=' . CRM_Utils_System::url('civicrm/contact/view',
+        $row['name'] = '<a class="view-contact" title="' . ts('View Contact') . '" href=' . CRM_Utils_System::url('civicrm/contact/view',
           'action=view&reset=1&cid=' . $row['cid']) . '>' . $row['name'] . '</a>';
       }
       // email column links/icon
       if ($row['email']) {
-        $row['email'] = '<a class="crm-hover-button crm-popup" href="' . CRM_Utils_System::url('civicrm/activity/email/add', 'reset=1&action=add&atype=3&cid=' . $row['cid']) . '&caseid=' . $caseID . '" title="' .  ts('Send an Email') . '"><span class="icon ui-icon-mail-closed"></span></a>';
+        $row['email'] = '<a class="crm-hover-button crm-popup" href="' . CRM_Utils_System::url('civicrm/activity/email/add', 'reset=1&action=add&atype=3&cid=' . $row['cid']) . '&caseid=' . $caseID . '" title="' . ts('Send an Email') . '"><span class="icon ui-icon-mail-closed"></span></a>';
       }
       // edit links
       $row['actions'] = '';
@@ -285,17 +285,17 @@ class CRM_Activity_Page_AJAX {
         switch ($row['source']) {
           case 'caseRel':
             $row['actions'] =
-            '<a href="#editCaseRoleDialog" title="' .  ts('Reassign %1', array(1 => $typeLabel))  . '" class="crm-hover-button case-miniform" data-contact_type="' . $contactType . '" data-rel_type="' .  $row['relation_type']  . '" data-rel_id="' .  $row['rel_id']  . '"data-key="' .  CRM_Core_Key::get('civicrm/ajax/relation')  . '">' .
+            '<a href="#editCaseRoleDialog" title="' . ts('Reassign %1', array(1 => $typeLabel)) . '" class="crm-hover-button case-miniform" data-contact_type="' . $contactType . '" data-rel_type="' . $row['relation_type'] . '" data-rel_id="' . $row['rel_id'] . '"data-key="' . CRM_Core_Key::get('civicrm/ajax/relation') . '">' .
               '<span class="icon ui-icon-pencil"></span>' .
             '</a>' .
-            '<a href="#deleteCaseRoleDialog" title="' .  ts('Remove %1', array(1 => $typeLabel))  . '" class="crm-hover-button case-miniform" data-contact_type="' . $contactType . '" data-rel_type="' . $row['relation_type'] . '" data-key="' .  CRM_Core_Key::get('civicrm/ajax/delcaserole')  . '">' .
+            '<a href="#deleteCaseRoleDialog" title="' . ts('Remove %1', array(1 => $typeLabel)) . '" class="crm-hover-button case-miniform" data-contact_type="' . $contactType . '" data-rel_type="' . $row['relation_type'] . '" data-key="' . CRM_Core_Key::get('civicrm/ajax/delcaserole') . '">' .
               '<span class="icon delete-icon"></span>' .
             '</a>';
             break;
 
           case 'caseRoles':
             $row['actions'] =
-            '<a href="#editCaseRoleDialog" title="' .  ts('Assign %1', array(1 => $typeLabel))  . '" class="crm-hover-button case-miniform" data-contact_type="' . $contactType . '" data-rel_type="' .  $row['relation_type']  . '" data-key="' .  CRM_Core_Key::get('civicrm/ajax/relation')  . '">' .
+            '<a href="#editCaseRoleDialog" title="' . ts('Assign %1', array(1 => $typeLabel)) . '" class="crm-hover-button case-miniform" data-contact_type="' . $contactType . '" data-rel_type="' . $row['relation_type'] . '" data-key="' . CRM_Core_Key::get('civicrm/ajax/relation') . '">' .
               '<span class="icon ui-icon-pencil"></span>' .
             '</a>';
             break;

diff --git a/CRM/Admin/Form/Extensions.php b/CRM/Admin/Form/Extensions.php
index 31be15dfd0c43a634c361ae4467a1dca5a8c4d6b..d5a7d7031135e0cf250b3d99dee09371a8c0015b 100644 (file)
--- a/CRM/Admin/Form/Extensions.php
+++ b/CRM/Admin/Form/Extensions.php
@@ -108,12 +108,12 @@ class CRM_Admin_Form_Extensions extends CRM_Admin_Form {
     switch ($this->_action) {
       case CRM_Core_Action::ADD:
         $buttonName = ts('Install');
-        $title = ts('Install ' . $extName  . '?');
+        $title = ts('Install ' . $extName . '?');
         break;
 
       case CRM_Core_Action::UPDATE:
         $buttonName = ts('Download and Install');
-        $title = ts('Download and Install ' . $extName  . '?');
+        $title = ts('Download and Install ' . $extName . '?');
         break;
 
       case CRM_Core_Action::DELETE:

diff --git a/CRM/Badge/Form/Layout.php b/CRM/Badge/Form/Layout.php
index 4379559175278106425c3bece8f2499fb19fddff..cea31003591c067b8d08ae68565649ca5649f800 100644 (file)
--- a/CRM/Badge/Form/Layout.php
+++ b/CRM/Badge/Form/Layout.php
@@ -54,7 +54,7 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form {
     $resources = CRM_Core_Resources::singleton();
     $resources->addSetting(
       array(
-        'kcfinderPath' => $config->userFrameworkResourceURL  . 'packages'  . DIRECTORY_SEPARATOR
+        'kcfinderPath' => $config->userFrameworkResourceURL . 'packages' . DIRECTORY_SEPARATOR
       )
     );
     $resources->addScriptFile('civicrm', 'templates/CRM/Badge/Form/Layout.js', 1, 'html-header');

diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
index 3a389e200ff3c6bce5495cf9a3ee35b15e482f33..3a161b4fe9f275e53076d2fe067754aa9e91d898 100755 (executable)
--- a/CRM/Batch/BAO/Batch.php
+++ b/CRM/Batch/BAO/Batch.php
@@ -780,7 +780,7 @@ WHERE  {$where}
   public static function getBatchNames($batchIds) {
     $query = 'SELECT id, title
       FROM civicrm_batch
-      WHERE id IN (' .  $batchIds . ')';
+      WHERE id IN (' . $batchIds . ')';
 
     $batches = array();
     $dao = CRM_Core_DAO::executeQuery($query);

diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index fc2d9622fd9a3e3d98ee6b24cb061cf0531aeee2..7f5c87f6a917e4ce83e107a2d8496fe9581b48dc 100755 (executable)
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -492,7 +492,7 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form {
 
         // build line item params
         $this->_priceSet['fields'][$priceFieldID]['options'][$priceFieldValueID]['amount'] = $value['total_amount'];
-        $value['price_' .  $priceFieldID] = 1;
+        $value['price_' . $priceFieldID] = 1;
 
         $lineItem = array();
         CRM_Price_BAO_PriceSet::processAmount($this->_priceSet['fields'], $value, $lineItem[$priceSetId]);

diff --git a/CRM/Contribute/Form/ContributionView.php b/CRM/Contribute/Form/ContributionView.php
index 425414cd9148ab1a20e7fe8aa3b0b06031b2dac6..a20189bddd02c1d462b1f90d3da7f282af0554ad 100644 (file)
--- a/CRM/Contribute/Form/ContributionView.php
+++ b/CRM/Contribute/Form/ContributionView.php
@@ -168,7 +168,7 @@ class CRM_Contribute_Form_ContributionView extends CRM_Core_Form {
     }
 
     // omitting contactImage from title for now since the summary overlay css doesn't work outside of our crm-container
-    CRM_Utils_System::setTitle(ts('View Contribution from') .  ' ' . $displayName);
+    CRM_Utils_System::setTitle(ts('View Contribution from') . ' ' . $displayName);
 
     // add viewed contribution to recent items list
     $url = CRM_Utils_System::url('civicrm/contact/view/contribution',

diff --git a/CRM/Contribute/PseudoConstant.php b/CRM/Contribute/PseudoConstant.php
index 5cd2a80d8da25483a5b249cb4917ef8644db9d68..70b54ac57b72aeed38755e0b12342df57e7ddfad 100644 (file)
--- a/CRM/Contribute/PseudoConstant.php
+++ b/CRM/Contribute/PseudoConstant.php
@@ -160,7 +160,7 @@ class CRM_Contribute_PseudoConstant extends CRM_Core_PseudoConstant {
   public static function &financialAccount($id = NULL, $financialAccountTypeId = NULL, $retrieveColumn = 'name', $key = 'id') {
     $condition = NULL;
     if ($financialAccountTypeId) {
-      $condition = " financial_account_type_id = " .  $financialAccountTypeId;
+      $condition = " financial_account_type_id = " . $financialAccountTypeId;
     }
     $cacheKey = "{$id}_{$financialAccountTypeId}_{$retrieveColumn}_{$key}";
     if (!isset(self::$financialAccount[$cacheKey])) {

diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php
index c04ba2999572bb4f1b358a3235772ccb360b1b6d..0f878431bd3df021b4ad824dbfb9877847673c93 100644 (file)
--- a/CRM/Core/BAO/ActionSchedule.php
+++ b/CRM/Core/BAO/ActionSchedule.php
@@ -1207,7 +1207,7 @@ reminder.action_schedule_id = %1";
         $date = $operator . "({$dateField}, INTERVAL {$actionSchedule->start_action_offset} {$actionSchedule->start_action_unit})";
         $startDateClause[] = "'{$now}' >= {$date}";
         if ($mapping->entity == 'civicrm_participant') {
-          $startDateClause[] = $operator .  "({$now}, INTERVAL 1 DAY ) {$op} " . $dateField;
+          $startDateClause[] = $operator . "({$now}, INTERVAL 1 DAY ) {$op} " . $dateField;
         }
         else {
           $startDateClause[] = "DATE_SUB({$now}, INTERVAL 1 DAY ) <= {$date}";
@@ -1390,7 +1390,7 @@ WHERE     m.owner_membership_id IS NOT NULL AND
     }
 
     if (!empty($excludeIds)) {
-      $clause = "AND {$field} NOT IN ( "  . implode(', ', $excludeIds) . ' ) ';
+      $clause = "AND {$field} NOT IN ( " . implode(', ', $excludeIds) . ' ) ';
       return $clause;
     }
     return NULL;

diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php
index 169b2dfb0a674ff71a93e6d2b59ca23a0c4293ba..7fb4aa0e52dfbf91635fd950aeb81d04edfa2f2a 100644 (file)
--- a/CRM/Core/BAO/Navigation.php
+++ b/CRM/Core/BAO/Navigation.php
@@ -630,7 +630,7 @@ ORDER BY parent_id, weight";
           <ul id='civicrm-home'>
             <li><a href='$homeURL'>$homeLabel</a></li>
             <li><a href='#' class='crm-hidemenu'>$hideLabel</a></li>
-            <li><a href='$logoutURL' class='crm-logout-link'>" .  ts('Log out')  . "</a></li>
+            <li><a href='$logoutURL' class='crm-logout-link'>" . ts('Log out') . "</a></li>
           </ul>";
       // <li> tag doesn't need to be closed
     }

diff --git a/CRM/Core/BAO/Setting.php b/CRM/Core/BAO/Setting.php
index ae9af0d1a4a40157ec3986667270a6d36882d18a..8c2a3b7f316cd97700fb705eefe80e53dcc79b16 100644 (file)
--- a/CRM/Core/BAO/Setting.php
+++ b/CRM/Core/BAO/Setting.php
@@ -663,7 +663,7 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting {
       $settingsMetadata = CRM_Core_BAO_Cache::getItem('CiviCRM setting Spec', 'All', $componentID);
       if (empty($settingsMetadata)) {
         global $civicrm_root;
-        $metaDataFolders = array($civicrm_root .  '/settings');
+        $metaDataFolders = array($civicrm_root . '/settings');
         CRM_Utils_Hook::alterSettingsFolders($metaDataFolders);
         $settingsMetadata = self::loadSettingsMetaDataFolders($metaDataFolders);
         CRM_Core_BAO_Cache::setItem($settingsMetadata,'CiviCRM setting Spec', 'All', $componentID);

diff --git a/CRM/Core/BAO/Tag.php b/CRM/Core/BAO/Tag.php
index 0a81bde29a9aef592df18aaeb1dc24241f8938f6..e845b11b381e53ca4a953b4056402a57a8958a90 100644 (file)
--- a/CRM/Core/BAO/Tag.php
+++ b/CRM/Core/BAO/Tag.php
@@ -304,7 +304,7 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
     $formattedTags = array();
     foreach ($tags as $key => $tag) {
       if (!empty($tag[2])) {
-        $key = $tag[2] .  "-" . $key;
+        $key = $tag[2] . "-" . $key;
       }
       $formattedTags[$key] = $tag[0] . $tag[1];
     }

diff --git a/CRM/Core/CodeGen/Main.php b/CRM/Core/CodeGen/Main.php
index 567c466f2370b1c7d8b11b9a48aa64b3b84f082e..a395224489ba30427d1ece8f2d91e0a41db3ec61 100644 (file)
--- a/CRM/Core/CodeGen/Main.php
+++ b/CRM/Core/CodeGen/Main.php
@@ -76,7 +76,7 @@ class CRM_Core_CodeGen_Main {
       unlink($this->digestPath);
     }
 
-    echo "\ncivicrm_domain.version := " .  $this->db_version . "\n\n";
+    echo "\ncivicrm_domain.version := " . $this->db_version . "\n\n";
     if ($this->buildVersion < 1.1) {
       echo "The Database is not compatible for this version";
       exit();

diff --git a/CRM/Core/CodeGen/Util/Template.php b/CRM/Core/CodeGen/Util/Template.php
index 1fc02d62d1e965ec1cb0e8e5b529937a9c14bf7c..36d7db36dd41d0f9a462fbddcbe8f6d693197935 100644 (file)
--- a/CRM/Core/CodeGen/Util/Template.php
+++ b/CRM/Core/CodeGen/Util/Template.php
@@ -50,7 +50,7 @@ class CRM_Core_CodeGen_Util_Template {
     }
     foreach ($inputs as $infile) {
       // FIXME: does not beautify.  Document.
-      file_put_contents($outpath, $this->smarty->fetch($infile)  . "\n", FILE_APPEND);
+      file_put_contents($outpath, $this->smarty->fetch($infile) . "\n", FILE_APPEND);
     }
   }
 

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index e34c6fa1efd82d5d3ffbb81d15d87a0467e10ebe..0f42fad21f3756f6214ef0ad3b7a9a7a50f30620 100644 (file)
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -739,7 +739,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
               break;
 
             case 'string':
-              $args[] = '"' . CRM_Utils_String::ellipsify(addcslashes((string) $arg, "\r\n\t\""), $maxArgLen) .  '"';
+              $args[] = '"' . CRM_Utils_String::ellipsify(addcslashes((string) $arg, "\r\n\t\""), $maxArgLen) . '"';
               break;
 
             case 'array':

diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index 953678f32d83f946453a584489d04f8442fbd19a..3e4494422c8a0bf7d79ed1ac3cc53d5813a9a4df 100644 (file)
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -266,7 +266,7 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
       $display[] = $val['label'];
     }
 
-    $el['html'] = implode('; ', $display) . '<input type="hidden" value="' .  $field->getValue() . '" name="' . $field->getAttribute('name') . '">';
+    $el['html'] = implode('; ', $display) . '<input type="hidden" value="' . $field->getValue() . '" name="' . $field->getAttribute('name') . '">';
   }
 
   /**

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index fa8f5602eaeaccf3bd582a2aebea2d64556e08c8..d478d2db16b509ee30dabc96d4c1210b49bedd6d 100644 (file)
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -1473,7 +1473,7 @@ WHERE  id = %1";
    * @return array - array of all payment processor types
    */
   public static function &paymentProcessorType($all = FALSE, $id = NULL, $return = 'title') {
-    $cacheKey = $id . '_'  . $return;
+    $cacheKey = $id . '_' . $return;
     if (empty(self::$paymentProcessorType[$cacheKey])) {
       self::populate(self::$paymentProcessorType[$cacheKey], 'CRM_Financial_DAO_PaymentProcessorType', $all, $return, 'is_active', NULL, "is_default, $return", 'id');
     }

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index cc714c9c8974c323c47b1cbdcb0569cedbe55002..e87b4aab7dfd1151942d7b7f0b2aa0c3413843ad 100644 (file)
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -1104,7 +1104,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
 
       // also add location name to the array
       $params["address_name-{$this->_bltID}"] =
-        CRM_Utils_Array::value('billing_first_name', $params)  . ' ' .
+        CRM_Utils_Array::value('billing_first_name', $params) . ' ' .
         CRM_Utils_Array::value('billing_middle_name', $params) . ' ' .
         CRM_Utils_Array::value('billing_last_name', $params);
 

diff --git a/CRM/Event/Form/ParticipantView.php b/CRM/Event/Form/ParticipantView.php
index ba3aba2b7550087546b2961dfac2c78b1fae63b1..43510502fe32e7e3f4a70358c165bc6492fc9fa3 100644 (file)
--- a/CRM/Event/Form/ParticipantView.php
+++ b/CRM/Event/Form/ParticipantView.php
@@ -194,7 +194,7 @@ class CRM_Event_Form_ParticipantView extends CRM_Core_Form {
     }
     $this->assign('displayName', $displayName);
     // omitting contactImage from title for now since the summary overlay css doesn't work outside of our crm-container
-    CRM_Utils_System::setTitle(ts('View Event Registration for') .  ' ' . $displayName);
+    CRM_Utils_System::setTitle(ts('View Event Registration for') . ' ' . $displayName);
 
     $roleId = CRM_Utils_Array::value('role_id', $values[$participantID]);
     $title = $displayName . ' (' . CRM_Utils_Array::value($roleId, $participantRoles) . ' - ' . $eventTitle . ')';

diff --git a/CRM/Financial/BAO/ExportFormat.php b/CRM/Financial/BAO/ExportFormat.php
index 6d14587708c0eddf45af7b23cba8387921d7a2bd..b7af63b929b0e42c02e4f5e958914d1a0f084a91 100644 (file)
--- a/CRM/Financial/BAO/ExportFormat.php
+++ b/CRM/Financial/BAO/ExportFormat.php
@@ -197,14 +197,14 @@ class CRM_Financial_BAO_ExportFormat {
     $details = '<p>' . ts('Record:') . ' ' . $values['title'] . '</p><p>' . ts('Description:') . '</p><p>' . ts('Created By:') . " $createdBy" . '</p><p>' . ts('Created Date:') . ' ' . $values['created_date'] . '</p><p>' . ts('Last Modified By:') . ' ' . $modifiedBy . '</p><p>' . ts('Payment Instrument:') . ' ' . $values['payment_instrument_id'] . '</p>';
     $subject = '';
     if (!empty($values['total'])) {
-      $subject .= ts('Total') . '[' .  CRM_Utils_Money::format($values['total'])  . '],';
+      $subject .= ts('Total') . '[' . CRM_Utils_Money::format($values['total']) . '],';
     }
     if (!empty($values['item_count'])) {
-      $subject .= ' ' . ts('Count') . '[' .  $values['item_count']  . '],';
+      $subject .= ' ' . ts('Count') . '[' . $values['item_count'] . '],';
     }
 
     //create activity.
-    $subject .= ' ' . ts('Batch') . '[' .  $values['title']  . ']';
+    $subject .= ' ' . ts('Batch') . '[' . $values['title'] . ']';
     $activityTypes = CRM_Core_PseudoConstant::activityType(TRUE, FALSE, FALSE, 'name');
     $activityParams = array(
       'activity_type_id' => array_search('Export Accounting Batch', $activityTypes),

diff --git a/CRM/Financial/BAO/ExportFormat/IIF.php b/CRM/Financial/BAO/ExportFormat/IIF.php
index 5043255088ad30743082090111be1dd84c98142f..76891bcad5179eaaf83ee65ce0f7a5cbf00ca4ae 100644 (file)
--- a/CRM/Financial/BAO/ExportFormat/IIF.php
+++ b/CRM/Financial/BAO/ExportFormat/IIF.php
@@ -263,7 +263,7 @@ class CRM_Financial_BAO_ExportFormat_IIF extends CRM_Financial_BAO_ExportFormat
               'trxn_date' => $this->format($itemDAO->transaction_date, 'date'),
               'spl_id' => $this->format($itemDAO->financial_item_id),
               'account_name' => $this->format($itemDAO->account_name),
-              'amount' => '-'  . $this->format($itemDAO->amount, 'money'),
+              'amount' => '-' . $this->format($itemDAO->amount, 'money'),
               'contact_name' => $this->format($itemDAO->contact_name),
               'payment_instrument' => $this->format($itemDAO->payment_instrument),
               'description' => $this->format($itemDAO->description),

diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php
index d5d81bc6218adfa923f200bf96d58ef9f645bf4c..ade03e298b01b4edcc26b904e9038c3c3ead8986 100644 (file)
--- a/CRM/Financial/BAO/FinancialItem.php
+++ b/CRM/Financial/BAO/FinancialItem.php
@@ -271,7 +271,7 @@ WHERE cc.id IN (' . implode(',', $contactIds) . ') AND con.is_test = 0';
           $errorStatus = '<ul><li>' . implode('</li><li>', $not_deleted) . '</li></ul>';
         }
 
-        $error['_qf_default'] = $errorStatus .  ts('This contact(s) can not be permanently deleted because the contact record is linked to one or more live financial transactions. Deleting this contact would result in the loss of financial data.');
+        $error['_qf_default'] = $errorStatus . ts('This contact(s) can not be permanently deleted because the contact record is linked to one or more live financial transactions. Deleting this contact would result in the loss of financial data.');
         return $error;
       }
     }

diff --git a/CRM/Financial/Form/FinancialBatch.php b/CRM/Financial/Form/FinancialBatch.php
index 02dab2fd5b10395f94061a7af98860c8570ec847..5b8cc30436da7a84064b9497502cbdb883994475 100644 (file)
--- a/CRM/Financial/Form/FinancialBatch.php
+++ b/CRM/Financial/Form/FinancialBatch.php
@@ -91,7 +91,7 @@ class CRM_Financial_Form_FinancialBatch extends CRM_Contribute_Form {
 
     if (isset($this->_id)) {
       $this->_title = CRM_Core_DAO::getFieldValue('CRM_Batch_DAO_Batch', $this->_id, 'title');
-      CRM_Utils_System::setTitle($this->_title  . ' - ' . ts('Accounting Batch'));
+      CRM_Utils_System::setTitle($this->_title . ' - ' . ts('Accounting Batch'));
       $this->assign('batchTitle', $this->_title);
       $contactID = CRM_Core_DAO::getFieldValue('CRM_Batch_DAO_Batch', $this->_id, 'created_id');
       $contactName = CRM_Contact_BAO_Contact::displayName($contactID);
@@ -245,7 +245,7 @@ class CRM_Financial_Form_FinancialBatch extends CRM_Contribute_Form {
     //create activity.
     $activityParams = array(
       'activity_type_id' => array_search($activityTypeName, $activityTypes),
-      'subject' => $batch->title  . "- Batch",
+      'subject' => $batch->title . "- Batch",
       'status_id' => 2,
       'priority_id' => 2,
       'activity_date_time' => date('YmdHis'),

diff --git a/CRM/Financial/Form/FinancialTypeAccount.php b/CRM/Financial/Form/FinancialTypeAccount.php
index 22df3bb1c5de06d0b3d7179eaff79641729d6599..e1d396a348519275f3a7571eb401816d11bed765 100644 (file)
--- a/CRM/Financial/Form/FinancialTypeAccount.php
+++ b/CRM/Financial/Form/FinancialTypeAccount.php
@@ -106,7 +106,7 @@ class CRM_Financial_Form_FinancialTypeAccount extends CRM_Contribute_Form {
     if ($this->_id) {
       $financialAccount = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_EntityFinancialAccount', $this->_id, 'financial_account_id');
       $fieldTitle = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialAccount', $financialAccount, 'name');
-      CRM_Utils_System::setTitle($fieldTitle . ' - ' .  ts('Financial Type Accounts'));
+      CRM_Utils_System::setTitle($fieldTitle . ' - ' . ts('Financial Type Accounts'));
     }
 
     $breadCrumb = array(

diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
index d219cdf29a5fdf04e599b2288ee3fb0c5b5c68ac..fb58e1e2990591430df3fb48da73bab4e97f8e6f 100644 (file)
--- a/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@ -390,7 +390,7 @@ class CRM_Financial_Page_AJAX {
       if ($statusID == CRM_Core_OptionGroup::getValue('batch_status', 'Open')) {
         if (isset($notPresent)) {
           $js = "enableActions('x')";
-          $row[$financialItem->id]['check'] = "<input type='checkbox' id='mark_x_" .  $financialItem->id . "' name='mark_x_" .  $financialItem->id . "' value='1' onclick={$js}></input>";
+          $row[$financialItem->id]['check'] = "<input type='checkbox' id='mark_x_" . $financialItem->id . "' name='mark_x_" . $financialItem->id . "' value='1' onclick={$js}></input>";
           $row[$financialItem->id]['action'] = CRM_Core_Action::formLink(
             CRM_Financial_Form_BatchTransaction::links(),
             NULL,
@@ -408,7 +408,7 @@ class CRM_Financial_Page_AJAX {
         }
         else {
           $js = "enableActions('y')";
-          $row[$financialItem->id]['check'] = "<input type='checkbox' id='mark_y_" .  $financialItem->id . "' name='mark_y_" .  $financialItem->id . "' value='1' onclick={$js}></input>";
+          $row[$financialItem->id]['check'] = "<input type='checkbox' id='mark_y_" . $financialItem->id . "' name='mark_y_" . $financialItem->id . "' value='1' onclick={$js}></input>";
           $row[$financialItem->id]['action'] = CRM_Core_Action::formLink(
             CRM_Financial_Page_BatchTransaction::links(),
             NULL,

diff --git a/CRM/Financial/Page/FinancialTypeAccount.php b/CRM/Financial/Page/FinancialTypeAccount.php
index d7f9b29bde6a9f383dc59154164ae8d82a0b1dee..699215d7920f49a1ffd63537367de41d4f7e9b9e 100644 (file)
--- a/CRM/Financial/Page/FinancialTypeAccount.php
+++ b/CRM/Financial/Page/FinancialTypeAccount.php
@@ -134,7 +134,7 @@ class CRM_Financial_Page_FinancialTypeAccount extends CRM_Core_Page {
     if ($this->_aid) {
       $relationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' "));
       $this->_title = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialType', $this->_aid, 'name');
-      CRM_Utils_System::setTitle($this->_title  . ' - ' . ts('Assigned Financial Accounts'));
+      CRM_Utils_System::setTitle($this->_title . ' - ' . ts('Assigned Financial Accounts'));
       $financialAccountType = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_FinancialAccount', 'financial_account_type_id');
       $accountRelationship = CRM_Core_PseudoConstant::get('CRM_Financial_DAO_EntityFinancialAccount', 'account_relationship');
       $dao->copyValues($params);

diff --git a/CRM/Mailing/BAO/Query.php b/CRM/Mailing/BAO/Query.php
index fe17e974641346a32d0e27863e5c9beeefce29d9..4cc084c077114ac23c04e45514dd5c6f66baa0a3 100644 (file)
--- a/CRM/Mailing/BAO/Query.php
+++ b/CRM/Mailing/BAO/Query.php
@@ -467,7 +467,7 @@ class CRM_Mailing_BAO_Query {
 
     if (is_array($value)) {
       $query->_where[$grouping][] = "$tableName.$fieldName $op (" . implode(',', $value) . ")";
-      $query->_qill[$grouping][] = "$fieldTitle $op " .  implode(', ', array_intersect_key($valueTitles, array_flip($value)));
+      $query->_qill[$grouping][] = "$fieldTitle $op " . implode(', ', array_intersect_key($valueTitles, array_flip($value)));
     }
     else {
       $query->_qill[$grouping][] = $fieldTitle . ' - ' . $valueTitles[$value];

diff --git a/CRM/Pledge/Form/PledgeView.php b/CRM/Pledge/Form/PledgeView.php
index 17968e93e0e609ddfd94a4e9f52ca4cef27b7b64..92b45e90579d12832d1bc10943e90e5a5c0c4fd7 100644 (file)
--- a/CRM/Pledge/Form/PledgeView.php
+++ b/CRM/Pledge/Form/PledgeView.php
@@ -119,7 +119,7 @@ class CRM_Pledge_Form_PledgeView extends CRM_Core_Form {
       $displayName .= ' (' . ts('default organization') . ')';
     }
     // omitting contactImage from title for now since the summary overlay css doesn't work outside of our crm-container
-    CRM_Utils_System::setTitle(ts('View Pledge by') .  ' ' . $displayName);
+    CRM_Utils_System::setTitle(ts('View Pledge by') . ' ' . $displayName);
 
     //do check for campaigns
     if ($campaignId = CRM_Utils_Array::value('campaign_id', $values)) {

diff --git a/CRM/Price/BAO/PriceField.php b/CRM/Price/BAO/PriceField.php
index 6976f7a7f6ff5670bf1ecfce6b17af36ea1c43f4..ff67088dc08115d8a74e915dbd6a9e60a8326b73 100644 (file)
--- a/CRM/Price/BAO/PriceField.php
+++ b/CRM/Price/BAO/PriceField.php
@@ -384,7 +384,7 @@ class CRM_Price_BAO_PriceField extends CRM_Price_DAO_PriceField {
               }
               else {
                 $opt['label'] =  '<span class="crm-price-amount-label">' . $opt['label'] . '</span>' . '<span class="crm-price-amount-amount">' . CRM_Utils_Money::format($opt[$valueFieldName]) . '</span>';
-                $opt['label'] .= '<span class="crm-price-amount-tax"> + ' .  CRM_Utils_Money::format($opt['tax_amount']) . ' ' . $taxTerm . '</span>';
+                $opt['label'] .= '<span class="crm-price-amount-tax"> + ' . CRM_Utils_Money::format($opt['tax_amount']) . ' ' . $taxTerm . '</span>';
               }
             }
             else {
@@ -794,7 +794,7 @@ WHERE  id IN (" . implode(',', array_keys($priceFields)) . ')';
     }
     else {
       $label = CRM_Utils_Money::format($opt[$valueFieldName]);
-      $label .= '<span class="crm-price-amount-tax"> + ' .  CRM_Utils_Money::format($opt['tax_amount']) . ' ' . $taxTerm . '</span>';
+      $label .= '<span class="crm-price-amount-tax"> + ' . CRM_Utils_Money::format($opt['tax_amount']) . ' ' . $taxTerm . '</span>';
     }
 
     return $label;

diff --git a/CRM/Profile/Page/MultipleRecordFieldsListing.php b/CRM/Profile/Page/MultipleRecordFieldsListing.php
index fda862787780beb4eec9c116988db9771f92fecb..c8bdf03abfa4aafa7e0953b017d6f0b63b14aeb8 100644 (file)
--- a/CRM/Profile/Page/MultipleRecordFieldsListing.php
+++ b/CRM/Profile/Page/MultipleRecordFieldsListing.php
@@ -365,7 +365,7 @@ class CRM_Profile_Page_MultipleRecordFieldsListing extends CRM_Core_Page_Basic {
                   'key' => CRM_Core_Key::get('civicrm/ajax/customvalue'),
                 );
                 $links[CRM_Core_Action::DELETE]['url'] = '#';
-                $links[CRM_Core_Action::DELETE]['extra'] = ' data-delete_params="' .  htmlspecialchars(json_encode($deleteData))  . '"';
+                $links[CRM_Core_Action::DELETE]['extra'] = ' data-delete_params="' . htmlspecialchars(json_encode($deleteData)) . '"';
                 $links[CRM_Core_Action::DELETE]['class'] = 'delete-custom-row';
               }
               if (!empty($pageCheckSum)) {

diff --git a/CRM/Report/Form/Contact/LoggingSummary.php b/CRM/Report/Form/Contact/LoggingSummary.php
index de6d783442de10aff8aa6cb46e290b253cdd176d..ec48efa8c1a9dcd7575e9766adc3d996dd9d48ba 100644 (file)
--- a/CRM/Report/Form/Contact/LoggingSummary.php
+++ b/CRM/Report/Form/Contact/LoggingSummary.php
@@ -205,7 +205,7 @@ class CRM_Report_Form_Contact_LoggingSummary extends CRM_Logging_ReportSummary {
       $date = CRM_Utils_Date::isoToMysql($row['log_civicrm_entity_log_date']);
 
       if ('Update' == CRM_Utils_Array::value('log_civicrm_entity_log_action', $row)) {
-        $q = "reset=1&log_conn_id={$row['log_civicrm_entity_log_conn_id']}&log_date=" .  $date;
+        $q = "reset=1&log_conn_id={$row['log_civicrm_entity_log_conn_id']}&log_date=" . $date;
         if ($this->cid) {
           $q .= '&cid=' . $this->cid;
         }

diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php
index b6129522a02044d34aaf50b5d91fe8e2d4c6ef55..beddb3c0f18e1a5d2e64cd3fb9a5645f4a062d29 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/CRM/Upgrade/Incremental/php/FourFour.php
@@ -106,7 +106,7 @@ WHERE ceft.entity_table = 'civicrm_contribution' AND cft.payment_instrument_id I
       }
     }
     if ($rev == '4.4.6') {
-      $postUpgradeMessage .= '<br /><br /><strong>' .  ts('Your contact image urls have been upgraded. If your contact image urls did not follow the standard format for image Urls they have not been upgraded. Please check the log to see image urls that were not upgraded.');
+      $postUpgradeMessage .= '<br /><br /><strong>' . ts('Your contact image urls have been upgraded. If your contact image urls did not follow the standard format for image Urls they have not been upgraded. Please check the log to see image urls that were not upgraded.');
     }
   }
 
@@ -311,7 +311,7 @@ ALTER TABLE civicrm_dashboard
       }
       elseif ($urlElements[1] == 'report') {
         $url = explode('&', $urlElements[3]);
-        $name = 'report/'  . $url[0];
+        $name = 'report/' . $url[0];
       }
       $values .= "
       WHEN {$dashboard->id} THEN '{$name}'
@@ -788,7 +788,7 @@ CREATE TABLE IF NOT EXISTS `civicrm_word_replacement` (
     // add civicrm_report_instance.name
 
     $sql = "SELECT count(*) FROM information_schema.columns "
-      . "WHERE table_schema = database() AND table_name = 'civicrm_report_instance' AND COLUMN_NAME = 'name' ";
+     . "WHERE table_schema = database() AND table_name = 'civicrm_report_instance' AND COLUMN_NAME = 'name' ";
 
     $res = CRM_Core_DAO::singleValueQuery($sql);
 

diff --git a/CRM/Upgrade/Incremental/php/FourThree.php b/CRM/Upgrade/Incremental/php/FourThree.php
index f8e2d09d81695de496841e94cd26f66565487aba..39e046d4f525d75910de979b61c0bb69b812cc61 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourThree.php
+++ b/CRM/Upgrade/Incremental/php/FourThree.php
@@ -1111,7 +1111,7 @@ cfi.financial_account_id = %4,
 cfi.description = %5,
 cli.financial_type_id = %6
 WHERE cfi.entity_table = 'civicrm_line_item'
-AND cli.entity_table = 'civicrm_contribution' AND cli.id IN (" . implode(',', $value) .  ');';
+AND cli.entity_table = 'civicrm_contribution' AND cli.id IN (" . implode(',', $value) . ');';
       $params =  array(
         1 => array($financialTrxn[$key]['label'], 'String'),
         2 => array($financialTrxn[$key]['price_field_id'], 'Integer'),

diff --git a/CRM/Upgrade/Incremental/php/FourTwo.php b/CRM/Upgrade/Incremental/php/FourTwo.php
index ec5f51bec0699e4b5a810b80494d8936ea834fe8..c2c498b8ca179fa5ac6a420b759eefac01d7aa91 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourTwo.php
+++ b/CRM/Upgrade/Incremental/php/FourTwo.php
@@ -130,7 +130,7 @@ INNER JOIN civicrm_price_field cpf ON cpf.id = cpfv.price_field_id and cpf.id !=
 INNER JOIN civicrm_price_set cps ON cps.id = cpf.price_set_id AND cps.name <>'default_membership_type_amount' ";
       $dao = CRM_Core_DAO::executeQuery($query);
       if ($dao->N) {
-        $preUpgradeMessage .= "<br /><strong>" .  ts('We have identified extraneous data in your database that a previous upgrade likely introduced. We STRONGLY recommend making a backup of your site before continuing. We also STRONGLY suggest fixing this issue with unneeded records BEFORE you upgrade. You can find more information about this issue and the way to fix it by visiting <a href="http://forum.civicrm.org/index.php/topic,26181.0.html">http://forum.civicrm.org/index.php/topic,26181.0.html</a>.')  . "</strong>";
+        $preUpgradeMessage .= "<br /><strong>" . ts('We have identified extraneous data in your database that a previous upgrade likely introduced. We STRONGLY recommend making a backup of your site before continuing. We also STRONGLY suggest fixing this issue with unneeded records BEFORE you upgrade. You can find more information about this issue and the way to fix it by visiting <a href="http://forum.civicrm.org/index.php/topic,26181.0.html">http://forum.civicrm.org/index.php/topic,26181.0.html</a>.') . "</strong>";
       }
     }
 

diff --git a/CRM/Utils/Cache/SerializeCache.php b/CRM/Utils/Cache/SerializeCache.php
index f00e3c8a8fb6f8dff65f5046f82a14cc7bf45098..2e6ede07b69a922402326cccb8ad189a509ca5c0 100644 (file)
--- a/CRM/Utils/Cache/SerializeCache.php
+++ b/CRM/Utils/Cache/SerializeCache.php
@@ -54,9 +54,9 @@ class CRM_Utils_Cache_SerializeCache implements CRM_Utils_Cache_Interface {
    */
   public function fileName ($key) {
     if (strlen($key) > 50) {
-      return CIVICRM_TEMPLATE_COMPILEDIR  . "CRM_" . md5($key) . ".php";
+      return CIVICRM_TEMPLATE_COMPILEDIR . "CRM_" . md5($key) . ".php";
     }
-    return CIVICRM_TEMPLATE_COMPILEDIR  . $key . ".php";
+    return CIVICRM_TEMPLATE_COMPILEDIR . $key . ".php";
   }
 
   /**

diff --git a/CRM/Utils/Mail/EmailProcessor.php b/CRM/Utils/Mail/EmailProcessor.php
index 9e762d2fa06788214aa4ab33782c193770ff03b8..ef11c256cb2ac7544ab8008df1829e3064b3b06a 100644 (file)
--- a/CRM/Utils/Mail/EmailProcessor.php
+++ b/CRM/Utils/Mail/EmailProcessor.php
@@ -177,7 +177,7 @@ class CRM_Utils_Mail_EmailProcessor {
       $store = CRM_Mailing_MailStore::getStore($dao->name);
     }
     catch(Exception$e) {
-      $message = ts('Could not connect to MailStore for ') . $dao->username . '@' . $dao->server  . '<p>';
+      $message = ts('Could not connect to MailStore for ') . $dao->username . '@' . $dao->server . '<p>';
       $message .= ts('Error message: ');
       $message .= '<pre>' . $e->getMessage() . '</pre><p>';
       CRM_Core_Error::fatal($message);

diff --git a/api/v3/Activity.php b/api/v3/Activity.php
index b8ff55bd2f8ac69080edd8ae0aa30a104a16148c..fc1e693f6dad686a97bdc647bcaa8fec34c7c2b0 100644 (file)
--- a/api/v3/Activity.php
+++ b/api/v3/Activity.php
@@ -376,7 +376,7 @@ SELECT  count(*)
   FROM  civicrm_contact
  WHERE  id IN (' . implode(', ', $contactIds) . ' )';
     if (count($contactIds) != CRM_Core_DAO::singleValueQuery($sql)) {
-      throw new API_Exception('Invalid ' .  ' Contact Id');
+      throw new API_Exception('Invalid ' . ' Contact Id');
     }
   }
 

diff --git a/api/v3/Contact.php b/api/v3/Contact.php
index 281897beb8a6f890e40fc207d8ff69490f83c9d5..13b832c77e408b8fbab26013e3a4f16e8a5705ed 100644 (file)
--- a/api/v3/Contact.php
+++ b/api/v3/Contact.php
@@ -362,7 +362,7 @@ function _civicrm_api3_contact_check_params(&$params, $dupeCheck = TRUE, $dupeEr
     $ids = CRM_Dedupe_Finder::dupesByParams($dedupeParams, $params['contact_type'], 'Unsupervised', array());
 
     if (count($ids) > 0) {
-      throw new API_Exception("Found matching contacts: " .  implode(',', $ids), "duplicate", array("ids" => $ids));
+      throw new API_Exception("Found matching contacts: " . implode(',', $ids), "duplicate", array("ids" => $ids));
     }
   }
 

diff --git a/api/v3/Profile.php b/api/v3/Profile.php
index a3df2cb68becb16aeb8b032c36d2fac07444677c..95d0c678c7188dab3db41646bba875c9f110204d 100644 (file)
--- a/api/v3/Profile.php
+++ b/api/v3/Profile.php
@@ -457,16 +457,16 @@ function _civicrm_api3_profile_getbillingpseudoprofile(&$params) {
   }
 
   if (!empty($result['api.email.get.1']['count'])) {
-    $values['billing-email' .  '-' . $locationTypeID] = $result['api.email.get.1']['values'][0]['email'];
+    $values['billing-email' . '-' . $locationTypeID] = $result['api.email.get.1']['values'][0]['email'];
   }
   elseif(!empty($result['api.email.get.2']['count'])) {
-    $values['billing-email' .  '-' . $locationTypeID] = $result['api.email.get.2']['values'][0]['email'];
+    $values['billing-email' . '-' . $locationTypeID] = $result['api.email.get.2']['values'][0]['email'];
   }
   else{
-    $values['billing-email' .  '-' . $locationTypeID] = $result['email'];
+    $values['billing-email' . '-' . $locationTypeID] = $result['email'];
   }
   // return both variants of email to reflect inconsistencies in form layer
-  $values['email' .  '-' . $locationTypeID] = $values['billing-email' .  '-' . $locationTypeID];
+  $values['email' . '-' . $locationTypeID] = $values['billing-email' . '-' . $locationTypeID];
   return $values;
 }
 

diff --git a/api/v3/utils.php b/api/v3/utils.php
index b16b49cb078e0fe119c1b4ce1f059266b1b97d07..a40e47ee3efb9f58ea7dc5ec9606e0c5280cec98 100644 (file)
--- a/api/v3/utils.php
+++ b/api/v3/utils.php
@@ -780,7 +780,7 @@ function _civicrm_api3_get_options_from_params(&$params, $queryObject = FALSE, $
       $legacyreturnProperties[substr($n, 7)] = $v;
     }
     elseif ($n == 'id') {
-      $inputParams[$entity .  '_id'] = $v;
+      $inputParams[$entity . '_id'] = $v;
     }
     elseif (in_array($n, $otherVars)) {
     }

diff --git a/tests/phpunit/CRM/Core/Payment/AuthorizeNetTest.php b/tests/phpunit/CRM/Core/Payment/AuthorizeNetTest.php
index 4db64adba8d1f1a47560f26c4edf1000ccee8a61..d6ace534eee3caa94b07e9476c273bff418e88fc 100644 (file)
--- a/tests/phpunit/CRM/Core/Payment/AuthorizeNetTest.php
+++ b/tests/phpunit/CRM/Core/Payment/AuthorizeNetTest.php
@@ -65,7 +65,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
    * Test works but not both due to some form of caching going on in the SmartySingleton
    */
   public function testCreateSingleNowDated() {
-    $firstName  = 'John_' .  substr(sha1(rand()), 0, 7);
+    $firstName  = 'John_' . substr(sha1(rand()), 0, 7);
     $lastName   = 'Smith_' . substr(sha1(rand()), 0, 7);
     $nameParams = array('first_name' => $firstName, 'last_name' => $lastName);
     $contactId  = $this->individualCreate($nameParams);
@@ -198,7 +198,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
   public function testCreateSinglePostDated() {
     $start_date = date('Ymd', strtotime("+ 1 week"));
 
-    $firstName  = 'John_' .  substr(sha1(rand()), 0, 7);
+    $firstName  = 'John_' . substr(sha1(rand()), 0, 7);
     $lastName   = 'Smith_' . substr(sha1(rand()), 0, 7);
     $nameParams = array('first_name' => $firstName, 'last_name' => $lastName);
     $contactId  = $this->individualCreate($nameParams);

diff --git a/tests/phpunit/CRM/Extension/BrowserTest.php b/tests/phpunit/CRM/Extension/BrowserTest.php
index eae44d0c5a67e3dca70d90e87ca11254740d8ed7..1c177d99d6b1a728c2337d654684e9e9584af545 100644 (file)
--- a/tests/phpunit/CRM/Extension/BrowserTest.php
+++ b/tests/phpunit/CRM/Extension/BrowserTest.php
@@ -22,21 +22,21 @@ class CRM_Extension_BrowserTest extends CiviUnitTestCase {
   }
 
   public function testCheckRequirements_BadCachedir_false() {
-    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__)  . '/dataset/good-repository', '/index.html', FALSE);
+    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__) . '/dataset/good-repository', '/index.html', FALSE);
     $this->assertEquals(TRUE, $browser->isEnabled());
     $reqs = $browser->checkRequirements();
     $this->assertEquals(1, count($reqs));
   }
 
   public function testCheckRequirements_BadCachedir_nonexistent() {
-    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__)  . '/dataset/good-repository', '/index.html', '/tot/all/yin/v/alid');
+    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__) . '/dataset/good-repository', '/index.html', '/tot/all/yin/v/alid');
     $this->assertEquals(TRUE, $browser->isEnabled());
     $reqs = $browser->checkRequirements();
     $this->assertEquals(1, count($reqs));
   }
 
   public function testGetExtensions_good() {
-    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__)  . '/dataset/good-repository', '/index.html', $this->createTempDir('ext-cache-'));
+    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__) . '/dataset/good-repository', '/index.html', $this->createTempDir('ext-cache-'));
     $this->assertEquals(TRUE, $browser->isEnabled());
     $this->assertEquals(array(), $browser->checkRequirements());
     $exts = $browser->getExtensions();
@@ -50,7 +50,7 @@ class CRM_Extension_BrowserTest extends CiviUnitTestCase {
   }
 
   public function testGetExtension_good() {
-    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__)  . '/dataset/good-repository', '/index.html', $this->createTempDir('ext-cache-'));
+    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__) . '/dataset/good-repository', '/index.html', $this->createTempDir('ext-cache-'));
     $this->assertEquals(TRUE, $browser->isEnabled());
     $this->assertEquals(array(), $browser->checkRequirements());
 
@@ -60,7 +60,7 @@ class CRM_Extension_BrowserTest extends CiviUnitTestCase {
   }
 
   public function testGetExtension_nonexistent() {
-    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__)  . '/dataset/good-repository', '/index.html', $this->createTempDir('ext-cache-'));
+    $browser = new CRM_Extension_Browser('file://' . dirname(__FILE__) . '/dataset/good-repository', '/index.html', $this->createTempDir('ext-cache-'));
     $this->assertEquals(TRUE, $browser->isEnabled());
     $this->assertEquals(array(), $browser->checkRequirements());
 

diff --git a/tests/phpunit/CiviTest/CiviReportTestCase.php b/tests/phpunit/CiviTest/CiviReportTestCase.php
index 14faf22118682c28f59b257d339c928655c0bc8f..550c56cd56ca84b7cddb6213cc348ae72592a658 100644 (file)
--- a/tests/phpunit/CiviTest/CiviReportTestCase.php
+++ b/tests/phpunit/CiviTest/CiviReportTestCase.php
@@ -146,7 +146,7 @@ class CiviReportTestCase extends CiviUnitTestCase {
       $this->assertEquals(
         count($actualCsvArray[$intKey]),
         count($expectedCsvArray[$intKey]),
-        'Arrays have different number of columns at row ' . $intKey . '; in line ' . __LINE__ .  '; data: ' . $rowData
+        'Arrays have different number of columns at row ' . $intKey . '; in line ' . __LINE__ . '; data: ' . $rowData
       );
       $this->assertEquals($expectedCsvArray[$intKey], $strVal);
     }

diff --git a/tests/phpunit/CiviTest/bootstrap.php b/tests/phpunit/CiviTest/bootstrap.php
index a775679e68554318f709cce5488348268c92886a..84640680b40de00d3cc746494d8df7e8dac04de4 100644 (file)
--- a/tests/phpunit/CiviTest/bootstrap.php
+++ b/tests/phpunit/CiviTest/bootstrap.php
@@ -2,8 +2,8 @@
 // ADAPTED FROM tools/scripts/phpunit
 
 $GLOBALS['base_dir'] = dirname(dirname(dirname(__DIR__)));
-$tests_dir = $GLOBALS['base_dir']  . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . 'phpunit';
-$civi_pkgs_dir = $GLOBALS['base_dir'] .   DIRECTORY_SEPARATOR . 'packages';
+$tests_dir = $GLOBALS['base_dir'] . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . 'phpunit';
+$civi_pkgs_dir = $GLOBALS['base_dir'] . DIRECTORY_SEPARATOR . 'packages';
 ini_set('safe_mode', 0);
 ini_set('include_path',
         "{$GLOBALS['base_dir']}" . PATH_SEPARATOR .

diff --git a/tests/phpunit/WebTest/Activity/ContactContextAddTest.php b/tests/phpunit/WebTest/Activity/ContactContextAddTest.php
index e7238d6e83f3d47636b01e20e3717ad2f7f3f921..b0306389a1fd43a1c74bd6b8af1e292be5230894 100644 (file)
--- a/tests/phpunit/WebTest/Activity/ContactContextAddTest.php
+++ b/tests/phpunit/WebTest/Activity/ContactContextAddTest.php
@@ -221,7 +221,7 @@ class WebTest_Activity_ContactContextAddTest extends CiviSeleniumTestCase {
 
     $this->clickLink('_qf_Search_refresh');
 
-    $targetContacts = array("Summerson, " .  $firstName1, "Andersonnn, " .  $firstName2, "Anderson, " .  $firstName3);
+    $targetContacts = array("Summerson, " . $firstName1, "Andersonnn, " . $firstName2, "Anderson, " . $firstName3);
 
     //check whether separate activities are created for the target contacts
     foreach ($targetContacts as $contact) {

diff --git a/tests/phpunit/WebTest/Case/AddCaseTypeTest.php b/tests/phpunit/WebTest/Case/AddCaseTypeTest.php
index ca1f891b9521a87892ff186c12269ef484520715..988209b178c8751b182925c445f88073e194ff40 100644 (file)
--- a/tests/phpunit/WebTest/Case/AddCaseTypeTest.php
+++ b/tests/phpunit/WebTest/Case/AddCaseTypeTest.php
@@ -54,7 +54,7 @@ class WebTest_Case_AddCaseTypeTest extends CiviSeleniumTestCase {
 
     $this->openCiviPage('a/#/caseType/new');
 
-    $caseTypeLabel = "Case Type" .  substr(sha1(rand()), 0, 7);
+    $caseTypeLabel = "Case Type" . substr(sha1(rand()), 0, 7);
     $this->waitForElementPresent('title');
     $this->type('title', $caseTypeLabel);
 
@@ -123,7 +123,7 @@ class WebTest_Case_AddCaseTypeTest extends CiviSeleniumTestCase {
     $this->click("xpath=//table/tbody//tr/td[1][text()='{$caseTypeLabel}']/../td[5]/span/a[text()='Edit']");
     $this->waitForElementPresent("xpath=//div[@class='crm-submit-buttons']/span/input[@value='Save']");
 
-    $editCaseTypeLabel = "Case Type Edit" .  substr(sha1(rand()), 0, 7);
+    $editCaseTypeLabel = "Case Type Edit" . substr(sha1(rand()), 0, 7);
     $this->waitForElementPresent('title');
     $this->type('title', $editCaseTypeLabel);
 

diff --git a/tests/phpunit/WebTest/Contact/RelationshipAddTest.php b/tests/phpunit/WebTest/Contact/RelationshipAddTest.php
index 292bee2cc713ab40ee198a855f4cbdf01814bee7..767e6e8b1e5b6ec4e73eccb5ce414fb532d3edf3 100644 (file)
--- a/tests/phpunit/WebTest/Contact/RelationshipAddTest.php
+++ b/tests/phpunit/WebTest/Contact/RelationshipAddTest.php
@@ -187,7 +187,7 @@ class WebTest_Contact_RelationshipAddTest extends CiviSeleniumTestCase {
 
     //test for individual contact and household subtype contact
     //relationship
-    $typeb = "Household__" .  $householdSubtypeName;
+    $typeb = "Household__" . $householdSubtypeName;
 
     //create a relationship type between different contact types
     $params = array(

diff --git a/tests/phpunit/WebTest/Contribute/OnBehalfOfOrganization.php b/tests/phpunit/WebTest/Contribute/OnBehalfOfOrganization.php
index 262463b5641433321e143a5641b1aef3529e53c8..6ee756dbdd89c327e270a2b6d6aad1ef4e6030c0 100644 (file)
--- a/tests/phpunit/WebTest/Contribute/OnBehalfOfOrganization.php
+++ b/tests/phpunit/WebTest/Contribute/OnBehalfOfOrganization.php
@@ -236,14 +236,14 @@ class WebTest_Contribute_OnBehalfOfOrganization extends CiviSeleniumTestCase {
     $this->click("link=Add Field");
     $this->waitForElementPresent('_qf_Field_next-bottom');
     $this->select('field_name[0]', 'value=Membership');
-    $label = $checkboxFieldLabel . ' :: ' .  $customGroupTitle;
+    $label = $checkboxFieldLabel . ' :: ' . $customGroupTitle;
     $this->select('field_name[1]', "label=$label");
     $this->click('field_name[1]');
     $this->click('_qf_Field_next_new-bottom');
     $this->waitForPageToLoad($this->getTimeoutMsec());
 
     $this->select('field_name[0]', 'value=Membership');
-    $label = $radioFieldLabel . ' :: ' .  $customGroupTitle;
+    $label = $radioFieldLabel . ' :: ' . $customGroupTitle;
     $this->select('field_name[1]', "label=$label");
     $this->click('field_name[1]');
     $this->click('_qf_Field_next-bottom');
@@ -251,8 +251,8 @@ class WebTest_Contribute_OnBehalfOfOrganization extends CiviSeleniumTestCase {
     $this->assertTrue($this->isTextPresent("Your CiviCRM Profile Field '{$radioFieldLabel}' has been saved to 'On Behalf Of Organization'."));
 
     //create organisation
-    $orgName = "Org WebAccess " .  substr(sha1(rand()), 0, 7);
-    $orgEmail = "org" .  substr(sha1(rand()), 0, 7) . "@web.com";
+    $orgName = "Org WebAccess " . substr(sha1(rand()), 0, 7);
+    $orgEmail = "org" . substr(sha1(rand()), 0, 7) . "@web.com";
     $this->webtestAddOrganization($orgName, $orgEmail);
 
     $this->waitForPageToLoad($this->getTimeoutMsec());
@@ -482,8 +482,8 @@ class WebTest_Contribute_OnBehalfOfOrganization extends CiviSeleniumTestCase {
     $this->waitForPageToLoad($this->getTimeoutMsec());
 
     //create organisation
-    $orgName = "Org WebAccess " .  substr(sha1(rand()), 0, 7);
-    $orgEmail = "org" .  substr(sha1(rand()), 0, 7) . "@web.com";
+    $orgName = "Org WebAccess " . substr(sha1(rand()), 0, 7);
+    $orgEmail = "org" . substr(sha1(rand()), 0, 7) . "@web.com";
     $this->webtestAddOrganization($orgName, $orgEmail);
 
     $this->waitForPageToLoad($this->getTimeoutMsec());
@@ -564,8 +564,8 @@ class WebTest_Contribute_OnBehalfOfOrganization extends CiviSeleniumTestCase {
     $this->webtestLogin();
 
     //create organisation
-    $orgName = "Org WebAccess " .  substr(sha1(rand()), 0, 7);
-    $orgEmail = "org" .  substr(sha1(rand()), 0, 7) . "@web.com";
+    $orgName = "Org WebAccess " . substr(sha1(rand()), 0, 7);
+    $orgEmail = "org" . substr(sha1(rand()), 0, 7) . "@web.com";
     $contactSubType = 'Sponsor';
     $this->webtestAddOrganization($orgName, $orgEmail, $contactSubType);
 

diff --git a/tests/phpunit/WebTest/Event/AddPricesetTest.php b/tests/phpunit/WebTest/Event/AddPricesetTest.php
index 37c7a9272cfc621a3bee55a1bdeb4a2eb26dc6bd..3dcdda4e5ec74cb9d23b5db942bb4e46ed76d179 100644 (file)
--- a/tests/phpunit/WebTest/Event/AddPricesetTest.php
+++ b/tests/phpunit/WebTest/Event/AddPricesetTest.php
@@ -459,7 +459,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase {
     // Adding contact with randomized first name (so we can then select that contact when creating event registration)
     // We're using Quick Add block on the main page for this.
     $firstName = substr(sha1(rand()), 0, 7);
-    $lastName = 'Anderson' .  substr(sha1(rand()), 0, 7);
+    $lastName = 'Anderson' . substr(sha1(rand()), 0, 7);
     $this->webtestAddContact($firstName, $lastName, TRUE);
     $contactName = "$lastName, $firstName";
     $displayName = "$firstName $lastName";
@@ -515,7 +515,7 @@ class WebTest_Event_AddPricesetTest extends CiviSeleniumTestCase {
     // Adding contact with randomized first name (so we can then select that contact when creating event registration)
     // We're using Quick Add block on the main page for this.
     $firstName = substr(sha1(rand()), 0, 7);
-    $lastName = 'Anderson' .  substr(sha1(rand()), 0, 7);
+    $lastName = 'Anderson' . substr(sha1(rand()), 0, 7);
     $this->webtestAddContact($firstName, $lastName, TRUE);
     $contactName = "$lastName, $firstName";
     $displayName = "$firstName $lastName";

diff --git a/tests/phpunit/WebTest/Event/ParticipantCountTest.php b/tests/phpunit/WebTest/Event/ParticipantCountTest.php
index 59890c97848f2b51ed1019f5d16c7dc8bd89bf46..194f0968d9b95769f9071364cf99714a3704d7da 100644 (file)
--- a/tests/phpunit/WebTest/Event/ParticipantCountTest.php
+++ b/tests/phpunit/WebTest/Event/ParticipantCountTest.php
@@ -73,7 +73,7 @@ class WebTest_Event_ParticipantCountTest extends CiviSeleniumTestCase {
 
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jones' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jones' . substr(sha1(rand()), 0, 5));
     $this->type('email-Primary', $email);
 
     // fill billing details and register
@@ -90,7 +90,7 @@ class WebTest_Event_ParticipantCountTest extends CiviSeleniumTestCase {
     $this->click("xpath=//input[@class='crm-form-radio']");
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jones' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jones' . substr(sha1(rand()), 0, 5));
     $this->type('email-Primary', $email);
 
     // fill billing details and register

diff --git a/tests/phpunit/WebTest/Event/PricesetMaxCountTest.php b/tests/phpunit/WebTest/Event/PricesetMaxCountTest.php
index 5bcd5f9eabcf3da43de9dc23a61f7af85e64cbc1..1f1b38dcc2c2ca8cca461f6009a4f7cc8033cf37 100644 (file)
--- a/tests/phpunit/WebTest/Event/PricesetMaxCountTest.php
+++ b/tests/phpunit/WebTest/Event/PricesetMaxCountTest.php
@@ -170,7 +170,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->select("price_{$selectFieldId}", "value={$selectFieldOp1}");
 
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jones' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jones' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -198,7 +198,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     // exceed maximun count for text field, check for form rule
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '2');
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -366,7 +366,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '3');
 
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -396,7 +396,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     // check for form rule
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '2');
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -564,7 +564,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '7');
 
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -585,7 +585,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '6');
 
     $this->type('first_name', 'Mary Add 2');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -606,7 +606,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '3');
 
     $this->type('first_name', 'Mary Add 2');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -650,7 +650,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '3');
 
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -681,7 +681,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '2');
 
     $this->type('first_name', 'Mary Add 1');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -856,7 +856,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '7');
 
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -877,7 +877,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '6');
 
     $this->type('first_name', 'Mary Add 1');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -898,7 +898,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '3');
 
     $this->type('first_name', 'Mary Add 2');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -942,7 +942,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '3');
 
     $this->type('first_name', 'Mary');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 
@@ -973,7 +973,7 @@ class WebTest_Event_PricesetMaxCountTest extends CiviSeleniumTestCase {
     $this->type("xpath=//input[@id='price_{$textFieldId}']", '2');
 
     $this->type('first_name', 'Mary Add 1');
-    $this->type('last_name', 'Jane' .  substr(sha1(rand()), 0, 5));
+    $this->type('last_name', 'Jane' . substr(sha1(rand()), 0, 5));
     $email = 'jane_' . substr(sha1(rand()), 0, 5) . '@example.org';
     $this->type('email-Primary', $email);
 

diff --git a/tests/phpunit/WebTest/Event/TellAFriendTest.php b/tests/phpunit/WebTest/Event/TellAFriendTest.php
index 5ba8143da8442103eda2237ef19b307e597a74dc..eb5661f93a769e57b5ae4f42cdc3a6fd6f5736fd 100644 (file)
--- a/tests/phpunit/WebTest/Event/TellAFriendTest.php
+++ b/tests/phpunit/WebTest/Event/TellAFriendTest.php
@@ -75,7 +75,7 @@ class WebTest_Event_TellAFriendTest extends CiviSeleniumTestCase {
     $this->open($registerUrl);
     $this->waitForElementPresent('_qf_Register_upload-bottom');
 
-    $firstName = 'Jane'  . substr(sha1(rand()), 0, 7);
+    $firstName = 'Jane' . substr(sha1(rand()), 0, 7);
     $lastName = 'Doe' . substr(sha1(rand()), 0, 7);
     $this->type('first_name', "$firstName");
     $this->type('last_name', "$lastName");

diff --git a/tests/phpunit/api/v3/GrantTest.php b/tests/phpunit/api/v3/GrantTest.php
index 7ec5aff507ece645b7347589f6db0d923c9c7a9d..b63f4367a35459bb0af944f9183489f274b8dd77 100644 (file)
--- a/tests/phpunit/api/v3/GrantTest.php
+++ b/tests/phpunit/api/v3/GrantTest.php
@@ -112,7 +112,7 @@ class api_v3_GrantTest extends CiviUnitTestCase {
     $this->assertEquals($expectedValue, $savedValue);
 
     //let's try with 2 params already separated
-    $expectedValue = CRM_Core_DAO::VALUE_SEPARATOR . 'valley' . CRM_Core_DAO::VALUE_SEPARATOR . 'goat' .  CRM_Core_DAO::VALUE_SEPARATOR;
+    $expectedValue = CRM_Core_DAO::VALUE_SEPARATOR . 'valley' . CRM_Core_DAO::VALUE_SEPARATOR . 'goat' . CRM_Core_DAO::VALUE_SEPARATOR;
     $this->params[$customFieldLabel] = $expectedValue;
     $result = $this->callAPISuccess($this->_entity, 'create', $this->params);
     $savedValue = CRM_Core_DAO::singleValueQuery("SELECT {$columnName} FROM $customTable WHERE entity_id = {$result['id']}");

diff --git a/tests/phpunit/api/v3/ReportTemplateTest.php b/tests/phpunit/api/v3/ReportTemplateTest.php
index 43e6d3c3f4efe7d484c8ea21cc2986ef6104dfd1..dcd5246d4ccec3bddc1c797f3e82885534d36dc8 100644 (file)
--- a/tests/phpunit/api/v3/ReportTemplateTest.php
+++ b/tests/phpunit/api/v3/ReportTemplateTest.php
@@ -195,7 +195,7 @@ class api_v3_ReportTemplateTest extends CiviUnitTestCase {
         $reportTemplates[] = array($report['value']);
       }
       else {
-        $reportTemplates[] = array($report['value'] .  " has existing issues :  " . $reportsToSkip[$report['value']]);
+        $reportTemplates[] = array($report['value'] . " has existing issues :  " . $reportsToSkip[$report['value']]);
       }
     }