Fix char issues

src/Helper/Char.php

@@ -27,7 +27,7 @@ class Char
      */
     public function __construct(string $char)
     {
-        if (strlen($char) != 1) {
+        if (mb_strlen($char, 'UTF-8') !== 1) {
             throw new HelperException("char parameter may not contain more or less than one character");
         }
 
@@ -163,31 +163,63 @@ public function toAscii(): int
      */
     public function toUnicode(): int
     {
+        $length = strlen($this->char);
         $h = ord($this->char[0]);
 
         if ($h <= 0x7F) {
-            return $h;
+            return $length === 1 ? $h : -1;
         } elseif ($h < 0xC2) {
-            return false;
+            return -1;
         } elseif ($h <= 0xDF) {
+            if ($length !== 2 || !$this->isContinuationByte(1)) {
+                return -1;
+            }
+
             return ($h & 0x1F) << 6 | (ord($this->char[1]) & 0x3F);
         } elseif ($h <= 0xEF) {
+            if ($length !== 3 || !$this->isContinuationByte(1) || !$this->isContinuationByte(2)) {
+                return -1;
+            }
+
             return ($h & 0x0F) << 12 | (ord($this->char[1]) & 0x3F) << 6 | (ord($this->char[2]) & 0x3F);
         } elseif ($h <= 0xF4) {
-            return ($h & 0x0F) << 18 | (ord($this->char[1]) & 0x3F) << 12 | (ord($this->char[2]) & 0x3F) << 6 | (ord($this->char[3]) & 0x3F);
+            if (
+                $length !== 4
+                || !$this->isContinuationByte(1)
+                || !$this->isContinuationByte(2)
+                || !$this->isContinuationByte(3)
+            ) {
+                return -1;
+            }
+
+            return ($h & 0x07) << 18
+                | (ord($this->char[1]) & 0x3F) << 12
+                | (ord($this->char[2]) & 0x3F) << 6
+                | (ord($this->char[3]) & 0x3F);
         } else {
             return -1;
         }
     }
 
+    private function isContinuationByte(int $offset): bool
+    {
+        if (!isset($this->char[$offset])) {
+            return false;
+        }
+
+        $byte = ord($this->char[$offset]);
+
+        return $byte >= 0x80 && $byte <= 0xBF;
+    }
+
     /**
      * Returns the hexadecimal value of the char.
      *
      * @return string
      */
     public function toHex(): string
     {
-        return strtoupper(dechex($this->toAscii()));
+        return strtoupper(bin2hex($this->char));
     }
 
     /**
@@ -199,11 +231,18 @@ public function toHex(): string
      */
     public static function fromHex(string $hex): Char
     {
-        if (strlen($hex) != 2 || !ctype_xdigit($hex)) {
-            throw new HelperException("given parameter '" . $hex . "' is not a valid hexadecimal number");
+        // Check: only even numbers of hex characters allowed, all must be valid
+        if (strlen($hex) % 2 !== 0 || ! ctype_xdigit($hex)) {
+            throw new HelperException("given parameter '".$hex."' is not a valid hexadecimal number");
+        }
+
+        // Hex → Binary string (UTF-8 compatible)
+        $bytes = hex2bin($hex);
+        if ($bytes === false) {
+            throw new HelperException("given parameter '".$hex."' could not be converted to binary data");
         }
 
-        return new self(hex2bin($hex));
+        return new self($bytes);
     }
 
     /**

tests/Helper/CharTest.php

@@ -256,6 +256,84 @@ public function testUnicode1Byte()
             static::calculateUTF8Ordinal("\x7F"),
             Char::fromHex("7F")->toUnicode()
         );
+
+        //
+        // INVALID LEADING BYTE (< 0xC2)
+        // e.g., 0x80 – 0xC1 should return -1
+        //
+        $this->assertEquals(-1, Char::fromHex('80')->toUnicode());
+        $this->assertEquals(-1, Char::fromHex('C1')->toUnicode());
+
+        //
+        // 2-BYTE UTF-8 (U+0080 – U+07FF)
+        // Example: '¢' (U+00A2) → C2 A2
+        //
+        $this->assertEquals(
+            static::calculateUTF8Ordinal("\xC2\xA2"),
+            Char::fromHex('C2A2')->toUnicode()
+        );
+
+        // Upper end of 2-byte range: '߿' (U+07FF) → DF BF
+        $this->assertEquals(
+            static::calculateUTF8Ordinal("\xDF\xBF"),
+            Char::fromHex('DFBF')->toUnicode()
+        );
+
+        //
+        // 3-BYTE UTF-8 (U+0800 – U+FFFF)
+        // Example: '€' (U+20AC) → E2 82 AC
+        //
+        $this->assertEquals(
+            static::calculateUTF8Ordinal("\xE2\x82\xAC"),
+            Char::fromHex('E282AC')->toUnicode()
+        );
+
+        // Upper end of 3-byte range: '￿' (U+FFFF) → EF BF BF
+        $this->assertEquals(
+            static::calculateUTF8Ordinal("\xEF\xBF\xBF"),
+            Char::fromHex('EFBFBF')->toUnicode()
+        );
+
+        //
+        // 4-BYTE UTF-8 (U+10000 – U+10FFFF)
+        // Example: '😀' (U+1F600) → F0 9F 98 80
+        //
+        $this->assertEquals(
+            static::calculateUTF8Ordinal("\xF0\x9F\x98\x80"),
+            Char::fromHex('F09F9880')->toUnicode()
+        );
+
+        // Upper end: U+10FFFF → F4 8F BF BF
+        $this->assertEquals(
+            static::calculateUTF8Ordinal("\xF4\x8F\xBF\xBF"),
+            Char::fromHex('F48FBFBF')->toUnicode()
+        );
+
+        //
+        // INVALID TOO-HIGH LEAD BYTE (> 0xF4)
+        //
+        $this->assertEquals(
+            -1,
+            Char::fromHex('F5')->toUnicode()
+        );
+    }
+
+    /**
+     * @throws HelperException
+     */
+    public function testUnicodeRejectsTruncatedUtf8Sequence(): void
+    {
+        $this->assertSame(-1, Char::fromHex('C2')->toUnicode());
+    }
+
+    /**
+     * @throws HelperException
+     */
+    public function testFromHexToHexRoundTripsMultibyteUtf8Characters(): void
+    {
+        $this->assertSame('C2A2', Char::fromHex('C2A2')->toHex());
+        $this->assertSame('E282AC', (new Char('€'))->toHex());
+        $this->assertSame('F09F9880', (new Char('😀'))->toHex());
     }
 
     public function testFromHexRejectsMalformedInput(): void
@@ -303,13 +381,30 @@ public function testUnicode2Bytes() {
      */
     private static function calculateUTF8Ordinal(string $char): int
     {
-        $charString = mb_substr($char, 0, 1, 'utf-8');
-        $charLength = strlen($charString);
-        $ordinal    = ord($charString[0]) & (0xFF >> $charLength);
-        //Merge other characters into the value
-        for ($i = 1; $i < $charLength; $i++) {
-            $ordinal = $ordinal << 6 | (ord($charString[$i]) & 127);
+        $bytes = array_map('ord', str_split($char));
+        $length = strlen($char);
+
+        if ($length === 1) {
+            // 1-byte (ASCII)
+            return $bytes[0];
+        } elseif ($length === 2) {
+            // 2-byte
+            return (($bytes[0] & 0x1F) << 6) |
+                ($bytes[1] & 0x3F);
+        } elseif ($length === 3) {
+            // 3-byte
+            return (($bytes[0] & 0x0F) << 12) |
+                (($bytes[1] & 0x3F) << 6) |
+                ($bytes[2] & 0x3F);
+        } elseif ($length === 4) {
+            // 4-byte
+            return (($bytes[0] & 0x07) << 18) |
+                (($bytes[1] & 0x3F) << 12) |
+                (($bytes[2] & 0x3F) << 6) |
+                ($bytes[3] & 0x3F);
         }
-        return $ordinal;
+
+        // invalid UTF-8 (longer than 4 bytes)
+        return -1;
     }
 }