bug symfony#31869 Fix json-encoding when JSON_THROW_ON_ERROR is used (nicolas-grekas)

fabpot · fabpot · commit 92e8514dbbf9 · 2019-06-05T15:14:18.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Fix json-encoding when JSON_THROW_ON_ERROR is used | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - As hinted in symfony#31860 by @lt Commits ------- d18f42c Fix json-encoding when JSON_THROW_ON_ERROR is used
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -186,11 +186,6 @@ private function writeData(array $data, array $options)
     {
         $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;
 
-        if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $flags)) {
-            // Work around https://bugs.php.net/77997
-            json_encode(null);
-        }
-
         $this->write(json_encode($data, $flags | JSON_PRETTY_PRINT)."\n");
     }
 
diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -99,11 +99,6 @@ private function writeData(array $data, array $options)
     {
         $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;
 
-        if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $flags)) {
-            // Work around https://bugs.php.net/77997
-            json_encode(null);
-        }
-
         $this->write(json_encode($data, $flags));
     }
 
diff --git a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
@@ -83,11 +83,6 @@ private function writeData(array $data, array $options)
     {
         $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;
 
-        if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $flags)) {
-            // Work around https://bugs.php.net/77997
-            json_encode(null);
-        }
-
         $this->output->write(json_encode($data, $flags | JSON_PRETTY_PRINT)."\n");
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -153,11 +153,6 @@ public function setData($data = [])
                     restore_error_handler();
                 }
             } else {
-                if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $this->encodingOptions)) {
-                    // Work around https://bugs.php.net/77997
-                    json_encode(null);
-                }
-
                 try {
                     $data = json_encode($data, $this->encodingOptions);
                 } catch (\Exception $e) {
@@ -166,6 +161,10 @@ public function setData($data = [])
                     }
                     throw $e;
                 }
+
+                if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $this->encodingOptions)) {
+                    return $this->setJson($data);
+                }
             }
         }
 
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -72,7 +72,15 @@ public function decode($data, $format, array $context = [])
         $recursionDepth = $context['json_decode_recursion_depth'];
         $options = $context['json_decode_options'];
 
-        $decodedData = json_decode($data, $associative, $recursionDepth, $options);
+        try {
+            $decodedData = json_decode($data, $associative, $recursionDepth, $options);
+        } catch (\JsonException $e) {
+            throw new NotEncodableValueException($e->getMessage(), 0, $e);
+        }
+
+        if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $options)) {
+            return $decodedData;
+        }
 
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new NotEncodableValueException(json_last_error_msg());
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -36,13 +36,12 @@ public function encode($data, $format, array $context = [])
     {
         $context = $this->resolveContext($context);
 
+        $encodedJson = json_encode($data, $context['json_encode_options']);
+
         if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $context['json_encode_options'])) {
-            // Work around https://bugs.php.net/77997
-            json_encode(null);
+            return $encodedJson;
         }
 
-        $encodedJson = json_encode($data, $context['json_encode_options']);
-
         if (JSON_ERROR_NONE !== json_last_error() && (false === $encodedJson || !($context['json_encode_options'] & JSON_PARTIAL_OUTPUT_ON_ERROR))) {
             throw new NotEncodableValueException(json_last_error_msg());
         }
diff --git a/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php b/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
@@ -31,11 +31,6 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
             $flags = \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;
         }
 
-        if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $flags)) {
-            // Work around https://bugs.php.net/77997
-            json_encode(null);
-        }
-
         return json_encode($messages->all($domain), $flags);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -186,11 +186,6 @@ private function writeData(array $data, array $options)`
`186`	`186`	`{`
`187`	`187`	`$flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;`
`188`	`188`
`189`		`- if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $flags)) {`
`190`		`- // Work around https://bugs.php.net/77997`
`191`		`- json_encode(null);`
`192`		`- }`
`193`		`-`
`194`	`189`	`$this->write(json_encode($data, $flags \| JSON_PRETTY_PRINT)."\n");`
`195`	`190`	`}`
`196`	`191`
Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,6 @@ private function writeData(array $data, array $options)`
`99`	`99`	`{`
`100`	`100`	`$flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;`
`101`	`101`
`102`		`- if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $flags)) {`
`103`		`- // Work around https://bugs.php.net/77997`
`104`		`- json_encode(null);`
`105`		`- }`
`106`		`-`
`107`	`102`	`$this->write(json_encode($data, $flags));`
`108`	`103`	`}`
`109`	`104`
Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,6 @@ private function writeData(array $data, array $options)`
`83`	`83`	`{`
`84`	`84`	`$flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;`
`85`	`85`
`86`		`- if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $flags)) {`
`87`		`- // Work around https://bugs.php.net/77997`
`88`		`- json_encode(null);`
`89`		`- }`
`90`		`-`
`91`	`86`	`$this->output->write(json_encode($data, $flags \| JSON_PRETTY_PRINT)."\n");`
`92`	`87`	`}`
`93`	`88`
Original file line number	Diff line number	Diff line change
`@@ -153,11 +153,6 @@ public function setData($data = [])`
`153`	`153`	`restore_error_handler();`
`154`	`154`	`}`
`155`	`155`	`} else {`
`156`		`- if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $this->encodingOptions)) {`
`157`		`- // Work around https://bugs.php.net/77997`
`158`		`- json_encode(null);`
`159`		`- }`
`160`		`-`
`161`	`156`	`try {`
`162`	`157`	`$data = json_encode($data, $this->encodingOptions);`
`163`	`158`	`} catch (\Exception $e) {`
`@@ -166,6 +161,10 @@ public function setData($data = [])`
`166`	`161`	`}`
`167`	`162`	`throw $e;`
`168`	`163`	`}`
	`164`	`+`
	`165`	`+ if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $this->encodingOptions)) {`
	`166`	`+ return $this->setJson($data);`
	`167`	`+ }`
`169`	`168`	`}`
`170`	`169`	`}`
`171`	`170`
Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,12 @@ public function encode($data, $format, array $context = [])`
`36`	`36`	`{`
`37`	`37`	`$context = $this->resolveContext($context);`
`38`	`38`
	`39`	`+ $encodedJson = json_encode($data, $context['json_encode_options']);`
	`40`	`+`
`39`	`41`	`if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $context['json_encode_options'])) {`
`40`		`- // Work around https://bugs.php.net/77997`
`41`		`- json_encode(null);`
	`42`	`+ return $encodedJson;`
`42`	`43`	`}`
`43`	`44`
`44`		`- $encodedJson = json_encode($data, $context['json_encode_options']);`
`45`		`-`
`46`	`45`	`if (JSON_ERROR_NONE !== json_last_error() && (false === $encodedJson \|\| !($context['json_encode_options'] & JSON_PARTIAL_OUTPUT_ON_ERROR))) {`
`47`	`46`	`throw new NotEncodableValueException(json_last_error_msg());`
`48`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,6 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti`
`31`	`31`	`$flags = \defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0;`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $flags)) {`
`35`		`- // Work around https://bugs.php.net/77997`
`36`		`- json_encode(null);`
`37`		`- }`
`38`		`-`
`39`	`34`	`return json_encode($messages->all($domain), $flags);`
`40`	`35`	`}`
`41`	`36`