HeaderUtil::normalizeHeaderName(): handle spaces in header names

Author: codemasher

src/HeaderUtil.php

@@ -108,10 +108,17 @@ public static function trimValues(iterable $values):iterable{
 	}
 
 	/**
-	 * Normalizes a header name, e.g. "conTENT- lenGTh" -> "Content-Length"
+	 * Normalizes a header name, e.g. "con TENT- lenGTh" -> "Content-Length"
 	 */
 	public static function normalizeHeaderName(string $name):string{
-		return implode('-', array_map(fn(string $v):string => ucfirst(strtolower(trim($v))), explode('-', $name)));
+		$parts = explode('-', $name);
+
+		foreach($parts as &$part){
+			// we'll remove any spaces in the name part, e.g. "con tent" -> "content"
+			$part = ucfirst(strtolower(str_replace(' ', '', trim($part))));
+		}
+
+		return implode('-', $parts);
 	}
 
 }

tests/HeaderUtilTest.php

@@ -35,6 +35,7 @@ public static function headerDataProvider():array{
 			'invalid: what' => [['what'], []],
 			'empty value'   => [['empty-value' => ''], ['Empty-Value' => '']],
 			'null value'    => [['null-value' => null], ['Null-Value' => '']],
+			'space in name' => [['space name - header' => 'nope'], ['Spacename-Header' => 'nope']],
 		];
 	}