Merge pull request #2 from tiny-blocks/release/1.1.0

Release/1.1.0

Author: gustavofreze

infection.json.dist

@@ -13,7 +13,11 @@
     },
     "mutators": {
         "@default": true,
-        "FalseValue": false
+        "Concat": false,
+        "FalseValue": false,
+        "IncrementInteger": false,
+        "DecrementInteger": false,
+        "ConcatOperandRemoval": false
     },
     "phpUnit": {
         "configDir": "",

src/Base62.php

@@ -10,41 +10,44 @@ final class Base62
 
     public static function encode(string $value): string
     {
-        if (empty($value)) {
-            return $value;
+        $bytes = 0;
+        $hexadecimal = bin2hex($value);
+
+        while (str_starts_with($hexadecimal, '00')) {
+            $bytes++;
+            $hexadecimal = substr($hexadecimal, 2);
         }
 
-        $hexadecimal = bin2hex($value);
-        $decimal = gmp_init($hexadecimal, self::HEXADECIMAL_RADIX);
-        $encoded = '';
+        $base62 = str_repeat(self::BASE62_ALPHABET[0], $bytes);
 
-        while (gmp_cmp($decimal, '0') > 0) {
-            $remainder = gmp_intval(gmp_mod($decimal, self::BASE62_RADIX));
-            $decimal = gmp_div_q($decimal, self::BASE62_RADIX);
-            $encoded = self::BASE62_ALPHABET[$remainder] . $encoded;
+        if (empty($hexadecimal)) {
+            return strtr($base62, self::BASE62_ALPHABET, self::BASE62_ALPHABET);
         }
 
-        return $encoded;
+        $base62Conversion = gmp_strval(gmp_init($hexadecimal, self::HEXADECIMAL_RADIX), self::BASE62_RADIX);
+
+        return strtr($base62 . $base62Conversion, self::BASE62_ALPHABET, self::BASE62_ALPHABET);
     }
 
     public static function decode(string $value): string
     {
+        $bytes = 0;
+
+        while (!empty($value) && str_starts_with($value, self::BASE62_ALPHABET[0])) {
+            $bytes++;
+            $value = substr($value, 1);
+        }
+
         if (empty($value)) {
-            return $value;
+            return str_repeat("\x00", $bytes);
         }
 
-        $decimal = gmp_init('0');
+        $hexadecimal = gmp_strval(gmp_init($value, self::BASE62_RADIX), self::HEXADECIMAL_RADIX);
 
-        for ($i = 0, $length = strlen($value); $i < $length; $i++) {
-            $character = $value[$i];
-            $position = strpos(self::BASE62_ALPHABET, $character);
-            $decimal = gmp_mul($decimal, self::BASE62_RADIX);
-            $decimal = gmp_add($decimal, $position);
+        if (strlen($hexadecimal) % 2 !== 0) {
+            $hexadecimal = '0' . $hexadecimal;
         }
 
-        $hexadecimal = gmp_strval($decimal, self::HEXADECIMAL_RADIX);
-        $decoded = hex2bin($hexadecimal);
-
-        return $decoded !== false ? $decoded : '';
+        return hex2bin(str_repeat('00', $bytes) . $hexadecimal);
     }
 }

tests/Base62Test.php

@@ -26,6 +26,17 @@ public function testDecode(string $value, string $expected)
         self::assertEquals($expected, $actual);
     }
 
+    /**
+     * @dataProvider providerForTestEncodeAndDecodeWithLeadingZeroBytes
+     */
+    public function testEncodeAndDecodeWithLeadingZeroBytes(string $value): void
+    {
+        $encoded = Base62::encode(value: $value);
+        $actual = Base62::decode(value: $encoded);
+
+        self::assertEquals($value, $actual);
+    }
+
     public function providerForTestEncode(): array
     {
         return [
@@ -45,4 +56,13 @@ public function providerForTestDecode(): array
             ['T8dgcjRGuYUueWht', 'Hello world!']
         ];
     }
+
+    public function providerForTestEncodeAndDecodeWithLeadingZeroBytes(): array
+    {
+        return [
+            ['001jlt60MnKnB9ECKRt4gl'],
+            [hex2bin('07d8e31da269bf28')],
+            [hex2bin('0000010203040506')]
+        ];
+    }
 }