Merge remote-tracking branch 'upstream/2.3-develop' into MQE-1690

Author: jilu1

CHANGELOG.md

@@ -612,11 +612,11 @@ To get detailed information about changes in Magento 2.3.0, see the [Release Not
 
 2.2.0
 =============
-To get detailed information about changes in Magento 2.2.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.2/release-notes/bk-release-notes.html)
+To get detailed information about changes in Magento 2.2.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
 
 2.1.0
 =============
-To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
+To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
 
 2.0.0
 =============
@@ -1637,7 +1637,7 @@ Tests:
     * Improved backend menu keyboard accessibility
     * Accessibility improvements: WAI-ARIA in a product item on a category page and related products
     * Checkout flow code can work with a separate DB storage
-    * <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
+    * Unit tests moved to module directories
     * Addressed naming inconsistencies in REST routes
     * Added Advanced Developer workflow for frontend developers
 * Setup

README.md

@@ -20,10 +20,10 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
-[2]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
-[3]: <https://github.com/magento/magento2/issues>
-[4]: <https://devdocs.magento.com>
+[1]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html
+[2]: https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report
+[3]: https://github.com/magento/magento2/issues
+[4]: https://devdocs.magento.com
 
 <h3>Community Maintainers</h3>
 The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.

app/code/Magento/Analytics/README.md

@@ -1,6 +1,6 @@
 # Magento_Analytics Module
 
-The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
+The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.3/advanced-reporting/modules.html) functionality.
 
 The module implements the following functionality:
 
@@ -16,8 +16,8 @@ The module implements the following functionality:
 
 ## Structure
 
-Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
-[Report XML](https://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
+Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.3/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
+[Report XML](https://devdocs.magento.com/guides/v2.3/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
 The language declares SQL queries using XML declaration.
 
 ## Subscription Process

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

@@ -27,7 +27,7 @@ class AbstractBlock extends \Magento\Framework\View\Element\AbstractBlock
      */
     public function __construct(\Magento\Backend\Block\Context $context, array $data = [])
     {
-        parent::__construct($context, $data);
         $this->_authorization = $context->getAuthorization();
+        parent::__construct($context, $data);
     }
 }

app/code/Magento/Catalog/Block/Rss/Category.php

@@ -11,14 +11,16 @@
 
 /**
  * Class Category
+ *
  * @package Magento\Catalog\Block\Rss
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Category extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
 {
-    /**
-     * @var \Magento\Catalog\Model\CategoryFactory
-     */
+   /**
+    * @var \Magento\Catalog\Model\CategoryFactory
+    */
     protected $categoryFactory;
 
     /**
@@ -50,7 +52,6 @@ class Category extends \Magento\Framework\View\Element\AbstractBlock implements
      * @var CategoryRepositoryInterface
      */
     protected $categoryRepository;
-
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
@@ -83,6 +84,8 @@ public function __construct(
     }
 
     /**
+     * Set Block cache key
+     *
      * @return void
      */
     protected function _construct()
@@ -97,7 +100,9 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * Get info about category by category id
+     *
+     * @return array
      */
     public function getRssData()
     {
@@ -116,7 +121,9 @@ public function getRssData()
         $newUrl = $category->getUrl();
         $title = $category->getName();
         $data = ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];
-
+        $attributes = $this->_viewConfig
+            ->getViewConfig()
+            ->getMediaAttributes('Magento_Catalog', $this->imageHelper::MEDIA_TYPE_CONFIG_NODE, 'rss_thumbnail');
         /** @var $product \Magento\Catalog\Model\Product */
         foreach ($this->rssModel->getProductCollection($category, $this->getStoreId()) as $product) {
             $product->setAllowedInRss(true);
@@ -130,7 +137,7 @@ public function getRssData()
 
             $description = '
                     <table><tr>
-                        <td><a href="%s"><img src="%s" border="0" align="left" height="75" width="75"></a></td>
+                        <td><a href="%s"><img src="%s" border="0" align="left" height="%s" width="%s"></a></td>
                         <td  style="text-decoration:none;">%s %s</td>
                     </tr></table>
                 ';
@@ -139,6 +146,8 @@ public function getRssData()
                 $description,
                 $product->getProductUrl(),
                 $this->imageHelper->init($product, 'rss_thumbnail')->getUrl(),
+                isset($attributes['height']) ? $attributes['height'] : 75,
+                isset($attributes['width']) ? $attributes['width'] : 75,
                 $product->getDescription(),
                 $product->getAllowedPriceInRss() ? $this->renderPriceHtml($product) : ''
             );
@@ -187,6 +196,8 @@ protected function renderPriceHtml(\Magento\Catalog\Model\Product $product)
     }
 
     /**
+     * Get current Store Id
+     *
      * @return int
      */
     protected function getStoreId()
