[HttpFoundation] added HeaderBag::__toString()

symfony · May 15, 2011 · e81b88c · e81b88c
1 parent dcb4ef6
commit e81b88c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 34 deletions.
diff --git a/src/Symfony/Component/HttpFoundation/HeaderBag.php b/src/Symfony/Component/HttpFoundation/HeaderBag.php
@@ -37,6 +37,27 @@ public function __construct(array $headers = array())
         }
     }
 
+    /**
+     * Returns the headers as a string.
+     *
+     * @return string The headers
+     */
+    public function __toString()
+    {
+        $beautifier = function ($name) {
+            return preg_replace('/\-(.)/e', "'-'.strtoupper('\\1')", ucfirst($name));
+        };
+
+        $content = '';
+        foreach ($this->headers as $name => $values) {
+            foreach ($values as $value) {
+                $content .= sprintf("%s: %s\r\n", $beautifier($name), $value);
+            }
+        }
+
+        return $content;
+    }
+
     /**
      * Returns the headers.
      *

diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -288,23 +288,10 @@ public function __clone()
      */
     public function __toString()
     {
-        // status
-        $content = sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n";
-
-        $beautifier = function ($name) {
-            return preg_replace('/\-(.)/e', "'-'.strtoupper('\\1')", ucfirst($name));
-        };
-
-        // headers
-        foreach ($this->headers->all() as $name => $values) {
-            foreach ($values as $value) {
-                $content .= sprintf("%s: %s\r\n", $beautifier($name), $value);
-            }
-        }
-
-        $content .= "\r\n".$this->getContent();
-
-        return $content;
+        return
+            sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
+            $this->headers."\r\n".
+            $this->getContent();
     }
 
     /**

diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -98,23 +98,10 @@ public function __toString()
     {
         $this->fixContentType();
 
-        // status
-        $content = sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n";
-
-        $beautifier = function ($name) {
-            return preg_replace('/\-(.)/e', "'-'.strtoupper('\\1')", ucfirst($name));
-        };
-
-        // headers
-        foreach ($this->headers->all() as $name => $values) {
-            foreach ($values as $value) {
-                $content .= sprintf("%s: %s\r\n", $beautifier($name), $value);
-            }
-        }
-
-        $content .= "\r\n".$this->getContent();
-
-        return $content;
+        return
+            sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".
+            $this->headers."\r\n".
+            $this->getContent();
     }
 
     /**