#97: Wrap multiple-root XML responses with a <response> root tag

jacwright · Oct 22, 2017 · a26a3bd · a26a3bd
1 parent adc218e
commit a26a3bd
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/source/Jacwright/RestServer/RestServer.php b/source/Jacwright/RestServer/RestServer.php
@@ -127,7 +127,7 @@ public function handle() {
 			$this->data = $this->getData();
 		}
 
-		//preflight requests response 
+		//preflight requests response
 		if ($this->method == 'OPTIONS' && getallheaders()->Access-Control-Request-Headers) {
 			$this->sendData($this->options());
 		}
@@ -231,7 +231,7 @@ protected function instantiateClass($obj) {
 
 		return false;
 	}
-	
+
 	protected function initClass($obj) {
 		if (method_exists($obj, 'init')) {
 			$obj->init();
@@ -482,7 +482,7 @@ public function sendData($data) {
 		if ($this->useCors) {
 			$this->corsHeaders();
 		}
-		
+
 		if ($this->format == RestFormat::XML) {
 			if (is_object($data) && method_exists($data, '__keepOut')) {
 				$data = clone $data;
@@ -491,6 +491,10 @@ public function sendData($data) {
 				}
 			}
 
+			if (is_array($data) && count($data) > 1) {
+				$data = array('response' => $data);
+			}
+
 			$this->xml_encode($data);
 		} else {
 			if (is_object($data) && method_exists($data, '__keepOut')) {
@@ -571,7 +575,7 @@ private function corsHeaders() {
 		header('Access-Control-Allow-Credential: true');
 		header('Access-Control-Allow-Headers: X-Requested-With, content-type, access-control-allow-origin, access-control-allow-methods, access-control-allow-headers, Authorization');
 	}
-	
+
 	private $codes = array(
 		'100' => 'Continue',
 		'200' => 'OK',