Update changelog

Author: Riimu

CHANGES.md

@@ -2,9 +2,18 @@
 
 ## 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
+  * Added `string.utf8` option which causes the string encoder to escape all
+    valid multibyte UTF-8 characters using the PHP7 unicode code point syntax.
+  * Added `string.binary` option which causes the string encoder to encode all
+    non UTF-8 strings using a `base64_encode()`.
+  * Added `integer.type` option that accepts values `binary`, `octal`, `decimal`
+    or `hexadecimal` which can be used to change the output syntax of integers.
+  * Added `hex.capitalize` option that causes all hexadecimal character in
+    output to appear in upper case
+  * Added `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 (to
+    allow different integer types).
 
 ## v2.2.0 (2017-07-08) ##
 

README.md

@@ -147,6 +147,10 @@ apply to following calls.
     When set to `false`, generation of all extra whitespace is disabled and all
     other settings that affect whitespace are ignored.
 
+  * **hex.capitalize** : &lt;boolean&gt; (false)<br>
+    When set to `true` all hexadecimal characters in the output are written
+    using upper case instead of lower case.
+
   * **null.capitalize** : &lt;boolean&gt; (false)<br>
     When set to `true`, all `null` values are written in upper case instead of
     lower case.
@@ -155,25 +159,45 @@ apply to following calls.
     When set to `true`, all `true` and `false` values are written in upper case
     instead of lower case.
 
+  * **integer.type** : &lt;"binary"|"octal"|"decimal"|"hexadecimal"&gt; ("decimal")<br>
+    Change the output syntax of integers. For example, using the type `"hexadecimal"`
+    would output the number `15` as `0xf`.
+
   * **float.integers** : &lt;boolean|"all"&gt; (false)<br>
     When set to `true`, any float that represents an integer and has a value
     that is accurately represented by the floating point number will be encoded
     as an integer instead of a float. (e.g. the value `2.0` will be encoded as
     `2`). To include the values that are not accurately represented, you may set
     option to `"all"`.
 
+  * **float.export** : &lt;boolean&gt; (false)<br>
+    When set to `true` floats are encoded using `var_export()`, which causes a
+    slightly different output on non integer floating point numbers compared to
+    the standard implemented method. In some cases, this may produce more
+    accurate numbers but with less cleaner representation.
+
   * **float.precision** : &lt;integer|false&gt; (17)<br>
     The maximum precision of encoded floating point values, which usually also
     means the maximum number of digits in encoded floats. If the value is set to
     `false`, the PHP ini setting `serialize_precision` will be used instead.
     Note that due to the way floating point values work, a value greater than 17
     does not provide any additional precision.
 
+  * **string.binary** : &lt;boolean&gt; (false)<br>
+    When set to `true` any string that is not valid UTF-8 will be encoded in
+    base 64 and wrapped with `base64_decode()` call.
+
   * **string.escape** : &lt;boolean&gt; (true)<br>
     When set to `true`, all strings containing bytes outside the 32-126 ASCII
     range will be written with double quotes and the characters outside the
     range will be escaped.
 
+  * **string.utf8** : &lt;boolean&gt; (false)<br>
+    When both this option and `string.escape` are set to `true`, all valid
+    multibyte UTF-8 characters in strings are encoded using the PHP7 unicode
+    code point syntax. Note that this syntax does not work in PHP versions
+    earlier than 7.0.
+
   * **array.short** : &lt;boolean&gt; (true)<br>
     When set to `true`, arrays are enclosed using square brackets `[]` instead
     using of the long array notation `array()`.

src/Encoder/StringEncoder.php

@@ -111,15 +111,11 @@ private function getDoubleQuotedString($string, $options)
             $string = $this->encodeUtf8($string, $options);
         }
 
-        $format = $options['hex.capitalize'] ? '\x%02X' : '\x%02x';
-
-        return sprintf('"%s"', preg_replace_callback(
-            '/[^\x20-\x7E]/',
-            function ($matches) use ($format) {
-                return sprintf($format, ord($matches[0]));
-            },
-            $string
-        ));
+        $hexFormat = function ($matches) use ($options) {
+            return sprintf($options['hex.capitalize'] ? '\x%02X' : '\x%02x', ord($matches[0]));
+        };
+
+        return sprintf('"%s"', preg_replace_callback('/[^\x20-\x7E]/', $hexFormat, $string));
     }
 
     /**
@@ -130,7 +126,6 @@ function ($matches) use ($format) {
      */
     private function encodeUtf8($string, $options)
     {
-        $format = $options['hex.capitalize'] ? '\u{%X}' : '\u{%x}';
         $pattern =
             '/  [\xC2-\xDF][\x80-\xBF]
               |  \xE0[\xA0-\xBF][\x80-\xBF]
@@ -140,8 +135,8 @@ private function encodeUtf8($string, $options)
               | [\xF1-\xF3][\x80-\xBF]{3}
               |  \xF4[\x80-\x8F][\x80-\xBF]{2}/x';
 
-        return preg_replace_callback($pattern, function ($match) use ($format) {
-            return sprintf($format, $this->getCodePoint($match[0]));
+        return preg_replace_callback($pattern, function ($match) use ($options) {
+            return sprintf($options['hex.capitalize'] ? '\u{%X}' : '\u{%x}', $this->getCodePoint($match[0]));
         }, $string);
     }