Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-841

Author: Mohan Ahuja

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/README.md

@@ -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:
 

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())

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -527,6 +527,10 @@ public function getRealPath($path)
      */
     public function rename($oldPath, $newPath, DriverInterface $targetDriver = null): bool
     {
+        if ($oldPath === $newPath) {
+            return true;
+        }
+
         try {
             $this->adapter->move(
                 $this->normalizeRelativePath($oldPath, true),

app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

@@ -496,4 +496,21 @@ public function testCreateDirectory(): void
 
         self::assertTrue($this->driver->createDirectory(self::URL . 'test/test2/'));
     }
+
+    public function testRename(): void
+    {
+        $this->adapterMock->expects(self::once())
+            ->method('move')
+            ->with('test/path', 'test/path2');
+
+        self::assertTrue($this->driver->rename('test/path', 'test/path2'));
+    }
+
+    public function testRenameSameDestination(): void
+    {
+        $this->adapterMock->expects(self::never())
+            ->method('move');
+
+        self::assertTrue($this->driver->rename('test/path', 'test/path'));
+    }
 }

app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml

@@ -11,5 +11,8 @@
     <section name="AdminSystemAccountSection">
         <element name="interfaceLocale" type="select" selector="#interface_locale"/>
         <element name="currentPassword" type="text" selector="#current_password"/>
+        <element name="username" type="text" selector="#username"/>
+        <element name="newPassword" type="text" selector="#password"/>
+        <element name="passwordConfirmation" type="text" selector="#confirmation"/>
     </section>
 </sections>

app/code/Magento/Backend/etc/menu.xsd

@@ -85,7 +85,7 @@
     <xs:simpleType name="typeId">
         <xs:annotation>
             <xs:documentation>
-                Item id attribute can has only [a-z0-9/_]. Minimal length 3 symbol. Case insensitive.
+                Item id attribute can have only [a-z0-9/_]. Minimal length 3 characters. Case insensitive.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -96,7 +96,7 @@
     <xs:simpleType name="typeAction">
         <xs:annotation>
             <xs:documentation>
-                Item action attribute can has only [a-zA-Z0-9/_]. Minimal length 3 symbol
+                Item action attribute can have only [a-zA-Z0-9/_]. Minimal length 3 characters.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -107,7 +107,7 @@
     <xs:simpleType name="typeTitle">
         <xs:annotation>
             <xs:documentation>
-                Item title attribute minimal length 3 symbol
+                Item title attribute minimal length 3 characters.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -119,7 +119,7 @@
     <xs:simpleType name="typeModule">
         <xs:annotation>
             <xs:documentation>
-                Item module attribute can has only [a-z0-9_]. Minimal length 3 symbol. Case insensitive.
+                Item module attribute can have only [a-z0-9_]. Minimal length 3 characters. Case insensitive.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -130,7 +130,7 @@
     <xs:simpleType name="typeResource">
         <xs:annotation>
             <xs:documentation>
-                Item resource attribute can has only [a-z0-9_]. Minimal length 3 symbol. Case insensitive.
+                Item resource attribute can have only [a-z0-9_]. Minimal length 3 characters. Case insensitive.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -141,7 +141,7 @@
     <xs:simpleType name="typeDependsConfig">
         <xs:annotation>
             <xs:documentation>
-                Item resource attribute can has only [a-z0-9_]. Minimal length 3 symbol. Case insensitive.
+                Item dependsOnConfig attribute can have only [a-z0-9_]. Minimal length 3 characters. Case insensitive.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">

app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml

@@ -40,8 +40,11 @@
 
         <!-- Go to new product page and see a default attribute -->
         <!-- Switch from default attribute set to new attribute set -->
-        <amOnPage url="{{AdminProductCreatePage.url('4', 'bundle')}}" stepKey="goToNewProductPage"/>
-        <waitForPageLoad stepKey="wait2"/>
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToNewProductPage">
+            <argument name="attributeSetId" value="4"/>
+            <argument name="productType" value="bundle"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait2"/>
 
         <actionGroup ref="AdminSelectAttributeSetOnEditProductPageActionGroup" stepKey="startEditAttrSet">
             <argument name="attributeSet" value="{{ProductAttributeFrontendLabel.label}}"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml

@@ -40,7 +40,10 @@
         </actionGroup>
 
         <!--Go to product creation page-->
-        <actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+            <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+            <argument name="productType" value="{{BundleProduct.type}}"/>
+        </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
 
         <!--Enable/Disable Toggle-->

app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml

@@ -31,7 +31,11 @@
         </after>
 
         <!--Create bundle product-->
-        <actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
+            <argument name="attributeSetId" value="{{BundleProduct.set}}"/>
+            <argument name="productType" value="{{BundleProduct.type}}"/>
+        </actionGroup>
+
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
         <conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
         <click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>