feat(CBOR): Add decode support for TextString and UnsignedInteger with validation

- Implemented `decode` method in `CBOR` class to support both `TextString` and `UnsignedInteger` types.
- Added `validate` method to `TextString` and `UnsignedInteger` classes for type-specific validation.
- Updated `decode` methods in `TextString` and `UnsignedInteger` to use their respective `validate` methods.
- Enhanced `CBORTest` to include tests for decoding mixed types (`TextString` and `UnsignedInteger`).
- Fixed and refactored exception messages for better consistency and readability in `UnsignedInteger`.

Author: shahmal1yev

src/CBOR/CBOR.php

@@ -30,8 +30,16 @@ public static function encode(string|int|array $data): string
         throw new \ValueError("Unsupported type: " . gettype($data));
     }
 
-    public static function decode(string $data): int
+    public static function decode(string $data): int|string
     {
-        // TODO
+        if (TextString::validate($data)) {
+            return TextString::decode($data);
+        }
+
+        if (UnsignedInteger::validate($data)) {
+            return UnsignedInteger::decode($data);
+        }
+
+        throw new \ValueError("Unsupported type");
     }
 }

src/CBOR/MajorTypes/TextString.php

@@ -34,14 +34,11 @@ public static function encode(string $input): string
 
     public static function decode(string $input): string
     {
-        $initialByte = ord($input[0]);
-        $majorType = ($initialByte >> 5) & 0x07;
-
-        if ($majorType !== 0x03) {
+        if (! self::validate($input)) {
             throw new \ValueError('Invalid CBOR TextString major type.');
         }
 
-        $additionalInfo = $initialByte & 0x1F;
+        $additionalInfo = ord($input[0]) & 0x1F;
         $offset = 1;
 
         if ($additionalInfo <= 23) {
@@ -70,4 +67,9 @@ public static function decode(string $input): string
 
         return $text;
     }
+
+    public static function validate(string $input): bool
+    {
+        return ((ord($input[0]) >> 5) & 0x07) === 0x03;
+    }
 }

src/CBOR/MajorTypes/UnsignedInteger.php

@@ -17,14 +17,12 @@ class UnsignedInteger
 {
     public static function decode(string $data): int
     {
-        $firstByte = ord($data[0]);
-        $majorType = ($firstByte >> 5) & 0x07;
-        $additionalInfo = $firstByte & 0x1F;
-
-        if ($majorType !== 0) {
-            throw new ValueError("Invalid major type for unsigned integer: $majorType");
+        if (! self::validate($data)) {
+            throw new ValueError("Invalid major type for unsigned integer.");
         }
 
+        $additionalInfo = ord($data[0]) & 0x1F;
+
         if ($additionalInfo <= 23) {
             $value = $additionalInfo;
         } elseif ($additionalInfo === 24) {
@@ -73,4 +71,9 @@ public static function encode(int $value): string
 
         return $prefixedPack('J', "\x1B");
     }
+
+    public static function validate(string $input): bool
+    {
+        return ((ord($input[0]) >> 5) & 0x07) === 0x00;
+    }
 }

tests/Unit/CBOR/CBORTest.php

@@ -18,14 +18,14 @@
 class CBORTest extends TestCase
 {
     #[DataProvider('validCases')]
-    public function testEncode(int $data, string $expected): void
+    public function testEncode(int|string $data, string $expected): void
     {
         $encoded = CBOR::encode($data);
         $this->assertSame($expected, $encoded);
     }
 
     #[DataProvider('validCases')]
-    public function testDecode(int $expected, string $data): void
+    public function testDecode(int|string $expected, string $data): void
     {
         $actual = CBOR::decode($data);
 
@@ -42,8 +42,8 @@ public static function validCases(): array
             [1, hex2bin('01')], // 1 encoded as CBOR unsigned integer
             [10, hex2bin('0a')], // 10 encoded as CBOR unsigned integer
 
-//            // String test cases
-//            [['hello'], hex2bin('6568656c6c6f')], // "hello" encoded as CBOR text string
+            // String test cases
+            ['hello', hex2bin('6568656C6C6F')], // "hello" encoded as CBOR text string
 //
 //            // Boolean test cases
 //            [[true], hex2bin('f5')], // true encoded as CBOR special type

tests/Unit/CBOR/MajorTypes/UnsignedIntegerTest.php

@@ -47,7 +47,7 @@ public function testEncodeThrowsAnExceptionForValueGreaterThanIntMax(): void
     public function testDecodeThrowsAnExceptionWhenPassedInvalidValue(string $case): void
     {
         $this->expectException(\ValueError::class);
-        $this->expectExceptionMessage("Invalid major type for unsigned integer: ");
+        $this->expectExceptionMessage("Invalid major type for unsigned integer.");
 
         UnsignedInteger::decode($case);
     }