Improved string length calculation

sorinsarca · sorinsarca · commit 5fbf2107ae7b · 2025-11-20T01:06:38.000+02:00
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "php": ">=7.4"
     },
     "require-dev": {
-        "opis/string": "^2.0",
+        "opis/string": "^2.1",
         "ext-bcmath": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
diff --git a/src/ValidatorHelper.php b/src/ValidatorHelper.php
@@ -36,10 +36,8 @@ class ValidatorHelper implements IValidatorHelper
     public function __construct(int $scale = 10)
     {
         $this->scale = $scale;
-        if (class_exists('\\Opis\String\\UnicodeString', true)) {
-            $this->strLengthFunc = function (string $data): int {
-                return \Opis\String\UnicodeString::from($data)->length();
-            };
+        if (class_exists(\Opis\String\UnicodeString::class, true)) {
+            $this->strLengthFunc = [\Opis\String\UnicodeString::class, "getStringLength"];
         }
         else {
             $this->strLengthFunc = function_exists('mb_strlen') ? 'mb_strlen' : 'strlen';

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,8 @@ class ValidatorHelper implements IValidatorHelper`
`36`	`36`	`public function __construct(int $scale = 10)`
`37`	`37`	`{`
`38`	`38`	`$this->scale = $scale;`
`39`		`- if (class_exists('\\Opis\String\\UnicodeString', true)) {`
`40`		`- $this->strLengthFunc = function (string $data): int {`
`41`		`- return \Opis\String\UnicodeString::from($data)->length();`
`42`		`- };`
	`39`	`+ if (class_exists(\Opis\String\UnicodeString::class, true)) {`
	`40`	`+ $this->strLengthFunc = [\Opis\String\UnicodeString::class, "getStringLength"];`
`43`	`41`	`}`
`44`	`42`	`else {`
`45`	`43`	`$this->strLengthFunc = function_exists('mb_strlen') ? 'mb_strlen' : 'strlen';`