Merge branch '4.2' into 4.3

nicolas-grekas · nicolas-grekas · commit d50bbeeb0e17 · 2019-06-05T15:25:51.000+02:00
* 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
diff --git a/Descriptor/JsonDescriptor.php b/Descriptor/JsonDescriptor.php
@@ -97,7 +97,9 @@ 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;
+
+        $this->write(json_encode($data, $flags));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,9 @@ protected function describeApplication(Application $application, array $options`
`97`	`97`	`*/`
`98`	`98`	`private function writeData(array $data, array $options)`
`99`	`99`	`{`
`100`		`- $this->write(json_encode($data, isset($options['json_encoding']) ? $options['json_encoding'] : 0));`
	`100`	`+ $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;`
	`101`	`+`
	`102`	`+ $this->write(json_encode($data, $flags));`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`/**`