[php8-compat] Fix some more examples of where required parameters are after optional...

diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php
index 73bc3a02b06e5cad6f2c246f5b8fde303499f064..3846fd9e07921673bfdad2849031cb4aa6967c90 100644 (file)
--- 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 e112636b437bafa5b80327e94309cc474630c45d..be1e9bc39bcd4da9cfe4aed436fecb602dc13615 100644 (file)
--- 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 77ec4824cb2f648ed0002bceecf4f60296801adf..8cd494f3869fedaa6915c8e636d2711fd4a9a6fb 100644 (file)
--- 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 dd2749378f96522f98ba7b3f97213898918723c0..20428279197b803537ff4e9261df7c9187b3ca86 100644 (file)
--- 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 7518043f3118b68adf6c6a5806410549b433f9e0..12d1cfbecc4fe2d54f3dcaf4e6169c6e9f95ae9a 100644 (file)
--- 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 aa5282a866d9ce6e75cd0be81f92a88418cfc661..d1b02676d4f57de23f7dc9448a6b515c074bc52f 100644 (file)
--- 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 6f6fcd0854eacbcb9589d1408323ea190d833613..7397d9a821dd3272093749ebc85d2b9a967fedd4 100644 (file)
--- 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,