Merge pull request #49 from guilhermednt/improved-string-length

Improved string length checking

Author: vsouz4

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [7.0.0] - 2021-08-27
+### Fixed
+- Using `grapheme_strlen` to properly count string lengths.
+
 ## [6.1.0] - 2021-08-27
 ### Added
 - Readded enums as consts only

src/Entity/Constraint/MaxLengthConstraint.php

@@ -30,7 +30,7 @@ public function exists(): bool
     public function getIfCondition(Variable $variable, CodeBuilder $builder): Expr
     {
         return $builder->compare(
-            $builder->funcCall('strlen', [$variable]),
+            $builder->funcCall('grapheme_strlen', [$variable]),
             '>',
             $builder->val($this->maxLength)
         );

src/Entity/Constraint/MinLengthConstraint.php

@@ -30,7 +30,7 @@ public function exists(): bool
     public function getIfCondition(Variable $variable, CodeBuilder $builder): Expr
     {
         return $builder->compare(
-            $builder->funcCall('strlen', [$variable]),
+            $builder->funcCall('grapheme_strlen', [$variable]),
             '<',
             $builder->val($this->minLength)
         );

test/suite/functional/Generator/Schema/ItemPhp70.php

@@ -241,10 +241,10 @@ public function setOptionalArrayWithMinMaxItems(array $optionalArrayWithMinMaxIt
      */
     public function setOptionalStringWithMinMaxLength(string $optionalStringWithMinMaxLength): self
     {
-        if (\strlen($optionalStringWithMinMaxLength) < 1) {
+        if (\grapheme_strlen($optionalStringWithMinMaxLength) < 1) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Length should be greater than 1.', 'optionalStringWithMinMaxLength', $optionalStringWithMinMaxLength));
         }
-        if (\strlen($optionalStringWithMinMaxLength) > 5) {
+        if (\grapheme_strlen($optionalStringWithMinMaxLength) > 5) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Length should be less than 5.', 'optionalStringWithMinMaxLength', $optionalStringWithMinMaxLength));
         }
         $this->optionalStringWithMinMaxLength = $optionalStringWithMinMaxLength;

test/suite/functional/Generator/Schema/ItemPhp72.php

@@ -234,10 +234,10 @@ public function setOptionalArrayWithMinMaxItems(array $optionalArrayWithMinMaxIt
      */
     public function setOptionalStringWithMinMaxLength(string $optionalStringWithMinMaxLength): self
     {
-        if (\strlen($optionalStringWithMinMaxLength) < 1) {
+        if (\grapheme_strlen($optionalStringWithMinMaxLength) < 1) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Length should be greater than 1.', 'optionalStringWithMinMaxLength', $optionalStringWithMinMaxLength));
         }
-        if (\strlen($optionalStringWithMinMaxLength) > 5) {
+        if (\grapheme_strlen($optionalStringWithMinMaxLength) > 5) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Length should be less than 5.', 'optionalStringWithMinMaxLength', $optionalStringWithMinMaxLength));
         }
         $this->optionalStringWithMinMaxLength = $optionalStringWithMinMaxLength;

test/suite/functional/Generator/Schema/ItemPhp74.php

@@ -206,10 +206,10 @@ public function setOptionalArrayWithMinMaxItems(array $optionalArrayWithMinMaxIt
      */
     public function setOptionalStringWithMinMaxLength(string $optionalStringWithMinMaxLength): self
     {
-        if (\strlen($optionalStringWithMinMaxLength) < 1) {
+        if (\grapheme_strlen($optionalStringWithMinMaxLength) < 1) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Length should be greater than 1.', 'optionalStringWithMinMaxLength', $optionalStringWithMinMaxLength));
         }
-        if (\strlen($optionalStringWithMinMaxLength) > 5) {
+        if (\grapheme_strlen($optionalStringWithMinMaxLength) > 5) {
             throw new RequestValidationException(\sprintf('Invalid %s value. Given: `%s`. Length should be less than 5.', 'optionalStringWithMinMaxLength', $optionalStringWithMinMaxLength));
         }
         $this->optionalStringWithMinMaxLength = $optionalStringWithMinMaxLength;