Fix JSON reports with long UTF8 strings

vimeo · Mar 1, 2021 · 6d3166c · 6d3166c
1 parent bca09d7
commit 6d3166c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Json/Json.php b/src/Psalm/Internal/Json/Json.php
@@ -34,7 +34,8 @@ public static function encode($data, ?int $options = null): string
 
         $result = json_encode($data, $options);
         if ($result === false) {
-            throw new RuntimeException('Cannot create JSON string.');
+            /** @psalm-suppress ImpureFunctionCall */
+            throw new RuntimeException('Cannot create JSON string: '.json_last_error_msg());
         }
 
         return $result;

diff --git a/src/Psalm/Type/Atomic/TLiteralString.php b/src/Psalm/Type/Atomic/TLiteralString.php
@@ -2,8 +2,8 @@
 namespace Psalm\Type\Atomic;
 
 use function preg_replace;
-use function strlen;
-use function substr;
+use function mb_strlen;
+use function mb_substr;
 
 /**
  * Denotes a string whose value is known.
@@ -31,8 +31,8 @@ public function __toString(): string
     public function getId(bool $nested = false): string
     {
         $no_newline_value = preg_replace("/\n/m", '\n', $this->value);
-        if (strlen($this->value) > 80) {
-            return '"' . substr($no_newline_value, 0, 80) . '...' . '"';
+        if (mb_strlen($this->value) > 80) {
+            return '"' . mb_substr($no_newline_value, 0, 80) . '...' . '"';
         }
 
         return '"' . $no_newline_value . '"';

diff --git a/tests/TypeParseTest.php b/tests/TypeParseTest.php
@@ -860,6 +860,15 @@ public function testEnumWithoutSpaces(): void
         $this->assertSame($resolved_type->getId(), $docblock_type->getId());
     }
 
+    public function testLongUtf8LiteralString(): void
+    {
+        $string = "АаБбВвГгДдЕеЁёЖжЗзИиЙйКкЛлМмНнОоПпРрСсТтУуФфХхЦцЧчШшЩщЪъЫыЬьЭэЮюЯя";
+        $string .= $string;
+        $expected = mb_substr($string, 0, 80);
+        $this->assertSame("\"$expected...\"", Type:: parseString("'$string'")->getId());
+        $this->assertSame("\"$expected...\"", Type:: parseString("\"$string\"")->getId());
+    }
+
     public function testSingleLiteralString(): void
     {
         $this->assertSame(