@@ -199,6 +210,8 @@ protected function getStoreId()
     }
 
     /**
+     * Cache lifetime for RSS feed
+     *
      * @return int
      */
     public function getCacheLifetime()
@@ -207,7 +220,9 @@ public function getCacheLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * Retrieve rss feed enable for category page
+     *
+     * @return bool
      */
     public function isAllowed()
     {
@@ -218,6 +233,8 @@ public function isAllowed()
     }
 
     /**
+     * Get category feed collection
+     *
      * @return array
      */
     public function getFeeds()
@@ -257,7 +274,9 @@ public function getFeeds()
     }
 
     /**
-     * {@inheritdoc}
+     * Check isAuthRequired Required
+     *
+     * @return bool
      */
     public function isAuthRequired()
     {

app/code/Magento/Catalog/Test/Unit/Block/Rss/CategoryTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Block\Rss;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
@@ -73,6 +74,16 @@ class CategoryTest extends \PHPUnit\Framework\TestCase
      */
     protected $categoryRepository;
 
+    /**
+     * @var \Magento\Framework\View\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $viewConfig;
+
+    /**
+     * @var \Magento\Framework\Config\View
+     */
+    protected $configView;
+
     /**
      * @var array
      */
@@ -115,6 +126,8 @@ protected function setUp()
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->categoryRepository = $this->createMock(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
+        $this->viewConfig = $this->getMockBuilder(\Magento\Framework\View\ConfigInterface::class)
+            ->getMockForAbstractClass();
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->block = $objectManagerHelper->getObject(
             \Magento\Catalog\Block\Rss\Category::class,
@@ -130,6 +143,7 @@ protected function setUp()
                 'customerSession' => $this->customerSession,
                 'storeManager' => $this->storeManager,
                 'categoryRepository' => $this->categoryRepository,
+                'viewConfig' => $this->viewConfig,
             ]
         );
     }
@@ -145,16 +159,26 @@ public function testGetRssData()
 
         $this->categoryRepository->expects($this->once())->method('get')->will($this->returnValue($category));
 
+        $configViewMock = $this->getMockBuilder(\Magento\Framework\Config\View::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->viewConfig->expects($this->once())
+            ->method('getViewConfig')
+            ->willReturn($configViewMock);
+
         $product = $this->getMockBuilder(\Magento\catalog\Model\Product::class)
-            ->setMethods([
-                '__sleep',
-                '__wakeup',
-                'getName',
-                'getAllowedInRss',
-                'getProductUrl',
-                'getDescription',
-                'getAllowedPriceInRss',
-            ])->disableOriginalConstructor()->getMock();
+            ->setMethods(
+                [
+                    '__sleep',
+                    '__wakeup',
+                    'getName',
+                    'getAllowedInRss',
+                    'getProductUrl',
+                    'getDescription',
+                    'getAllowedPriceInRss'
+                ]
+            )->disableOriginalConstructor()->getMock();
         $product->expects($this->once())->method('getName')->will($this->returnValue('Product Name'));
         $product->expects($this->once())->method('getAllowedInRss')->will($this->returnValue(true));
         $product->expects($this->exactly(2))->method('getProductUrl')
@@ -213,23 +237,23 @@ public function testGetFeeds()
             ->disableOriginalConstructor()->getMock();
 
         $collection = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class)
