Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Jun 5, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
View file
Open in desktop
Expand Up @@ -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");
}

Expand Down
9 changes: 8 additions & 1 deletion src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
View file
Open in desktop
Expand Up @@ -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));
}

/**
Expand Down
6 changes: 6 additions & 0 deletions src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
View file
Open in desktop
Expand Up @@ -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");
}

Expand Down
5 changes: 5 additions & 0 deletions src/Symfony/Component/HttpFoundation/JsonResponse.php
View file
Open in desktop
Expand Up @@ -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) {
Expand Down
5 changes: 5 additions & 0 deletions src/Symfony/Component/Serializer/Encoder/JsonEncode.php
View file
Open in desktop
Expand Up @@ -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))) {
Expand Down
5 changes: 5 additions & 0 deletions src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
View file
Open in desktop
Expand Up @@ -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);
}

Expand Down