Merge remote-tracking branch 'origin/2.4-develop' into ACP2E-4270

Author: bubasuma

app/code/Magento/Backend/Block/Cache.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2013 Adobe
+ * Copyright 2011 Adobe
  * All Rights Reserved.
  */
 namespace Magento\Backend\Block;
@@ -35,7 +35,11 @@ protected function _construct()
         }
 
         if ($this->_authorization->isAllowed('Magento_Backend::flush_cache_storage')) {
-            $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?');
+            $message = $this->escapeJs(
+                $this->escapeHtml(
+                    __('The cache storage may contain additional data. Are you sure that you want to flush it?')
+                )
+            );
             $this->buttonList->add(
                 'flush_system',
                 [

app/code/Magento/Backend/Block/System/Design/Edit.php

@@ -1,10 +1,13 @@
 <?php
 /**
- * Copyright 2013 Adobe
+ * Copyright 2011 Adobe
  * All Rights Reserved.
  */
 namespace Magento\Backend\Block\System\Design;
 
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Edit store design schedule block.
  */
@@ -16,25 +19,35 @@ class Edit extends \Magento\Backend\Block\Widget
     protected $_template = 'Magento_Backend::system/design/edit.phtml';
 
     /**
-     * Core registry
+     * Application data storage
      *
      * @var \Magento\Framework\Registry
      */
     protected $_coreRegistry = null;
 
+    /**
+     * Escaper for secure output rendering
+     *
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @inheritdoc
      *
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
+     * @param Escaper|null $escaper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
-        array $data = []
+        array $data = [],
+        ?Escaper $escaper = null
     ) {
         $this->_coreRegistry = $registry;
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(Escaper::class);
         parent::__construct($context, $data);
     }
 
@@ -66,14 +79,17 @@ protected function _prepareLayout()
         );
 
         if ($this->getDesignChangeId()) {
+            $confirmMessage = $this->escaper->escapeJs(
+                $this->escaper->escapeHtml(__('Are you sure?'))
+            );
+            $deleteOnClick = 'deleteConfirm(\'' . $confirmMessage . '\', \'' .
+                $this->getDeleteUrl() . '\', {data: {}})';
             $this->getToolbar()->addChild(
                 'delete_button',
                 \Magento\Backend\Block\Widget\Button::class,
                 [
                     'label' => __('Delete'),
-                    'onclick' => 'deleteConfirm(\'' . __(
-                        'Are you sure?'
-                    ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})',
+                    'onclick' => $deleteOnClick,
                     'class' => 'delete'
                 ]
             );

app/code/Magento/Backend/Block/Widget/Form/Container.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2013 Adobe
+ * Copyright 2011 Adobe
  * All Rights Reserved.
  */
 namespace Magento\Backend\Block\Widget\Form;
@@ -13,7 +13,8 @@
  * Backend form container block
  *
  * @api
- * @deprecated 100.2.0 in favour of UI component implementation
+ * @deprecated 100.2.0 Use UI components for form rendering instead of this legacy form container
+ * @see \Magento\Ui\Component\Form
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2
  */
@@ -45,14 +46,14 @@ class Container extends \Magento\Backend\Block\Widget\Container
     protected $_blockGroup = 'Magento_Backend';
 
     /**
-     *  @var string
+     * @var string
      */
-    const PARAM_BLOCK_GROUP = 'block_group';
+    public const PARAM_BLOCK_GROUP = 'block_group';
 
     /**
-     *  @var string
+     * @var string
      */
-    const PARAM_MODE = 'mode';
+    public const PARAM_MODE = 'mode';
 
     /**
      * @var string
@@ -111,14 +112,17 @@ protected function _construct()
         $objId = (int)$this->getRequest()->getParam($this->_objectId);
 
         if (!empty($objId)) {
+            $confirmMessage = $this->escapeJs(
+                $this->escapeHtml(__('Are you sure you want to do this?'))
+            );
+            $deleteOnClick = 'deleteConfirm(\'' . $confirmMessage . '\', \'' .
+                $this->getDeleteUrl() . '\', {data: {}})';
             $this->addButton(
                 'delete',
                 [
                     'label' => __('Delete'),
                     'class' => 'delete',
-                    'onclick' => 'deleteConfirm(\'' . __(
-                        'Are you sure you want to do this?'
-                    ) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})'
+                    'onclick' => $deleteOnClick
                 ]
             );
         }

app/code/Magento/Bundle/Model/LinkManagement.php

@@ -252,6 +252,9 @@ private function processLinkedProduct(
             throw new CouldNotSaveException(__('Could not save child: "%1"', $e->getMessage()), $e);
         }
 
+        $linkedProduct->setId($selectionModel->getId());
+        $linkedProduct->setSelectionId($selectionModel->getId());
+        $linkedProduct->setOptionId($optionId);
         return (int)$selectionModel->getId();
     }
 
@@ -450,14 +453,16 @@ public function removeChild($sku, $optionId, $childSku)
         $excludeSelectionIds = [];
         $usedProductIds = [];
         $removeSelectionIds = [];
+        $removeProductIds = [];
         foreach ($this->getOptions($product) as $option) {
             /** @var Selection $selection */
             foreach ($option->getSelections() as $selection) {
                 if ((strcasecmp($selection->getSku(), $childSku) == 0) && ($selection->getOptionId() == $optionId)) {
                     $removeSelectionIds[] = $selection->getSelectionId();
-                    $usedProductIds[] = $selection->getProductId();
+                    $removeProductIds[] = $selection->getProductId();
                     continue;
                 }
+                $usedProductIds[] = $selection->getProductId();
                 $excludeSelectionIds[] = $selection->getSelectionId();
             }
         }
@@ -470,7 +475,10 @@ public function removeChild($sku, $optionId, $childSku)
         /* @var $resource Bundle */
         $resource = $this->bundleFactory->create();
         $resource->dropAllUnneededSelections($product->getData($linkField), $excludeSelectionIds);
-        $resource->removeProductRelations($product->getData($linkField), array_unique($usedProductIds));
+        $productRelationsToRemove = array_diff($removeProductIds, $usedProductIds);
+        if ($productRelationsToRemove) {
+            $resource->removeProductRelations($product->getData($linkField), array_unique($productRelationsToRemove));
+        }
 
         return true;
     }

app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php

@@ -35,10 +35,15 @@ public function build(Product $product, Product $duplicate)
              * Set option and selection ids to 'null' in order to create new option(selection) for duplicated product,
              * but not modifying existing one, which led to lost of option(selection) in original product.
              */
-            $productLinks = $duplicatedBundleOption->getProductLinks() ?: [];
-            foreach ($productLinks as $productLink) {
-                $productLink->setSelectionId(null);
+            $productLinks = [];
+            foreach ($duplicatedBundleOption->getProductLinks() ?: [] as $productLink) {
+                $productLinkDuplicate = clone $productLink;
+                $productLinkDuplicate->setId(null);
+                $productLinkDuplicate->setSelectionId(null);
+                $productLinkDuplicate->setOptionId(null);
+                $productLinks[] = $productLinkDuplicate;
             }
+            $duplicatedBundleOption->setProductLinks($productLinks);
             $duplicatedBundleOption->setOptionId(null);
             $duplicatedBundleOptions[$key] = $duplicatedBundleOption;
         }

app/code/Magento/Bundle/Model/Product/SaveHandler.php

@@ -141,10 +141,7 @@ protected function removeOptionLinks($entitySku, $option)
         $links = $option->getProductLinks();
         if (!empty($links)) {
             foreach ($links as $link) {
-                $linkCanBeDeleted = $this->checkOptionLinkIfExist->execute($entitySku, $option, $link);
-                if ($linkCanBeDeleted) {
-                    $this->productLinkManagement->removeChild($entitySku, $option->getId(), $link->getSku());
-                }
+                $this->productLinkManagement->removeChild($entitySku, $option->getId(), $link->getSku());
             }
         }
     }

