diff vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1

--- a/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php	Thu May 09 15:34:47 2019 +0100
@@ -43,7 +43,9 @@
      */
     public function createRequest(Request $symfonyRequest)
     {
-        $server = DiactorosRequestFactory::normalizeServer($symfonyRequest->server->all());
+        $server = method_exists('Zend\Diactoros\ServerRequestFactory', 'normalizeServer')
+            ? DiactorosRequestFactory::normalizeServer($symfonyRequest->server->all())
+            : \Zend\Diactoros\normalizeServer($symfonyRequest->server->all());
         $headers = $symfonyRequest->headers->all();
 
         if (PHP_VERSION_ID < 50600) {
@@ -53,9 +55,13 @@
             $body = new DiactorosStream($symfonyRequest->getContent(true));
         }
 
+        $files = method_exists('Zend\Diactoros\ServerRequestFactory', 'normalizeFiles')
+            ? DiactorosRequestFactory::normalizeFiles($this->getFiles($symfonyRequest->files->all()))
+            : \Zend\Diactoros\normalizeUploadedFiles($this->getFiles($symfonyRequest->files->all()));
+
         $request = new ServerRequest(
             $server,
-            DiactorosRequestFactory::normalizeFiles($this->getFiles($symfonyRequest->files->all())),
+            $files,
             $symfonyRequest->getSchemeAndHttpHost().$symfonyRequest->getRequestUri(),
             $symfonyRequest->getMethod(),
             $body,
@@ -144,7 +150,7 @@
         }
 
         $headers = $symfonyResponse->headers->all();
-        if (!isset($headers['Set-Cookie']) && !isset($headers['set-sookie'])) {
+        if (!isset($headers['Set-Cookie']) && !isset($headers['set-cookie'])) {
             $cookies = $symfonyResponse->headers->getCookies();
             if (!empty($cookies)) {
                 $headers['Set-Cookie'] = array();