bug #10797 [HttpFoundation] Allow File instance to be passed to BinaryFileResponse (anlutro)

fabpot · fabpot · commit 9e2a83458220 · 2014-04-28T18:47:48.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [HttpFoundation] Allow File instance to be passed to BinaryFileResponse | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #10608 | License | MIT | Doc PR | See #10608 for discussion and reasoning. The docblocks get rather long with this change. The File class does extend SplFileObject so technically it could be left out of the docblock if that is more desirable. Commits ------- fc04ad2 Allow File instance to be passed to BinaryFileResponse
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -81,7 +81,9 @@ public static function create($file = null, $status = 200, $headers = array(), $
      */
     public function setFile($file, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
     {
-        $file = new File((string) $file);
+        if (!$file instanceof File) {
+            $file = new File((string) $file);
+        }
 
         if (!$file->isReadable()) {
             throw new FileException('File must be readable.');
