CIVICRM-1383 Remove typo, double ;; from CiviCRM code

diff --git a/CRM/Contact/Form/Search/Custom/FullText/Activity.php b/CRM/Contact/Form/Search/Custom/FullText/Activity.php
index a6cf61d614766d89241a14e4bbf974933fa840dd..2e18c7c945097d6d32632434c564b7c06ed00a90 100644 (file)
--- a/CRM/Contact/Form/Search/Custom/FullText/Activity.php
+++ b/CRM/Contact/Form/Search/Custom/FullText/Activity.php
@@ -121,7 +121,7 @@ AND    (ca.is_deleted = 0 OR ca.is_deleted IS NULL)
     ];
 
     $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 923683a60ef4ff76d10bdc4756391a247223f4fd..f6574dcebe83236c121e6177dba690f268b0fa35 100644 (file)
--- a/CRM/Contact/Form/Task/HookSample.php
+++ b/CRM/Contact/Form/Task/HookSample.php
@@ -45,7 +45,7 @@ class CRM_Contact_Form_Task_HookSample extends CRM_Contact_Form_Task {
     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 d5413f5ad77db9b4f2c08aee6f89407c8d85ec68..9e2e62e6c08413bcb4862f0b838491f1b4af9a4b 100644 (file)
--- a/CRM/Contribute/ActionMapping/ByPage.php
+++ b/CRM/Contribute/ActionMapping/ByPage.php
@@ -195,7 +195,7 @@ class CRM_Contribute_ActionMapping_ByPage implements \Civi\ActionSchedule\Mappin
     $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 7339130d57628bdd5dda8099d7e90cf087d78300..c2d55fbd40e54b827c6e2bdc9f74ce9938e08f32 100644 (file)
--- a/CRM/Contribute/ActionMapping/ByType.php
+++ b/CRM/Contribute/ActionMapping/ByType.php
@@ -203,7 +203,7 @@ class CRM_Contribute_ActionMapping_ByType implements \Civi\ActionSchedule\Mappin
     $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 6987eab95d114a14e35a8ec4c39a6e46c4f4939f..56c94852814aee33183de1a0681d86686bcf29ab 100644 (file)
--- a/CRM/Core/BAO/CustomQuery.php
+++ b/CRM/Core/BAO/CustomQuery.php
@@ -349,7 +349,7 @@ SELECT f.id, f.label, f.data_type,
 
           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 9bef0644e7d82f43b2dbd96e27ba2869d85fbd35..98db373d5946f8eb882ea65bf6d20881c5fffcb9 100644 (file)
--- a/CRM/Core/BAO/OptionGroup.php
+++ b/CRM/Core/BAO/OptionGroup.php
@@ -93,7 +93,7 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
       $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 782c9dd218e573293302eb4057653c9897ec8d68..b23970927d736bdb85bc1b3e8a38d647e5bdec9b 100644 (file)
--- a/CRM/Core/BAO/UFField.php
+++ b/CRM/Core/BAO/UFField.php
@@ -203,7 +203,7 @@ class CRM_Core_BAO_UFField extends CRM_Core_DAO_UFField {
     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 d0c4bbccfbd3dce8b08ece8ace90775778d5fcc1..ad955a0efc373088f7f6e6c8b0a06499f5a50f80 100644 (file)
--- a/CRM/Core/Payment/Elavon.php
+++ b/CRM/Core/Payment/Elavon.php
@@ -77,7 +77,7 @@ class CRM_Core_Payment_Elavon extends CRM_Core_Payment {
     $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 6b2e220785a19faa2bf6dc46216ac58a58e21bcf..9e56c28cb4dccdbc42aa56fc49c0eb0b4e1b37e7 100644 (file)
--- a/CRM/Custom/Page/Group.php
+++ b/CRM/Custom/Page/Group.php
@@ -247,7 +247,7 @@ class CRM_Custom_Page_Group extends CRM_Core_Page {
     $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 031f2688e4a763732d04ec0a226b55e649933119..7aebcaf6a59a3c7918983866dca22bdadd418c72 100644 (file)
--- a/CRM/Event/ActionMapping.php
+++ b/CRM/Event/ActionMapping.php
@@ -151,7 +151,7 @@ class CRM_Event_ActionMapping extends \Civi\ActionSchedule\Mapping {
     $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 f0fcb02b74ba016dde50bd6d30e3f81f5d83b629..971105c5c1a77411dc9626861832326bd36cd1b8 100644 (file)
--- a/CRM/Event/BAO/Participant.php
+++ b/CRM/Event/BAO/Participant.php
@@ -1910,7 +1910,7 @@ WHERE    civicrm_participant.contact_id = {$contactID} AND
     ];
 
     // 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 893b48459477009aa2899747bf2b838c9876275d..3edc77bc5ddc0a34cfd746fb8dd2cac69ecfa17e 100644 (file)
--- a/CRM/Event/Import/Parser/Participant.php
+++ b/CRM/Event/Import/Parser/Participant.php
@@ -607,7 +607,7 @@ class CRM_Event_Import_Parser_Participant extends CRM_Event_Import_Parser {
 
         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 342c32a612b241c1a2a75ee73d2b6ba43822b8ad..8fd8e39543dccbf49d597316029c51074df3c7e2 100644 (file)
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -960,7 +960,7 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
       $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 ee61627f27b500f0bf9d22dc293d7d4bfb771ca9..d9b640d494150d8ae549088a17c52d1f133d371c 100644 (file)
--- a/CRM/Price/Form/Option.php
+++ b/CRM/Price/Form/Option.php
@@ -105,7 +105,7 @@ class CRM_Price_Form_Option extends CRM_Core_Form {
     }
     // 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 0c5431cb2c4038eca99b7a00e90b7f35205ecd5d..29517b49cb56ce50eb01f38cbb87aea6edc081c7 100644 (file)
--- a/CRM/UF/Form/Preview.php
+++ b/CRM/UF/Form/Preview.php
@@ -107,7 +107,7 @@ class CRM_UF_Form_Preview extends CRM_UF_Form_AbstractPreview {
       $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 4794492d8702dafbec89531d5a3095af718d6ee4..9a5885a3cac3699e3efaa02e2b283d387f0dcc5e 100644 (file)
--- a/CRM/Upgrade/Incremental/SmartGroups.php
+++ b/CRM/Upgrade/Incremental/SmartGroups.php
@@ -123,7 +123,7 @@ class CRM_Upgrade_Incremental_SmartGroups {
             $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 7ad11729ac63a13886111d2bb97ef9ebb5e16d25..abc4bf9e211c51f1f264a38d05b010a901d10b34 100644 (file)
--- a/CRM/Utils/Date.php
+++ b/CRM/Utils/Date.php
@@ -1565,7 +1565,7 @@ class CRM_Utils_Date {
 
           case 'greater':
             $from['d'] = 1;
-            $from['M'] = $now['mon'];;
+            $from['M'] = $now['mon'];
             $from['Y'] = $now['year'];
             unset($to);
             break;
@@ -1607,7 +1607,7 @@ class CRM_Utils_Date {
 
           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 @@ class CRM_Utils_Date {
 
           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 29232e7cd21361c672fc6bced5713c8c327acfdc..745755ebec8b6ed28467437d157fdaff2ac046ee 100644 (file)
--- a/templates/CRM/Admin/Page/Admin.tpl
+++ b/templates/CRM/Admin/Page/Admin.tpl
@@ -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>

diff --git a/templates/CRM/common/additionalBlocks.tpl b/templates/CRM/common/additionalBlocks.tpl
index 40f6220079923d780c44ca6110ea97f26e154c24..001e9511d02a41ae34b85a504f6f3e89c698ddf0 100644 (file)
--- 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 851481de221bb9d2b6aa8646ec14c62f93c8813d..9ad163a1262cad0d78c04872d5376f1acd3f2f90 100644 (file)
--- a/tests/phpunit/CRM/Event/Form/ParticipantTest.php
+++ b/tests/phpunit/CRM/Event/Form/ParticipantTest.php
@@ -134,7 +134,7 @@ class CRM_Event_Form_ParticipantTest extends CiviUnitTestCase {
     // 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 f179af1f0f94f9e5cf2e0f6eb26d0214e7ed4cfc..ce56d5a0c77833de9eff8a48bbdc246686ed6e83 100644 (file)
--- a/tests/phpunit/CiviTest/CiviMailUtils.php
+++ b/tests/phpunit/CiviTest/CiviMailUtils.php
@@ -371,7 +371,7 @@ class CiviMailUtils extends PHPUnit\Framework\TestCase {
       $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 59d3bdafa4379f12307be87ee988ed3868c7f23b..08b77ab534ea949ec84409247588b4946249a316 100644 (file)
--- a/tests/phpunit/api/v3/SystemCheckTest.php
+++ b/tests/phpunit/api/v3/SystemCheckTest.php
@@ -135,7 +135,7 @@ class api_v3_SystemCheckTest extends CiviUnitTestCase {
         $testedCheck = [];
       }
     }
-    $this->assertEquals($testedCheck['is_visible'], '0', 'in line ' . __LINE__);;
+    $this->assertEquals($testedCheck['is_visible'], '0', 'in line ' . __LINE__);
   }
 
   /**