Use adapter for UploadedFile objects

nicolas-grekas · nicolas-grekas · commit a4f9f6d318a4 · 2019-11-25T20:32:35.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-* 1.3.0 (2019-11-26)
+* 1.3.0 (2019-11-25)
 
   * Added support for streamed requests
   * Added support for Symfony 5.0+
diff --git a/Factory/HttpFoundationFactory.php b/Factory/HttpFoundationFactory.php
@@ -18,7 +18,6 @@
 use Psr\Http\Message\UriInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
 use Symfony\Component\HttpFoundation\Cookie;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -78,10 +77,8 @@ public function createRequest(ServerRequestInterface $psrRequest, bool $streamed
 
     /**
      * Converts to the input array to $_FILES structure.
-     *
-     * @return array
      */
-    private function getFiles(array $uploadedFiles)
+    private function getFiles(array $uploadedFiles): array
     {
         $files = [];
 
@@ -98,27 +95,10 @@ private function getFiles(array $uploadedFiles)
 
     /**
      * Creates Symfony UploadedFile instance from PSR-7 ones.
-     *
-     * @return UploadedFile
      */
-    private function createUploadedFile(UploadedFileInterface $psrUploadedFile)
+    private function createUploadedFile(UploadedFileInterface $psrUploadedFile): UploadedFile
     {
-        $temporaryPath = '';
-        $clientFileName = '';
-        if (UPLOAD_ERR_NO_FILE !== $psrUploadedFile->getError()) {
-            $temporaryPath = $this->getTemporaryPath();
-            $psrUploadedFile->moveTo($temporaryPath);
-
-            $clientFileName = $psrUploadedFile->getClientFilename();
-        }
-
-        return new UploadedFile(
-            $temporaryPath,
-            null === $clientFileName ? '' : $clientFileName,
-            $psrUploadedFile->getClientMediaType(),
-            $psrUploadedFile->getError(),
-            true
-        );
+        return new UploadedFile($psrUploadedFile, function () { return $this->getTemporaryPath(); });
     }
 
     /**
@@ -167,11 +147,9 @@ public function createResponse(ResponseInterface $psrResponse, bool $streamed =
      *
      * Some snippets have been taken from the Guzzle project: https://github.com/guzzle/guzzle/blob/5.3/src/Cookie/SetCookie.php#L34
      *
-     * @return Cookie
-     *
      * @throws \InvalidArgumentException
      */
-    private function createCookie(string $cookie)
+    private function createCookie(string $cookie): Cookie
     {
         foreach (explode(';', $cookie) as $part) {
             $part = trim($part);
diff --git a/Factory/UploadedFile.php b/Factory/UploadedFile.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Factory;
+
+use Psr\Http\Message\UploadedFileInterface;
+use Symfony\Component\HttpFoundation\File\Exception\FileException;
+use Symfony\Component\HttpFoundation\File\File;
+use Symfony\Component\HttpFoundation\File\UploadedFile as BaseUploadedFile;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class UploadedFile extends BaseUploadedFile
+{
+    private $psrUploadedFile;
+    private $test = false;
+
+    public function __construct(UploadedFileInterface $psrUploadedFile, callable $getTemporaryPath)
+    {
+        $error = $psrUploadedFile->getError();
+        $path = '';
+
+        if (UPLOAD_ERR_NO_FILE !== $error) {
+            $path = $psrUploadedFile->getStream()->getMetadata('uri') ?? '';
+
+            if ($this->test = !\is_string($path) || !is_uploaded_file($path)) {
+                $path = $getTemporaryPath();
+                $psrUploadedFile->moveTo($path);
+            }
+        }
+
+        parent::__construct(
+            $path,
+            (string) $psrUploadedFile->getClientFilename(),
+            $psrUploadedFile->getClientMediaType(),
+            $psrUploadedFile->getError(),
+            $this->test
+        );
+
+        $this->psrUploadedFile = $psrUploadedFile;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function move($directory, $name = null): File
+    {
+        if (!$this->isValid() || $this->test) {
+            return parent::move($directory, $name);
+        }
+
+        $target = $this->getTargetFile($directory, $name);
+
+        try {
+            $this->psrUploadedFile->moveTo($target);
+        } catch (\RuntimeException $e) {
+            throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, $e->getMessage()), 0, $e);
+        }
+
+        @chmod($target, 0666 & ~umask());
+
+        return $target;
+    }
+}
diff --git a/Tests/Fixtures/UploadedFile.php b/Tests/Fixtures/UploadedFile.php
@@ -35,7 +35,7 @@ public function __construct($filePath, $size = null, $error = UPLOAD_ERR_OK, $cl
 
     public function getStream()
     {
-        throw new \RuntimeException('No stream is available.');
+        return new Stream(file_get_contents($this->filePath));
     }
 
     public function moveTo($targetPath)

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct($filePath, $size = null, $error = UPLOAD_ERR_OK, $cl`
`35`	`35`
`36`	`36`	`public function getStream()`
`37`	`37`	`{`
`38`		`- throw new \RuntimeException('No stream is available.');`
	`38`	`+ return new Stream(file_get_contents($this->filePath));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function moveTo($targetPath)`