From 545b05f46265fe416873bbc845b4b0e8c9a24453 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Sun, 23 Aug 2015 14:53:29 -0400 Subject: [PATCH 1/2] Naming, immutable array manipulation This is a sqashed version to add back the changes from #37: - 2ab98d2b16b198c43d3c02b05662544f41d20f11 - 75ff84ad24cddeb37977241cb9419d0a1f2d5950 --- src/RequestHeaderParser.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/RequestHeaderParser.php b/src/RequestHeaderParser.php index 5f0dc1f0..3d0a4a7c 100644 --- a/src/RequestHeaderParser.php +++ b/src/RequestHeaderParser.php @@ -44,12 +44,13 @@ public function parseRequest($data) parse_str($queryString, $parsedQuery); } - $headers = $psrRequest->getHeaders(); - array_walk($headers, function(&$val) { + $headers = array_map(function($val) { if (1 === count($val)) { $val = $val[0]; } - }); + + return $val; + }, $psrRequest->getHeaders()); $request = new Request( $psrRequest->getMethod(), From f0000a55dca55e874d33602dc7d1037c8194685e Mon Sep 17 00:00:00 2001 From: Cees-Jan Kiewiet Date: Wed, 6 Jul 2016 17:43:06 +0200 Subject: [PATCH 2/2] Remove branch-alias definition as per reactphp/react#343 --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index cd1194da..c186927d 100644 --- a/composer.json +++ b/composer.json @@ -14,10 +14,5 @@ "psr-4": { "React\\Http\\": "src" } - }, - "extra": { - "branch-alias": { - "dev-master": "0.5-dev" - } } }