From f2466a580bcc1a33fb8ccee420bcf31ceb7b00ed Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 14 Mar 2014 17:02:23 +1300
Subject: [PATCH] small refactor of ResponseBuilder to handle 'original'
structures
---
core/API/ResponseBuilder.php | 76 +++++++++++++++++++++---------------
1 file changed, 44 insertions(+), 32 deletions(-)
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index 8266c831f2..55fce0d0d5 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -72,6 +72,50 @@ class ResponseBuilder
$this->apiModule = $apiModule;
$this->apiMethod = $apiMethod;
+ if($this->outputFormat == 'original') {
+ @header('Content-Type: text/plain; charset=utf-8');
+ }
+ return $this->renderValue($value);
+ }
+
+ /**
+ * Returns an error $message in the requested $format
+ *
+ * @param Exception $e
+ * @throws Exception
+ * @return string
+ */
+ public function getResponseException(Exception $e)
+ {
+ $format = strtolower($this->outputFormat);
+
+ if ($format == 'original') {
+ throw $e;
+ }
+
+ try {
+ $renderer = Renderer::factory($format);
+ } catch (Exception $exceptionRenderer) {
+ return "Error: " . $e->getMessage() . " and: " . $exceptionRenderer->getMessage();
+ }
+
+ $e = $this->decorateExceptionWithDebugTrace($e);
+
+ $renderer->setException($e);
+
+ if ($format == 'php') {
+ $renderer->setSerialize($this->caseRendererPHPSerialize());
+ }
+
+ return $renderer->renderException();
+ }
+
+ /**
+ * @param $value
+ * @return string
+ */
+ protected function renderValue($value)
+ {
// when null or void is returned from the api call, we handle it as a successful operation
if (!isset($value)) {
return $this->handleSuccess();
@@ -110,38 +154,6 @@ class ResponseBuilder
return $this->handleScalar($value);
}
- /**
- * Returns an error $message in the requested $format
- *
- * @param Exception $e
- * @throws Exception
- * @return string
- */
- public function getResponseException(Exception $e)
- {
- $format = strtolower($this->outputFormat);
-
- if ($format == 'original') {
- throw $e;
- }
-
- try {
- $renderer = Renderer::factory($format);
- } catch (Exception $exceptionRenderer) {
- return "Error: " . $e->getMessage() . " and: " . $exceptionRenderer->getMessage();
- }
-
- $e = $this->decorateExceptionWithDebugTrace($e);
-
- $renderer->setException($e);
-
- if ($format == 'php') {
- $renderer->setSerialize($this->caseRendererPHPSerialize());
- }
-
- return $renderer->renderException();
- }
-
/**
* @param Exception $e
* @return Exception
--
GitLab