update

Author: mevdschee

src/Elements.php

@@ -151,7 +151,7 @@ public static function checkbox(string $name = '', string $value = 'on'): Checkb
     }
 
     /**
-     * @param array<string, string> $options
+     * @param array<string|int, string> $options
      */
     public static function select(string $name = '', array $options = []): Select
     {

src/Select.php

@@ -10,7 +10,7 @@ class Select implements Control
     use HtmlElement;
 
     protected string $name = '';
-    /** @var array<string,string> $options */
+    /** @var array<string|int,string> $options */
     protected array $options = [];
     /** @var string[] $values */
     protected array $values = [];
@@ -39,7 +39,7 @@ public function getName(): string
     }
 
     /**
-     * @param array<string,string> $options
+     * @param array<string|int,string> $options
      */
     public function options(array $options): self
     {
@@ -98,7 +98,7 @@ public function renderDom(\DOMDocument $doc): \DOMElement
         }
         foreach ($this->options as $key => $value) {
             $option = $doc->createElement('option');
-            $option->setAttribute('value', $key);
+            $option->setAttribute('value', strval($key));
             if (in_array($key, $this->values)) {
                 $option->setAttribute('selected', 'selected');
             }

src/Validator/CustomFunc.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace MintyPHP\Form\Validator;
+
+class CustomFunc implements Validator
+{
+    protected mixed $function;
+    protected string $message = 'Invalid value';
+
+    public function __construct(mixed $function)
+    {
+        if (!is_callable($function)) {
+            throw new \InvalidArgumentException("Invalid function");
+        }
+        $this->function = $function;
+    }
+
+    public function evaluate(string $value): bool
+    {
+        return call_user_func($this->function, $value) ? true : false;
+    }
+
+    public function message(string $message): self
+    {
+        $this->message = $message;
+        return $this;
+    }
+
+    public function validate(string $value): string
+    {
+        return !$this->evaluate($value) ? $this->message : '';
+    }
+}

src/Validator/Expression.php

@@ -5,10 +5,10 @@
 class Expression implements Validator
 {
     protected string $comparator;
-    protected string $value;
+    protected string|int|float $value;
     protected string $message = 'Number must be {comparator} {value}';
 
-    public function __construct(string $comparator, string $value)
+    public function __construct(string $comparator, string|int|float $value)
     {
         if (!in_array($comparator, ['>', '>=', '<', '<='])) {
             throw new \InvalidArgumentException('Comparator not supported');
@@ -42,7 +42,7 @@ public function evaluate(string $value): bool
 
     public function message(string $message): self
     {
-        $this->message = str_replace(['{value}', '{comparator}'], [$this->value, $this->comparator], $message);
+        $this->message = str_replace(['{value}', '{comparator}'], [strval($this->value), $this->comparator], $message);
         return $this;
     }
 

src/Validator/Validators.php

@@ -40,7 +40,7 @@ public static function integer(string $message = ''): Validator
         return $validator;
     }
 
-    public static function expression(string $comperator, string $value, string $message = ''): Validator
+    public static function expression(string $comperator, string|int|float $value, string $message = ''): Validator
     {
         $validator = new Expression($comperator, $value);
         if ($message) {
@@ -75,4 +75,13 @@ public static function regex(string $pattern, string $message = ''): Validator
         }
         return $validator;
     }
+
+    public static function function(callable $function, string $message = ''): Validator
+    {
+        $validator = new CustomFunc($function);
+        if ($message) {
+            $validator->message($message);
+        }
+        return $validator;
+    }
 }