Add capital hex support

Author: Riimu

CHANGES.md

@@ -2,7 +2,9 @@
 
 ## v2.3.0 (2017-07-15) ##
 
-  * 
+  * Add `float.export` option that forces float encoder to use `var_export` for
+    encoding floating point numbers
+  * Float encoder now delegates integer encoding to the integer encoder
 
 ## v2.2.0 (2017-07-08) ##
 

src/Encoder/IntegerEncoder.php

@@ -33,8 +33,8 @@ public function __construct()
             'decimal' => function ($value, $options) {
                 return $this->encodeDecimal($value, $options);
             },
-            'hexadecimal' => function ($value) {
-                return $this->encodeHexadecimal($value);
+            'hexadecimal' => function ($value, $options) {
+                return $this->encodeHexadecimal($value, $options);
             },
         ];
     }
@@ -67,7 +67,7 @@ public function encode($value, $depth, array $options, callable $encode)
      */
     public function encodeBinary($integer)
     {
-        return sprintf('%s0b%s', $this->sign($integer), decbin(abs($integer)));
+        return sprintf('%s0b%b', $this->sign($integer), abs($integer));
     }
 
     /**
@@ -77,7 +77,7 @@ public function encodeBinary($integer)
      */
     public function encodeOctal($integer)
     {
-        return sprintf('%s0%s', $this->sign($integer), decoct(abs($integer)));
+        return sprintf('%s0%o', $this->sign($integer), abs($integer));
     }
 
     /**
@@ -89,7 +89,7 @@ public function encodeOctal($integer)
     public function encodeDecimal($integer, $options)
     {
         if ($integer === 1 << (PHP_INT_SIZE * 8 - 1)) {
-            return sprintf('(int)%s%s', $options['whitespace'] ? ' ' : '', $integer);
+            return sprintf('(int)%s%d', $options['whitespace'] ? ' ' : '', $integer);
         }
 
         return var_export($integer, true);
@@ -98,11 +98,16 @@ public function encodeDecimal($integer, $options)
     /**
      * Encodes an integer into hexadecimal representation.
      * @param int $integer The integer to encode
+     * @param array $options The integer encoding options
      * @return string The PHP code representation for the integer
      */
-    public function encodeHexadecimal($integer)
+    public function encodeHexadecimal($integer, $options)
     {
-        return sprintf('%s0x%s', $this->sign($integer), dechex(abs($integer)));
+        if ($options['hex.capitalize']) {
+            return sprintf('%s0x%X', $this->sign($integer), abs($integer));
+        }
+
+        return sprintf('%s0x%x', $this->sign($integer), abs($integer));
     }
 
     /**

src/Encoder/StringEncoder.php

@@ -93,7 +93,7 @@ private function getSingleQuotedString($string)
     /**
      * Returns the string wrapped in double quotes and all but print characters escaped.
      * @param string $string String to wrap and escape
-     * @param array $options String encoding options
+     * @param array $options The string encoding options
      * @return string The string wrapped in double quotes and escape correctly
      */
     private function getDoubleQuotedString($string, $options)
@@ -108,13 +108,15 @@ private function getDoubleQuotedString($string, $options)
         ]);
 
         if ($options['string.utf8']) {
-            $string = $this->encodeUtf8($string);
+            $string = $this->encodeUtf8($string, $options);
         }
 
