Enable wrapping for non western text (#1444)

Author: olivervogel

src/Typography/Line.php

@@ -36,7 +36,7 @@ public function __construct(
         protected PointInterface $position = new Point()
     ) {
         if (is_string($text)) {
-            $this->segments = explode(" ", $text);
+            $this->segments = $this->wordsSeperatedBySpaces($text) ? explode(" ", $text) : mb_str_split($text);
         }
     }
 
@@ -88,7 +88,7 @@ public function setPosition(PointInterface $point): self
 
     /**
      * Count segments (individual words including punctuation marks) of line
-    *
+     *
      * @return int
      */
     public function count(): int
@@ -106,13 +106,36 @@ public function length(): int
         return mb_strlen((string) $this);
     }
 
+    /**
+     * Dermine if words are sperarated by spaces in the written language of the given text
+     */
+    private function wordsSeperatedBySpaces(string $text): bool
+    {
+        return 1 !== preg_match(
+            '/[' .
+            '\x{4E00}-\x{9FFF}' . // CJK Unified Ideographs (chinese)
+            '\x{3400}-\x{4DBF}' . // CJK Unified Ideographs Extension A (chinese)
+            '\x{3040}-\x{309F}' . // hiragana (japanese)
+            '\x{30A0}-\x{30FF}' . // katakana (japanese)
+            '\x{0E00}-\x{0E7F}' . // thai
+            ']/u',
+            $text
+        );
+    }
+
     /**
      * Cast line to string
      *
      * @return string
      */
     public function __toString(): string
     {
-        return implode(" ", $this->segments);
+        $string = implode("", $this->segments);
+
+        if ($this->wordsSeperatedBySpaces($string)) {
+            return implode(" ", $this->segments);
+        }
+
+        return $string;
     }
 }

tests/Unit/Typography/LineTest.php

@@ -4,10 +4,12 @@
 
 namespace Intervention\Image\Tests\Unit\Typography;
 
+use Generator;
 use Intervention\Image\Geometry\Point;
 use Intervention\Image\Tests\BaseTestCase;
 use Intervention\Image\Typography\Line;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 #[CoversClass(Line::class)]
 final class LineTest extends BaseTestCase
@@ -18,10 +20,12 @@ public function testConstructor(): void
         $this->assertInstanceOf(Line::class, $line);
     }
 
-    public function testToString(): void
+    #[DataProvider('toStringDataProvider')]
+    public function testToString(string $text, int $words): void
     {
-        $line = new Line('foo bar');
-        $this->assertEquals('foo bar', (string) $line);
+        $line = new Line($text);
+        $this->assertEquals($words, $line->count());
+        $this->assertEquals($text, (string) $line);
     }
 
     public function testSetGetPosition(): void
@@ -75,4 +79,14 @@ public function testAdd(): void
         $this->assertEquals(2, $line->count());
         $this->assertEquals(2, $result->count());
     }
+
+    public static function toStringDataProvider(): Generator
+    {
+        yield ['foo', 1];
+        yield ['foo bar', 2];
+        yield ['测试', 2]; // CJK Unified Ideographs
+        yield ['テスト', 3]; // japanese
+        yield ['ทดสอบ', 5]; // thai
+        yield ['这只是我写的一个测试。', 11]; // CJK Unified Ideographs
+    }
 }