lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mvc: make getCurrentValue() never return null; closes #8195

Browse Source
This commit is contained in:
Franco Fichtner 2025-01-09 14:02:38 +01:00
parent be42113aa5
commit 03bd82881f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
View File

@ -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;
}

6
src/opnsense/mvc/app/models/OPNsense/Interfaces/FieldTypes/LinkAddressField.php
View File

@ -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 '';
}
/**