refactor: move isNumeric/asFloat to BaseField

Author: kumy

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

@@ -49,24 +49,6 @@ public function isEmpty($node)
         return false;
     }
 
-    /**
-     * check if field value is numeric
-     * @param $node
-     * @return bool
-     */
-    public function isNumeric($node): bool {
-        return is_numeric((string)$node->getCurrentValue());
-    }
-
-    /**
-     * Try to convert to current value as float
-     * @param $node
-     * @return float
-     */
-    public function asFloat($node): float {
-        return floatval((string)$node->getCurrentValue());
-    }
-
     /**
      * @param $validator
      * @param $attribute

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

@@ -61,16 +61,16 @@ public function validate($validator, $attribute): bool
             // if the other field is not set, or invalid type -> ignore this constraint
             if (
                 $this->isEmpty($other_node_content) ||
-                    !$this->isNumeric($node) && !$this->isNumeric($other_node_content)
+                    !$node->isNumeric() && !$other_node_content->isNumeric()
             ) {
                 return true;
             }
 
             if (
                 !$this->is_constraint_fulfilled(
                     $operator,
-                    $this->asFloat($node),
-                    $this->asFloat($other_node_content)
+                    $node->asFloat(),
+                    $other_node_content->asFloat(),
                 )
             ) {
                 $this->appendMessage($validator, $attribute);

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

@@ -371,6 +371,22 @@ public function getCurrentValue(): ?string {
         return (string)$this->internalValue;
     }
 
+    /**
+     * check if field value is numeric
+     * @return bool
+     */
+    public function isNumeric(): bool {
+        return is_numeric($this->getCurrentValue());
+    }
+
+    /**
+     * Try to convert to current value as float
+     * @return float
+     */
+    public function asFloat(): float {
+        return floatval($this->getCurrentValue());
+    }
+
     /**
      * default setter
      * @param string $value set field value