Fix non-selected files

gtg-bantonio · gtg-bantonio · commit a0d191dd2c1e · 2026-02-26T12:48:07.000-06:00
- Converted the non-selected files into nulls.
diff --git a/src/Drivers/LaravelHttpServer.php b/src/Drivers/LaravelHttpServer.php
@@ -16,7 +16,6 @@
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Contracts\Http\Kernel as HttpKernel;
 use Illuminate\Foundation\Testing\Concerns\WithoutExceptionHandlingHandler;
-use Illuminate\Http\Concerns\InteractsWithInput;
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Routing\UrlGenerator;
@@ -28,7 +27,6 @@
 use Pest\Browser\Http\RequestBodyParser;
 use Pest\Browser\Playwright\Playwright;
 use Psr\Log\NullLogger;
-use Symfony\Component\HttpFoundation\File\UploadedFile as SymfonyUploadedFile;
 use Symfony\Component\Mime\MimeTypes;
 use Throwable;
 
@@ -318,20 +316,22 @@ private function handleRequest(AmpRequest $request): Response
     }
 
     /**
-     * Taken from Laravel because we can't manipulate the test flag
-     *
-     * @param  array<SymfonyUploadedFile[]|SymfonyUploadedFile>  $files
-     * @return array<UploadedFile[]|UploadedFile>
-     *
-     * @see InteractsWithInput
+     * Convert the array to a Laravel file, to keep the test flag.
+     * If the file is empty, we return the original array, so Laravel
+     * would convert it to a null.
      */
