From 978f2a7d28065a330a902e058c030750df162c91 Mon Sep 17 00:00:00 2001 From: neilime Date: Thu, 1 Oct 2015 14:31:59 +0200 Subject: [PATCH 1/4] Fix #21 Test params string before exploding it --- src/Header/AbstractAccept.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Header/AbstractAccept.php b/src/Header/AbstractAccept.php index 7a8c379ee4..7bbe2eead9 100644 --- a/src/Header/AbstractAccept.php +++ b/src/Header/AbstractAccept.php @@ -168,6 +168,10 @@ protected function getParametersFromFieldValuePart($fieldValuePart) } foreach ($paramsStrings as $param) { + if (strpos($param, '=') === false) { + continue; + } + $explode = explode('=', $param, 2); $value = trim($explode[1]); From 2510e969ca2a4a2e8dde011fb444299fddfd52d1 Mon Sep 17 00:00:00 2001 From: neilime Date: Thu, 1 Oct 2015 14:52:14 +0200 Subject: [PATCH 2/4] Add tests to check fix #21 --- test/Header/AcceptLanguageTest.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/Header/AcceptLanguageTest.php b/test/Header/AcceptLanguageTest.php index bc7d4eb6b2..641ad33bef 100644 --- a/test/Header/AcceptLanguageTest.php +++ b/test/Header/AcceptLanguageTest.php @@ -31,6 +31,12 @@ public function testAcceptLanguageGetFieldValueReturnsProperValue() $acceptLanguageHeader = AcceptLanguage::fromString('Accept-Language: xxx'); $this->assertEquals('xxx', $acceptLanguageHeader->getFieldValue()); } + + public function testAcceptLanguageGetFieldValueReturnsProperNonWellFormattedHeaderValue() + { + $acceptLanguageHeader = AcceptLanguage::fromString('Accept-Language: en-US;en'); + $this->assertEquals('en-US', $acceptLanguageHeader->getFieldValue()); + } public function testAcceptLanguageToStringReturnsHeaderFormattedString() { From 1f7fc283524d5e29299151fd66b3fc53d50c44b5 Mon Sep 17 00:00:00 2001 From: neilime Date: Mon, 12 Oct 2015 17:56:16 +0200 Subject: [PATCH 3/4] Remove trailing whitespaces --- src/Header/AbstractAccept.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Header/AbstractAccept.php b/src/Header/AbstractAccept.php index 7bbe2eead9..13b9c2cf78 100644 --- a/src/Header/AbstractAccept.php +++ b/src/Header/AbstractAccept.php @@ -169,9 +169,9 @@ protected function getParametersFromFieldValuePart($fieldValuePart) foreach ($paramsStrings as $param) { if (strpos($param, '=') === false) { - continue; + continue; } - + $explode = explode('=', $param, 2); $value = trim($explode[1]); From f3a17a3e0e37882c4fb02c1de8dc48ba93c5cfc6 Mon Sep 17 00:00:00 2001 From: neilime Date: Mon, 12 Oct 2015 17:56:52 +0200 Subject: [PATCH 4/4] Remove trailing whitespaces --- test/Header/AcceptLanguageTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Header/AcceptLanguageTest.php b/test/Header/AcceptLanguageTest.php index 641ad33bef..71b71898ea 100644 --- a/test/Header/AcceptLanguageTest.php +++ b/test/Header/AcceptLanguageTest.php @@ -31,7 +31,7 @@ public function testAcceptLanguageGetFieldValueReturnsProperValue() $acceptLanguageHeader = AcceptLanguage::fromString('Accept-Language: xxx'); $this->assertEquals('xxx', $acceptLanguageHeader->getFieldValue()); } - + public function testAcceptLanguageGetFieldValueReturnsProperNonWellFormattedHeaderValue() { $acceptLanguageHeader = AcceptLanguage::fromString('Accept-Language: en-US;en');