Merge branch 2.3-develop into ENGCOM-3621-magento-magento2-19502

Author: magento-engcom-team

app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml

@@ -83,7 +83,7 @@ $ccType = $block->getInfoData('cc_type');
                    id="<?= /* @noEscape */ $code ?>_vault"
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
-            <label class="label" for="<?= /* @noEscape */ $code ?>_vault">
+            <label class="label admin__field-label" for="<?= /* @noEscape */ $code ?>_vault">
                 <span><?= $block->escapeHtml(__('Save for later use.')) ?></span>
             </label>
         </div>

app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Plugin\Frontend;
+
+use Magento\Bundle\Model\Product\Type;
+use Magento\Catalog\Model\Product as CatalogProduct;
+
+/**
+ * Add child identities to product identities on storefront.
+ */
+class Product
+{
+    /**
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @param Type $type
+     */
+    public function __construct(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * Add child identities to product identities
+     *
+     * @param CatalogProduct $product
+     * @param array $identities
+     * @return array
+     */
+    public function afterGetIdentities(CatalogProduct $product, array $identities): array
+    {
+        foreach ($this->type->getChildrenIds($product->getEntityId()) as $childIds) {
+            foreach ($childIds as $childId) {
+                $identities[] = CatalogProduct::CACHE_TAG . '_' . $childId;
+            }
+        }
+
+        return array_unique($identities);
+    }
+}

app/code/Magento/Bundle/Test/Unit/Model/Plugin/Frontend/ProductTest.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Unit\Model\Plugin\Frontend;
+
+use Magento\Bundle\Model\Plugin\Frontend\Product as ProductPlugin;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Catalog\Model\Product;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class ProductTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var  \Magento\Bundle\Model\Plugin\Product */
+    private $plugin;
+
+    /** @var  MockObject|Type */
+    private $type;
+
+    /** @var  MockObject|\Magento\Catalog\Model\Product */
+    private $product;
+
+    protected function setUp()
+    {
+        $this->product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityId'])
+            ->getMock();
+
+        $this->type = $this->getMockBuilder(Type::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getChildrenIds'])
+            ->getMock();
+
+        $this->plugin = new ProductPlugin($this->type);
+    }
+
+    public function testAfterGetIdentities()
+    {
+        $baseIdentities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+        ];
+        $id = 12345;
+        $childIds = [
+            1 => [1, 2, 5, 100500],
+            12 => [7, 22, 45, 24612]
+        ];
+        $expectedIdentities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+            Product::CACHE_TAG . '_' . 1,
+            Product::CACHE_TAG . '_' . 2,
+            Product::CACHE_TAG . '_' . 5,
+            Product::CACHE_TAG . '_' . 100500,
+            Product::CACHE_TAG . '_' . 7,
+            Product::CACHE_TAG . '_' . 22,
+            Product::CACHE_TAG . '_' . 45,
+            Product::CACHE_TAG . '_' . 24612,
+        ];
+        $this->product->expects($this->once())
+            ->method('getEntityId')
+            ->will($this->returnValue($id));
+        $this->type->expects($this->once())
+            ->method('getChildrenIds')
+            ->with($id)
+            ->will($this->returnValue($childIds));
+        $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
+        $this->assertEquals($expectedIdentities, $identities);
+    }
+}

app/code/Magento/Bundle/etc/frontend/di.xml

@@ -13,4 +13,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product">
+        <plugin name="bundle" type="Magento\Bundle\Model\Plugin\Frontend\Product" sortOrder="100" />
+    </type>
 </config>

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php

@@ -322,7 +322,7 @@ protected function _prepareColumns()
     }
 
     /**
-     * Rerieve grid URL
+     * Retrieve grid URL
      *
      * @return string
      */

app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php

@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Catalog\Model\Layer\Filter\Item;
+
 /**
  * Item Data Builder
  */
-namespace Magento\Catalog\Model\Layer\Filter\Item;
-
 class DataBuilder
 {
     /**
@@ -29,7 +29,7 @@ class DataBuilder
      * Add Item Data
      *
      * @param string $label
-     * @param string $label
+     * @param string $value
      * @param int $count
      * @return void
      */

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js

@@ -91,8 +91,8 @@ define([
 
         /**
          * Add product list types as scope and their urls
-         * expamle: addListType('product_to_add', {urlFetch: 'http://magento...'})
-         * expamle: addListType('wishlist', {urlSubmit: 'http://magento...'})
+         * example: addListType('product_to_add', {urlFetch: 'http://magento...'})
+         * example: addListType('wishlist', {urlSubmit: 'http://magento...'})
          *
          * @param type types as scope
          * @param urls obj can be
@@ -112,7 +112,7 @@ define([
         /**
          * Adds complex list type - that is used to submit several list types at once
          * Only urlSubmit is possible for this list type
-         * expamle: addComplexListType(['wishlist', 'product_list'], 'http://magento...')
+         * example: addComplexListType(['wishlist', 'product_list'], 'http://magento...')
          *
          * @param type types as scope
          * @param urls obj can be

app/code/Magento/Catalog/view/adminhtml/web/js/form/element/action-delete.js

@@ -5,10 +5,10 @@
 define([
     'underscore',
     'Magento_Ui/js/form/element/abstract'
-], function (_, Acstract) {
+], function (_, Abstract) {
     'use strict';
 
-    return Acstract.extend({
+    return Abstract.extend({
         defaults: {
             prefixName: '',
             prefixElementName: '',

app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js

@@ -5,10 +5,10 @@
 define([
     'underscore',
     'Magento_Ui/js/form/element/abstract'
-], function (_, Acstract) {
+], function (_, Abstract) {
     'use strict';
 
-    return Acstract.extend({
+    return Abstract.extend({
         defaults: {
             prefixName: '',
             prefixElementName: '',

app/code/Magento/Catalog/view/base/web/js/price-utils.js

@@ -60,7 +60,7 @@ define([
         pattern = pattern.indexOf('{sign}') < 0 ? s + pattern : pattern.replace('{sign}', s);
 
         // we're avoiding the usage of to fixed, and using round instead with the e representation to address
-        // numbers like 1.005 = 1.01. Using ToFixed to only provide trailig zeroes in case we have a whole number
+        // numbers like 1.005 = 1.01. Using ToFixed to only provide trailing zeroes in case we have a whole number
         i = parseInt(
                 amount = Number(Math.round(Math.abs(+amount || 0) + 'e+' + precision) + ('e-' + precision)),
                 10