HeaderUtil::normalize() skip empty array values and ignore numeric keys

Author: codemasher

src/HeaderUtil.php

@@ -16,7 +16,7 @@
 /**
  *
  */
-class HeaderUtil{
+final class HeaderUtil{
 
 	/**
 	 * Normalizes an array of header lines to format ["Name" => "Value (, Value2, Value3, ...)", ...]
@@ -30,7 +30,6 @@ public static function normalize(iterable $headers):array{
 
 			// the key is numeric, so $val is either a string or an array
 			if(is_numeric($key)){
-
 				// "key: val"
 				if(is_string($val)){
 					$header = explode(':', $val, 2);
@@ -43,9 +42,14 @@ public static function normalize(iterable $headers):array{
 					$val = $header[1];
 				}
 				// [$key, $val], ["key" => $key, "val" => $val]
-				elseif(is_array($val)){
+				elseif(is_array($val) && !empty($val)){
 					$key = array_keys($val)[0];
 					$val = array_values($val)[0];
+
+					// skip if the key is numeric
+					if(is_numeric($key)){
+						continue;
+					}
 				}
 				else{
 					continue;
@@ -92,10 +96,6 @@ public static function normalize(iterable $headers):array{
 	 * header-field = field-name ":" OWS field-value OWS
 	 * OWS          = *( SP / HTAB )
 	 *
-	 * @param string[] $values header values
-	 *
-	 * @return string[] Trimmed header values
-	 *
 	 * @see https://tools.ietf.org/html/rfc7230#section-3.2.4
 	 */
 	public static function trimValues(iterable $values):iterable{

tests/HeaderUtilTest.php

@@ -30,6 +30,8 @@ public static function headerDataProvider():array{
 			'numericvalue'  => [['numericvalue:1'], ['Numericvalue' => '1']],
 			'numericvalue2' => [['numericvalue' => 2], ['Numericvalue' => '2']],
 			'keyvaluearray' => [[['foo' => 'bar']], ['Foo' => 'bar']],
+			'emptykvearray' => [[[]], []],
+			'kvarraynumkey' => [[[69 => 420]], []],
 			'arrayvalue'    => [['foo' => ['bar', 'baz']], ['Foo' => 'bar, baz']],
 			'invalid: 2'    => [[2 => 2], []],
 			'invalid: what' => [['what'], []],