test: isolate bug #72

Author: g105b

test/phpunit/Header/HeadersTest.php

@@ -62,12 +62,12 @@ public function testAddMultiple() {
 	public function testAddMultipleCommaHeader() {
 		$headers = new Headers(self::HEADER_ARRAY);
 		$headers->add(
-			"Cookie-set",
+			"Set-Cookie",
 			"language=en; expires=Thu, 1-Jan-1970 00:00:00 UTC; path=/; domain=example.com",
 			"id=123; expires=Thu, 1-Jan-1970 00:00:00 UTC; path=/; domain=example.com httponly"
 		);
 		$headerArray = $headers->asArray();
-		$cookie = explode("\n", $headerArray["Cookie-set"]);
+		$cookie = explode("\n", $headerArray["Set-Cookie"]);
 		self::assertContains("language=en; expires=Thu, 1-Jan-1970 00:00:00 UTC; path=/; domain=example.com", $cookie);
 		self::assertContains("id=123; expires=Thu, 1-Jan-1970 00:00:00 UTC; path=/; domain=example.com httponly", $cookie);
 	}
@@ -115,15 +115,66 @@ public function testGetMultiple() {
 	public function testGetMultipleCommas() {
 		$headers = new Headers(self::HEADER_ARRAY);
 		$headers->add(
-			"Cookie-set",
+			"Set-Cookie",
 			"language=en; expires=Thu, 1-Jan-1970 00:00:00 UTC; path=/; domain=example.com",
 			"id=123; expires=Thu, 1-Jan-1970 00:00:00 UTC; path=/; domain=example.com httponly"
 		);
 		self::assertEquals(
 			"language=en; expires=Thu, 1-Jan-1970 00:00:00 UTC; path=/; domain=example.com"
 			. "\n"
 			. "id=123; expires=Thu, 1-Jan-1970 00:00:00 UTC; path=/; domain=example.com httponly",
-			$headers->get("Cookie-set")
+			$headers->get("Set-Cookie")
+		);
+	}
+
+	public function testAddMultipleSetCookieWithoutCommaPreservesSeparateLines():void {
+		$headers = new Headers(self::HEADER_ARRAY);
+		$headers->add("Set-Cookie", "language=en; Path=/");
+		$headers->add("Set-Cookie", "id=123; HttpOnly");
+
+		self::assertCount(5, $headers);
+		self::assertSame(
+			"language=en; Path=/\nid=123; HttpOnly",
+			$headers->asArray()["Set-Cookie"]
+		);
+	}
+
+	public function testGetAllAggregatesValuesAcrossSeparateHeaderLines():void {
+		$firstValue = "Digest realm=\"example.com\", qop=\"auth\"";
+		$secondValue = "Digest realm=\"api.example.com\", qop=\"auth-int\"";
+		$headers = new Headers(self::HEADER_ARRAY);
+		$headers->add("WWW-Authenticate", $firstValue);
+		$headers->add("WWW-Authenticate", $secondValue);
+
+		self::assertSame(
+			[$firstValue, $secondValue],
+			$headers->getAll("WWW-Authenticate")
+		);
+	}
+
+	public function testAsArrayPreservesAllDuplicateSpecialCaseHeaderLines():void {
+		$firstValue = "Digest realm=\"example.com\", qop=\"auth\"";
+		$secondValue = "Digest realm=\"api.example.com\", qop=\"auth-int\"";
+		$headers = new Headers(self::HEADER_ARRAY);
+		$headers->add("WWW-Authenticate", $firstValue);
+		$headers->add("WWW-Authenticate", $secondValue);
+
+		self::assertSame(
+			$firstValue . "\n" . $secondValue,
+			$headers->asArray()["WWW-Authenticate"]
+		);
+	}
+
+	public function testAsArrayNestedPreservesAllDuplicateHeaderLineValues():void {
+		$firstValue = "Digest realm=\"example.com\", qop=\"auth\"";
+		$secondValue = "Digest realm=\"api.example.com\", qop=\"auth-int\"";
+		$headers = new Headers(self::HEADER_ARRAY);
+		$headers->add("WWW-Authenticate", $firstValue);
+		$headers->add("WWW-Authenticate", $secondValue);
+
+		self::assertSame(
+			[$firstValue, $secondValue],
+			$headers->asArray(true)["WWW-Authenticate"]
 		);
 	}
 

test/phpunit/Header/ParserTest.php

@@ -73,4 +73,18 @@ public function testGetKeyValuesResponse() {
 		self::assertArrayHasKey("X-Test-For", $keyValues);
 		self::assertEquals("PHP.Gt", $keyValues["X-Test-For"]);
 	}
+
+	public function testGetKeyValuesCombinesRepeatedListValuedHeaders():void {
+		$headers = <<<HEADERS
+HTTP/1.1 200 OK
+Accept: text/html
+Accept: application/json
+HEADERS;
+		$parser = new Parser($headers);
+
+		self::assertSame(
+			"text/html, application/json",
+			$parser->getKeyValues()["Accept"]
+		);
+	}
 }

test/phpunit/RequestTest.php

@@ -115,6 +115,26 @@ public function testWithFormDataBodyAutomaticallySetsContentTypeHeader():void {
 		);
 	}
 
+	public function testGetHeaderReturnsAllValuesAcrossSeparateHeaderLines():void {
+		$headers = new RequestHeaders();
+		$headers->add("WWW-Authenticate", "Digest realm=\"example.com\", qop=\"auth\"");
+		$headers->add("WWW-Authenticate", "Digest realm=\"api.example.com\", qop=\"auth-int\"");
+
+		$request = new Request(
+			"GET",
+			self::getUriMock("/"),
+			$headers
+		);
+
+		self::assertSame(
+			[
+				"Digest realm=\"example.com\", qop=\"auth\"",
+				"Digest realm=\"api.example.com\", qop=\"auth-int\"",
+			],
+			$request->getHeader("WWW-Authenticate")
+		);
+	}
+
 	/** @return MockObject|Uri */
 	protected function getUriMock(string $uriPath = ""):MockObject {
 		$partPath = parse_url($uriPath, PHP_URL_PATH);