Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / vendor / symfony / psr-http-message-bridge / Factory / DiactorosFactory.php

diff --git a/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php b/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
index 0600325373ae3590b05462c838d57f429a96bdb9..a5dcd8698c3d5d7c5a92b54e4b2884f54306fb86 100644 (file)
--- a/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
+++ b/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\PsrHttpMessage\Factory;
 
+use Psr\Http\Message\UploadedFileInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -112,7 +113,7 @@ class DiactorosFactory implements HttpMessageFactoryInterface
     {
         return new DiactorosUploadedFile(
             $symfonyUploadedFile->getRealPath(),
-            $symfonyUploadedFile->getClientSize(),
+            (int) $symfonyUploadedFile->getSize(),
             $symfonyUploadedFile->getError(),
             $symfonyUploadedFile->getClientOriginalName(),
             $symfonyUploadedFile->getClientMimeType()
@@ -132,7 +133,7 @@ class DiactorosFactory implements HttpMessageFactoryInterface
                 ob_start(function ($buffer) use ($stream) {
                     $stream->write($buffer);
 
-                    return false;
+                    return '';
                 });
 
                 $symfonyResponse->sendContent();
@@ -143,13 +144,13 @@ class DiactorosFactory implements HttpMessageFactoryInterface
         }
 
         $headers = $symfonyResponse->headers->all();
-
-        $cookies = $symfonyResponse->headers->getCookies();
-        if (!empty($cookies)) {
-            $headers['Set-Cookie'] = array();
-
-            foreach ($cookies as $cookie) {
-                $headers['Set-Cookie'][] = $cookie->__toString();
+        if (!isset($headers['Set-Cookie']) && !isset($headers['set-sookie'])) {
+            $cookies = $symfonyResponse->headers->getCookies();
+            if (!empty($cookies)) {
+                $headers['Set-Cookie'] = array();
+                foreach ($cookies as $cookie) {
+                    $headers['Set-Cookie'][] = $cookie->__toString();
+                }
             }
         }