diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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 | #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
-------

e6e63017f0 [HttpFoundation] work around PHP 7.3 bug related to json_encode()
This commit is contained in:
Fabien Potencier 2019-06-05 03:57:52 +02:00
parent 5498cf559c e6e63017f0
commit 2ae0580eea
6 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
View File

@ -185,6 +185,12 @@ class JsonDescriptor extends Descriptor
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");
}

9
src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
View File

@ -97,7 +97,14 @@ class JsonDescriptor extends Descriptor
*/
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));
}
/**

6
src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
View File

@ -82,6 +82,12 @@ class JsonDescriptor extends Descriptor
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");
}

5
src/Symfony/Component/HttpFoundation/JsonResponse.php
View File

@ -153,6 +153,11 @@ class JsonResponse extends Response
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) {

5
src/Symfony/Component/Serializer/Encoder/JsonEncode.php
View File

@ -36,6 +36,11 @@ class JsonEncode implements EncoderInterface
{
$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))) {

5
src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
View File

@ -31,6 +31,11 @@ class JsonFileDumper extends FileDumper
$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);
}