From 03bd82881f05af84c4aaed44c03af219a34d8cd1 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 9 Jan 2025 14:02:38 +0100
Subject: [PATCH] mvc: make getCurrentValue() never return null; closes #8195

---
 .../mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php   | 4 ++--
 .../OPNsense/Interfaces/FieldTypes/LinkAddressField.php     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
index 072dc4a50..37209bff8 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
@@ -360,14 +360,14 @@ abstract class BaseField
      */
     public function __toString()
     {
-        return $this->getCurrentValue() ?? '';
+        return $this->getCurrentValue();
     }
 
     /**
      * return field current value
      * @return null|string field current value
      */
-    public function getCurrentValue(): ?string
+    public function getCurrentValue(): string
     {
         return (string)$this->internalValue;
     }
diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php b/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php
index 44e69738d..f813d7776 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php
@@ -112,7 +112,7 @@ class LinkAddressField extends BaseField
      */
     public function getDescription()
     {
-        $value = $this->getCurrentValue() ?? '';
+        $value = $this->getCurrentValue();
 
         if (isset(self::$known_addresses[$value])) {
             return self::$known_addresses[$value];
@@ -124,7 +124,7 @@ class LinkAddressField extends BaseField
     /**
      * return either ipaddr or if field, only one should be used, addresses are preferred.
      */
-    public function getCurrentValue(): ?string
+    public function getCurrentValue(): string
     {
         $parent = $this->getParentNode();
 
@@ -134,7 +134,7 @@ class LinkAddressField extends BaseField
             }
         }
 
-        return null;
+        return '';
     }
 
     /**