Add support for integer encoding types

Author: Riimu

src/Encoder/FloatEncoder.php

@@ -55,7 +55,7 @@ private function encodeNumber($float, array $options, callable $encode)
         } elseif ($float === 0.0) {
             return '0.0';
         } elseif ($options['float.export']) {
-            return var_export($float, true);
+            return var_export((float) $float, true);
         }
 
         return $this->encodeFloat($float, $this->determinePrecision($options));

src/Encoder/IntegerEncoder.php

@@ -10,9 +10,14 @@
  */
 class IntegerEncoder implements Encoder
 {
+    /** @var array Default values for options in the encoder */
+    private static $defaultOptions = [
+        'integer.type' => 'decimal',
+    ];
+
     public function getDefaultOptions()
     {
-        return [];
+        return self::$defaultOptions;
     }
 
     public function supports($value)
@@ -22,12 +27,60 @@ public function supports($value)
 
     public function encode($value, $depth, array $options, callable $encode)
     {
-        $string = (string) $value;
+        $encoders = [
+            'binary' => function ($value) {
+                return $this->encodeBinary($value);
+            },
+            'octal' => function ($value) {
+                return $this->encodeOctal($value);
+            },
+            'decimal' => function ($value, $options) {
+                return $this->encodeDecimal($value, $options);
+            },
+            'hexadecimal' => function ($value) {
+                return $this->encodeHexadecimal($value);
+            },
+        ];
+
+        if (!isset($encoders[$options['integer.type']])) {
+            throw new \InvalidArgumentException('Invalid integer encoding type');
+        }
+
+        $callback = $encoders[$options['integer.type']];
+
+        return $callback((int) $value, $options);
+    }
 
-        if ($value === 1 << (PHP_INT_SIZE * 8 - 1)) {
-            $string = sprintf('(int)%s%s', $options['whitespace'] ? ' ' : '', $string);
+    public function encodeBinary($integer)
+    {
+        return sprintf('%s0b%s', $this->sign($integer), decbin(abs($integer)));
+    }
+
+    public function encodeOctal($integer)
+    {
+        return sprintf('%s0%s', $this->sign($integer), decoct(abs($integer)));
+    }
+
+    public function encodeDecimal($integer, $options)
+    {
+        if ($integer === 1 << (PHP_INT_SIZE * 8 - 1)) {
+            return sprintf('(int)%s%s', $options['whitespace'] ? ' ' : '', $integer);
+        }
+
+        return var_export($integer, true);
+    }
+
+    public function encodeHexadecimal($integer)
+    {
+        return sprintf('%s0x%s', $this->sign($integer), dechex(abs($integer)));
+    }
+
+    private function sign($integer)
+    {
+        if ($integer < 0) {
+            return '-';
         }
 
-        return $string;
+        return '';
     }
 }

tests/tests/EncodingTest.php

@@ -71,6 +71,26 @@ public function testMinimumInteger()
         $this->assertEncode('(int)' . (-PHP_INT_MAX - 1), -PHP_INT_MAX - 1, ['whitespace' => false]);
     }
 
+    public function testIntegerTypes()
+    {
+        $this->assertEncode('0b110011000000011111001001', 13371337, ['integer.type' => 'binary']);
+        $this->assertEncode('-0b110011000000011111001001', -13371337, ['integer.type' => 'binary']);
+        $this->assertEncode('063003711', 13371337, ['integer.type' => 'octal']);
+        $this->assertEncode('-063003711', -13371337, ['integer.type' => 'octal']);
+        $this->assertEncode('13371337', 13371337, ['integer.type' => 'decimal']);
+        $this->assertEncode('-13371337', -13371337, ['integer.type' => 'decimal']);
+        $this->assertEncode('0xcc07c9', 13371337, ['integer.type' => 'hexadecimal']);
+        $this->assertEncode('-0xcc07c9', -13371337, ['integer.type' => 'hexadecimal']);
+    }
+
+    public function testInvalidIntegerType()
+    {
+        $encoder = new PHPEncoder();
+
+        $this->expectException(\InvalidArgumentException::class);
+        $encoder->encode(1, ['integer.type' => 'invalid']);
+    }
+
     public function testFloatEncoding()
     {
         $this->assertEncode('0.0', 0.0);