Merge remote-tracking branch 'origin/2.4-develop' into AC-2044

Author: rimple-saini

app/code/Magento/Authorization/Model/CompositeUserContext.php

@@ -7,6 +7,7 @@
 namespace Magento\Authorization\Model;
 
 use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * User context.
@@ -17,7 +18,7 @@
  * @api
  * @since 100.0.2
  */
-class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface
+class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface, ResetAfterRequestInterface
 {
     /**
      * @var UserContextInterface[]
@@ -92,4 +93,12 @@ protected function getUserContext()
         }
         return $this->chosenUserContext;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->chosenUserContext = null;
+    }
 }

app/code/Magento/Backend/Model/Auth/Session.php

@@ -114,6 +114,16 @@ public function __construct(
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_isFirstAfterLogin = null;
+        $this->acl = null;
+    }
+
     /**
      * Refresh ACL resources stored in session
      *

app/code/Magento/Backend/Model/Session/Quote.php

@@ -139,6 +139,17 @@ public function __construct(
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_quote = null;
+        $this->_store = null;
+        $this->_order = null;
+    }
+
     /**
      * Retrieve quote model object
      *
@@ -154,7 +165,7 @@ public function getQuote()
                     $this->_quote->setCustomerGroupId($customerGroupId);
                     $this->_quote->setIsActive(false);
                     $this->_quote->setStoreId($this->getStoreId());
-                    
+
                     $this->quoteRepository->save($this->_quote);
                     $this->setQuoteId($this->_quote->getId());
                     $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);

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

@@ -18,5 +18,8 @@
         <element name="defaultLocale" type="checkbox" selector="#general_locale_code_inherit"/>
         <element name="checkIfTabExpand" type="button" selector="#general_locale-head:not(.open)"/>
         <element name="timeZoneDropdown" type="select" selector="//select[@id='general_locale_timezone']"/>
+        <element name="changeStoreConfigButton" type="button" selector="//button[@id='store-change-button']"/>
+        <element name="changeStoreConfigToSpecificWebsite" type="select" selector="//a[contains(text(),'{{var}}')]" parameterized="true"/>
+        <element name="changeWebsiteConfirmButton" type="button" selector="//button[@class='action-primary action-accept']/span"/>
     </section>
 </sections>

app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php

@@ -6,9 +6,10 @@
  */
 namespace Magento\Backup\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-class Download extends \Magento\Backup\Controller\Adminhtml\Index
+class Download extends \Magento\Backup\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
@@ -66,17 +67,12 @@ public function execute()
 
         $fileName = $this->_objectManager->get(\Magento\Backup\Helper\Data::class)->generateBackupDownloadName($backup);
 
-        $this->_fileFactory->create(
+        return $this->_fileFactory->create(
             $fileName,
-            null,
+            ['type' => 'filename', 'value' => $backup->getPath() . DIRECTORY_SEPARATOR . $backup->getFileName()],
             DirectoryList::VAR_DIR,
             'application/octet-stream',
             $backup->getSize()
         );
-
-        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
-        $resultRaw = $this->resultRawFactory->create();
-        $resultRaw->setContents($backup->output());
-        return $resultRaw;
     }
 }

app/code/Magento/Backup/Model/ResourceModel/Db.php

@@ -301,7 +301,7 @@ public function rollBackTransaction()
      */
     public function runCommand($command)
     {
-        $this->connection->query($command);
+        $this->connection->multiQuery($command);
         return $this;
     }
 }

app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php

@@ -115,7 +115,7 @@ protected function setUp(): void
             ->getMock();
         $this->backupModelMock = $this->getMockBuilder(Backup::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getTime', 'exists', 'getSize', 'output'])
+            ->setMethods(['getTime', 'exists', 'getSize', 'output', 'getPath', 'getFileName'])
             ->getMock();
         $this->dataHelperMock = $this->getMockBuilder(Data::class)
             ->disableOriginalConstructor()
@@ -169,8 +169,13 @@ public function testExecuteBackupFound()
         $type = 'db';
         $filename = 'filename';
         $size = 10;
-        $output = 'test';
-
+        $path = 'testpath';
+        $this->backupModelMock->expects($this->atLeastOnce())
+            ->method('getPath')
+            ->willReturn($path);
+        $this->backupModelMock->expects($this->atLeastOnce())
+            ->method('getFileName')
+            ->willReturn($filename);
         $this->backupModelMock->expects($this->atLeastOnce())
             ->method('getTime')
             ->willReturn($time);
@@ -180,9 +185,6 @@ public function testExecuteBackupFound()
         $this->backupModelMock->expects($this->atLeastOnce())
             ->method('getSize')
             ->willReturn($size);
-        $this->backupModelMock->expects($this->atLeastOnce())
-            ->method('output')
-            ->willReturn($output);
         $this->requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap(
@@ -206,20 +208,14 @@ public function testExecuteBackupFound()
         $this->fileFactoryMock->expects($this->once())
             ->method('create')->with(
                 $filename,
-                null,
+                ['type' => 'filename', 'value' => $path . '/' . $filename],
                 DirectoryList::VAR_DIR,
                 'application/octet-stream',
                 $size
             )
             ->willReturn($this->responseMock);
-        $this->resultRawMock->expects($this->once())
-            ->method('setContents')
-            ->with($output);
-        $this->resultRawFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($this->resultRawMock);
 
-        $this->assertSame($this->resultRawMock, $this->downloadController->execute());
+        $this->assertSame($this->responseMock, $this->downloadController->execute());
     }
 
     /**

app/code/Magento/Bundle/Api/ProductLinkManagementAddChildrenInterface.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Api;
+
+/**
+ * Interface for Bulk children addition
+ */
+interface ProductLinkManagementAddChildrenInterface
+{
+    /**
+     * Bulk add children operation
+     *
+     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param int $optionId
+     * @param \Magento\Bundle\Api\Data\LinkInterface[] $linkedProducts
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @return void
+     */
+    public function addChildren(
+        \Magento\Catalog\Api\Data\ProductInterface $product,
+        int $optionId,
+        array $linkedProducts
+    );
+}

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -19,6 +19,7 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Json\EncoderInterface;
 use Magento\Framework\Locale\FormatInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
@@ -28,7 +29,7 @@
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Bundle extends AbstractView
+class Bundle extends AbstractView implements ResetAfterRequestInterface
 {
     /**
      * @var array
@@ -421,4 +422,13 @@ function (&$selection, $selectionId) use ($preConfiguredQtys) {
 
         return $options;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->selectedOptions = [];
+        $this->optionsPosition = [];
+    }
 }