Merge pull request #40 from mekras/response_builder_refactoring

Single header line parsing extracted to a separate method in ResponseBuilder

Author: sagikazarmark

src/Builder/ResponseBuilder.php

@@ -48,38 +48,16 @@ public function getResponse()
      */
     public function setHeadersFromArray(array $headers)
     {
-        $statusLine = trim(array_shift($headers));
-        $parts = explode(' ', $statusLine, 3);
-        if (count($parts) < 2 || substr(strtolower($parts[0]), 0, 5) !== 'http/') {
-            throw new \UnexpectedValueException(
-                sprintf('"%s" is not a valid HTTP status line', $statusLine)
-            );
-        }
-
-        $reasonPhrase = count($parts) > 2 ? $parts[2] : '';
-        $this->response = $this->response
-            ->withStatus((int) $parts[1], $reasonPhrase)
-            ->withProtocolVersion(substr($parts[0], 5));
+        $status = array_shift($headers);
+        $this->setStatus($status);
 
         foreach ($headers as $headerLine) {
             $headerLine = trim($headerLine);
             if ('' === $headerLine) {
                 continue;
             }
 
-            $parts = explode(':', $headerLine, 2);
-            if (count($parts) !== 2) {
-                throw new \UnexpectedValueException(
-                    sprintf('"%s" is not a valid HTTP header line', $headerLine)
-                );
-            }
-            $name = trim(urldecode($parts[0]));
-            $value = trim(urldecode($parts[1]));
-            if ($this->response->hasHeader($name)) {
-                $this->response = $this->response->withAddedHeader($name, $value);
-            } else {
-                $this->response = $this->response->withHeader($name, $value);
-            }
+            $this->addHeader($headerLine);
         }
 
         return $this;
@@ -113,4 +91,58 @@ public function setHeadersFromString($headers)
 
         return $this;
     }
+
+    /**
+     * Set response status from a status string.
+     *
+     * @param string $statusLine Response status as a string.
+     *
+     * @return $this
+     *
+     * @throws \InvalidArgumentException For invalid status line.
+     */
+    public function setStatus($statusLine)
+    {
+        $parts = explode(' ', $statusLine, 3);
+        if (count($parts) < 2 || strpos(strtolower($parts[0]), 'http/') !== 0) {
+            throw new \InvalidArgumentException(
+                sprintf('"%s" is not a valid HTTP status line', $statusLine)
+            );
+        }
+
+        $reasonPhrase = count($parts) > 2 ? $parts[2] : '';
+        $this->response = $this->response
+            ->withStatus((int) $parts[1], $reasonPhrase)
+            ->withProtocolVersion(substr($parts[0], 5));
+
+        return $this;
+    }
+
+    /**
+     * Add header represented by a string.
+     *
+     * @param string $headerLine Response header as a string.
+     *
+     * @return $this
+     *
+     * @throws \InvalidArgumentException For invalid header names or values.
+     */
+    public function addHeader($headerLine)
+    {
+        $parts = explode(':', $headerLine, 2);
+        if (count($parts) !== 2) {
+            throw new \InvalidArgumentException(
+                sprintf('"%s" is not a valid HTTP header line', $headerLine)
+            );
+        }
+        $name = trim(urldecode($parts[0]));
+        $value = trim(urldecode($parts[1]));
+        if ($this->response->hasHeader($name)) {
+            $this->response = $this->response->withAddedHeader($name, $value);
+        } else {
+            $this->response = $this->response->withHeader($name, $value);
+        }
+
+        return $this;
+    }
 }