From d1526ea50714cef95eea57ca6c8cdb7ff9fa4944 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sat, 1 Aug 2020 17:49:05 +0300 Subject: [PATCH] feat(support): Simplify parsers and serializers #438 --- src/flextype/app/Support/Serializers/Json.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/flextype/app/Support/Serializers/Json.php b/src/flextype/app/Support/Serializers/Json.php index d365be21..a43ee64f 100644 --- a/src/flextype/app/Support/Serializers/Json.php +++ b/src/flextype/app/Support/Serializers/Json.php @@ -92,12 +92,12 @@ class Json */ public function _encode($input, $options = 0, int $depth = 512) : string { - $options = ($options & $this->ESCAPE_UNICODE ? 0 : JSON_UNESCAPED_UNICODE) + $options = ($options & self::ESCAPE_UNICODE ? 0 : JSON_UNESCAPED_UNICODE) | JSON_UNESCAPED_SLASHES - | ($options & $this->PRETTY ? JSON_PRETTY_PRINT : 0) + | ($options & self::PRETTY ? JSON_PRETTY_PRINT : 0) | (defined('JSON_PRESERVE_ZERO_FRACTION') ? JSON_PRESERVE_ZERO_FRACTION : 0); - $json = json_encode($value, $options, $depth); + $json = json_encode($input, $options, $depth); if ($error = json_last_error()) { throw new RuntimeException(json_last_error_msg(), $error); @@ -111,7 +111,7 @@ class Json */ protected function _decode(string $input, bool $assoc = true, int $depth = 512, int $flags = 0) { - $value = json_decode($json, $assoc, $depth, $flags); + $value = json_decode($input, $assoc, $depth, $flags); if ($error = json_last_error()) { throw new RuntimeException(json_last_error_msg(), $error);