[HttpFoundation][HttpKernel] Fix deprecations when Content-Type is null

HypeMC · HypeMC · commit 14e3fadd4e44 · 2023-07-19T22:24:03.000+02:00
diff --git a/DataCollector/DumpDataCollector.php b/DataCollector/DumpDataCollector.php
@@ -116,11 +116,11 @@ public function collect(Request $request, Response $response, \Throwable $except
         if (!$this->requestStack
             || !$response->headers->has('X-Debug-Token')
             || $response->isRedirection()
-            || ($response->headers->has('Content-Type') && !str_contains($response->headers->get('Content-Type'), 'html'))
+            || ($response->headers->has('Content-Type') && !str_contains($response->headers->get('Content-Type') ?? '', 'html'))
             || 'html' !== $request->getRequestFormat()
             || false === strripos($response->getContent(), '</body>')
         ) {
-            if ($response->headers->has('Content-Type') && str_contains($response->headers->get('Content-Type'), 'html')) {
+            if ($response->headers->has('Content-Type') && str_contains($response->headers->get('Content-Type') ?? '', 'html')) {
                 $dumper = new HtmlDumper('php://output', $this->charset);
                 $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
             } else {
diff --git a/Tests/DataCollector/DumpDataCollectorTest.php b/Tests/DataCollector/DumpDataCollectorTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
@@ -152,4 +153,22 @@ public function testFlushNothingWhenDataDumperIsProvided()
         $collector->__destruct();
         $this->assertEmpty(ob_get_clean());
     }
+
+    public function testNullContentTypeWithNoDebugEnv()
+    {
+        $request = new Request();
+        $requestStack = new RequestStack();
+        $requestStack->push($request);
+
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('Content-Type', null);
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $collector = new DumpDataCollector(null, null, null, $requestStack);
+        $collector->collect($request, $response);
+
+        ob_start();
+        $collector->__destruct();
+        $this->assertEmpty(ob_get_clean());
+    }
 }
