Skip to content

Single header line parsing extracted to a separate method in ResponseBuilder #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 29, 2016
Merged

Single header line parsing extracted to a separate method in ResponseBuilder #40

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae497df
Single header line parsing extracted to a separate method in Response…
mekras Mar 23, 2016
fea6e47
Status line should be the first line/item in setHeadersFromString()/s…
mekras Mar 29, 2016
0d565b2
Remove old PHPDoc tag.
mekras Mar 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 57 additions & 25 deletions src/Builder/ResponseBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think this should be handled via the addHeader method as it's not a header but more the status string, also now a request like this :

Header: headervalue
GET / HTTP/1.1

would be correctly parsed but is invalid and should throw an error

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed.

Expand Down Expand Up @@ -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;
}
}