Merge remote-tracking branch 'origin/MC-18100' into 2.2.10-develop-pr106

Author: zakdma

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

@@ -181,6 +181,8 @@ public function __construct(
         Mime $fileMime = null,
         DirectoryList $directoryList = null
     ) {
+        $this->directoryList = $directoryList ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(DirectoryList::class);
         $this->_setUploadFileId($fileId);
         if (!file_exists($this->_file['tmp_name'])) {
             $code = empty($this->_file['tmp_name']) ? self::TMP_NAME_EMPTY : 0;
@@ -189,8 +191,6 @@ public function __construct(
             $this->_fileExists = true;
         }
         $this->fileMime = $fileMime ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Mime::class);
-        $this->directoryList= $directoryList ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(DirectoryList::class);
     }
 
     /**