bug symfony#31860 [HttpFoundation] work around PHP 7.3 bug related to json_encode() (nicolas-grekas)

fabpot · fabpot · commit 2ae0580eea98 · 2019-06-05T03:57:52.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpFoundation] work around PHP 7.3 bug related to json_encode() | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#31447 | License | MIT | Doc PR | - I know, this doesn't make any sense. `json_encode` embeds global state behind the scene :( For reference, I asked on php-internals what they think about this: https://externals.io/message/105653#105838 Commits ------- e6e6301 [HttpFoundation] work around PHP 7.3 bug related to json_encode()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -185,6 +185,12 @@ protected function describeContainerParameter($parameter, array $options = [])
     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
@@ -97,7 +97,14 @@ protected function describeApplication(Application $application, array $options
      */
     private function writeData(array $data, array $options)
     {
-        $this->write(json_encode($data, isset($options['json_encoding']) ? $options['json_encoding'] : 0));
+        $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
@@ -82,6 +82,12 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
     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,6 +153,11 @@ 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) {
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -36,6 +36,11 @@ public function encode($data, $format, array $context = [])
     {
         $context = $this->resolveContext($context);
 
+        if (\PHP_VERSION_ID >= 70300 && (JSON_THROW_ON_ERROR & $context['json_encode_options'])) {
+            // Work around https://bugs.php.net/77997
+            json_encode(null);
+        }
+
         $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))) {
diff --git a/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php b/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
@@ -31,6 +31,11 @@ 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
`@@ -185,6 +185,12 @@ protected function describeContainerParameter($parameter, array $options = [])`
`185`	`185`	`private function writeData(array $data, array $options)`
`186`	`186`	`{`
`187`	`187`	`$flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;`
	`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`	`+`
`188`	`194`	`$this->write(json_encode($data, $flags \| JSON_PRETTY_PRINT)."\n");`
`189`	`195`	`}`
`190`	`196`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,12 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio`
`82`	`82`	`private function writeData(array $data, array $options)`
`83`	`83`	`{`
`84`	`84`	`$flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;`
	`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`	`+`
`85`	`91`	`$this->output->write(json_encode($data, $flags \| JSON_PRETTY_PRINT)."\n");`
`86`	`92`	`}`
`87`	`93`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,11 @@ 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`	`+`
`34`	`39`	`return json_encode($messages->all($domain), $flags);`
`35`	`40`	`}`
`36`	`41`