Merge pull request #1471 from cakephp/feature/2.4-pretty-print

pretty print json and xml responses in debug mode
cakephp · Aug 3, 2013 · f34388c · f34388c
2 parents a5531f7 + 1643e10
commit f34388c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/View/JsonViewTest.php b/lib/Cake/Test/Case/View/JsonViewTest.php
@@ -30,6 +30,11 @@
  */
 class JsonViewTest extends CakeTestCase {
 
+	public function setUp() {
+		parent::setUp();
+		Configure::write('debug', 0);
+	}
+
 /**
  * testRenderWithoutView method
  *

diff --git a/lib/Cake/Test/Case/View/XmlViewTest.php b/lib/Cake/Test/Case/View/XmlViewTest.php
@@ -30,6 +30,11 @@
  */
 class XmlViewTest extends CakeTestCase {
 
+	public function setUp() {
+		parent::setUp();
+		Configure::write('debug', 0);
+	}
+
 /**
  * testRenderWithoutView method
  *

diff --git a/lib/Cake/View/JsonView.php b/lib/Cake/View/JsonView.php
@@ -128,6 +128,11 @@ protected function _serialize($serialize) {
 		} else {
 			$data = isset($this->viewVars[$serialize]) ? $this->viewVars[$serialize] : null;
 		}
+
+		if (version_compare(PHP_VERSION, '5.4.0', '>=') && Configure::read('debug')) {
+			return json_encode($data, JSON_PRETTY_PRINT);
+		}
+
 		return json_encode($data);
 	}
 

diff --git a/lib/Cake/View/XmlView.php b/lib/Cake/View/XmlView.php
@@ -116,7 +116,13 @@ protected function _serialize($serialize) {
 				$data = array($rootNode => array($serialize => $data));
 			}
 		}
-		return Xml::fromArray($data)->asXML();
+
+		$options = array();
+		if (Configure::read('debug')) {
+			$options['pretty'] = true;
+		}
+
+		return Xml::fromArray($data, $options)->asXML();
 	}
 
 }