From b05a74780a00a8be8154debdb732e97907c660ac Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 29 May 2021 02:26:59 +0000
Subject: [PATCH] [REF] Fix a couple of functions triggering deprecation
 notices in php8.0 where by an optional parameter is before required
 parameters in the function signature

---
 CRM/Core/DAO.php         | 2 +-
 CRM/Core/OptionValue.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index c8b6999663..80271dd449 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -2011,7 +2011,7 @@ SELECT contact_id
    * @return object
    *   an object of type referenced by daoName
    */
-  public static function commonRetrieveAll($daoName, $fieldIdName = 'id', $fieldId, &$details, $returnProperities = NULL) {
+  public static function commonRetrieveAll($daoName, $fieldIdName, $fieldId, &$details, $returnProperities = NULL) {
     require_once str_replace('_', DIRECTORY_SEPARATOR, $daoName) . ".php";
     $object = new $daoName();
     $object->$fieldIdName = $fieldId;
diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php
index 765cedd17f..79e6216c55 100644
--- a/CRM/Core/OptionValue.php
+++ b/CRM/Core/OptionValue.php
@@ -251,7 +251,7 @@ class CRM_Core_OptionValue {
    * @return bool
    *   true if object exists
    */
-  public static function optionExists($value, $daoName, $daoID, $optionGroupID, $fieldName = 'name', $domainSpecific) {
+  public static function optionExists($value, $daoName, $daoID, $optionGroupID, $fieldName, $domainSpecific) {
     $object = new $daoName();
     $object->$fieldName = $value;
     $object->option_group_id = $optionGroupID;
-- 
2.25.1