Fix Psr17Factory::createServerRequestFromGlobals() when uploaded files have been moved

nicolas-grekas · nicolas-grekas · commit 918f81344aa3 · 2023-04-26T17:16:57.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - [#230](https://github.com/php-http/discovery/pull/230) - Add Psr18Client to make it straightforward to use PSR-18
 - [#232](https://github.com/php-http/discovery/pull/232) - Allow pinning the preferred implementations in composer.json
+- [#233](https://github.com/php-http/discovery/pull/233) - Fix Psr17Factory::createServerRequestFromGlobals() when uploaded files have been moved
 
 ## 1.16.0 - 2023-04-26
 
diff --git a/src/Psr17Factory.php b/src/Psr17Factory.php
@@ -283,7 +283,7 @@ private function normalizeFiles(array $files): array
     private function createUploadedFileFromSpec(array $value)
     {
         if (!is_array($tmpName = $value['tmp_name'])) {
-            $file = $this->createStreamFromFile($tmpName, 'r');
+            $file = is_file($tmpName) ? $this->createStreamFromFile($tmpName, 'r') : $this->createStream();
 
             return $this->createUploadedFile($file, $value['size'], $value['error'], $value['name'], $value['type']);
         }

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ private function normalizeFiles(array $files): array`
`283`	`283`	`private function createUploadedFileFromSpec(array $value)`
`284`	`284`	`{`
`285`	`285`	`if (!is_array($tmpName = $value['tmp_name'])) {`
`286`		`- $file = $this->createStreamFromFile($tmpName, 'r');`
	`286`	`+ $file = is_file($tmpName) ? $this->createStreamFromFile($tmpName, 'r') : $this->createStream();`
`287`	`287`
`288`	`288`	`return $this->createUploadedFile($file, $value['size'], $value['error'], $value['name'], $value['type']);`
`289`	`289`	`}`