Fix json_encode for unicode(emoji) characters

najdanovicivan · najdanovicivan · commit 9e1487da9d75 · 2019-03-27T11:21:32.000+01:00
diff --git a/src/Elasticsearch/Serializers/ArrayToJSONSerializer.php b/src/Elasticsearch/Serializers/ArrayToJSONSerializer.php
@@ -29,7 +29,7 @@ public function serialize($data)
         if (is_string($data) === true) {
             return $data;
         } else {
-            $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION);
+            $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION + JSON_INVALID_UTF8_SUBSTITUTE);
             if ($data === false) {
                 throw new RuntimeException("Failed to JSON encode: ".json_last_error());
             }
diff --git a/src/Elasticsearch/Serializers/EverythingToJSONSerializer.php b/src/Elasticsearch/Serializers/EverythingToJSONSerializer.php
@@ -26,7 +26,7 @@ class EverythingToJSONSerializer implements SerializerInterface
      */
     public function serialize($data)
     {
-        $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION);
+        $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION + JSON_INVALID_UTF8_SUBSTITUTE);
         if ($data === false) {
             throw new RuntimeException("Failed to JSON encode: ".json_last_error());
         }
diff --git a/src/Elasticsearch/Serializers/SmartSerializer.php b/src/Elasticsearch/Serializers/SmartSerializer.php
@@ -30,7 +30,7 @@ public function serialize($data)
         if (is_string($data) === true) {
             return $data;
         } else {
-            $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION);
+            $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION + JSON_INVALID_UTF8_SUBSTITUTE);
             if ($data === false) {
                 throw new Exceptions\RuntimeException("Failed to JSON encode: ".json_last_error());
             }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function serialize($data)`
`29`	`29`	`if (is_string($data) === true) {`
`30`	`30`	`return $data;`
`31`	`31`	`} else {`
`32`		`- $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION);`
	`32`	`+ $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION + JSON_INVALID_UTF8_SUBSTITUTE);`
`33`	`33`	`if ($data === false) {`
`34`	`34`	`throw new RuntimeException("Failed to JSON encode: ".json_last_error());`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class EverythingToJSONSerializer implements SerializerInterface`
`26`	`26`	`*/`
`27`	`27`	`public function serialize($data)`
`28`	`28`	`{`
`29`		`- $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION);`
	`29`	`+ $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION + JSON_INVALID_UTF8_SUBSTITUTE);`
`30`	`30`	`if ($data === false) {`
`31`	`31`	`throw new RuntimeException("Failed to JSON encode: ".json_last_error());`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function serialize($data)`
`30`	`30`	`if (is_string($data) === true) {`
`31`	`31`	`return $data;`
`32`	`32`	`} else {`
`33`		`- $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION);`
	`33`	`+ $data = json_encode($data, JSON_PRESERVE_ZERO_FRACTION + JSON_INVALID_UTF8_SUBSTITUTE);`
`34`	`34`	`if ($data === false) {`
`35`	`35`	`throw new Exceptions\RuntimeException("Failed to JSON encode: ".json_last_error());`
`36`	`36`	`}`