Improve base16 and base32 test suite

Author: nyamsprod

ext/standard/tests/encoding/base16/basic_encoding.phpt

@@ -10,15 +10,14 @@ use Encoding\UnableToDecodeException;
 use function Encoding\base16_encode;
 use function Encoding\base16_decode;
 
-var_dump(base16_encode("Hello") === "48656C6C6F");
-var_dump(base16_decode("48656C6C6F") === "Hello");
-
-var_dump(base16_encode("Hello", Base16::Lower) === "48656c6c6f");
-var_dump(base16_decode("48656c6c6f", Base16::Lower) === "Hello");
+echo base16_encode("Hello"), PHP_EOL;
+echo base16_decode("48656C6C6F"), PHP_EOL;
+echo base16_encode("Hello", Base16::Lower), PHP_EOL;
+echo base16_decode("48656c6c6f", Base16::Lower), PHP_EOL;
 
 ?>
 --EXPECT--
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+48656C6C6F
+Hello
+48656c6c6f
+Hello

ext/standard/tests/encoding/base16/case_sensitive_encoding.phpt

@@ -14,16 +14,14 @@ $original = "Hello, World!";
 $encoded  = base16_encode($original);
 
 var_dump(1 === preg_match('/^[0-9A-F]+$/', $encoded));
-var_dump(base16_decode($encoded) === $original);
-
+echo base16_decode($encoded), PHP_EOL;
 $encodedLower = base16_encode($original, variant: Base16::Lower);
-
 var_dump(1 === preg_match('/^[0-9a-f]+$/', $encodedLower));
-var_dump(base16_decode($encodedLower, variant: Base16::Lower) === $original);
+echo base16_decode($encodedLower, variant: Base16::Lower), PHP_EOL;
 
 ?>
 --EXPECT--
 bool(true)
+Hello, World!
 bool(true)
-bool(true)
-bool(true)
+Hello, World!

ext/standard/tests/encoding/base16/decode-multiline.phpt

@@ -13,9 +13,7 @@ $input = <<<HEX
 6F
 HEX;
 
-var_dump(
-    base16_decode($input, decodingMode: DecodingMode::Forgiving) === 'Hello'
-);
+echo base16_decode($input, decodingMode: DecodingMode::Forgiving), PHP_EOL;
 ?>
 --EXPECT--
-bool(true)
+Hello

ext/standard/tests/encoding/base16/forgiving_encoding.phpt

@@ -13,22 +13,10 @@ use function Encoding\base16_decode;
 $encoded = "48656C6C6F2c20576F726C6421";
 $original = "Hello, World!";
 
-var_dump(
-    base16_decode(
-        strtolower($encoded),
-        decodingMode: DecodingMode::Forgiving
-    ) === $original
-);
-
-var_dump(
-    base16_decode(
-        strtoupper($encoded),
-        variant: Base16::Lower,
-        decodingMode: DecodingMode::Forgiving
-    ) === $original
-);
+echo base16_decode(strtolower($encoded), decodingMode: DecodingMode::Forgiving), PHP_EOL;
+echo base16_decode(strtoupper($encoded), variant: Base16::Lower, decodingMode: DecodingMode::Forgiving), PHP_EOL;
 
 ?>
 --EXPECT--
-bool(true)
-bool(true)
+Hello, World!
+Hello, World!

ext/standard/tests/encoding/base16/invalid_decoding.phpt

