Move header value normalisation into Response

.gitignore

@@ -8,3 +8,5 @@
 /laminas-mkdoc-theme/
 /phpunit.xml
 /vendor/
+
+.idea

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.14.1@b9d355e0829c397b9b3b47d0c0ed042a8a70284d">
+<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
   <file src="src/PubSubHubbub/AbstractCallback.php">
     <DocblockTypeContradiction>
       <code><![CDATA[$this->httpResponse === null]]></code>
@@ -2217,11 +2217,7 @@
     </UnsafeInstantiation>
   </file>
   <file src="src/Reader/Http/LaminasHttpClientDecorator.php">
-    <MixedArgumentTypeCoercion>
-      <code>$value</code>
-    </MixedArgumentTypeCoercion>
     <MixedAssignment>
-      <code>$normalized[$name]</code>
       <code>$value</code>
       <code>$value</code>
     </MixedAssignment>

src/Reader/Http/LaminasHttpClientDecorator.php

@@ -1,4 +1,4 @@
 <?php
 
 declare(strict_types=1);
 
@@ -9,7 +9,6 @@
 use Laminas\Http\Headers;
 
 use function gettype;
-use function implode;
 use function is_array;
 use function is_numeric;
 use function is_object;
@@ -47,10 +46,12 @@
         }
         $response = $this->client->send();
 
+        $headers = $response->getHeaders()->toArray();
+
         return new Response(
             $response->getStatusCode(),
             $response->getBody(),
-            $this->prepareResponseHeaders($response->getHeaders())
+            $headers
         );
     }
 
@@ -94,21 +95,4 @@
             }
         }
     }
-
-    /**
-     * Normalize headers to use with HeaderAwareResponseInterface.
-     *
-     * Ensures multi-value headers are represented as a single string, via
-     * comma concatenation.
-     *
-     * @return array
-     */
-    private function prepareResponseHeaders(Headers $headers)
-    {
-        $normalized = [];
-        foreach ($headers->toArray() as $name => $value) {
-            $normalized[$name] = is_array($value) ? implode(', ', $value) : $value;
-        }
-        return $normalized;
-    }
 }

src/Reader/Http/Response.php

@@ -7,7 +7,9 @@
 use Laminas\Feed\Reader\Exception;
 
 use function gettype;
+use function implode;
 use function intval;
+use function is_array;
 use function is_numeric;
 use function is_object;
 use function is_string;
@@ -142,27 +144,42 @@
                 ));
             }
 
-            if (! is_string($value) && ! is_numeric($value)) {
+            if (! is_string($value) && ! is_numeric($value) && ! is_array($value)) {
                 throw new Exception\InvalidArgumentException(sprintf(
                     'Individual header values provided to %s must be a string or numeric; received %s for header %s',
                     self::class,
                     is_object($value) ? $value::class : gettype($value),
                     $name
                 ));
             }
+
+            if (is_array($value)) {
+                foreach ($value as $key => $multiValue) {
+                    if (! is_string($multiValue) && ! is_numeric($multiValue)) {
+                        throw new Exception\InvalidArgumentException(sprintf(
+                            'Individual header values provided to %s must be a string or numeric; received %s for header %s',
+                            self::class,
+                            is_object($multiValue) ? $multiValue::class : gettype($multiValue),
+                            $name . "[$key]"
+                        ));
+                    }
+                }
+            }
         }
     }
 
     /**
      * Normalize header names to lowercase.
+     * Also ensures multi-value headers are represented as a single string, via
+     * comma concatenation.
      *
      * @return array
      */
     private function normalizeHeaders(array $headers)
     {
         $normalized = [];
         foreach ($headers as $name => $value) {
-            $normalized[strtolower($name)] = $value;
+            $normalized[strtolower($name)] = is_array($value) ? implode(', ', $value) : $value;
         }
         return $normalized;
     }

test/Reader/Http/LaminasHttpClientDecoratorTest.php

@@ -234,6 +234,8 @@ public static function invalidHeaders(): iterable
         foreach ($invalidIndividualValues as $key => $value) {
             yield $key => [['X-Test' => [$value]], 'strings or numbers'];
         }
+
+        // todo: expand here with multi values.
     }
 
     /**

test/Reader/Http/ResponseTest.php

@@ -43,7 +43,10 @@
             'Location'         => 'http://example.org/foo',
             'Content-Length'   => 1234,
             'X-Content-Length' => 1234.56,
+            'MultiValue'       => ['one', 'two'],
+            'MultiValue2'      => [1, 2],
+
         ]);
         $this->assertEquals(204, $response->getStatusCode());
         $this->assertEquals('', $response->getBody());
         $this->assertEquals('http://example.org/foo', $response->getHeaderLine('Location'));
@@ -120,42 +123,59 @@
     public static function invalidHeaders(): array
     {
         return [
             'empty-name'   => [
                 ['' => 'value'],
                 'non-empty, non-numeric',
             ],
             'zero-name'    => [
                 ['value'],
                 'non-empty, non-numeric',
             ],
             'int-name'     => [
                 [1 => 'value'],
                 'non-empty, non-numeric',
             ],
             'numeric-name' => [
                 ['1.1' => 'value'],
                 'non-empty, non-numeric',
             ],
             'null-value'   => [
                 ['X-Test' => null],
                 'must be a string or numeric',
             ],
             'true-value'   => [
                 ['X-Test' => true],
                 'must be a string or numeric',
             ],
             'false-value'  => [
                 ['X-Test' => false],
                 'must be a string or numeric',
             ],
-            'array-value'  => [
-                ['X-Test' => ['BODY']],
-                'must be a string or numeric',
-            ],
             'object-value' => [
                 ['X-Test' => (object) ['body' => 'BODY']],
                 'must be a string or numeric',
             ],
+            'null-value-in-array'   => [
+                ['X-Test' => [null]],
+                'must be a string or numeric',
+            ],
+            'true-value-in-array'   => [
+                ['X-Test' => [true]],
+                'must be a string or numeric',
+            ],
+            'false-value-in-array'  => [
+                ['X-Test' => [false]],
+                'must be a string or numeric',
+            ],
+            'object-value-in-array' => [
+                ['X-Test' => [(object) ['body' => 'BODY']]],
+                'must be a string or numeric',
+            ],
+            // todo: expand this with more combinations?
+            'mixed-values-in-array' => [
+                ['X-Test' => ['valid', false]],
+                'must be a string or numeric',
+            ]
         ];
     }