Merge branch '5.4' into 6.1

fabpot · fabpot · commit 6bc08823e0ae · 2022-04-23T17:25:37.000+02:00
* 5.4:
  Modify processing of uploaded files to be compatible with PHP 8.1
diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php
@@ -190,6 +190,8 @@ private static function fixPhpFilesArray(mixed $data): mixed
             return $data;
         }
 
+        // Remove extra key added by PHP 8.1.
+        unset($data['full_path']);
         $keys = array_keys($data);
         sort($keys);
 

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,8 @@ private static function fixPhpFilesArray(mixed $data): mixed`
`190`	`190`	`return $data;`
`191`	`191`	`}`
`192`	`192`
	`193`	`+ // Remove extra key added by PHP 8.1.`
	`194`	`+ unset($data['full_path']);`
`193`	`195`	`$keys = array_keys($data);`
`194`	`196`	`sort($keys);`
`195`	`197`