bug #85 Fix BinaryFileResponse with range to psr response conversion (iluuu1994)

nicolas-grekas · nicolas-grekas · commit cffb3a82b446 · 2020-09-29T09:57:44.000+02:00
This PR was merged into the 2.0-dev branch. Discussion ---------- Fix BinaryFileResponse with range to psr response conversion Closes #84 As requested by [Fabien](#38280 (comment)). I think using the slightly less optimal version of checking for a `Content-Range` header is better than relying on reflection. In theory, this could be slightly sub optimal when streaming whole files and setting the `Content-Range` manually but I'm assuming that's very rare in practice. Commits ------- 5d5932d Fix BinaryFileResponse with range to psr response conversion
diff --git a/Factory/PsrHttpFactory.php b/Factory/PsrHttpFactory.php
@@ -127,13 +127,13 @@ public function createResponse(Response $symfonyResponse)
     {
         $response = $this->responseFactory->createResponse($symfonyResponse->getStatusCode(), Response::$statusTexts[$symfonyResponse->getStatusCode()] ?? '');
 
-        if ($symfonyResponse instanceof BinaryFileResponse) {
+        if ($symfonyResponse instanceof BinaryFileResponse && !$symfonyResponse->headers->has('Content-Range')) {
             $stream = $this->streamFactory->createStreamFromFile(
                 $symfonyResponse->getFile()->getPathname()
             );
         } else {
             $stream = $this->streamFactory->createStreamFromFile('php://temp', 'wb+');
-            if ($symfonyResponse instanceof StreamedResponse) {
+            if ($symfonyResponse instanceof StreamedResponse || $symfonyResponse instanceof BinaryFileResponse) {
                 ob_start(function ($buffer) use ($stream) {
                     $stream->write($buffer);
 
diff --git a/Tests/Factory/AbstractHttpMessageFactoryTest.php b/Tests/Factory/AbstractHttpMessageFactoryTest.php
@@ -182,6 +182,23 @@ public function testCreateResponseFromBinaryFile()
         $this->assertEquals('Binary', $psrResponse->getBody()->__toString());
     }
 
+    public function testCreateResponseFromBinaryFileWithRange()
+    {
+        $path = tempnam($this->tmpDir, uniqid());
+        file_put_contents($path, 'Binary');
+
+        $request = new Request();
+        $request->headers->set('Range', 'bytes=1-4');
+
+        $response = new BinaryFileResponse($path, 200, ['Content-Type' => 'plain/text']);
+        $response->prepare($request);
+
+        $psrResponse = $this->factory->createResponse($response);
+
+        $this->assertEquals('inar', $psrResponse->getBody()->__toString());
+        $this->assertSame('bytes 1-4/6', $psrResponse->getHeaderLine('Content-Range'));
+    }
+
     public function testUploadErrNoFile()
     {
         $file = new UploadedFile('', '', null, UPLOAD_ERR_NO_FILE, true);
