update

Author: mevdschee

src/Validator/MaxLength.php

@@ -23,7 +23,7 @@ public function message(string $message): self
 
     public function evaluate(string $value): bool
     {
-        return mb_strlen($value) <= $this->maxLength;
+        return mb_strlen(trim($value)) <= $this->maxLength;
     }
 
     public function validate(string $value): string

src/Validator/MinLength.php

@@ -23,7 +23,7 @@ public function message(string $message): self
 
     public function evaluate(string $value): bool
     {
-        return mb_strlen($value) >= $this->minLength;
+        return mb_strlen(trim($value)) >= $this->minLength;
     }
 
     public function validate(string $value): string

tests/Validators/MaxLengthValidatorTest.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace MintyPHP\Tests\Validators;
+
+use MintyPHP\Form\Validator\Validators;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+class MaxLengthValidatorTest extends TestCase
+{
+    public static function maxLengthDataProvider(): array
+    {
+        return [
+            ['', 0, true],
+            ['', 1, true],
+            ['😜', 0, false],
+            ['😜', 1, true],
+            ['😜', 2, true],
+            ['12', 1, false],
+            ['12', 2, true],
+            ['12', 3, true],
+            ['123   78', 7, false],
+            ['123   78', 8, true],
+            ['123   78', 9, true],
+            ['12345   ', 4, false],
+            ['12345   ', 5, true],
+            ['12345   ', 6, true],
+            ['12345   ', 7, true],
+            ['   45678', 4, false],
+            ['   45678', 5, true],
+            ['   45678', 6, true],
+            ['   45678', 7, true],
+        ];
+    }
+
+    #[DataProvider('maxLengthDataProvider')]
+    public function testValidExpression(string $input, int $length, bool $expected): void
+    {
+        $validator = Validators::maxLength($length, 'invalid length');
+        $this->assertEquals($validator->validate($input) === '', $expected);
+    }
+}

tests/Validators/MinLengthValidatorTest.php

@@ -13,21 +13,23 @@ public static function minLengthDataProvider(): array
         return [
             ['', 0, true],
             ['', 1, false],
-            ['1', 0, true],
-            ['1', 1, true],
-            ['1', 2, false],
+            ['😜', 0, true],
+            ['😜', 1, true],
+            ['😜', 2, false],
             ['12', 1, true],
             ['12', 2, true],
             ['12', 3, false],
             ['123   78', 7, true],
             ['123   78', 8, true],
             ['123   78', 9, false],
-            ['12345   ', 7, true],
-            ['12345   ', 8, true],
-            ['12345   ', 9, false],
-            ['   45678', 7, true],
-            ['   45678', 8, true],
-            ['   45678', 9, false],
+            ['12345   ', 4, true],
+            ['12345   ', 5, true],
+            ['12345   ', 6, false],
+            ['12345   ', 7, false],
+            ['   45678', 4, true],
+            ['   45678', 5, true],
+            ['   45678', 6, false],
+            ['   45678', 7, false],
         ];
     }