Mercurial > hg > isophonics-drupal-site
diff vendor/symfony/serializer/Encoder/JsonEncode.php @ 17:129ea1e6d783
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:21:36 +0000 |
parents | 1fec387a4317 |
children |
line wrap: on
line diff
--- a/vendor/symfony/serializer/Encoder/JsonEncode.php Tue Jul 10 15:07:59 2018 +0100 +++ b/vendor/symfony/serializer/Encoder/JsonEncode.php Thu Feb 28 13:21:36 2019 +0000 @@ -32,7 +32,7 @@ * * {@inheritdoc} */ - public function encode($data, $format, array $context = array()) + public function encode($data, $format, array $context = []) { $context = $this->resolveContext($context); @@ -58,8 +58,8 @@ * * @return array */ - private function resolveContext(array $context = array()) + private function resolveContext(array $context = []) { - return array_merge(array('json_encode_options' => $this->options), $context); + return array_merge(['json_encode_options' => $this->options], $context); } }