Mercurial > hg > isophonics-drupal-site
comparison vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php @ 17:129ea1e6d783
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:21:36 +0000 |
parents | 7a779792577d |
children | af1871eacc83 |
comparison
equal
deleted
inserted
replaced
16:c2387f117808 | 17:129ea1e6d783 |
---|---|
9 * file that was distributed with this source code. | 9 * file that was distributed with this source code. |
10 */ | 10 */ |
11 | 11 |
12 namespace Symfony\Bridge\PsrHttpMessage\Factory; | 12 namespace Symfony\Bridge\PsrHttpMessage\Factory; |
13 | 13 |
14 use Psr\Http\Message\UploadedFileInterface; | |
14 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface; | 15 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface; |
15 use Symfony\Component\HttpFoundation\BinaryFileResponse; | 16 use Symfony\Component\HttpFoundation\BinaryFileResponse; |
16 use Symfony\Component\HttpFoundation\File\UploadedFile; | 17 use Symfony\Component\HttpFoundation\File\UploadedFile; |
17 use Symfony\Component\HttpFoundation\Request; | 18 use Symfony\Component\HttpFoundation\Request; |
18 use Symfony\Component\HttpFoundation\Response; | 19 use Symfony\Component\HttpFoundation\Response; |
110 */ | 111 */ |
111 private function createUploadedFile(UploadedFile $symfonyUploadedFile) | 112 private function createUploadedFile(UploadedFile $symfonyUploadedFile) |
112 { | 113 { |
113 return new DiactorosUploadedFile( | 114 return new DiactorosUploadedFile( |
114 $symfonyUploadedFile->getRealPath(), | 115 $symfonyUploadedFile->getRealPath(), |
115 $symfonyUploadedFile->getClientSize(), | 116 (int) $symfonyUploadedFile->getSize(), |
116 $symfonyUploadedFile->getError(), | 117 $symfonyUploadedFile->getError(), |
117 $symfonyUploadedFile->getClientOriginalName(), | 118 $symfonyUploadedFile->getClientOriginalName(), |
118 $symfonyUploadedFile->getClientMimeType() | 119 $symfonyUploadedFile->getClientMimeType() |
119 ); | 120 ); |
120 } | 121 } |
130 $stream = new DiactorosStream('php://temp', 'wb+'); | 131 $stream = new DiactorosStream('php://temp', 'wb+'); |
131 if ($symfonyResponse instanceof StreamedResponse) { | 132 if ($symfonyResponse instanceof StreamedResponse) { |
132 ob_start(function ($buffer) use ($stream) { | 133 ob_start(function ($buffer) use ($stream) { |
133 $stream->write($buffer); | 134 $stream->write($buffer); |
134 | 135 |
135 return false; | 136 return ''; |
136 }); | 137 }); |
137 | 138 |
138 $symfonyResponse->sendContent(); | 139 $symfonyResponse->sendContent(); |
139 ob_end_clean(); | 140 ob_end_clean(); |
140 } else { | 141 } else { |
141 $stream->write($symfonyResponse->getContent()); | 142 $stream->write($symfonyResponse->getContent()); |
142 } | 143 } |
143 } | 144 } |
144 | 145 |
145 $headers = $symfonyResponse->headers->all(); | 146 $headers = $symfonyResponse->headers->all(); |
146 | 147 if (!isset($headers['Set-Cookie']) && !isset($headers['set-sookie'])) { |
147 $cookies = $symfonyResponse->headers->getCookies(); | 148 $cookies = $symfonyResponse->headers->getCookies(); |
148 if (!empty($cookies)) { | 149 if (!empty($cookies)) { |
149 $headers['Set-Cookie'] = array(); | 150 $headers['Set-Cookie'] = array(); |
150 | 151 foreach ($cookies as $cookie) { |
151 foreach ($cookies as $cookie) { | 152 $headers['Set-Cookie'][] = $cookie->__toString(); |
152 $headers['Set-Cookie'][] = $cookie->__toString(); | 153 } |
153 } | 154 } |
154 } | 155 } |
155 | 156 |
156 $response = new DiactorosResponse( | 157 $response = new DiactorosResponse( |
157 $stream, | 158 $stream, |