Merge pull request #303 from gsteel/v3/string-length-malformed-multibyte

Change Malformed Multi-Byte input handling in `StringLength`
laminas · Jul 2, 2024 · d4c48d5 · d4c48d5
2 parents a46f708 + b2c072f
commit d4c48d5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/src/StringLength.php b/src/StringLength.php
@@ -6,7 +6,6 @@
 
 use Laminas\Stdlib\StringUtils;
 use Laminas\Validator\Exception\InvalidArgumentException;
-use Laminas\Validator\Exception\RuntimeException;
 use Throwable;
 
 use function is_string;
@@ -82,20 +81,20 @@ public function isValid(mixed $value): bool
             return false;
         }
 
-        $this->setValue($value);
-
-        $wrapper   = StringUtils::getWrapper($this->encoding);
-        $exception = null;
+        $wrapper = StringUtils::getWrapper($this->encoding);
         try {
             $length = $wrapper->strlen($value);
-        } catch (Throwable $exception) {
+        } catch (Throwable) {
             $length = false;
         }
 
         if ($length === false) {
-            throw new RuntimeException('Failed to detect string length', 0, $exception);
+            $this->error(self::INVALID);
+
+            return false;
         }
 
+        $this->setValue($value);
         $this->length = $length;
 
         if ($this->length < $this->min) {

diff --git a/test/StringLengthTest.php b/test/StringLengthTest.php
@@ -5,7 +5,6 @@
 namespace LaminasTest\Validator;
 
 use Laminas\Validator\Exception\InvalidArgumentException;
-use Laminas\Validator\Exception\RuntimeException;
 use Laminas\Validator\StringLength;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -82,7 +81,7 @@ public function testInvalidMaxOptionCausesException(): void
         new StringLength(['min' => 10, 'max' => 5]);
     }
 
-    public function testAnExceptionIsThrownWhenStringLengthCannotBeDetected(): void
+    public function testMalformedMultiByteDataWillCauseValidationFailure(): void
     {
         /**
          * Malformed UTF-8 will likely trigger errors/warnings in `ext-intl` or `ext-mbstring`
@@ -94,13 +93,11 @@ public function testAnExceptionIsThrownWhenStringLengthCannotBeDetected(): void
         // phpcs:enable
 
         $malformed = chr(0xED) . chr(0xA0) . chr(0x80);
-        try {
-            (new StringLength())->isValid($malformed);
-            self::fail('No exception was thrown');
-        } catch (RuntimeException $error) {
-            self::assertSame('Failed to detect string length', $error->getMessage());
-        } finally {
-            restore_error_handler();
-        }
+
+        $validator = new StringLength();
+        self::assertFalse($validator->isValid($malformed));
+        self::assertArrayHasKey(StringLength::INVALID, $validator->getMessages());
+
+        restore_error_handler();
     }
 }