Merge pull request #18 from CorpusPHP/fix/ReplaceDefaultHeaders

ResponseSender - Replace default headers

Author: donatj

src/ResponseSender.php

@@ -62,12 +62,17 @@ public function send( ResponseInterface $response ) : void {
 			http_response_code($response->getStatusCode());
 		}
 
+		$sentHeaders = [];
 		foreach( $response->getHeaders() as $name => $values ) {
 			foreach( $values as $value ) {
+				$lower = strtolower($name);
+
 				header(
 					sprintf("%s: %s", $name, $value),
-					false
+					!isset($sentHeaders[$lower])
 				);
+
+				$sentHeaders[$lower] = true;
 			}
 		}
 

test/ResponseSenderTest.php

@@ -23,30 +23,37 @@ public function testSend( bool $fullStmt ) : void {
 			$version = '1.1'
 		);
 
+		$response = $response->withHeader('X-Test', 'test')
+			->withAddedHeader('X-Test', 'test2')
+			->withAddedHeader('X-Test', 'test3');
+
 		$sent_headers = [];
 		$header       = $this->getFunctionMock(__NAMESPACE__, 'header');
 
-		$header->expects($this->any())->willReturnCallback(function ( $header, $replace ) use ( &$sent_headers ) {
-			return $sent_headers[] = $header;
-		});
+		$header->expects($this->any())
+			->willReturnCallback(function ( $header, $replace ) use ( &$sent_headers ) {
+				return $sent_headers[] = [ $header, $replace ];
+			});
 
 		$sender = new ResponseSender($fullStmt);
 
 		ob_start();
 		$sender->send($response);
 		$output = ob_get_clean();
 
+		$expectedHeaders = [
+			[ 'Content-Type: text/plain', true ],
+			[ 'X-Test: test', true ],
+			[ 'X-Test: test2', false ],
+			[ 'X-Test: test3', false ],
+		];
+
 		if( $fullStmt ) {
-			$this->assertSame([
-				"HTTP/$version $status OK",
-				"Content-Type: text/plain",
-			], $sent_headers);
-		} else {
-			$this->assertSame([
-				"Content-Type: text/plain",
-			], $sent_headers);
+			array_unshift($expectedHeaders, ["HTTP/$version $status OK", true]);
 		}
 
+		$this->assertSame($expectedHeaders, $sent_headers);
+
 		$this->assertSame($body, $output);
 	}