Skip to content

Naming, immutable array manipulation #37

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
WyriHaximus merged 1 commit into from
Aug 24, 2015
Merged

Naming, immutable array manipulation #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/RequestParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace React\Http;

use Evenement\EventEmitter;
use GuzzleHttp\Psr7 as g7;
use GuzzleHttp\Psr7 as gPsr;

/**
* @event headers
Expand Down Expand Up @@ -91,20 +91,21 @@ protected function headerSizeExceeded()

public function parseHeaders($data)
{
$psrRequest = g7\parse_request($data);
$psrRequest = gPsr\parse_request($data);

$parsedQuery = [];
$queryString = $psrRequest->getUri()->getQuery();
if ($queryString) {
parse_str($queryString, $parsedQuery);
}

$headers = $psrRequest->getHeaders();
array_walk($headers, function(&$val) {
$headers = array_map(function(&$val) {
Copy link

@elazar elazar Aug 24, 2015

Choose a reason for hiding this comment

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

$val doesn't still need to be passed by reference here, does it?

if (1 === count($val)) {
$val = $val[0];
}
});

return $val;
}, $psrRequest->getHeaders());

return new Request(
$psrRequest->getMethod(),
Expand Down