+        $format = $options['hex.capitalize'] ? '\x%02X' : '\x%02x';
+
         return sprintf('"%s"', preg_replace_callback(
             '/[^\x20-\x7E]/',
-            function ($matches) {
-                return sprintf('\x%02x', ord($matches[0]));
+            function ($matches) use ($format) {
+                return sprintf($format, ord($matches[0]));
             },
             $string
         ));
@@ -123,10 +125,12 @@ function ($matches) {
     /**
      * Encodes all multibyte UTF-8 characters into PHP7 string encoding.
      * @param string $string The string to encoder
+     * @param array $options The string encoding options
      * @return string The string with all the multibyte characters encoded
      */
-    private function encodeUtf8($string)
+    private function encodeUtf8($string, $options)
     {
+        $format = $options['hex.capitalize'] ? '\u{%X}' : '\u{%x}';
         $pattern =
             '/  [\xC2-\xDF][\x80-\xBF]
               |  \xE0[\xA0-\xBF][\x80-\xBF]
@@ -136,8 +140,8 @@ private function encodeUtf8($string)
               | [\xF1-\xF3][\x80-\xBF]{3}
               |  \xF4[\x80-\x8F][\x80-\xBF]{2}/x';
 
-        return preg_replace_callback($pattern, function ($match) {
-            return sprintf('\u{%s}', dechex($this->getCodePoint($match[0])));
+        return preg_replace_callback($pattern, function ($match) use ($format) {
+            return sprintf($format, $this->getCodePoint($match[0]));
         }, $string);
     }
 

src/PHPEncoder.php

@@ -28,6 +28,7 @@ class PHPEncoder
         'recursion.detect' => true,
         'recursion.ignore' => false,
         'recursion.max'    => false,
+        'hex.capitalize'   => false,
     ];
 
     /**

tests/tests/EncodingTest.php

@@ -81,6 +81,8 @@ public function testIntegerTypes()
         $this->assertEncode('-13371337', -13371337, ['integer.type' => 'decimal']);
         $this->assertEncode('0xcc07c9', 13371337, ['integer.type' => 'hexadecimal']);
         $this->assertEncode('-0xcc07c9', -13371337, ['integer.type' => 'hexadecimal']);
+        $this->assertEncode('0xCC07C9', 13371337, ['integer.type' => 'hexadecimal', 'hex.capitalize' => true]);
+        $this->assertEncode('-0xCC07C9', -13371337, ['integer.type' => 'hexadecimal', 'hex.capitalize' => true]);
     }
 
     public function testInvalidIntegerType()
@@ -156,6 +158,8 @@ public function testFloatIntegers()
         $this->assertEncode('1337', 1337, $encoder, 1337.0);
         $this->assertEncode('-1337', -1337, $encoder, -1337.0);
         $this->assertEncode('2000000000', 2000000000, $encoder, 2000000000.0);
+
+        $this->assertEncode('0xf', 15, ['float.integers' => true, 'integer.type' => 'hexadecimal'], 15.0);
     }
 
     public function testMaximumFloatIntegers()
@@ -223,6 +227,8 @@ public function testStringEncoding()
         $this->assertEncode('"\t\$foo"', "\t\$foo");
         $this->assertEncode('"\t{\$foo}"', "\t{\$foo}");
         $this->assertEncode('"\x00"', "\x00");
+        $this->assertEncode('"\xff"', "\xFF");
+        $this->assertEncode('"\xFF"', "\xFF", ['hex.capitalize' => true]);
         $this->assertEncode("'\r'", "\r", ['string.escape' => false]);
     }
 
@@ -240,7 +246,7 @@ public function testUtf8String()
         $encoder = new PHPEncoder(['string.utf8' => true]);
 
         $this->assertEncode('"\nA"', "\nA", $encoder);
-        $this->assertEncode('"\nA\u{c4}\x00"', "\nAÄ\x00", $encoder);
+        $this->assertSame('"\nA\u{c4}\x00"', $encoder->encode("\nAÄ\x00"));
 
         if (version_compare(PHP_VERSION, '7', '<')) {
             $this->assertSame('"\u{a2}"', $encoder->encode("\xC2\xA2"));
@@ -253,6 +259,9 @@ public function testUtf8String()
             $this->assertEncode('"\u{10348}"', "\u{10348}", $encoder);
             $this->assertEncode('"\u{e5}\u{e4}\u{f6}\u{c5}\u{c4}\u{d6}"', 'åäöÅÄÖ', $encoder);
         }
+
+        $encoder->setOption('hex.capitalize', true);
+        $this->assertSame('"\nA\u{C4}\x00"', $encoder->encode("\nAÄ\x00"));
     }
 
     public function testGMPEncoding()