Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Require $this->headers to be instance of Headers #124

Closed
wants to merge 2 commits into from
Closed

Require $this->headers to be instance of Headers #124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
016d30b
Require $this->headers to be instance of Headers
paragonie-scott Nov 29, 2016
6a53532
Update Part.php
paragonie-scott Nov 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
18 changes: 15 additions & 3 deletions src/Storage/Part.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,16 @@ public function getHeaders()
*/
public function getHeader($name, $format = null)
{
$header = $this->getHeaders()->get($name);
$headers = $this->getHeaders();
Copy link
Member

Choose a reason for hiding this comment

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

The API of getHeaders specifies that a Headers instance MUST be returned. If that is not true, then getHeaders needs fixing, and you are fixing a symptom here.

if (!($headers instanceof Headers)) {
throw new Exception\RuntimeException(
'$this->headers must be an instance of Headers'
);
}
$header = $headers->get($name);
if ($header === false) {
$lowerName = strtolower(preg_replace('%([a-z])([A-Z])%', '\1-\2', $name));
$header = $this->getHeaders()->get($lowerName);
$header = $headers->get($lowerName);
if ($header === false) {
throw new Exception\InvalidArgumentException(
"Header with Name $name or $lowerName not found"
Expand Down Expand Up @@ -383,7 +389,13 @@ public function __get($name)
*/
public function __isset($name)
{
return $this->getHeaders()->has($name);
$headers = $this->getHeaders();
Copy link
Member

Choose a reason for hiding this comment

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

The API of getHeaders specifies that a Headers instance MUST be returned. If that is not true, then getHeaders needs fixing, and you are fixing a symptom here.

if (!($headers instanceof Headers)) {
throw new Exception\RuntimeException(
'$this->headers must be an instance of Headers'
);
}
return $headers->has($name);
}

/**
Expand Down