+    // @phpstan-ignore-next-line
     private function convertUploadedFiles(array $files): array
     {
         // @phpstan-ignore-next-line
-        return array_map(function (array|SymfonyUploadedFile $file) {
-            return is_array($file)
+        return array_map(function (array $file) {
+            if (isset($file['error']) && $file['error'] === UPLOAD_ERR_NO_FILE) {
+                return $file;
+            }
+
+            return array_is_list($file)
                 ? $this->convertUploadedFiles($file)
-                : UploadedFile::createFromBase($file, true);
+                : new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['error'], true);
         }, $files);
     }
 
diff --git a/src/Http/MultipartParser.php b/src/Http/MultipartParser.php
@@ -6,7 +6,6 @@
 
 use Amp\Http\Server\Request as AmpRequest;
 use InvalidArgumentException;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Derived work from the MultipartParser in ReactPHP.
@@ -19,7 +18,7 @@
 final class MultipartParser
 {
     /**
-     * @var array{"$_POST": array<array-key, mixed[]|string>, "$_FILES": array<array-key, UploadedFile[]|UploadedFile>}
+     * @var array{"$_POST": array<array-key, mixed[]|string>, "$_FILES": array<array-key, array{tmp_file: string, error: int, name: string, type: string, size: int}[]|array{tmp_file: string, error: int, name: string, type: string, size: int}>}
      */
     private array $superglobals = ['$_POST' => [], '$_FILES' => []];
 
@@ -88,7 +87,7 @@ public function __construct(
     }
 
     /**
-     * @return array{array<mixed[]|string>, array<UploadedFile[]|UploadedFile>}
+     * @return array{array<mixed[]|string>, array<array{tmp_file: string, error: int, name: string, type: string, size: int}[]|array{tmp_file: string, error: int, name: string, type: string, size: int}>}
      */
     public function parse(AmpRequest $request, string $body): array
     {
@@ -219,8 +218,12 @@ private function parseFile(string $name, string $filename, ?string $contentType,
         );
     }
 
-    private function parseUploadedFile(string $filename, ?string $contentType, string $contents): ?UploadedFile
+    /**
+     * @return array{tmp_file: string, error: int, name: string, type: string, size: int}|null
+     */
+    private function parseUploadedFile(string $filename, ?string $contentType, string $contents): ?array
     {
+        $contentType ??= 'application/octet-stream';
         $size = strlen($contents);
 
         // no file selected (zero size and empty filename)
@@ -230,13 +233,13 @@ private function parseUploadedFile(string $filename, ?string $contentType, strin
                 return null;
             }
 
-            return new UploadedFile(
-                '',
-                $filename,
-                $contentType,
-                UPLOAD_ERR_NO_FILE,
-                true,
-            );
+            return [
+                'tmp_name' => '',
+                'error' => UPLOAD_ERR_NO_FILE,
+                'name' => $filename,
+                'type' => $contentType,
+                'size' => $size,
+            ];
         }
 
         // ignore excessive number of file uploads
@@ -246,36 +249,36 @@ private function parseUploadedFile(string $filename, ?string $contentType, strin
 
         // file exceeds "upload_max_filesize" ini setting
         if ($size > $this->uploadMaxFilesize) {
-            return new UploadedFile(
-                '',
-                $filename,
-                $contentType,
-                UPLOAD_ERR_INI_SIZE,
-                true,
-            );
+            return [
+                'tmp_name' => '',
+                'error' => UPLOAD_ERR_INI_SIZE,
+                'name' => $filename,
+                'type' => $contentType,
+                'size' => $size,
+            ];
         }
 
         // file exceeds MAX_FILE_SIZE value
         if ($this->maxFileSize !== null && $size > $this->maxFileSize) {
-            return new UploadedFile(
-                '',
-                $filename,
-                $contentType,
-                UPLOAD_ERR_FORM_SIZE,
-                true,
-            );
+            return [
+                'tmp_name' => '',
+                'error' => UPLOAD_ERR_FORM_SIZE,
+                'name' => $filename,
+                'type' => $contentType,
+                'size' => $size,
+            ];
         }
 
         $tempFileName = tempnam(sys_get_temp_dir(), 'php');
         file_put_contents($tempFileName, $contents);
 
-        return new UploadedFile(
-            $tempFileName,
-            $filename,
-            $contentType,
-            UPLOAD_ERR_OK,
-            true,
-        );
+        return [
+            'tmp_name' => $tempFileName,
+            'error' => UPLOAD_ERR_OK,
+            'name' => $filename,
+            'type' => $contentType,
+            'size' => $size,
+        ];
     }
 
     private function parsePost(string $name, string $value): void
diff --git a/tests/Fixtures/example.pdf b/tests/Fixtures/example.pdf
diff --git a/tests/Unit/Drivers/Laravel/LaravelHttpServerTest.php b/tests/Unit/Drivers/Laravel/LaravelHttpServerTest.php
@@ -71,6 +71,7 @@
 });
 
 it('parse a multipart body with files', function (): void {
+    Route::get('favicon.ico', static fn (): string => '');
     Route::get('/', static fn (): string => "
         <html>
         <head></head>
@@ -79,8 +80,14 @@
                 <label for='name'>Your name</label>
                 <input id='name' type='text' name='name'>
 
-                <label for='file'>Your file</label>
-                <input id='file' type='file' name='file'>
+                <label for='file1'>Your text file</label>
+                <input id='file1' type='file' name='file1'>
+
+                <label for='file2'>Your binary file</label>
+                <input id='file2' type='file' name='file2'>
+
+                <label for='file3'>Your empty file</label>
+                <input id='file3' type='file' name='file3'>
 
                 <button type='submit'>Send</button>
             </form>
@@ -92,7 +99,9 @@
         <head></head>
         <body>
             <h1>Hello {$request->post('name')}</h1>
-            <p>Uploaded file: {$request->file('file')->getClientOriginalName()}</p>
+            <p>Text file: {$request->file('file1')?->getClientOriginalName()}</p>
+            <p>Binary file: {$request->file('file2')?->getClientOriginalName()}</p>
+            <p>Empty file: {$request->file('file3')?->getClientOriginalName()}</p>
         </body>
         </html>
     ");
@@ -101,11 +110,14 @@
     $page->assertSee('Your name');
 
     $page->fill('Your name', 'World');
-    $page->attach('Your file', fixture('lorem-ipsum.txt'));
+    $page->attach('Your text file', fixture('lorem-ipsum.txt'));
+    $page->attach('Your binary file', fixture('example.pdf'));
     $page->submit();
 
     $page->assertSee('Hello World');
-    $page->assertSee('Uploaded file: lorem-ipsum.txt');
+    $page->assertSee('Text file: lorem-ipsum.txt');
+    $page->assertSee('Binary file: example.pdf');
+    $page->assertSee('Empty file: ');
 });
 
 it('parse a multipart body with nested fields', function (): void {
