B2B-2028: [AWS S3] [Integration Tests]: Investigate Test Failures in CustomerCustomAttributes module

Author: oshmyheliuk

app/code/Magento/RemoteStorage/Model/File/Uploader.php

@@ -34,19 +34,27 @@ class Uploader extends \Magento\Framework\File\Uploader
     /**
      * Copies file to the tmp directory if remote storage is enabled and tmp file is located on remote storage
      *
-     * {@inheritDoc}
+     * @param string|array $fileId
+     * @param Mime|null $fileMime
+     * @param DirectoryList|null $directoryList
+     * @param DriverPool|null $driverPool
+     * @param TargetDirectory|null $targetDirectory
+     * @param Filesystem|null $filesystem
+     * @param Config|null $config
+     * @throws \DomainException
      */
     public function __construct(
         $fileId,
         Mime $fileMime = null,
         DirectoryList $directoryList = null,
         DriverPool $driverPool = null,
         TargetDirectory $targetDirectory = null,
-        Filesystem $filesystem = null
+        Filesystem $filesystem = null,
+        Config $config = null
     ) {
         $targetDirectory = $targetDirectory ?: ObjectManager::getInstance()->get(TargetDirectory::class);
         $filesystem = $filesystem ?: ObjectManager::getInstance()->get(FileSystem::class);
-        $config = ObjectManager::getInstance()->get(Config::class);
+        $config = $config ?: ObjectManager::getInstance()->get(Config::class);
 
         if ($config->isEnabled() && isset($fileId['tmp_name'])) {
             $this->tmpDirectoryWrite = $filesystem->getDirectoryWrite(DirectoryList::TMP);
@@ -70,6 +78,7 @@ private function copyFileToTmp(string $filePath): string
         $absolutePath = $this->remoteDirectoryWrite->getAbsolutePath($filePath);
         if ($this->remoteDirectoryWrite->isFile($absolutePath)) {
             $this->tmpDirectoryWrite->create();
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $tmpPath = $this->tmpDirectoryWrite->getAbsolutePath() . basename($filePath);
             $content = $this->remoteDirectoryWrite->getDriver()->fileGetContents($filePath);
             $this->tmpDirectoryWrite->getDriver()->filePutContents($tmpPath, $content);