Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Code style, remove typo, double ;; from code where it makes sense to do so #16001

Merged
merged 1 commit into from
Dec 2, 2019
Merged

Code style, remove typo, double ;; from code where it makes sense to do so #16001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CRM/Contact/Form/Search/Custom/FullText/Activity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function prepareQueries($queryText, $entityIDTableName) {
];

$this->fillCustomInfo($tables, "( 'Activity' )");
return $tables;;
return $tables;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contact/Form/Task/HookSample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function preProcess() {
parent::preProcess();

// display name and email of all contact ids
$contactIDs = implode(',', $this->_contactIds);;
$contactIDs = implode(',', $this->_contactIds);
$query = "
SELECT c.id as contact_id, c.display_name as name,
c.contact_type as contact_type, e.email as email
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contribute/ActionMapping/ByPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public function createQuery($schedule, $phase, $defaultParams) {
$selectedValues = (array) \CRM_Utils_Array::explodePadded($schedule->entity_value);
$selectedStatuses = (array) \CRM_Utils_Array::explodePadded($schedule->entity_status);

$query = \CRM_Utils_SQL_Select::from("civicrm_contribution e")->param($defaultParams);;
$query = \CRM_Utils_SQL_Select::from("civicrm_contribution e")->param($defaultParams);
$query['casAddlCheckFrom'] = 'civicrm_contribution e';
$query['casContactIdField'] = 'e.contact_id';
$query['casEntityIdField'] = 'e.id';
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contribute/ActionMapping/ByType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public function createQuery($schedule, $phase, $defaultParams) {
$selectedValues = (array) \CRM_Utils_Array::explodePadded($schedule->entity_value);
$selectedStatuses = (array) \CRM_Utils_Array::explodePadded($schedule->entity_status);

$query = \CRM_Utils_SQL_Select::from("civicrm_contribution e")->param($defaultParams);;
$query = \CRM_Utils_SQL_Select::from("civicrm_contribution e")->param($defaultParams);
$query['casAddlCheckFrom'] = 'civicrm_contribution e';
$query['casContactIdField'] = 'e.contact_id';
$query['casEntityIdField'] = 'e.id';
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/BAO/CustomQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ public function where() {

case 'Int':
$this->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause($fieldName, $op, $value, 'Integer');
$this->_qill[$grouping][] = ts("%1 %2 %3", [1 => $field['label'], 2 => $qillOp, 3 => $qillValue]);;
$this->_qill[$grouping][] = ts("%1 %2 %3", [1 => $field['label'], 2 => $qillOp, 3 => $qillValue]);
break;

case 'Boolean':
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/BAO/OptionGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public static function add(&$params, $ids = []) {
$params['id'] = $ids['optionGroup'];
}
$optionGroup = new CRM_Core_DAO_OptionGroup();
$optionGroup->copyValues($params);;
$optionGroup->copyValues($params);
$optionGroup->save();
return $optionGroup;
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/BAO/UFField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public static function duplicateField($params) {
else {
$ufField->location_type_id = CRM_Utils_Array::value('location_type_id', $params);
}
$ufField->phone_type_id = CRM_Utils_Array::value('phone_type_id', $params);;
$ufField->phone_type_id = CRM_Utils_Array::value('phone_type_id', $params);

if (!empty($params['id'])) {
$ufField->whereAdd("id <> " . $params['id']);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/Payment/Elavon.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function mapProcessorFieldstoParams($params) {
$requestFields['ssl_ship_to_last_name'] = $params['last_name'];
$requestFields['ssl_card_number'] = $params['credit_card_number'];
$requestFields['ssl_amount'] = trim($params['amount']);
$requestFields['ssl_exp_date'] = sprintf('%02d', (int) $params['month']) . substr($params['year'], 2, 2);;
$requestFields['ssl_exp_date'] = sprintf('%02d', (int) $params['month']) . substr($params['year'], 2, 2);
$requestFields['ssl_cvv2cvc2'] = $params['cvv2'];
// CVV field passed to processor
$requestFields['ssl_cvv2cvc2_indicator'] = "1";
Expand Down
2 changes: 1 addition & 1 deletion CRM/Custom/Page/Group.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public function browse($action = NULL) {
$subTypes['Grant'] = CRM_Core_OptionGroup::values('grant_type');
$subTypes['Campaign'] = CRM_Campaign_PseudoConstant::campaignType();
$subTypes['Participant'] = [];
$subTypes['ParticipantRole'] = CRM_Core_OptionGroup::values('participant_role');;
$subTypes['ParticipantRole'] = CRM_Core_OptionGroup::values('participant_role');
$subTypes['ParticipantEventName'] = CRM_Event_PseudoConstant::event();
$subTypes['ParticipantEventType'] = CRM_Core_OptionGroup::values('event_type');
$subTypes['Individual'] = CRM_Contact_BAO_ContactType::subTypePairs('Individual', FALSE, NULL);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/ActionMapping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public function createQuery($schedule, $phase, $defaultParams) {
$selectedValues = (array) \CRM_Utils_Array::explodePadded($schedule->entity_value);
$selectedStatuses = (array) \CRM_Utils_Array::explodePadded($schedule->entity_status);

$query = \CRM_Utils_SQL_Select::from("{$this->entity} e")->param($defaultParams);;
$query = \CRM_Utils_SQL_Select::from("{$this->entity} e")->param($defaultParams);
$query['casAddlCheckFrom'] = 'civicrm_event r';
$query['casContactIdField'] = 'e.contact_id';
$query['casEntityIdField'] = 'e.id';
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/BAO/Participant.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,7 +1910,7 @@ public static function addActivityForSelection($participantId, $activityType) {
];

// create activity with target contacts
$id = CRM_Core_Session::singleton()->getLoggedInContactID();;
$id = CRM_Core_Session::singleton()->getLoggedInContactID();
if ($id) {
$activityParams['source_contact_id'] = $id;
$activityParams['target_contact_id'][] = $contactId;
Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Import/Parser/Participant.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ protected function formatValues(&$values, $params) {

case 'participant_status':
$status = CRM_Event_PseudoConstant::participantStatus();
$values['participant_status_id'] = CRM_Utils_Array::key($value, $status);;
$values['participant_status_id'] = CRM_Utils_Array::key($value, $status);
break;

case 'participant_role_id':
Expand Down
2 changes: 1 addition & 1 deletion CRM/Member/BAO/Membership.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ public static function &importableFields($contactType = 'Individual', $status =
$tmpContactField['external_identifier'] = $contactFields['external_identifier'];
$tmpContactField['external_identifier']['title'] = $contactFields['external_identifier']['title'] . " " . ts('(match to contact)');

$tmpFields['membership_contact_id']['title'] = $tmpFields['membership_contact_id']['title'] . " " . ts('(match to contact)');;
$tmpFields['membership_contact_id']['title'] = $tmpFields['membership_contact_id']['title'] . " " . ts('(match to contact)');

$fields = array_merge($fields, $tmpContactField);
$fields = array_merge($fields, $tmpFields);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Price/Form/Option.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function setDefaultValues() {
}
// set financial type used for price set to set default for new option
if (!$this->_oid) {
$defaults['financial_type_id'] = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $this->_sid, 'financial_type_id', 'id');;
$defaults['financial_type_id'] = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $this->_sid, 'financial_type_id', 'id');
}
if (!isset($defaults['weight']) || !$defaults['weight']) {
$fieldValues = ['price_field_id' => $this->_fid];
Expand Down
2 changes: 1 addition & 1 deletion CRM/UF/Form/Preview.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function preProcess() {
$fieldArray[$name] = $fields[$name];

if ($fieldDAO->field_name == 'phone_and_ext') {
$phoneExtField = str_replace('phone', 'phone_ext', $name);;
$phoneExtField = str_replace('phone', 'phone_ext', $name);
$fieldArray[$phoneExtField] = $fields[$phoneExtField];
}

Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/SmartGroups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function datePickerConversion($fields) {
$hasRelative = TRUE;
}
if ($formValue[0] === $relativeFieldName && empty($formValue[2])) {
unset($formValues[$index]);;
unset($formValues[$index]);
}
elseif (in_array($formValue[0], $fieldPossibilities)) {
if ($isRelative) {
Expand Down
6 changes: 3 additions & 3 deletions CRM/Utils/Date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1565,7 +1565,7 @@ public static function relativeToAbsolute($relativeTerm, $unit) {

case 'greater':
$from['d'] = 1;
$from['M'] = $now['mon'];;
$from['M'] = $now['mon'];
$from['Y'] = $now['year'];
unset($to);
break;
Expand Down Expand Up @@ -1607,7 +1607,7 @@ public static function relativeToAbsolute($relativeTerm, $unit) {

case 'current':
$from['d'] = 1;
$from['M'] = $now['mon'];;
$from['M'] = $now['mon'];
$from['Y'] = $now['year'];
$to['d'] = $now['mday'];
$to['M'] = $now['mon'];
Expand Down Expand Up @@ -1843,7 +1843,7 @@ public static function relativeToAbsolute($relativeTerm, $unit) {

case 'greater':
$from['d'] = $now['mday'];
$from['M'] = $now['mon'];;
$from['M'] = $now['mon'];
$from['Y'] = $now['year'];
unset($to);
break;
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Admin/Page/Admin.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<table class="form-layout">
<tr>
<td width="20%" class="font-size11pt" style="vertical-align: top;">{$group.show} {$group.title}</td>
<td width="80%" style="white-space: nowrap;;">
<td width="80%" style="white-space: nowrap;">

<table class="form-layout" width="100%">
<tr>
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/common/additionalBlocks.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function buildAdditionalBlocks( blockName, className ) {
cj("#" + blockName + '-Primary-html').show( );
}

var dataUrl = {/literal}"{crmURL h=0 q='snippet=4'}"{literal} + '&block=' + blockName + '&count=' + currentInstance;;
var dataUrl = {/literal}"{crmURL h=0 q='snippet=4'}"{literal} + '&block=' + blockName + '&count=' + currentInstance;

if ( className == 'CRM_Event_Form_ManageEvent_Location' ) {
dataUrl = ( currentInstance <= 2 ) ? dataUrl + '&subPage=Location' : '';
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/CRM/Event/Form/ParticipantTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public function testPaymentAllocationOnMultiLineItemEvent() {
// 5. Record the additional amount which $40 ($50-$10)
// Expected : Check the amount of new Financial Item created is $40
$this->createParticipantRecordsFromTwoFieldPriceSet();
$priceSetBlock = CRM_Price_BAO_PriceSet::getSetDetail($this->_ids['price_set'], TRUE, FALSE)[$this->_ids['price_set']]['fields'];;
$priceSetBlock = CRM_Price_BAO_PriceSet::getSetDetail($this->_ids['price_set'], TRUE, FALSE)[$this->_ids['price_set']]['fields'];

$priceSetParams = [
'priceSetId' => $this->_ids['price_set'],
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/CiviTest/CiviMailUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ public function checkMailForStrings($strings, $absentStrings, $prefix, $mail) {
$this->_ut->assertContains($string, $mail, "$string . not found in $mail $prefix");
}
foreach ($absentStrings as $string) {
$this->_ut->assertEmpty(strstr($mail, $string), "$string incorrectly found in $mail $prefix");;
$this->_ut->assertEmpty(strstr($mail, $string), "$string incorrectly found in $mail $prefix");
}
return $mail;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/api/v3/SystemCheckTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public function testSystemCheckHushFuture($version) {
$testedCheck = [];
}
}
$this->assertEquals($testedCheck['is_visible'], '0', 'in line ' . __LINE__);;
$this->assertEquals($testedCheck['is_visible'], '0', 'in line ' . __LINE__);
}

/**
Expand Down