Merge pull request #5525 from Gustry/request-id-guzzle

fix: In Guzzle, provided HTTP headers is an array

Author: Gustry

lizmap/modules/lizmap/lib/Request/OGCRequest.php

@@ -247,7 +247,7 @@ protected function logRequestIfError($code, $headers)
 
         $message = 'The HTTP OGC request to QGIS Server ended with an error.';
 
-        $xRequestId = $headers['X-Request-Id'] ?? '';
+        $xRequestId = Proxy::httpRequestId($headers);
         if ($xRequestId !== '') {
             $message .= ' The X-Request-Id `'.$xRequestId.'`.';
         }

lizmap/modules/lizmap/lib/Request/Proxy.php

@@ -282,6 +282,24 @@ protected static function buildOptions($options, $method, $debug)
         return $options;
     }
 
+    /**
+     * Get the X-Request-Id of the request from the given headers.
+     *
+     * @param array<string, array<string>> $headers The headers to check
+     *
+     * @return string
+     */
+    public static function httpRequestId($headers)
+    {
+        $xRequestId = $headers['X-Request-Id'] ?? '';
+
+        if (is_string($xRequestId)) {
+            return '';
+        }
+
+        return implode(',', $xRequestId);
+    }
+
     /**
      * @param string $url
      * @param array  $options
@@ -329,17 +347,17 @@ protected static function buildHeaders($url, $options)
     /**
      * Log if the HTTP code is a 4XX or 5XX error code.
      *
-     * @param int                   $httpCode The HTTP code of the request
-     * @param string                $url      The URL of the request, for logging
-     * @param array<string, string> $headers  The headers of the response
+     * @param int                          $httpCode The HTTP code of the request
+     * @param string                       $url      The URL of the request, for logging
+     * @param array<string, array<string>> $headers  The headers of the response
      */
     protected static function logRequestIfError($httpCode, $url, $headers = array())
     {
         if ($httpCode < 400) {
             return;
         }
 
-        $xRequestId = $headers['X-Request-Id'] ?? '';
+        $xRequestId = self::httpRequestId($headers);
 
         $lizmapAdmin = 'An HTTP request ended with an error, please check the main error log.';
         $lizmapAdmin .= ' HTTP code '.$httpCode.'.';