Merge pull request #1918 from nowackipawel/patch-55

JSONFormatter

Author: jim-parry

system/Format/FormatterInterface.php

@@ -51,5 +51,5 @@ interface FormatterInterface
 	 *
 	 * @return mixed
 	 */
-	public function format(array $data);
+	public function format($data);
 }

system/Format/JSONFormatter.php

@@ -51,9 +51,9 @@ class JSONFormatter implements FormatterInterface
 	 *
 	 * @param $data
 	 *
-	 * @return mixed
+	 * @return string|bool (JSON string | false)
 	 */
-	public function format(array $data)
+	public function format($data)
 	{
 		$options = JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
 

system/Format/XMLFormatter.php

@@ -50,9 +50,9 @@ class XMLFormatter implements FormatterInterface
 	 *
 	 * @param $data
 	 *
-	 * @return mixed
+	 * @return string|bool (XML string | false)
 	 */
-	public function format(array $data)
+	public function format($data)
 	{
 		// SimpleXML is installed but default
 		// but best to check, and then provide a fallback.
@@ -66,7 +66,7 @@ public function format(array $data)
 
 		$output = new \SimpleXMLElement('<?xml version="1.0"?><response></response>');
 
-		$this->arrayToXML($data, $output);
+		$this->arrayToXML((array)$data, $output);
 
 		return $output->asXML();
 	}