diff vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

--- a/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php	Thu Feb 28 13:21:36 2019 +0000
@@ -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 @@
     {
         return new DiactorosUploadedFile(
             $symfonyUploadedFile->getRealPath(),
-            $symfonyUploadedFile->getClientSize(),
+            (int) $symfonyUploadedFile->getSize(),
             $symfonyUploadedFile->getError(),
             $symfonyUploadedFile->getClientOriginalName(),
             $symfonyUploadedFile->getClientMimeType()
@@ -132,7 +133,7 @@
                 ob_start(function ($buffer) use ($stream) {
                     $stream->write($buffer);
 
-                    return false;
+                    return '';
                 });
 
                 $symfonyResponse->sendContent();
@@ -143,13 +144,13 @@
         }
 
         $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();
+                }
             }
         }