From 0880699a765f990c47fb3cf51cf4dcdfcbaa8938 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 12 Apr 2023 09:16:29 +1200 Subject: [PATCH] Remove some ; --- CRM/Import/ImportProcessor.php | 2 +- CRM/Mailing/Page/Open.php | 2 +- CRM/Upgrade/Incremental/Base.php | 2 +- CRM/Utils/System/WordPress.php | 2 +- Civi/Api4/Service/Spec/Provider/FieldDomainIdSpecProvider.php | 2 +- ext/flexmailer/src/Listener/Abdicator.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CRM/Import/ImportProcessor.php b/CRM/Import/ImportProcessor.php index e125e82aad..fbbe9d85ee 100644 --- a/CRM/Import/ImportProcessor.php +++ b/CRM/Import/ImportProcessor.php @@ -625,7 +625,7 @@ class CRM_Import_ImportProcessor { $processor = new CRM_Import_ImportProcessor(); $processor->setMappingID($mapping['id']); $processor->setMetadata(CRM_Contact_BAO_Contact::importableFields('All')); - $processor->legacyLoadSavedMapping();; + $processor->legacyLoadSavedMapping(); foreach ($processor->getMappingFields() as $field) { // The if is mostly precautionary against running this more than once // - which is common in dev if not live... diff --git a/CRM/Mailing/Page/Open.php b/CRM/Mailing/Page/Open.php index dbb8d85419..3a2870d5ad 100644 --- a/CRM/Mailing/Page/Open.php +++ b/CRM/Mailing/Page/Open.php @@ -33,7 +33,7 @@ class CRM_Mailing_Page_Open extends CRM_Core_Page { $queue_id = CRM_Utils_Request::retrieveValue('qid', 'Positive', NULL, FALSE, 'GET'); if (!$queue_id) { // Deprecated: "?q=" is problematic in Drupal integrations, but we'll accept if igiven - $queue_id = CRM_Utils_Request::retrieveValue('q', 'Positive', NULL, FALSE, 'GET');; + $queue_id = CRM_Utils_Request::retrieveValue('q', 'Positive', NULL, FALSE, 'GET'); } if (!$queue_id) { echo "Missing input parameters\n"; diff --git a/CRM/Upgrade/Incremental/Base.php b/CRM/Upgrade/Incremental/Base.php index 4171e4b5dc..29e5048759 100644 --- a/CRM/Upgrade/Incremental/Base.php +++ b/CRM/Upgrade/Incremental/Base.php @@ -50,7 +50,7 @@ class CRM_Upgrade_Incremental_Base { $revList = []; $sqlGlob = implode(DIRECTORY_SEPARATOR, [dirname(__FILE__), 'sql', $this->getMajorMinor() . '.*.mysql.tpl']); - $sqlFiles = glob($sqlGlob);; + $sqlFiles = glob($sqlGlob); foreach ($sqlFiles as $file) { $revList[] = basename($file, '.mysql.tpl'); } diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php index a384dfa6ea..a9e462eeb6 100644 --- a/CRM/Utils/System/WordPress.php +++ b/CRM/Utils/System/WordPress.php @@ -884,7 +884,7 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { $user_data['user_pass'] = $params['cms_pass']; } else { - $user_data['user_pass'] = wp_generate_password(12, FALSE);; + $user_data['user_pass'] = wp_generate_password(12, FALSE); } // Assign WordPress User "name" field(s). diff --git a/Civi/Api4/Service/Spec/Provider/FieldDomainIdSpecProvider.php b/Civi/Api4/Service/Spec/Provider/FieldDomainIdSpecProvider.php index e7912950df..bdce1fc331 100644 --- a/Civi/Api4/Service/Spec/Provider/FieldDomainIdSpecProvider.php +++ b/Civi/Api4/Service/Spec/Provider/FieldDomainIdSpecProvider.php @@ -27,7 +27,7 @@ class FieldDomainIdSpecProvider extends \Civi\Core\Service\AutoService implement $domainIdField = $spec->getFieldByName('domain_id'); // TODO: The WordReplacement entity should have domain_id required so this OR condition can be removed if ($domainIdField && ($domainIdField->isRequired() || $domainIdField->getEntity() === 'WordReplacement')) { - $domainIdField->setRequired(FALSE)->setDefaultValue('current_domain');; + $domainIdField->setRequired(FALSE)->setDefaultValue('current_domain'); } } diff --git a/ext/flexmailer/src/Listener/Abdicator.php b/ext/flexmailer/src/Listener/Abdicator.php index dd42953b3d..3c1a1e2fd8 100644 --- a/ext/flexmailer/src/Listener/Abdicator.php +++ b/ext/flexmailer/src/Listener/Abdicator.php @@ -76,7 +76,7 @@ class Abdicator { $errors = \CRM_Mailing_BAO_Mailing::checkSendable($e->getMailing()); if (is_array($errors)) { foreach ($errors as $key => $message) { - $e->setError($key, $message);; + $e->setError($key, $message); } } } -- 2.25.1