Merge pull request #3288 from devorama/devorama-formatter-json-patch1

add JSON_NUMERIC_CHECK to json encode options

Author: lonnieezell

app/Config/Format.php

@@ -39,7 +39,21 @@ class Format extends BaseConfig
 		'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
 		'text/xml'         => \CodeIgniter\Format\XMLFormatter::class,
 	];
-
+	
+	/*
+	|--------------------------------------------------------------------------
+	| Formatters Options
+	|--------------------------------------------------------------------------
+	|
+	| Additional Options to adjust default formatters behaviour.
+	| For each mime type, list the additional options that should be used. 
+	|
+	*/
+	public $formatterOptions  = [
+		'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+		'application/xml'  => 0,
+		'text/xml'         => 0,
+	];	
 	//--------------------------------------------------------------------
 
 	/**

system/Format/JSONFormatter.php

@@ -40,6 +40,7 @@
 namespace CodeIgniter\Format;
 
 use CodeIgniter\Format\Exceptions\FormatException;
+use Config\Format;
 
 /**
  * JSON data formatter
@@ -56,7 +57,10 @@ class JSONFormatter implements FormatterInterface
 	 */
 	public function format($data)
 	{
-		$options = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PARTIAL_OUTPUT_ON_ERROR;
+		$config  = new Format();
+		
+		$options = $config->formatterOptions['application/json'] ?? JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
+		$options = $options | JSON_PARTIAL_OUTPUT_ON_ERROR;
 
 		$options = ENVIRONMENT === 'production' ? $options : $options | JSON_PRETTY_PRINT;
 

system/Format/XMLFormatter.php

@@ -40,6 +40,7 @@
 namespace CodeIgniter\Format;
 
 use CodeIgniter\Format\Exceptions\FormatException;
+use Config\Format;
 
 /**
  * XML data formatter
@@ -56,6 +57,8 @@ class XMLFormatter implements FormatterInterface
 	 */
 	public function format($data)
 	{
+		$config  = new Format();
+		
 		// SimpleXML is installed but default
 		// but best to check, and then provide a fallback.
 		if (! extension_loaded('simplexml'))
@@ -66,7 +69,8 @@ public function format($data)
 			// @codeCoverageIgnoreEnd
 		}
 
-		$output = new \SimpleXMLElement('<?xml version="1.0"?><response></response>');
+		$options = $config->formatterOptions['application/xml'] ?? 0;
+		$output = new \SimpleXMLElement('<?xml version="1.0"?><response></response>', $options);
 
 		$this->arrayToXML((array)$data, $output);