Merge branch 'develop' to sphinx to solve conflict

jreklund · jreklund · commit d5dc08669e58 · 2020-03-09T22:08:24.000+01:00
diff --git a/README.md b/README.md
@@ -2,6 +2,11 @@
 
 [![Build Status](https://travis-ci.org/codeigniter4/CodeIgniter4.svg?branch=develop)](https://travis-ci.org/codeigniter4/CodeIgniter4)
 [![Coverage Status](https://coveralls.io/repos/github/codeigniter4/CodeIgniter4/badge.svg?branch=develop)](https://coveralls.io/github/codeigniter4/CodeIgniter4?branch=develop)
+[![GitHub All Releases](https://img.shields.io/github/downloads/codeigniter4/CodeIgniter4/total)](https://packagist.org/packages/codeigniter4/framework)
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/codeigniter4/CodeIgniter4)](https://packagist.org/packages/codeigniter4/framework)
+[![GitHub stars](https://img.shields.io/github/stars/codeigniter4/CodeIgniter4)](https://packagist.org/packages/codeigniter4/framework)
+[![GitHub license](https://img.shields.io/github/license/codeigniter4/CodeIgniter4)](https://github.com/codeigniter4/CodeIgniter4/blob/develop/license.txt)
+[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/codeigniter4/CodeIgniter4/pulls)
 <br>
 
 ## What is CodeIgniter?
diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php
@@ -56,13 +56,13 @@ class JSONFormatter implements FormatterInterface
 	 */
 	public function format($data)
 	{
-		$options = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
+		$options = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PARTIAL_OUTPUT_ON_ERROR;
 
 		$options = ENVIRONMENT === 'production' ? $options : $options | JSON_PRETTY_PRINT;
 
 		$result = json_encode($data, $options, 512);
 
-		if (json_last_error() !== JSON_ERROR_NONE)
+		if ( ! in_array(json_last_error(), [JSON_ERROR_NONE, JSON_ERROR_RECURSION]))
 		{
 			throw FormatException::forInvalidJSON(json_last_error_msg());
 		}

Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,13 @@ class JSONFormatter implements FormatterInterface`
`56`	`56`	`*/`
`57`	`57`	`public function format($data)`
`58`	`58`	`{`
`59`		`- $options = JSON_UNESCAPED_UNICODE \| JSON_UNESCAPED_SLASHES;`
	`59`	`+ $options = JSON_UNESCAPED_UNICODE \| JSON_UNESCAPED_SLASHES \| JSON_PARTIAL_OUTPUT_ON_ERROR;`
`60`	`60`
`61`	`61`	`$options = ENVIRONMENT === 'production' ? $options : $options \| JSON_PRETTY_PRINT;`
`62`	`62`
`63`	`63`	`$result = json_encode($data, $options, 512);`
`64`	`64`
`65`		`- if (json_last_error() !== JSON_ERROR_NONE)`
	`65`	`+ if ( ! in_array(json_last_error(), [JSON_ERROR_NONE, JSON_ERROR_RECURSION]))`
`66`	`66`	`{`
`67`	`67`	`throw FormatException::forInvalidJSON(json_last_error_msg());`
`68`	`68`	`}`