-            ->setMethods([
-                'addIdFilter',
-                'addAttributeToSelect',
-                'addAttributeToSort',
-                'load',
-                'addAttributeToFilter',
-                'getIterator',
-            ])->disableOriginalConstructor()->getMock();
+            ->setMethods(
+                [
+                    'addIdFilter',
+                    'addAttributeToSelect',
+                    'addAttributeToSort',
+                    'load',
+                    'addAttributeToFilter',
+                    'getIterator'
+                ]
+            )->disableOriginalConstructor()->getMock();
         $collection->expects($this->once())->method('addIdFilter')->will($this->returnSelf());
         $collection->expects($this->exactly(3))->method('addAttributeToSelect')->will($this->returnSelf());
         $collection->expects($this->once())->method('addAttributeToSort')->will($this->returnSelf());
         $collection->expects($this->once())->method('addAttributeToFilter')->will($this->returnSelf());
         $collection->expects($this->once())->method('load')->will($this->returnSelf());
-        $collection->expects($this->once())->method('getIterator')->will($this->returnValue(
-            new \ArrayIterator([$category])
-        ));
-
+        $collection->expects($this->once())->method('getIterator')
+                   ->will($this->returnValue(new \ArrayIterator([$category])));
         $category->expects($this->once())->method('getId')->will($this->returnValue(1));
         $category->expects($this->once())->method('getName')->will($this->returnValue('Category Name'));
         $category->expects($this->once())->method('getResourceCollection')->will($this->returnValue($collection));
@@ -250,9 +274,12 @@ public function testGetFeeds()
 
         $this->rssUrlBuilder->expects($this->once())->method('getUrl')
             ->will($this->returnValue('http://magento.com/category-name.html'));
-        $feeds = ['group' => 'Categories', 'feeds' => [
-            ['label' => 'Category Name', 'link' => 'http://magento.com/category-name.html'],
-        ]];
+        $feeds = [
+            'group' => 'Categories',
+            'feeds' => [
+                ['label' => 'Category Name', 'link' => 'http://magento.com/category-name.html'],
+            ]
+        ];
         $this->assertEquals($feeds, $this->block->getFeeds());
     }
 }

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml

@@ -37,7 +37,7 @@ $formName = $block->getFormName();
                type="hidden"
                value="<?= $block->escapeHtmlAttr($typeData['value']) ?>"/>
         <?php
-} ?>
+    } ?>
 
     <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
         <div class="image item<% if (data.disabled == 1) { %> hidden-for-front<% } %>"
@@ -61,7 +61,7 @@ $formName = $block->getFormName();
                    value="<%- data.label %>"/>
             <input type="hidden"
                    name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][disabled]"
-                   data-form-part="<?= $block->escapeHtmlAttr(formName) ?>"
+                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
                    value="<%- data.disabled %>"/>
             <input type="hidden"
                    name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][media_type]"

app/code/Magento/CatalogAnalytics/README.md

@@ -1,3 +1,3 @@
 # Magento_CatalogAnalytics module
 
-The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
+The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.3/advanced-reporting/modules.html).

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml

@@ -16,7 +16,7 @@
             <description value="Sort by price should be correct if the apply Catalog Rule to child product of configurable product"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-69988"/>
-            <group value="сonfigurable_product"/>
+            <group value="configurable_product"/>
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>

app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml

@@ -28,12 +28,13 @@ require(['prototype'], function(){
                         result = response.message;
                     }
                     if (response.valid == 1) {
-                        validationMessage.removeClassName('hidden').addClassName('success')
+                        validationMessage.removeClassName('hidden').removeClassName('admin__field-error').addClassName('note');
+                        validationMessage.setStyle({color:'green'});
                     } else {
-                        validationMessage.removeClassName('hidden').addClassName('error')
+                        validationMessage.removeClassName('hidden').addClassName('admin__field-error');
                     }
                 } catch (e) {
-                    validationMessage.removeClassName('hidden').addClassName('error')
+                    validationMessage.removeClassName('hidden').addClassName('admin__field-error');
                 }
                 validationMessage.update(result);
             }
@@ -46,8 +47,9 @@ require(['prototype'], function(){
 });
 </script>
 <div class="actions actions-validate-vat">
-    <div id="validation_result" class="message-validation hidden"></div>
+    <p class="admin__field-error hidden" id="validation_result" style="margin-bottom:10px;"></p>
     <button onclick="javascript:validateVat(); return false;" class="action-validate-vat" type="button" id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>">
         <span><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
     </button>
 </div>
+