Merge branch '2.4-develop' into AC-1271

# Conflicts:
#	app/etc/di.xml

Author: arhiopterecs

app/code/Magento/AdminAdobeIms/composer.json

@@ -33,7 +33,7 @@
             "registration.php"
         ],
         "psr-4": {
-            "Magento\\Backend\\": ""
+            "Magento\\AdminAdobeIms\\": ""
         }
     }
 }

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/AdobeStock_232925587.png

@@ -55,9 +55,7 @@ public function execute(int $adminUserId = null): ?string
     {
         try {
             $adminUserId = $adminUserId ?? (int) $this->userContext->getUserId();
-            return $this->encryptor->decrypt(
-                $this->userProfileRepository->getByUserId($adminUserId)->getAccessToken()
-            );
+            return $this->userProfileRepository->getByUserId($adminUserId)->getAccessToken();
         } catch (NoSuchEntityException $exception) {
             return null;
         }

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/[email protected]

@@ -72,13 +72,6 @@ public function testExecute(?string $token): void
             ->willReturn($userProfileMock);
         $userProfileMock->expects($this->once())->method('getAccessToken')->willReturn($token);
 
-        $decryptedToken = $token ?? '';
-
-        $this->encryptor->expects($this->once())
-            ->method('decrypt')
-            ->with($token)
-            ->willReturn($decryptedToken);
-
         $this->assertEquals($token, $this->getAccessToken->execute());
     }
 

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/adobe-commerce-dark.png

@@ -7,7 +7,7 @@ The Magento_AdvancedSearch module introduces advanced search functionality and p
 Before disabling or uninstalling this module, note that the following modules depends on this module:
 
 - Magento_Elasticsearch
-- Magento_Elasticsearch6
+- Magento_Elasticsearch7
 
 For information about module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-subcommands-enable.html).
 

app/code/Magento/AdminAdobeIms/view/adminhtml/web/images/adobe-commerce-light.png

@@ -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/AdobeIms/Model/GetAccessToken.php

@@ -1,6 +1,6 @@
 # Magento_Analytics module
 
-The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html) functionality.
+The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://business.adobe.com/products/magento/business-intelligence.html) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html) functionality.
 
 The module implements the following functionality: