[HttpFoundation] added logic to automatically add the charset when no…

…t present in the Content-Type for relevant Content-Types
symfony · Apr 22, 2011 · fd05f02 · fd05f02
1 parent 150e248
commit fd05f02
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -86,6 +86,7 @@ public function __construct($content = '', $status = 200, $headers = array())
         $this->setStatusCode($status);
         $this->setProtocolVersion('1.0');
         $this->headers = new ResponseHeaderBag($headers);
+        $this->charset = 'UTF-8';
     }
 
     /**
@@ -97,9 +98,7 @@ public function __toString()
     {
         $content = '';
 
-        if (!$this->headers->has('Content-Type')) {
-            $this->headers->set('Content-Type', 'text/html; charset='.(null === $this->charset ? 'UTF-8' : $this->charset));
-        }
+        $this->fixContentType();
 
         // status
         $content .= sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\n";
@@ -129,9 +128,7 @@ public function __clone()
      */
     public function sendHeaders()
     {
-        if (!$this->headers->has('Content-Type')) {
-            $this->headers->set('Content-Type', 'text/html; charset='.(null === $this->charset ? 'UTF-8' : $this->charset));
-        }
+        $this->fixContentType();
 
         // status
         header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText));
@@ -750,4 +747,14 @@ public function isRedirected($location)
     {
         return $this->isRedirect() && $location == $this->headers->get('Location');
     }
+
+    protected function fixContentType()
+    {
+        if (!$this->headers->has('Content-Type')) {
+            $this->headers->set('Content-Type', 'text/html; charset='.$this->charset);
+        } elseif ('text/' === substr($this->headers->get('Content-Type'), 0, 5) && false === strpos($this->headers->get('Content-Type'), 'charset')) {
+            // add the charset
+            $this->headers->set('Content-Type', $this->headers->get('Content-Type').'; charset='.$this->charset);
+        }
+    }
 }
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/ResponseTest.php b/tests/Symfony/Tests/Component/HttpFoundation/ResponseTest.php
@@ -188,6 +188,17 @@ public function testDefaultContentType()
         $response->__toString();
     }
 
+    public function testContentTypeCharset()
+    {
+        $response = new Response();
+        $response->headers->set('Content-Type', 'text/css');
+
+        // force fixContentType() to be called
+        $response->__toString();
+
+        $this->assertEquals('text/css; charset=UTF-8', $response->headers->get('Content-Type'));
+    }
+
     public function testSetCache()
     {
         $response = new Response();