Update base32 package

Author: nyamsprod

src/Base32/Base32.php

@@ -7,7 +7,6 @@
 use RuntimeException;
 use ValueError;
 
-use function array_key_exists;
 use function chr;
 use function rtrim;
 use function str_replace;
@@ -32,7 +31,7 @@ final class Base32
      * @param non-empty-string $alphabet
      * @param non-empty-string $padding
      */
-    private function __construct(string $alphabet, string $padding)
+    public function __construct(string $alphabet, string $padding)
     {
         if (1 !== strlen($padding) || false !== strpos(self::RESERVED_CHARACTERS, $padding)) {
             throw new ValueError('The padding character must be a non-reserved single byte character.');
@@ -48,29 +47,20 @@ private function __construct(string $alphabet, string $padding)
             throw new ValueError('The alphabet can not contain a reserved character.');
         }
 
-        $uniqueChars = [];
+        $uniqueChars = '';
         for ($index = 0; $index < self::ALPHABET_SIZE; $index++) {
             $char = $upperAlphabet[$index];
-            if (array_key_exists($char, $uniqueChars)) {
+            if (false !== strpos($uniqueChars, $char)) {
                 throw new ValueError('The alphabet must only contain unique characters.');
             }
 
-            $uniqueChars[$char] = 1;
+            $uniqueChars .= $char;
         }
 
         $this->alphabet = $alphabet;
         $this->padding = $padding;
     }
 
-    /**
-     * @param non-empty-string $alphabet
-     * @param non-empty-string $padding
-     */
-    public static function new(string $alphabet, string $padding): self
-    {
-        return new self($alphabet, $padding);
-    }
-
     public function encode(string $decoded): string
     {
         if ('' === $decoded) {
@@ -119,7 +109,7 @@ public function decode(string $encoded, bool $strict = false): string
         do {
             if (!isset($val)) {
                 $index = $encoded[$offset];
-                $val = array_key_exists($index, $chars) ? $chars[$index] : -1;
+                $val = $chars[$index] ?? -1;
             }
 
             if (-1 === $val) {
@@ -142,7 +132,7 @@ public function decode(string $encoded, bool $strict = false): string
                     $offset = $length;
                 }
 
-                if ($strict && !array_key_exists($pentet, $chars)) {
+                if ($strict && !isset($chars[$pentet])) {
                     throw new RuntimeException('The encoded data contains characters unknown to the alphabet.');
                 }
 

src/Base32/Base32Test.php

@@ -74,7 +74,7 @@ public function it_wiil_distinguish_alphabet_on_character_casing_on_strict_mode(
         $expected = 'bangui';
 
         self::assertSame($expected, base32_decode(encoded: base32_encode($expected, $alphabet)));
-        self::assertFalse(base32_decode(encoded: base32_encode($expected, $alphabet), strict: true));
+        self::assertNull(base32_decode(encoded: base32_encode($expected, $alphabet), strict: true));
     }
 
     #[DataProvider('invalidDecodingSequence')]
@@ -86,7 +86,7 @@ public function it_will_return_false_from_invalid_encoded_string_with_base32_dec
         string $padding
     ): void {
         try {
-            self::assertFalse(base32_decode($sequence, $alphabet, $padding, true)); /* @phpstan-ignore-line */
+            self::assertNull(base32_decode($sequence, $alphabet, $padding, true)); /* @phpstan-ignore-line */
         } catch (ValueError $exception) {
             self::assertSame($message, $exception->getMessage());
         }

src/Base32/functions.php

@@ -17,7 +17,7 @@ function base32_encode(
         string $alphabet = PHP_BASE32_ASCII,
         string $padding = '=',
     ): string {
-        return Base32::new($alphabet, $padding)->encode($decoded);
+        return (new Base32($alphabet, $padding))->encode($decoded);
     }
 }
 
@@ -31,11 +31,11 @@ function base32_decode(
         string $alphabet = PHP_BASE32_ASCII,
         string $padding = '=',
         bool $strict = false
-    ): string|false {
+    ): ?string {
         try {
-            return Base32::new($alphabet, $padding)->decode($encoded, $strict);
+            return (new Base32($alphabet, $padding))->decode($encoded, $strict);
         } catch (RuntimeException) {
-            return false;
+            return null;
         }
     }
 }