Check content string (#1679)

barryvdh · web-flow · commit 6ecece3edf0c · 2024-09-24T18:57:31.000+02:00
* Stricter check

* Add null test
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -905,7 +905,7 @@ protected function isJsonRequest(Request $request, Response $response)
 
         // Check if content looks like JSON without actually validating
         $content = $response->getContent();
-        if ($content && in_array($content[0], ['{', '['], true)) {
+        if (is_string($content) && strlen($content) > 0 && in_array($content[0], ['{', '['], true)) {
             return true;
         }
 
diff --git a/tests/DebugbarTest.php b/tests/DebugbarTest.php
@@ -47,6 +47,15 @@ public function testItInjectsOnEmptyResponse()
         $this->assertNotEmpty($crawler->headers->get('phpdebugbar-id'));
     }
 
+    public function testItInjectsOnNullyResponse()
+    {
+        $crawler = $this->call('GET', 'web/null');
+
+        $this->assertTrue(Str::contains($crawler->content(), 'debugbar'));
+        $this->assertEquals(200, $crawler->getStatusCode());
+        $this->assertNotEmpty($crawler->headers->get('phpdebugbar-id'));
+    }
+
     public function testItInjectsOnHtml()
     {
         $crawler = $this->call('GET', 'web/html');
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -66,6 +66,10 @@ protected function addWebRoutes(Router $router)
             return '';
         });
 
+        $router->get('web/null', function () {
+            return null;
+        });
+
         $router->get('web/html', function () {
             return '<html><head></head><body>Pong</body></html>';
         });

Original file line number	Diff line number	Diff line change
`@@ -905,7 +905,7 @@ protected function isJsonRequest(Request $request, Response $response)`
`905`	`905`
`906`	`906`	`// Check if content looks like JSON without actually validating`
`907`	`907`	`$content = $response->getContent();`
`908`		`- if ($content && in_array($content[0], ['{', '['], true)) {`
	`908`	`+ if (is_string($content) && strlen($content) > 0 && in_array($content[0], ['{', '['], true)) {`
`909`	`909`	`return true;`
`910`	`910`	`}`
`911`	`911`