Fix json-encoding when JSON_THROW_ON_ERROR is used

nicolas-grekas · nicolas-grekas · commit c4d2f3529755 · 2019-06-05T13:33:52.000+02:00
diff --git a/Descriptor/JsonDescriptor.php b/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));
     }
 

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`