symfony
diff --git a/‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+9-2Lines changed: 9 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
+9-2Lines changed: 9 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
+26Lines changed: 26 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
+26Lines changed: 26 additions & 0 deletions
@@ -179,12 +179,12 @@
                     </div>
                 {% elseif collector.content %}
                     <div class="sf-tabs">
-                        {% if collector.isJsonRequest and collector.prettyJsonContent != "null" %}
+                        {% if collector.isJsonRequest and collector.prettyJson.valid %}
                         <div class="tab">
                             <h3 class="tab-title">Pretty</h3>
                             <div class="tab-content">
                                 <div class="card" style="max-height: 500px; overflow-y: auto;">
-                                    <pre class="break-long-words">{{ collector.prettyJsonContent }}</pre>
+                                    <pre class="break-long-words">{{ collector.prettyJson.content }}</pre>
                                 </div>
                             </div>
                         </div>
 
@@ -263,9 +263,16 @@ public function getContent()
         return $this->data['content'];
     }
 
-    public function getPrettyJsonContent()
+    public function getPrettyJson()
     {
-        return json_encode(json_decode($this->getContent()), JSON_PRETTY_PRINT);
+        $decoded = json_decode($this->getContent());
+        $valid = JSON_ERROR_NONE === json_last_error();
+        $content = json_encode($decoded, JSON_PRETTY_PRINT);
+
+        return array(
+            'valid' => $valid,
+            'content' => $content,
+        );
     }
 
     public function getContentType()
 
@@ -361,4 +361,30 @@ public function provideJsonContentTypes()
             array('', false),
         );
     }
+
+    /**
+     * @dataProvider providePrettyJson
+     */
+    public function testGetPrettyJsonValidity($content, $expected)
+    {
+        $response = $this->createResponse();
+        $request = Request::create('/', 'POST', array(), array(), array(), array(), $content);
+
+        $c = new RequestDataCollector();
+        $c->collect($request, $response);
+
+        $this->assertSame($expected, $c->getPrettyJson());
+    }
+
+    public function providePrettyJson()
+    {
+        return array(
+            array('null', array('valid' => true, 'content' => 'null')),
+            array('{ "foo": "bar" }', array('valid' => true, 'content' => '{
+    "foo": "bar"
+}')),
+            array('{ "abc" }', array('valid' => false, 'content' => 'null')),
+            array('', array('valid' => false, 'content' => 'null')),
+        );
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -263,9 +263,16 @@ public function getContent()`
`263`	`263`	`return $this->data['content'];`
`264`	`264`	`}`
`265`	`265`
`266`		`- public function getPrettyJsonContent()`
	`266`	`+ public function getPrettyJson()`
`267`	`267`	`{`
`268`		`- return json_encode(json_decode($this->getContent()), JSON_PRETTY_PRINT);`
	`268`	`+ $decoded = json_decode($this->getContent());`
	`269`	`+ $valid = JSON_ERROR_NONE === json_last_error();`
	`270`	`+ $content = json_encode($decoded, JSON_PRETTY_PRINT);`
	`271`	`+`
	`272`	`+ return array(`
	`273`	`+ 'valid' => $valid,`
	`274`	`+ 'content' => $content,`
	`275`	`+ );`
`269`	`276`	`}`
`270`	`277`
`271`	`278`	`public function getContentType()`