refactor: Move isEmpty() to BaseField class

Author: kumy

src/opnsense/mvc/app/models/OPNsense/Base/Constraints/AllOrNoneConstraint.php

@@ -53,10 +53,10 @@ public function validate($validator, $attribute): bool
             $countEmpty = 0;
             $countNotEmpty = 0;
             foreach ($Fields as $fieldname) {
-                if ($this->isEmpty($parentNode->$fieldname)) {
-                    $countEmpty++;
-                } else {
+                if ($parentNode->$fieldname->isNotEmpty()) {
                     $countNotEmpty++;
+                } else {
+                    $countEmpty++;
                 }
             }
             if ($countEmpty != 0 && $countNotEmpty != 0) {

src/opnsense/mvc/app/models/OPNsense/Base/Constraints/BaseConstraint.php

@@ -33,21 +33,6 @@
 
 abstract class BaseConstraint extends BaseValidator
 {
-    /**
-     * check if field is empty  (either boolean field as false or an empty field)
-     * @param $node
-     * @return bool
-     */
-    public function isEmpty($node)
-    {
-        $node_class = get_class($node);
-        if ($node_class == "OPNsense\Base\FieldTypes\BooleanField") {
-            return empty((string)$node);
-        } elseif (empty((string)$node->getCurrentValue()) || (string)$node->getCurrentValue() == "0") {
-            return true;
-        }
-        return false;
-    }
 
     /**
      * @param $validator

src/opnsense/mvc/app/models/OPNsense/Base/Constraints/ComparedToFieldConstraint.php

@@ -54,14 +54,14 @@ public function validate($validator, $attribute): bool
         $node = $this->getOption('node');
         $field_name = $this->getOption('field');
         $operator = $this->getOption('operator');
-        if ($node && !($this->isEmpty($node) || empty($operator) || empty($field_name))) {
+        if ($node?->isNotEmpty() && !(empty($operator) || empty($field_name))) {
             $parent_node = $node->getParentNode();
             $other_node_content = $parent_node->$field_name;
 
             // if the other field is not set, or invalid type -> ignore this constraint
             if (
-                $this->isEmpty($other_node_content) ||
-                    !$node->isNumeric() && !$other_node_content->isNumeric()
+                !$other_node_content?->isNotEmpty() ||
+                !$node->isNumeric() && !$other_node_content->isNumeric()
             ) {
                 return true;
             }

src/opnsense/mvc/app/models/OPNsense/Base/Constraints/DependConstraint.php

@@ -50,9 +50,10 @@ public function validate($validator, $attribute): bool
         $node = $this->getOption('node');
         if ($node) {
             $parentNode = $node->getParentNode();
-            if ($this->isEmpty($node)) {
+            if ($node->isEmpty()) {
                 foreach (array_unique($this->getOptionValueList('addFields')) as $fieldname) {
-                    if (!$this->isEmpty($parentNode->$fieldname)) {
+                    // When is null or not empty
+                    if ($parentNode->$fieldname?->isNotEmpty()) {
                         $this->appendMessage($validator, $attribute);
                         break;
                     }

src/opnsense/mvc/app/models/OPNsense/Base/Constraints/SetIfConstraint.php

@@ -56,7 +56,7 @@ public function validate($validator, $attribute): bool
         $check = $this->getOption('check');
         if ($node) {
             $parentNode = $node->getParentNode();
-            if ($this->isEmpty($node) && (string)$parentNode->$field_name == $check) {
+            if ($node->isEmpty() && (string)$parentNode->$field_name == $check) {
                 $this->appendMessage($validator, $attribute);
             }
         }

src/opnsense/mvc/app/models/OPNsense/Base/Constraints/SingleSelectConstraint.php

@@ -53,7 +53,7 @@ public function validate($validator, $attribute): bool
             $Fields = array_unique(array_merge(array($nodeName), $this->getOptionValueList('addFields')));
             $countNotEmpty = 0;
             foreach ($Fields as $fieldname) {
-                if (!$this->isEmpty($parentNode->$fieldname)) {
+                if (!$parentNode->$fieldname?->isNotEmpty()) {
                     $countNotEmpty++;
                 }
             }

src/opnsense/mvc/app/models/OPNsense/Base/Constraints/UniqueConstraint.php

@@ -51,7 +51,7 @@ public function validate($validator, $attribute): bool
         $node = $this->getOption('node');
         $fieldSeparator = chr(10) . chr(0);
         if ($node) {
-            if (!$node->isRequired() && $this->isEmpty($node)) {
+            if (!$node->isRequired() && $node->isEmpty()) {
                 return true;
             }
             $mdl = $node->getParentModel();

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

@@ -368,7 +368,7 @@ public function __toString()
      * @return null|string field current value
      */
     public function getCurrentValue(): ?string {
-        return (string)$this->internalValue;
+        return trim((string)$this->internalValue);
     }
 
     /**
@@ -496,6 +496,24 @@ public function getChild($name)
         }
     }
 
+    /**
+     * check if current value is empty  (either boolean field as false or an empty field)
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->getCurrentValue()); // "0" is already considered false by `empty()`
+    }
+
+    /**
+     * check if current value is NOT empty  (either boolean field as false or an empty field)
+     * @return bool
+     */
+    public function isNotEmpty()
+    {
+        return !$this->isEmpty();
+    }
+
     public function isRequired()
     {
         return $this->internalIsRequired;
@@ -507,7 +525,7 @@ public function isRequired()
      */
     public function isEmptyAndRequired()
     {
-        if ($this->internalIsRequired && ($this->internalValue == "" || $this->internalValue == null)) {
+        if ($this->internalIsRequired && $this->isEmpty()) {
             return true;
         } else {
             return false;