Merge remote-tracking branch '38074/fix-for-issue-37957' into comm_prs_247beta3_dec

Author: Indraniks

lib/internal/Magento/Framework/File/Uploader.php

@@ -342,6 +342,7 @@ private function validateDestination(string $destinationFolder): void
      * @return void
      *
      * @deprecated 100.0.8
+     * @see Nothing
      */
     protected function chmod($file)
     {
@@ -383,8 +384,9 @@ protected function _moveFile($tmpPath, $destPath)
     /**
      * Get logger instance.
      *
-     * @deprecated
      * @return LoggerInterface
+     * @deprecated
+     * @see Nothing
      */
     private function getLogger(): LoggerInterface
     {
@@ -673,7 +675,7 @@ private function _getMimeType()
      * @param string|array $fileId
      * @return void
      * @throws \DomainException
-     * @throws \InvalidArgumentException
+     * @throws \InvalidArgumentException|FileSystemException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function _setUploadFileId($fileId)
@@ -688,7 +690,7 @@ private function _setUploadFileId($fileId)
             }
 
             $fileId = $fileId !== null ? $fileId : '';
-            preg_match("/^(.*?)\[(.*?)\]$/", $fileId, $file);
+            preg_match("/^(.*?)(\[.+])$/", $fileId, $file);
 
             if (is_array($file) && count($file) > 0 && !empty($file[0]) && !empty($file[1])) {
                 array_shift($file);
@@ -698,7 +700,14 @@ private function _setUploadFileId($fileId)
                 $tmpVar = [];
 
                 foreach ($fileAttributes as $attributeName => $attributeValue) {
-                    $tmpVar[$attributeName] = $attributeValue[$file[1]];
+                    $keys = explode('][', trim($file[1], '[]'));
+                    foreach ($keys as $key) {
+                        $key = trim($key, '[]');
+                        if (isset($attributeValue[$key])) {
+                            $attributeValue = $attributeValue[$key];
+                        }
+                    }
+                    $tmpVar[$attributeName] = $attributeValue;
                 }
 
                 $fileAttributes = $tmpVar;
@@ -831,6 +840,7 @@ public static function getNewFileName($destinationFile)
      * @param string $fileName
      * @return string
      * @deprecated 101.0.4
+     * @see Nothing
      */
     public static function getDispretionPath($fileName)
     {
@@ -864,8 +874,9 @@ public static function getDispersionPath($fileName)
     /**
      * Get driver for file
      *
-     * @deprecated
      * @return DriverInterface
+     * @deprecated
+     * @see Nothing
      */
     private function getFileDriver(): DriverInterface
     {