Make getPrettyJson return string|null

SamFleming · SamFleming · commit 0430c7717250 · 2018-11-26T20:27:10.000Z
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -179,12 +179,13 @@
                     </div>
                 {% elseif collector.content %}
                     <div class="sf-tabs">
-                        {% if collector.isJsonRequest and collector.prettyJson.valid %}
+                        {% set prettyJson = collector.isJsonRequest ? collector.prettyJson : null %}
+                        {% if prettyJson is not null %}
                         <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.prettyJson.content }}</pre>
+                                    <pre class="break-long-words">{{ collector.prettyJson }}</pre>
                                 </div>
                             </div>
                         </div>
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -263,28 +263,23 @@ public function getContent()
         return $this->data['content'];
     }
 
+    public function isJsonRequest()
+    {
+        return 1 === preg_match('{^application/(?:\w+\++)*json$}i', $this->data['request_headers']['content-type']);
+    }
+
     public function getPrettyJson()
     {
         $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,
-        );
+        return JSON_ERROR_NONE === json_last_error() ? json_encode($decoded, JSON_PRETTY_PRINT) : null;
     }
 
     public function getContentType()
     {
         return $this->data['content_type'];
     }
 
-    public function isJsonRequest()
-    {
-        return 1 === preg_match('{^application/(?:\w+\++)*json$}i', $this->data['request_headers']['content-type']);
-    }
-
     public function getStatusText()
     {
         return $this->data['status_text'];
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -379,12 +379,12 @@ public function testGetPrettyJsonValidity($content, $expected)
     public function providePrettyJson()
     {
         return array(
-            array('null', array('valid' => true, 'content' => 'null')),
-            array('{ "foo": "bar" }', array('valid' => true, 'content' => '{
+            array('null', 'null'),
+            array('{ "foo": "bar" }', '{
     "foo": "bar"
-}')),
-            array('{ "abc" }', array('valid' => false, 'content' => 'null')),
-            array('', array('valid' => false, 'content' => 'null')),
+}'),
+            array('{ "abc" }', null),
+            array('', null),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -263,28 +263,23 @@ public function getContent()`
`263`	`263`	`return $this->data['content'];`
`264`	`264`	`}`
`265`	`265`
	`266`	`+ public function isJsonRequest()`
	`267`	`+ {`
	`268`	`+ return 1 === preg_match('{^application/(?:\w+\++)*json$}i', $this->data['request_headers']['content-type']);`
	`269`	`+ }`
	`270`	`+`
`266`	`271`	`public function getPrettyJson()`
`267`	`272`	`{`
`268`	`273`	`$decoded = json_decode($this->getContent());`
`269`		`- $valid = JSON_ERROR_NONE === json_last_error();`
`270`		`- $content = json_encode($decoded, JSON_PRETTY_PRINT);`
`271`	`274`
`272`		`- return array(`
`273`		`- 'valid' => $valid,`
`274`		`- 'content' => $content,`
`275`		`- );`
	`275`	`+ return JSON_ERROR_NONE === json_last_error() ? json_encode($decoded, JSON_PRETTY_PRINT) : null;`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`public function getContentType()`
`279`	`279`	`{`
`280`	`280`	`return $this->data['content_type'];`
`281`	`281`	`}`
`282`	`282`
`283`		`- public function isJsonRequest()`
`284`		`- {`
`285`		`- return 1 === preg_match('{^application/(?:\w+\++)*json$}i', $this->data['request_headers']['content-type']);`
`286`		`- }`
`287`		`-`
`288`	`283`	`public function getStatusText()`
`289`	`284`	`{`
`290`	`285`	`return $this->data['status_text'];`
Original file line number	Diff line number	Diff line change
`@@ -379,12 +379,12 @@ public function testGetPrettyJsonValidity($content, $expected)`
`379`	`379`	`public function providePrettyJson()`
`380`	`380`	`{`
`381`	`381`	`return array(`
`382`		`- array('null', array('valid' => true, 'content' => 'null')),`
`383`		`- array('{ "foo": "bar" }', array('valid' => true, 'content' => '{`
	`382`	`+ array('null', 'null'),`
	`383`	`+ array('{ "foo": "bar" }', '{`
`384`	`384`	`"foo": "bar"`
`385`		`-}')),`
`386`		`- array('{ "abc" }', array('valid' => false, 'content' => 'null')),`
`387`		`- array('', array('valid' => false, 'content' => 'null')),`
	`385`	`+}'),`
	`386`	`+ array('{ "abc" }', null),`
	`387`	`+ array('', null),`
`388`	`388`	`);`
`389`	`389`	`}`
`390`	`390`	`}`