From 86bfa4f6487e37328f4b18c50cab27958311a0d2 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 8 Jan 2015 14:57:35 -0800 Subject: [PATCH] INFRA-132 - Remove extra spaces around '.' --- CRM/Activity/Page/AJAX.php | 16 +++++------ CRM/Admin/Form/Extensions.php | 4 +-- CRM/Badge/Form/Layout.php | 2 +- CRM/Batch/BAO/Batch.php | 2 +- CRM/Batch/Form/Entry.php | 2 +- CRM/Contribute/Form/ContributionView.php | 2 +- CRM/Contribute/PseudoConstant.php | 2 +- CRM/Core/BAO/ActionSchedule.php | 4 +-- CRM/Core/BAO/Navigation.php | 2 +- CRM/Core/BAO/Setting.php | 2 +- CRM/Core/BAO/Tag.php | 2 +- CRM/Core/CodeGen/Main.php | 2 +- CRM/Core/CodeGen/Util/Template.php | 2 +- CRM/Core/Error.php | 2 +- CRM/Core/Form/Renderer.php | 2 +- CRM/Core/PseudoConstant.php | 2 +- CRM/Event/Form/Participant.php | 2 +- CRM/Event/Form/ParticipantView.php | 2 +- CRM/Financial/BAO/ExportFormat.php | 6 ++-- CRM/Financial/BAO/ExportFormat/IIF.php | 2 +- CRM/Financial/BAO/FinancialItem.php | 2 +- CRM/Financial/Form/FinancialBatch.php | 4 +-- CRM/Financial/Form/FinancialTypeAccount.php | 2 +- CRM/Financial/Page/AJAX.php | 4 +-- CRM/Financial/Page/FinancialTypeAccount.php | 2 +- CRM/Mailing/BAO/Query.php | 2 +- CRM/Pledge/Form/PledgeView.php | 2 +- CRM/Price/BAO/PriceField.php | 4 +-- .../Page/MultipleRecordFieldsListing.php | 2 +- CRM/Report/Form/Contact/LoggingSummary.php | 2 +- CRM/Upgrade/Incremental/php/FourFour.php | 6 ++-- CRM/Upgrade/Incremental/php/FourThree.php | 2 +- CRM/Upgrade/Incremental/php/FourTwo.php | 2 +- CRM/Utils/Cache/SerializeCache.php | 4 +-- CRM/Utils/Mail/EmailProcessor.php | 2 +- api/v3/Activity.php | 2 +- api/v3/Contact.php | 2 +- api/v3/Profile.php | 8 +++--- api/v3/utils.php | 2 +- .../CRM/Core/Payment/AuthorizeNetTest.php | 4 +-- tests/phpunit/CRM/Extension/BrowserTest.php | 10 +++---- tests/phpunit/CiviTest/CiviReportTestCase.php | 2 +- tests/phpunit/CiviTest/bootstrap.php | 4 +-- .../Activity/ContactContextAddTest.php | 2 +- .../phpunit/WebTest/Case/AddCaseTypeTest.php | 4 +-- .../WebTest/Contact/RelationshipAddTest.php | 2 +- .../Contribute/OnBehalfOfOrganization.php | 16 +++++------ .../phpunit/WebTest/Event/AddPricesetTest.php | 4 +-- .../WebTest/Event/ParticipantCountTest.php | 4 +-- .../WebTest/Event/PricesetMaxCountTest.php | 28 +++++++++---------- .../phpunit/WebTest/Event/TellAFriendTest.php | 2 +- tests/phpunit/api/v3/GrantTest.php | 2 +- tests/phpunit/api/v3/ReportTemplateTest.php | 2 +- 53 files changed, 102 insertions(+), 102 deletions(-) diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php index 853d7880d7..7ae6a638da 100644 --- 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'] = '' . $row['name'] . ''; } // email column links/icon if ($row['email']) { - $row['email'] = ''; + $row['email'] = ''; } // edit links $row['actions'] = ''; @@ -285,17 +285,17 @@ class CRM_Activity_Page_AJAX { switch ($row['source']) { case 'caseRel': $row['actions'] = - '' . + '' . '' . '' . - '' . + '' . '' . ''; break; case 'caseRoles': $row['actions'] = - '' . + '' . '' . ''; break; diff --git a/CRM/Admin/Form/Extensions.php b/CRM/Admin/Form/Extensions.php index 31be15dfd0..d5a7d70311 100644 --- 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 4379559175..cea3100359 100644 --- 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 3a389e200f..3a161b4fe9 100755 --- 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 fc2d9622fd..7f5c87f6a9 100755 --- 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 425414cd91..a20189bddd 100644 --- 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 5cd2a80d8d..70b54ac57b 100644 --- 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 c04ba29995..0f878431bd 100644 --- 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 169b2dfb0a..7fb4aa0e52 100644 --- a/CRM/Core/BAO/Navigation.php +++ b/CRM/Core/BAO/Navigation.php @@ -630,7 +630,7 @@ ORDER BY parent_id, weight"; "; //
  • tag doesn't need to be closed } diff --git a/CRM/Core/BAO/Setting.php b/CRM/Core/BAO/Setting.php index ae9af0d1a4..8c2a3b7f31 100644 --- 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 0a81bde29a..e845b11b38 100644 --- 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 567c466f23..a395224489 100644 --- 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 1fc02d62d1..36d7db36dd 100644 --- 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 e34c6fa1ef..0f42fad21f 100644 --- 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 953678f32d..3e4494422c 100644 --- 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) . ''; + $el['html'] = implode('; ', $display) . ''; } /** diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php index fa8f5602ea..d478d2db16 100644 --- 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 cc714c9c89..e87b4aab7d 100644 --- 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 ba3aba2b75..43510502fe 100644 --- 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 6d14587708..b7af63b929 100644 --- a/CRM/Financial/BAO/ExportFormat.php +++ b/CRM/Financial/BAO/ExportFormat.php @@ -197,14 +197,14 @@ class CRM_Financial_BAO_ExportFormat { $details = '

    ' . ts('Record:') . ' ' . $values['title'] . '

    ' . ts('Description:') . '

    ' . ts('Created By:') . " $createdBy" . '

    ' . ts('Created Date:') . ' ' . $values['created_date'] . '

    ' . ts('Last Modified By:') . ' ' . $modifiedBy . '

    ' . ts('Payment Instrument:') . ' ' . $values['payment_instrument_id'] . '

    '; $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 5043255088..76891bcad5 100644 --- 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 d5d81bc621..ade03e298b 100644 --- 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 = ''; } - $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 02dab2fd5b..5b8cc30436 100644 --- 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 22df3bb1c5..e1d396a348 100644 --- 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 d219cdf29a..fb58e1e299 100644 --- 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'] = ""; + $row[$financialItem->id]['check'] = ""; $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'] = ""; + $row[$financialItem->id]['check'] = ""; $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 d7f9b29bde..699215d792 100644 --- 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 fe17e97464..4cc084c077 100644 --- 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 17968e93e0..92b45e9057 100644 --- 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 6976f7a7f6..ff67088dc0 100644 --- 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'] = '' . $opt['label'] . '' . '' . CRM_Utils_Money::format($opt[$valueFieldName]) . ''; - $opt['label'] .= ' + ' . CRM_Utils_Money::format($opt['tax_amount']) . ' ' . $taxTerm . ''; + $opt['label'] .= ' + ' . CRM_Utils_Money::format($opt['tax_amount']) . ' ' . $taxTerm . ''; } } else { @@ -794,7 +794,7 @@ WHERE id IN (" . implode(',', array_keys($priceFields)) . ')'; } else { $label = CRM_Utils_Money::format($opt[$valueFieldName]); - $label .= ' + ' . CRM_Utils_Money::format($opt['tax_amount']) . ' ' . $taxTerm . ''; + $label .= ' + ' . CRM_Utils_Money::format($opt['tax_amount']) . ' ' . $taxTerm . ''; } return $label; diff --git a/CRM/Profile/Page/MultipleRecordFieldsListing.php b/CRM/Profile/Page/MultipleRecordFieldsListing.php index fda8627877..c8bdf03abf 100644 --- 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 de6d783442..ec48efa8c1 100644 --- 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 b6129522a0..beddb3c0f1 100644 --- 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 .= '

    ' . 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 .= '

    ' . 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 f8e2d09d81..39e046d4f5 100644 --- 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 ec5f51bec0..c2c498b8ca 100644 --- 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 .= "
    " . 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 http://forum.civicrm.org/index.php/topic,26181.0.html.') . ""; + $preUpgradeMessage .= "
    " . 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 http://forum.civicrm.org/index.php/topic,26181.0.html.') . ""; } } diff --git a/CRM/Utils/Cache/SerializeCache.php b/CRM/Utils/Cache/SerializeCache.php index f00e3c8a8f..2e6ede07b6 100644 --- 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 9e762d2fa0..ef11c256cb 100644 --- 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 . '

    '; + $message = ts('Could not connect to MailStore for ') . $dao->username . '@' . $dao->server . '

    '; $message .= ts('Error message: '); $message .= '

    ' . $e->getMessage() . '

    '; CRM_Core_Error::fatal($message); diff --git a/api/v3/Activity.php b/api/v3/Activity.php index b8ff55bd2f..fc1e693f6d 100644 --- 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 281897beb8..13b832c77e 100644 --- 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 a3df2cb68b..95d0c678c7 100644 --- 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 b16b49cb07..a40e47ee3e 100644 --- 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 4db64adba8..d6ace534ee 100644 --- 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 eae44d0c5a..1c177d99d6 100644 --- 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 14faf22118..550c56cd56 100644 --- 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 a775679e68..84640680b4 100644 --- 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 e7238d6e83..b0306389a1 100644 --- 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 ca1f891b95..988209b178 100644 --- 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 292bee2cc7..767e6e8b1e 100644 --- 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 262463b564..6ee756dbdd 100644 --- 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 37c7a9272c..3dcdda4e5e 100644 --- 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 59890c9784..194f0968d9 100644 --- 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 5bcd5f9eab..1f1b38dcc2 100644 --- 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 5ba8143da8..eb5661f93a 100644 --- 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 7ec5aff507..b63f4367a3 100644 --- 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 43e6d3c3f4..dcd5246d4c 100644 --- 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']]); } } -- 2.25.1