Make sure required numerical value is valid when zero

Author: jissereitsma

Filter/PositiveNumber.php

@@ -6,6 +6,10 @@ class PositiveNumber implements FilterInterface
 {
     public function filter(mixed $value): mixed
     {
-        return abs((int)$value);
+        if ($value > 0) {
+            return $value;
+        }
+
+        return 0;
     }
 }

Util/IsEmpty.php

@@ -0,0 +1,40 @@
+<?php
+declare(strict_types=1);
+
+namespace Loki\Components\Util;
+
+use Loki\Components\Component\ComponentInterface;
+
+class IsEmpty
+{
+    public function execute(ComponentInterface $component, mixed $value): bool
+    {
+        if ($this->shouldBeNumber($component) && is_numeric($value)) {
+            return false;
+        }
+
+        if ($this->shouldBePositiveNumber($component) && is_numeric($value) && $value >= 0) {
+            return false;
+        }
+
+        if (is_string($value) && strlen($value) > 0) {
+            return false;
+        }
+
+        return empty($value);
+    }
+
+    private function shouldBePositiveNumber(ComponentInterface $component): bool
+    {
+        $filters = $component->getFilters();
+
+        return in_array('positive_number', $filters, true);
+    }
+
+    private function shouldBeNumber(ComponentInterface $component): bool
+    {
+        $filters = $component->getFilters();
+
+        return in_array('number', $filters, true);
+    }
+}

Validator/RequiredValidator.php

@@ -3,12 +3,18 @@
 namespace Loki\Components\Validator;
 
 use Loki\Components\Component\ComponentInterface;
+use Loki\Components\Util\IsEmpty;
 
 class RequiredValidator implements ValidatorInterface
 {
+    public function __construct(
+        private IsEmpty $isEmpty,
+    ) {
+    }
+
     public function validate(mixed $value, ?ComponentInterface $component = null): bool|array
     {
-        if (empty($value)) {
+        if ($this->isEmpty->execute($component, $value)) {
             return [(string)__('Value is required')];
         }
 

Validator/Validator.php

@@ -2,6 +2,7 @@
 
 namespace Loki\Components\Validator;
 
+use Loki\Components\Util\IsEmpty;
 use Magento\Framework\Phrase;
 use Loki\Components\Component\ComponentInterface;
 use Loki\Components\Messages\LocalMessage;
@@ -12,18 +13,21 @@ class Validator
     public function __construct(
         private readonly ValidatorRegistry $validatorRegistry,
         private readonly Ajax $ajax,
+        private readonly IsEmpty $isEmpty,
     ) {
     }
 
     public function validate(
         ComponentInterface $component,
         mixed $data = null
     ): bool {
-        if ($this->isRequiredButEmpty($component, $data) && false === $this->ajax->isAjax()) {
+        if ($this->isRequired($component)
+            && $this->isEmpty->execute($component, $data)
+            && false === $this->ajax->isAjax()) {
             return true;
         }
 
-        if (empty($data) && true === in_array('required', $component->getValidators())) {
+        if ($this->isRequired($component) && $this->isEmpty->execute($component, $data)) {
             return false;
         }
 
@@ -69,8 +73,8 @@ public function validate(
         return true;
     }
 
-    private function isRequiredButEmpty(ComponentInterface $component, mixed $data): bool
+    private function isRequired(ComponentInterface $component): bool
     {
-        return empty($data) && in_array('required', $component->getValidators());
+        return in_array('required', $component->getValidators());
     }
 }