[HttpFoundation] fix FileBag under PHP 8.1

symfony · Jul 15, 2021 · 17a1c3d · 17a1c3d
1 parent 48f7bed
commit 17a1c3d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/FileBag.php b/FileBag.php
@@ -113,6 +113,8 @@ protected function convertFileInformation($file)
      */
     protected function fixPhpFilesArray($data)
     {
+        // Remove extra key added by PHP 8.1.
+        unset($data['full_path']);
         $keys = array_keys($data);
         sort($keys);
 

diff --git a/Tests/FileBagTest.php b/Tests/FileBagTest.php
@@ -45,6 +45,23 @@ public function testShouldConvertsUploadedFiles()
         $this->assertEquals($file, $bag->get('file'));
     }
 
+    public function testShouldConvertsUploadedFilesPhp81()
+    {
+        $tmpFile = $this->createTempFile();
+        $file = new UploadedFile($tmpFile, basename($tmpFile), 'text/plain');
+
+        $bag = new FileBag(['file' => [
+            'name' => basename($tmpFile),
+            'full_path' => basename($tmpFile),
+            'type' => 'text/plain',
+            'tmp_name' => $tmpFile,
+            'error' => 0,
+            'size' => null,
+        ]]);
+
+        $this->assertEquals($file, $bag->get('file'));
+    }
+
     public function testShouldSetEmptyUploadedFilesToNull()
     {
         $bag = new FileBag(['file' => [