Merge remote-tracking branch 'origin/MC-17928' into 2.3-develop-pr57

Author: zakdma

app/code/Magento/Customer/Model/FileUploaderDataResolver.php

@@ -88,9 +88,7 @@ private function getFileUploaderData(
         $file = $customerData[$attributeCode] ?? null;
 
         /** @var FileProcessor $fileProcessor */
-        $fileProcessor = $this->fileProcessorFactory->create([
-            'entityTypeCode' => $entityType->getEntityTypeCode(),
-        ]);
+        $fileProcessor = $this->fileProcessorFactory->create(['entityTypeCode' => $entityType->getEntityTypeCode()]);
 
         if (!empty($file)
             && $fileProcessor->isExist($file)
@@ -103,6 +101,7 @@ private function getFileUploaderData(
                     'file' => $file,
                     'size' => null !== $stat ? $stat['size'] : 0,
                     'url' => $viewUrl ?? '',
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
                     'name' => basename($file),
                     'type' => $fileProcessor->getMimeType($file),
                 ],
@@ -138,9 +137,12 @@ public function overrideFileUploaderMetadata(
 
             if (isset($config['validation']['file_extensions'])) {
                 $allowedExtensions = explode(',', $config['validation']['file_extensions']);
-                array_walk($allowedExtensions, function (&$value) {
-                    $value = strtolower(trim($value));
-                });
+                array_walk(
+                    $allowedExtensions,
+                    function (&$value) {
+                        $value = strtolower(trim($value));
+                    }
+                );
             }
 
             $allowedExtensions = implode(' ', $allowedExtensions);
@@ -149,6 +151,7 @@ public function overrideFileUploaderMetadata(
             $url = $this->getFileUploadUrl($entityTypeCode);
 
             $config = [
+                'dataType' => $this->getMetadataValue($config, 'dataType'),
                 'formElement' => 'fileUploader',
                 'componentType' => 'fileUploader',
                 'maxFileSize' => $maxFileSize,