diff --git a/CRM/Contact/Form/Search/Custom/FullText/Activity.php b/CRM/Contact/Form/Search/Custom/FullText/Activity.php index a6cf61d61476..2e18c7c94509 100644 --- a/CRM/Contact/Form/Search/Custom/FullText/Activity.php +++ b/CRM/Contact/Form/Search/Custom/FullText/Activity.php @@ -121,7 +121,7 @@ public function prepareQueries($queryText, $entityIDTableName) { ]; $this->fillCustomInfo($tables, "( 'Activity' )"); - return $tables;; + return $tables; } /** diff --git a/CRM/Contact/Form/Task/HookSample.php b/CRM/Contact/Form/Task/HookSample.php index 923683a60ef4..f6574dcebe83 100644 --- a/CRM/Contact/Form/Task/HookSample.php +++ b/CRM/Contact/Form/Task/HookSample.php @@ -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 diff --git a/CRM/Contribute/ActionMapping/ByPage.php b/CRM/Contribute/ActionMapping/ByPage.php index d5413f5ad77d..9e2e62e6c084 100644 --- a/CRM/Contribute/ActionMapping/ByPage.php +++ b/CRM/Contribute/ActionMapping/ByPage.php @@ -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'; diff --git a/CRM/Contribute/ActionMapping/ByType.php b/CRM/Contribute/ActionMapping/ByType.php index 7339130d5762..c2d55fbd40e5 100644 --- a/CRM/Contribute/ActionMapping/ByType.php +++ b/CRM/Contribute/ActionMapping/ByType.php @@ -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'; diff --git a/CRM/Core/BAO/CustomQuery.php b/CRM/Core/BAO/CustomQuery.php index 6987eab95d11..56c94852814a 100644 --- a/CRM/Core/BAO/CustomQuery.php +++ b/CRM/Core/BAO/CustomQuery.php @@ -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': diff --git a/CRM/Core/BAO/OptionGroup.php b/CRM/Core/BAO/OptionGroup.php index 9bef0644e7d8..98db373d5946 100644 --- a/CRM/Core/BAO/OptionGroup.php +++ b/CRM/Core/BAO/OptionGroup.php @@ -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; } diff --git a/CRM/Core/BAO/UFField.php b/CRM/Core/BAO/UFField.php index 782c9dd218e5..b23970927d73 100644 --- a/CRM/Core/BAO/UFField.php +++ b/CRM/Core/BAO/UFField.php @@ -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']); diff --git a/CRM/Core/Payment/Elavon.php b/CRM/Core/Payment/Elavon.php index d0c4bbccfbd3..ad955a0efc37 100644 --- a/CRM/Core/Payment/Elavon.php +++ b/CRM/Core/Payment/Elavon.php @@ -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"; diff --git a/CRM/Custom/Page/Group.php b/CRM/Custom/Page/Group.php index 6b2e220785a1..9e56c28cb4dc 100644 --- a/CRM/Custom/Page/Group.php +++ b/CRM/Custom/Page/Group.php @@ -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); diff --git a/CRM/Event/ActionMapping.php b/CRM/Event/ActionMapping.php index 031f2688e4a7..7aebcaf6a59a 100644 --- a/CRM/Event/ActionMapping.php +++ b/CRM/Event/ActionMapping.php @@ -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'; diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php index f0fcb02b74ba..971105c5c1a7 100644 --- a/CRM/Event/BAO/Participant.php +++ b/CRM/Event/BAO/Participant.php @@ -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; diff --git a/CRM/Event/Import/Parser/Participant.php b/CRM/Event/Import/Parser/Participant.php index 893b48459477..3edc77bc5ddc 100644 --- a/CRM/Event/Import/Parser/Participant.php +++ b/CRM/Event/Import/Parser/Participant.php @@ -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': diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index 342c32a612b2..8fd8e39543dc 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -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); diff --git a/CRM/Price/Form/Option.php b/CRM/Price/Form/Option.php index ee61627f27b5..d9b640d49415 100644 --- a/CRM/Price/Form/Option.php +++ b/CRM/Price/Form/Option.php @@ -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]; diff --git a/CRM/UF/Form/Preview.php b/CRM/UF/Form/Preview.php index 0c5431cb2c40..29517b49cb56 100644 --- a/CRM/UF/Form/Preview.php +++ b/CRM/UF/Form/Preview.php @@ -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]; } diff --git a/CRM/Upgrade/Incremental/SmartGroups.php b/CRM/Upgrade/Incremental/SmartGroups.php index 4794492d8702..9a5885a3cac3 100644 --- a/CRM/Upgrade/Incremental/SmartGroups.php +++ b/CRM/Upgrade/Incremental/SmartGroups.php @@ -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) { diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php index 7ad11729ac63..abc4bf9e211c 100644 --- a/CRM/Utils/Date.php +++ b/CRM/Utils/Date.php @@ -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; @@ -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']; @@ -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; diff --git a/templates/CRM/Admin/Page/Admin.tpl b/templates/CRM/Admin/Page/Admin.tpl index 29232e7cd213..745755ebec8b 100644 --- a/templates/CRM/Admin/Page/Admin.tpl +++ b/templates/CRM/Admin/Page/Admin.tpl @@ -46,7 +46,7 @@ -
{$group.show} {$group.title} + diff --git a/templates/CRM/common/additionalBlocks.tpl b/templates/CRM/common/additionalBlocks.tpl index 40f622007992..001e9511d02a 100644 --- a/templates/CRM/common/additionalBlocks.tpl +++ b/templates/CRM/common/additionalBlocks.tpl @@ -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' : ''; diff --git a/tests/phpunit/CRM/Event/Form/ParticipantTest.php b/tests/phpunit/CRM/Event/Form/ParticipantTest.php index 851481de221b..9ad163a1262c 100644 --- a/tests/phpunit/CRM/Event/Form/ParticipantTest.php +++ b/tests/phpunit/CRM/Event/Form/ParticipantTest.php @@ -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'], diff --git a/tests/phpunit/CiviTest/CiviMailUtils.php b/tests/phpunit/CiviTest/CiviMailUtils.php index f179af1f0f94..ce56d5a0c778 100644 --- a/tests/phpunit/CiviTest/CiviMailUtils.php +++ b/tests/phpunit/CiviTest/CiviMailUtils.php @@ -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; } diff --git a/tests/phpunit/api/v3/SystemCheckTest.php b/tests/phpunit/api/v3/SystemCheckTest.php index 59d3bdafa437..08b77ab534ea 100644 --- a/tests/phpunit/api/v3/SystemCheckTest.php +++ b/tests/phpunit/api/v3/SystemCheckTest.php @@ -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__); } /**