Merge branch 'bugfix/issue-29373' of github.com:innobyte/magento2 into 2.4-develop-prs

Author: ishakhsuvarov

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

@@ -8,6 +8,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Archive;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -89,8 +90,7 @@ public function __construct(
     public function prepareExportData()
     {
         try {
-            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
-
+            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::TMP);
             $this->prepareDirectory($tmpDirectory, $this->getTmpFilesDirRelativePath());
             $this->reportWriter->write($tmpDirectory, $this->getTmpFilesDirRelativePath());
 
@@ -106,8 +106,10 @@ public function prepareExportData()
                 $this->cryptographer->encode($tmpDirectory->readFile($this->getArchiveRelativePath()))
             );
         } finally {
-            $tmpDirectory->delete($this->getTmpFilesDirRelativePath());
-            $tmpDirectory->delete($this->getArchiveRelativePath());
+            if (isset($tmpDirectory)) {
+                $tmpDirectory->delete($this->getTmpFilesDirRelativePath());
+                $tmpDirectory->delete($this->getArchiveRelativePath());
+            }
         }
 
         return true;

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

@@ -15,7 +15,7 @@
 use Magento\Framework\Archive;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
-use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -127,7 +127,7 @@ public function testPrepareExportData($isArchiveSourceDirectory)
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::SYS_TMP)
+            ->with(DirectoryList::TMP)
             ->willReturn($this->directoryMock);
         $this->directoryMock
             ->expects($this->exactly(4))
@@ -228,7 +228,7 @@ public function testPrepareExportDataWithLocalizedException()
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::SYS_TMP)
+            ->with(DirectoryList::TMP)
             ->willReturn($this->directoryMock);
         $this->reportWriterMock
             ->expects($this->once())