Skip to content

Commit

Permalink
Merge branch '4.2' into 4.3
Browse files Browse the repository at this point in the history
* 4.2:
  [HttpKernel] Fix handling non-catchable fatal errors
  Fix json-encoding when JSON_THROW_ON_ERROR is used
  [HttpFoundation] work around PHP 7.3 bug related to json_encode()
  [Security] added support for updated \"distinguished name\" format in x509 authentication
  • Loading branch information
nicolas-grekas committed Jun 5, 2019
2 parents ee0a146 + 1bc4c33 commit 01c956f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Console/Descriptor/JsonDescriptor.php
Expand Up @@ -94,7 +94,8 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio

private function writeData(array $data, array $options)
{
$flags = $options['json_encoding'] ?? 0;
$flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;

$this->output->write(json_encode($data, $flags | JSON_PRETTY_PRINT)."\n");
}

Expand Down

0 comments on commit 01c956f

Please sign in to comment.