@@ -11,20 +11,18 @@ use function Encoding\base16_encode;
 use function Encoding\base16_decode;
 
 try {
-    base16_decode("abc");
-    var_dump(false);
-} catch (UnableToDecodeException) {
-    var_dump(true);
+    echo base16_decode("abc"), ' ; "abc" must not be decoded', PHP_EOL;
+} catch (Throwable $exception) {
+    echo $exception::class, ' : ', $exception->getMessage(), PHP_EOL;
 }
 
 try {
-    base16_decode("gh");
-    var_dump(false);
+    echo base16_decode("gh"), ' ; "gh" must not be encoded', PHP_EOL;
 } catch (UnableToDecodeException) {
-    var_dump(true);
+    echo $exception::class, ' : ', $exception->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-bool(true)
-bool(true)
+Encoding\UnableToDecodeException : Invalid character
+Encoding\UnableToDecodeException : Invalid character

ext/standard/tests/encoding/base16/invalid_sequence_and_characters.phpt

@@ -11,20 +11,18 @@ use function Encoding\base16_encode;
 use function Encoding\base16_decode;
 
 try {
-    base16_decode("ZZ");
-    var_dump(false);
-} catch (UnableToDecodeException) {
-    var_dump(true);
+    echo base16_decode("ZZ"), ' ; "ZZ" must not be decoded', PHP_EOL;
+} catch (Throwable $exception) {
+    echo $exception::class, ' : ', $exception->getMessage(), PHP_EOL;
 }
 
 try {
-    base16_decode("ABC");
-    var_dump(false);
-} catch (UnableToDecodeException) {
-    var_dump(true);
+    echo base16_decode("ABC"), ' ; "ABC" must not be decoded', PHP_EOL;
+} catch (Throwable $exception) {
+    echo $exception::class, ' : ', $exception->getMessage(), PHP_EOL;
 }
 
 ?>
 --EXPECT--
-bool(true)
-bool(true)
+Encoding\UnableToDecodeException : Invalid character
+Encoding\UnableToDecodeException : Invalid length

ext/standard/tests/encoding/base16/round_trip_consistency.phpt

@@ -24,7 +24,6 @@ foreach ($inputs as $original) {
 
     if ($decoded !== $original) {
         echo "Round-trip failed for: " . $original . PHP_EOL;
-        var_dump(false);
         continue;
     }
 

ext/standard/tests/encoding/base16/whitespace_handling.phpt

@@ -10,16 +10,11 @@ use function Encoding\base16_encode;
 use function Encoding\base16_decode;
 
 $encoded = "48 65\n6C\t6C\r6F 2C 20 57 6F 72 6C 64 21";
-$original = "Hello, World!";
 
-var_dump(
-    base16_decode($encoded, decodingMode: DecodingMode::Forgiving) === $original
-);
-var_dump(
-    base16_decode($encoded, decodingMode: DecodingMode::Strict) === $original
-);
+echo base16_decode($encoded, decodingMode: DecodingMode::Forgiving), PHP_EOL;
+echo base16_decode($encoded, decodingMode: DecodingMode::Strict), PHP_EOL;
 
 ?>
 --EXPECT--
-bool(true)
-bool(true)
+Hello, World!
+Hello, World!

…ncoding/base32/decode-ascii-padding.phpt …oding/base32/decode-ascii-forgiving.phptext/standard/tests/encoding/base32/decode-ascii-padding.phpt renamed to ext/standard/tests/encoding/base32/decode-ascii-forgiving.phpt ext/standard/tests/encoding/base32/decode-ascii-padding.phpt renamed to ext/standard/tests/encoding/base32/decode-ascii-forgiving.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Base32 ASCII decoding vectors with strip padding
+Base32 ASCII decoding vectors with forgiving mode
 --FILE--
 <?php
 declare(strict_types=1);
@@ -24,16 +24,20 @@ $vectors = [
 ];
 
 foreach ($vectors as [$decoded, $encoded]) {
-    var_dump(base32_decode(data: $encoded, decodingMode: DecodingMode::Forgiving) === $decoded);
-}
+    $res = base32_decode(data: $encoded, decodingMode: DecodingMode::Forgiving);
+    if ('' === trim($decoded)) {
+        var_dump($decoded === $res);
+    } else {
+        echo $res, PHP_EOL;
+    }}
 ?>
 --EXPECT--
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+f
+fo
+foo
+foob
+fooba
+foobar
 bool(true)
 bool(true)
 bool(true)