app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php

@@ -639,14 +639,11 @@ static function () {
      */
     public function testAddChild(): void
     {
-        $productLink = $this->getMockBuilder(LinkInterface::class)
-            ->onlyMethods(['getSku', 'getOptionId'])
-            ->addMethods(['getSelectionId'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $productLink->method('getSku')->willReturn('linked_product_sku');
-        $productLink->method('getOptionId')->willReturn(1);
-        $productLink->method('getSelectionId')->willReturn(1);
+        $selectionId = 42;
+        $optionId = 1;
+        $sku = 'linked_product_sku';
+        $productLink = $this->createPartialMock(\Magento\Bundle\Model\Link::class, []);
+        $productLink->setSku($sku);
 
         $this->metadataMock->expects($this->exactly(2))->method('getLinkField')->willReturn($this->linkField);
         $productMock = $this->createMock(Product::class);
@@ -662,7 +659,7 @@ public function testAddChild(): void
         $this->productRepository
             ->expects($this->once())
             ->method('get')
-            ->with('linked_product_sku')
+            ->with($sku)
             ->willReturn($linkedProductMock);
 
         $store = $this->createMock(Store::class);
@@ -698,10 +695,14 @@ public function testAddChild(): void
 
         $selection = $this->createPartialMock(Selection::class, ['save', 'getId', 'load']);
         $selection->expects($this->once())->method('save');
-        $selection->expects($this->once())->method('getId')->willReturn(42);
+        $selection->expects($this->any())->method('getId')->willReturn($selectionId);
         $this->bundleSelectionMock->expects($this->once())->method('create')->willReturn($selection);
-        $result = $this->model->addChild($productMock, 1, $productLink);
-        $this->assertEquals(42, $result);
+
+        $result = $this->model->addChild($productMock, $optionId, $productLink);
+        $this->assertEquals($selectionId, $result);
+        $this->assertEquals($selectionId, $productLink->getId());
+        $this->assertEquals($selectionId, $productLink->getSelectionId());
+        $this->assertEquals($optionId, $productLink->getOptionId());
     }
 
     /**