Merge remote-tracking branch 'tier4/ACP2E-3339' into PR-10-04-24

Author: dhorytskyi

app/code/Magento/Analytics/Model/ExportDataHandler.php

@@ -90,7 +90,7 @@ public function __construct(
     public function prepareExportData()
     {
         try {
-            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::TMP);
+            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
             $this->prepareDirectory($tmpDirectory, $this->getTmpFilesDirRelativePath());
             $this->reportWriter->write($tmpDirectory, $this->getTmpFilesDirRelativePath());
 
@@ -122,7 +122,17 @@ public function prepareExportData()
      */
     private function getTmpFilesDirRelativePath()
     {
-        return $this->subdirectoryPath . 'tmp/';
+        return $this->subdirectoryPath . 'tmp/' . $this->getInstanceIdentifier() . '/';
+    }
+
+    /**
+     * Return unique identifier for an instance.
+     *
+     * @return string
+     */
+    private function getInstanceIdentifier()
+    {
+        return hash('sha256', BP);
     }
 
     /**

app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php

@@ -112,13 +112,23 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Return unique identifier for an instance.
+     *
+     * @return string
+     */
+    private function getInstanceIdentifier()
+    {
+        return hash('sha256', BP);
+    }
+
     /**
      * @param bool $isArchiveSourceDirectory
      * @dataProvider prepareExportDataDataProvider
      */
     public function testPrepareExportData($isArchiveSourceDirectory)
     {
-        $tmpFilesDirectoryPath = $this->subdirectoryPath . 'tmp/';
+        $tmpFilesDirectoryPath = $this->subdirectoryPath . 'tmp/' . $this->getInstanceIdentifier() . '/';
         $archiveRelativePath = $this->subdirectoryPath . $this->archiveName;
 
         $archiveSource = $isArchiveSourceDirectory ? (__DIR__) : '/tmp/' . $tmpFilesDirectoryPath;
@@ -127,7 +137,7 @@ public function testPrepareExportData($isArchiveSourceDirectory)
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::TMP)
+            ->with(DirectoryList::SYS_TMP)
             ->willReturn($this->directoryMock);
         $this->directoryMock
             ->expects($this->exactly(4))
@@ -210,13 +220,13 @@ public static function prepareExportDataDataProvider()
     public function testPrepareExportDataWithLocalizedException()
     {
         $this->expectException('Magento\Framework\Exception\LocalizedException');
-        $tmpFilesDirectoryPath = $this->subdirectoryPath . 'tmp/';
+        $tmpFilesDirectoryPath = $this->subdirectoryPath . 'tmp/' . $this->getInstanceIdentifier() . '/';
         $archivePath = $this->subdirectoryPath . $this->archiveName;
 
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::TMP)
+            ->with(DirectoryList::SYS_TMP)
             ->willReturn($this->directoryMock);
         $this->reportWriterMock
             ->expects($this->once())