B2B-2033: [AWS S3] [Integration Tests]: Investigate Test Failures in ScheduledImportExport module

oshmyheliuk · oshmyheliuk · commit 218684953f93 · 2021-12-03T11:54:04.000-06:00
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
@@ -638,10 +638,11 @@ public function uploadFileAndGetSource()
      */
     protected function _removeBom($sourceFile)
     {
-        $string = $this->_varDirectory->readFile($this->_varDirectory->getRelativePath($sourceFile));
+        $driver = $this->_varDirectory->getDriver();
+        $string = $driver->fileGetContents($this->_varDirectory->getAbsolutePath($sourceFile));
         if ($string !== false && substr($string, 0, 3) == pack("CCC", 0xef, 0xbb, 0xbf)) {
             $string = substr($string, 3);
-            $this->_varDirectory->writeFile($this->_varDirectory->getRelativePath($sourceFile), $string);
+            $driver->filePutContents($this->_varDirectory->getAbsolutePath($sourceFile), $string);
         }
         return $this;
     }

Original file line number	Diff line number	Diff line change
`@@ -638,10 +638,11 @@ public function uploadFileAndGetSource()`
`638`	`638`	`*/`
`639`	`639`	`protected function _removeBom($sourceFile)`
`640`	`640`	`{`
`641`		`- $string = $this->_varDirectory->readFile($this->_varDirectory->getRelativePath($sourceFile));`
	`641`	`+ $driver = $this->_varDirectory->getDriver();`
	`642`	`+ $string = $driver->fileGetContents($this->_varDirectory->getAbsolutePath($sourceFile));`
`642`	`643`	`if ($string !== false && substr($string, 0, 3) == pack("CCC", 0xef, 0xbb, 0xbf)) {`
`643`	`644`	`$string = substr($string, 3);`
`644`		`- $this->_varDirectory->writeFile($this->_varDirectory->getRelativePath($sourceFile), $string);`
	`645`	`+ $driver->filePutContents($this->_varDirectory->getAbsolutePath($sourceFile), $string);`
`645`	`646`	`}`
`646`	`647`	`return $this;`
`647`	`648`	`}`