[Forwardport] Add 'const' type support to layout arguments

app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php

@@ -10,6 +10,10 @@
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 
 /**
  * @api
@@ -29,22 +33,30 @@ class Index extends AbstractDb
      */
     protected $metadataPool;
 
+    /**
+     * @var TableResolver
+     */
+    private $tableResolver;
+
     /**
      * Index constructor.
      * @param Context $context
      * @param StoreManagerInterface $storeManager
      * @param MetadataPool $metadataPool
      * @param null $connectionName
+     * @param TableResolver|null $tableResolver
      */
     public function __construct(
         Context $context,
         StoreManagerInterface $storeManager,
         MetadataPool $metadataPool,
-        $connectionName = null
+        $connectionName = null,
+        TableResolver $tableResolver = null
     ) {
         parent::__construct($context, $connectionName);
         $this->storeManager = $storeManager;
         $this->metadataPool = $metadataPool;
+        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
     }
 
     /**
@@ -116,8 +128,17 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null)
     {
         $connection = $this->getConnection();
 
+        $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $storeId);
+
+        $catalogCategoryProductTableName = $this->tableResolver->resolve(
+            AbstractAction::MAIN_INDEX_TABLE,
+            [
+                $catalogCategoryProductDimension
+            ]
+        );
+
         $select = $connection->select()->from(
-            [$this->getTable('catalog_category_product_index')],
+            [$catalogCategoryProductTableName],
             ['category_id', 'product_id', 'position', 'store_id']
         )->where(
             'store_id = ?',

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

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block;
 
 /**
@@ -17,10 +20,12 @@
  * Example:
  * <block name="my.block" class="Magento\Backend\Block\Template" template="My_Module::template.phtml" >
  *      <arguments>
- *          <argument name="viewModel" xsi:type="object">My\Module\ViewModel\Custom</argument>
+ *          <argument name="view_model" xsi:type="object">My\Module\ViewModel\Custom</argument>
  *      </arguments>
  * </block>
  *
+ * Your class object can then be accessed by doing $block->getViewModel()
+ *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php

@@ -65,7 +65,7 @@ public function render(\Magento\Framework\DataObject $row)
      */
     protected function _getCheckboxHtml($value, $checked)
     {
-        $id = 'id_' . rand(0, 999);
+        $id = 'id_' . random_int(0, 999);
         $html = '<label class="data-grid-checkbox-cell-inner" for="'. $id .'">';
         $html .= '<input type="checkbox" name="' . $this->getColumn()->getName() . '" ';
         $html .= 'id="' . $id . '" data-role="select-row"';

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -136,7 +136,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Add Block Names to Hints</label>
+                    <label>Add Block Class Type to Hints</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>

app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php

@@ -66,6 +66,13 @@ public function __construct(
     public function beforeSave()
     {
         $value = $this->getValue();
+        if (!is_array($value)) {
+            try {
+                $value = $this->serializer->unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $value = [];
+            }
+        }
         $result = [];
         foreach ($value as $data) {
             if (empty($data['country_id']) || empty($data['cc_types'])) {

app/code/Magento/Bundle/Model/Option/SaveAction.php

@@ -0,0 +1,195 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Option;
+
+use Magento\Bundle\Api\Data\OptionInterface;
+use Magento\Bundle\Model\ResourceModel\Option;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Bundle\Api\ProductLinkManagementInterface;
+
+/**
+ * Encapsulates logic for saving a bundle option, including coalescing the parent product's data.
+ */
+class SaveAction
+{
+    /**
+     * @var Option
+     */
+    private $optionResource;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @var ProductLinkManagementInterface
+     */
+    private $linkManagement;
+
+    /**
+     * @param Option $optionResource
+     * @param MetadataPool $metadataPool
+     * @param Type $type
+     * @param ProductLinkManagementInterface $linkManagement
+     */
+    public function __construct(
+        Option $optionResource,
+        MetadataPool $metadataPool,
+        Type $type,
+        ProductLinkManagementInterface $linkManagement
+    ) {
+        $this->optionResource = $optionResource;
+        $this->metadataPool = $metadataPool;
+        $this->type = $type;
+        $this->linkManagement = $linkManagement;
+    }
+
+    /**
+     * Manage the logic of saving a bundle option, including the coalescence of its parent product data.
+     *
+     * @param ProductInterface $bundleProduct
+     * @param OptionInterface $option
+     * @return OptionInterface
+     * @throws CouldNotSaveException
+     * @throws \Exception
+     */
+    public function save(ProductInterface $bundleProduct, OptionInterface $option)
+    {
+        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+
+        $option->setStoreId($bundleProduct->getStoreId());
+        $parentId = $bundleProduct->getData($metadata->getLinkField());
+        $option->setParentId($parentId);
+
+        $optionId = $option->getOptionId();
+        $linksToAdd = [];
+        $optionCollection = $this->type->getOptionsCollection($bundleProduct);
+        $optionCollection->setIdFilter($option->getOptionId());
+        $optionCollection->setProductLinkFilter($parentId);
+
+        /** @var \Magento\Bundle\Model\Option $existingOption */
+        $existingOption = $optionCollection->getFirstItem();
+        if (!$optionId || $existingOption->getParentId() != $parentId) {
+            //If option ID is empty or existing option's parent ID is different
+            //we'd need a new ID for the option.
+            $option->setOptionId(null);
+            $option->setDefaultTitle($option->getTitle());
+            if (is_array($option->getProductLinks())) {
+                $linksToAdd = $option->getProductLinks();
+            }
+        } else {
+            if (!$existingOption->getOptionId()) {
+                throw new NoSuchEntityException(
+                    __("The option that was requested doesn't exist. Verify the entity and try again.")
+                );
+            }
+
+            $option->setData(array_merge($existingOption->getData(), $option->getData()));
+            $this->updateOptionSelection($bundleProduct, $option);
+        }
+
+        try {
+            $this->optionResource->save($option);
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(__("The option couldn't be saved."), $e);
+        }
+
+        /** @var \Magento\Bundle\Api\Data\LinkInterface $linkedProduct */
+        foreach ($linksToAdd as $linkedProduct) {
+            $this->linkManagement->addChild($bundleProduct, $option->getOptionId(), $linkedProduct);
+        }
+
+        $bundleProduct->setIsRelationsChanged(true);
+
+        return $option;
+    }
+
+    /**
+     * Update option selections
+     *
+     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param \Magento\Bundle\Api\Data\OptionInterface $option
+     * @return void
+     */
+    private function updateOptionSelection(ProductInterface $product, OptionInterface $option)
+    {
+        $optionId = $option->getOptionId();
+        $existingLinks = $this->linkManagement->getChildren($product->getSku(), $optionId);
+        $linksToAdd = [];
+        $linksToUpdate = [];
+        $linksToDelete = [];
+        if (is_array($option->getProductLinks())) {
+            $productLinks = $option->getProductLinks();
+            foreach ($productLinks as $productLink) {
+                if (!$productLink->getId() && !$productLink->getSelectionId()) {
+                    $linksToAdd[] = $productLink;
+                } else {
+                    $linksToUpdate[] = $productLink;
+                }
+            }
+            /** @var \Magento\Bundle\Api\Data\LinkInterface[] $linksToDelete */
+            $linksToDelete = $this->compareLinks($existingLinks, $linksToUpdate);
+        }
+        foreach ($linksToUpdate as $linkedProduct) {
+            $this->linkManagement->saveChild($product->getSku(), $linkedProduct);
+        }
+        foreach ($linksToDelete as $linkedProduct) {
+            $this->linkManagement->removeChild(
+                $product->getSku(),
+                $option->getOptionId(),
+                $linkedProduct->getSku()
+            );
+        }
+        foreach ($linksToAdd as $linkedProduct) {
+            $this->linkManagement->addChild($product, $option->getOptionId(), $linkedProduct);
+        }
+    }
+
+    /**
+     * Compute the difference between given arrays.
+     *
+     * @param \Magento\Bundle\Api\Data\LinkInterface[] $firstArray
+     * @param \Magento\Bundle\Api\Data\LinkInterface[] $secondArray
+     *
+     * @return array
+     */
+    private function compareLinks(array $firstArray, array $secondArray)
+    {
+        $result = [];
+
+        $firstArrayIds = [];
+        $firstArrayMap = [];
+
+        $secondArrayIds = [];
+
+        foreach ($firstArray as $item) {
+            $firstArrayIds[] = $item->getId();
+
+            $firstArrayMap[$item->getId()] = $item;
+        }
+
+        foreach ($secondArray as $item) {
+            $secondArrayIds[] = $item->getId();
+        }
+
+        foreach (array_diff($firstArrayIds, $secondArrayIds) as $id) {
+            $result[] = $firstArrayMap[$id];
+        }
+
+        return $result;
+    }
+}