From 0efafdb0afffe0374a09caaf68e68f7d5f8b0c52 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 5 Jun 2021 23:13:40 +0000
Subject: [PATCH] [php8-compat] Fix some more examples of where required
 parameters are after optional parameters in fucntion declaration

---
 CRM/Activity/Import/Parser.php             | 2 +-
 CRM/Campaign/Form/Campaign.php             | 2 +-
 CRM/Contribute/Import/Parser.php           | 2 +-
 CRM/Core/Smarty/plugins/block.localize.php | 2 +-
 CRM/Event/Form/Registration.php            | 4 ++--
 CRM/Event/Import/Parser.php                | 2 +-
 CRM/Member/Import/Parser.php               | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php
index 73bc3a02b0..3846fd9e07 100644
--- a/CRM/Activity/Import/Parser.php
+++ b/CRM/Activity/Import/Parser.php
@@ -58,7 +58,7 @@ abstract class CRM_Activity_Import_Parser extends CRM_Import_Parser {
    */
   public function run(
     array $fileName,
-    $separator = ',',
+    $separator,
     &$mapper,
     $skipColumnHeader = FALSE,
     $mode = self::MODE_PREVIEW,
diff --git a/CRM/Campaign/Form/Campaign.php b/CRM/Campaign/Form/Campaign.php
index e112636b43..be1e9bc39b 100644
--- a/CRM/Campaign/Form/Campaign.php
+++ b/CRM/Campaign/Form/Campaign.php
@@ -314,7 +314,7 @@ class CRM_Campaign_Form_Campaign extends CRM_Core_Form {
     }
   }
 
-  public static function submit($params = [], $form) {
+  public static function submit($params, $form) {
     $groups = [];
     if (!empty($params['includeGroups']) && is_array($params['includeGroups'])) {
       foreach ($params['includeGroups'] as $key => $id) {
diff --git a/CRM/Contribute/Import/Parser.php b/CRM/Contribute/Import/Parser.php
index 77ec4824cb..8cd494f386 100644
--- a/CRM/Contribute/Import/Parser.php
+++ b/CRM/Contribute/Import/Parser.php
@@ -118,7 +118,7 @@ abstract class CRM_Contribute_Import_Parser extends CRM_Import_Parser {
    */
   public function run(
     $fileName,
-    $separator = ',',
+    $separator,
     &$mapper,
     $skipColumnHeader = FALSE,
     $mode = self::MODE_PREVIEW,
diff --git a/CRM/Core/Smarty/plugins/block.localize.php b/CRM/Core/Smarty/plugins/block.localize.php
index dd2749378f..2042827919 100644
--- a/CRM/Core/Smarty/plugins/block.localize.php
+++ b/CRM/Core/Smarty/plugins/block.localize.php
@@ -38,7 +38,7 @@ function smarty_block_localize($params, $text, &$smarty) {
   $lines = [];
   foreach ($smarty->_tpl_vars['locales'] as $locale) {
     $line = $text;
-    if ($params['field']) {
+    if (isset($params['field'])) {
       $fields = explode(',', $params['field']);
       foreach ($fields as $field) {
         $field = trim($field);
diff --git a/CRM/Event/Form/Registration.php b/CRM/Event/Form/Registration.php
index 7518043f31..12d1cfbecc 100644
--- a/CRM/Event/Form/Registration.php
+++ b/CRM/Event/Form/Registration.php
@@ -1100,7 +1100,7 @@ class CRM_Event_Form_Registration extends CRM_Core_Form {
    * @param array $optionFullIds
    * @param CRM_Core_Form $form
    */
-  public static function resetElementValue($optionFullIds = [], &$form) {
+  public static function resetElementValue($optionFullIds, &$form) {
     if (!is_array($optionFullIds) ||
       empty($optionFullIds) ||
       !$form->isSubmitted()
@@ -1173,7 +1173,7 @@ class CRM_Event_Form_Registration extends CRM_Core_Form {
    * @param array $optionIds
    * @param CRM_Core_Form $form
    */
-  public static function resetSubmittedValue($elementName, $optionIds = [], &$form) {
+  public static function resetSubmittedValue($elementName, $optionIds, &$form) {
     if (empty($elementName) ||
       !$form->elementExists($elementName) ||
       !$form->getSubmitValue($elementName)
diff --git a/CRM/Event/Import/Parser.php b/CRM/Event/Import/Parser.php
index aa5282a866..d1b02676d4 100644
--- a/CRM/Event/Import/Parser.php
+++ b/CRM/Event/Import/Parser.php
@@ -60,7 +60,7 @@ abstract class CRM_Event_Import_Parser extends CRM_Import_Parser {
    */
   public function run(
     $fileName,
-    $separator = ',',
+    $separator,
     &$mapper,
     $skipColumnHeader = FALSE,
     $mode = self::MODE_PREVIEW,
diff --git a/CRM/Member/Import/Parser.php b/CRM/Member/Import/Parser.php
index 6f6fcd0854..7397d9a821 100644
--- a/CRM/Member/Import/Parser.php
+++ b/CRM/Member/Import/Parser.php
@@ -61,7 +61,7 @@ abstract class CRM_Member_Import_Parser extends CRM_Import_Parser {
    */
   public function run(
     $fileName,
-    $separator = ',',
+    $separator,
     &$mapper,
     $skipColumnHeader = FALSE,
     $mode = self::MODE_PREVIEW,
-- 
2.25.1