🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #15891: Remove parameter from method calling (by @saurabh-aureate)
 - #15892: Wrong annotation in _toOptionArray : lib\internal\Magento\Framework\D� (by @namratachangani)
 - #15888: Correct typo correction js files (by @saurabh-aureate)
 - #13862: Add compare list link to success message after adding a product (by @avstudnitz)

Author: Stanislav Idolov

app/code/Magento/Catalog/Controller/Product/Compare/Add.php

@@ -36,7 +36,14 @@ public function execute()
                 $productName = $this->_objectManager->get(
                     \Magento\Framework\Escaper::class
                 )->escapeHtml($product->getName());
-                $this->messageManager->addSuccess(__('You added product %1 to the comparison list.', $productName));
+                $this->messageManager->addComplexSuccessMessage(
+                    'addCompareSuccessMessage',
+                    [
+                        'product_name' => $productName,
+                        'compare_list_url' => $this->_url->getUrl('catalog/product_compare')
+                    ]
+                );
+
                 $this->_eventManager->dispatch('catalog_product_compare_add_product', ['product' => $product]);
             }
 

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

@@ -79,6 +79,18 @@
             <argument name="typeId" xsi:type="string">recently_compared_product</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Framework\View\Element\Message\MessageConfigurationsPool">
+        <arguments>
+            <argument name="configurationsMap" xsi:type="array">
+                <item name="addCompareSuccessMessage" xsi:type="array">
+                    <item name="renderer" xsi:type="const">\Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE</item>
+                    <item name="data" xsi:type="array">
+                        <item name="template" xsi:type="string">Magento_Catalog::messages/addCompareSuccessMessage.phtml</item>
+                    </item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\App\ResourceConnection">
         <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
     </type>

app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+/** @var \Magento\Framework\View\Element\Template $block */
+?>
+<?= $block->escapeHtml(__(
+    'You added product %1 to the <a href="%2">comparison list</a>.',
+    $block->getData('product_name'),
+    $block->getData('compare_list_url')),
+    ['a']
+);

app/code/Magento/Catalog/view/frontend/web/js/storage-manager.js

@@ -129,7 +129,7 @@ define([
         },
 
         /**
-         * Prepare storages congfig.
+         * Prepare storages config.
          *
          * @returns {Object} Chainable.
          */

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

@@ -133,7 +133,7 @@ define([
 
         /**
          * Retrieves from the list file which matches
-         * search criteria implemented in itertor function.
+         * search criteria implemented in iterator function.
          *
          * @param {Function} fn - Function that will be invoked
          *      for each file in the list.
@@ -193,7 +193,7 @@ define([
         },
 
         /**
-         * Returns path to the files' preview image.
+         * Returns path to the file's preview image.
          *
          * @param {Object} file
          * @returns {String}
@@ -310,7 +310,7 @@ define([
 
         /**
          * Abstract handler which is invoked when files are choosed for upload.
-         * May be used for implementation of aditional validation rules,
+         * May be used for implementation of additional validation rules,
          * e.g. total files and a total size rules.
          *
          * @abstract

app/code/Magento/UrlRewrite/Block/Catalog/Product/Edit.php

@@ -55,7 +55,7 @@ protected function _prepareLayoutFeatures()
         }
 
         if ($this->_getProduct()->getId()) {
-            $this->_addProductLinkBlock($this->_getProduct());
+            $this->_addProductLinkBlock();
         }
 
         if ($this->_getCategory()->getId()) {

dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/CompareTest.php

@@ -49,7 +49,7 @@ public function testAddAction()
         );
 
         $this->assertSessionMessages(
-            $this->equalTo(['You added product Simple Product 1 Name to the comparison list.']),
+            $this->equalTo(['You added product Simple Product 1 Name to the <a href="http://localhost/index.php/catalog/product_compare/">comparison list</a>.']),
             MessageInterface::TYPE_SUCCESS
         );
 

lib/internal/Magento/Framework/Data/SearchResultProcessor.php

@@ -188,8 +188,8 @@ public function toArray($arrRequiredFields = [])
     }
 
     /**
-     * @param null $valueField
-     * @param null $labelField
+     * @param string|null $valueField
+     * @param string|null $labelField
      * @param array $additional
      * @return array
      */