Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit 3b7e525131bb · 2019-06-05T15:22:46.000+02:00
* 3.4:
  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
diff --git a/Console/Descriptor/JsonDescriptor.php b/Console/Descriptor/JsonDescriptor.php
@@ -185,6 +185,7 @@ protected function describeContainerParameter($parameter, array $options = [])
     private function writeData(array $data, array $options)
     {
         $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;
+
         $this->write(json_encode($data, $flags | JSON_PRETTY_PRINT)."\n");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ 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`	`+`
`188`	`189`	`$this->write(json_encode($data, $flags \| JSON_PRETTY_PRINT)."\n");`
`189`	`190`	`}`
`190`	`191`