🔃 [EngCom] Public Pull Requests - 2.3-develop

Stanislav Idolov · web-flow · commit c62d9225f154 · 2018-06-06T16:25:46.000+03:00
Accepted Public Pull Requests: - magento/magento2#15853: Fixed return type hinting in DocBlocks for Wishlist module (by @rogyar) - magento/magento2#15695: Fixed a couple of typos (by @dverkade) - magento/magento2#15833: [Forwardport] Format the javascript code #10 (by @chirag-wagento) - magento/magento2#15755: [Forwardport] Error 500 in Module Manager (by @vijay-wagento) - magento/magento2#15794: [Forwardport] [Resolved : Styling <select> by changing less variables in Luma theme� (by @hitesh-wagento) - magento/magento2#15809: [Forwardport] fix: support multiple minisearch widget instances (by @DanielRuf) - magento/magento2#15558: Fixes in catalog component blocks [2.3-develop] (by @mhauri) - magento/magento2#15572: [Forwardport] Docblock typo fixes (by @rogyar) - magento/magento2#15748: [Forwardport] Prevent multiple add-to-cart initializations in case of ajax loaded product listing (by @vijay-wagento) - magento/magento2#15745: [Forwardport] Fix method name (typo) (by @vijay-wagento) - magento/magento2#15746: [Forwardport] Resolved : UI Component listing action column outside of screen when... (by @vgelani) - magento/magento2#15692: Fix minor issues in ui export converter classes (by @dmytro-ch) - magento/magento2#15649: [Forwardport] Fixes in config module (by @mhauri) - magento/magento2#15540: fix for Wrong price amount on product page #11717 (by @HirokazuNishi) Fixed GitHub Issues: - magento/magento2#15192: Module Manager module grid is not working Magento 2.2.4 (reported by @jignesh-baldha) has been fixed in magento/magento2#15755 by @vijay-wagento in 2.3-develop branch Related commits: 1. 486f7a7 2. 1b5d1d1 - magento/magento2#15608: Styling <select> by changing less variables in Luma theme doesn't work as expected (reported by @denistrator) has been fixed in magento/magento2#15794 by @hitesh-wagento in 2.3-develop branch Related commits: 1. 9fa6425 - magento/magento2#14153: UI Component listing action column outside of screen when too many columns (reported by @milansimek) has been fixed in magento/magento2#15746 by @vgelani in 2.3-develop branch Related commits: 1. 365bfb4 - magento/magento2#11717: Wrong price amount on product page (reported by @HirokazuNishi) has been fixed in magento/magento2#15540 by @HirokazuNishi in 2.3-develop branch Related commits: 1. cf05a84 2. 67a2038
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -325,7 +325,7 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
      *
      * @param Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
@@ -144,7 +144,7 @@ function (node, e) {
      *
      * @param \Magento\Framework\Data\Tree\Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      */
     protected function _getNodeJson($node, $level = 0)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * Retrieve data object related with form
      *
-     * @return \Magento\Catalog\Model\Product || \Magento\Catalog\Model\Category
+     * @return \Magento\Catalog\Model\Product|\Magento\Catalog\Model\Category
      */
     public function getDataObject()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
@@ -101,8 +101,7 @@ protected function _prepareColumns()
                 'type' => 'options',
                 'options' => ['1' => __('Yes'), '0' => __('No')],
                 'align' => 'center'
-            ],
-            'is_user_defined'
+            ]
         );
 
         $this->_eventManager->dispatch('product_attribute_grid_build', ['grid' => $this]);
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -81,7 +81,7 @@ public function getSelectorOptions()
      *
      * @param string $labelPart
      * @param int $templateId
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
+     * @return array
      */
     public function getSuggestedAttributes($labelPart, $templateId = null)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
@@ -69,7 +69,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
@@ -62,7 +62,7 @@ public function getLabel()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
@@ -195,7 +195,7 @@ public function getAddToCompareUrl()
      * Gets minimal sales quantity
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return int|null
+     * @return float|null
      */
     public function getMinimalQty($product)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -178,7 +178,7 @@ public function getPrice($price, $includingTax = null)
      * Returns price converted to current currency rate
      *
      * @param float $price
-     * @return float
+     * @return float|string
      */
     public function getCurrencyPrice($price)
     {
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -107,7 +107,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return array
      */
     public function getRssData()
     {
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
@@ -38,6 +38,11 @@ define([
         _bindSubmit: function () {
             var self = this;
 
+            if (this.element.data('catalog-addtocart-initialized')) {
+                return;
+            }
+
+            this.element.data('catalog-addtocart-initialized', 1);
             this.element.on('submit', function (e) {
                 e.preventDefault();
                 self.submitForm($(this));
diff --git a/app/code/Magento/Config/Model/Config/Importer.php b/app/code/Magento/Config/Model/Config/Importer.php
@@ -124,7 +124,7 @@ public function import(array $data)
                 $this->scopeConfig->clean();
             }
 
-            $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData, $data) {
+            $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData) {
                 $this->scope->setCurrentScope(Area::AREA_ADMINHTML);
 
                 // Invoke saving of new values.
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -72,7 +72,7 @@ public function testGetElementHtmlWithValue()
                 'showInWebsite' => '1',
                 'showInStore' => '1',
                 'label' => null,
-                'backend_model' => \Magento\BackendModelConfig\Backend\Image::class,
+                'backend_model' => \Magento\Config\Model\Config\Backend\Image::class,
                 'upload_dir' => [
                     'config' => 'system/filesystem/media',
                     'scope_info' => '1',
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -319,9 +319,19 @@ public function getQuote()
     }
 
     /**
+     * @deprecated
+     * typo in method name, see getBillingAddressTotals()
      * @return mixed
      */
     public function getBillinAddressTotals()
+    {
+        return $this->getBillingAddressTotals();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getBillingAddressTotals()
     {
         $address = $this->getQuote()->getBillingAddress();
         return $this->getShippingAddressTotals($address);
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
@@ -9,7 +9,7 @@
 use Magento\Quote\Model\Quote\Address;
 
 /**
- * Multishipping checkout shipping
+ * Mustishipping checkout shipping
  *
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -186,7 +186,7 @@
                         <?php endforeach; ?>
                     </tbody>
                     <tfoot>
-                    <?= /* @noEscape */ $block->renderTotals($block->getBillinAddressTotals()); ?>
+                    <?= /* @noEscape */ $block->renderTotals($block->getBillingAddressTotals()); ?>
                     </tfoot>
                 </table>
             </div>
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
@@ -71,7 +71,7 @@ public function canDisplay()
     }
 
     /**
-     * Retrieve disply item qty availability
+     * Retrieve display item qty availability
      *
      * @return false
      */
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
@@ -6,8 +6,10 @@
 namespace Magento\Ui\Model\Export;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Ui\Component\MassAction\Filter;
 
 /**
@@ -16,7 +18,7 @@
 class ConvertToCsv
 {
     /**
-     * @var DirectoryList
+     * @var WriteInterface
      */
     protected $directory;
 
@@ -30,11 +32,17 @@ class ConvertToCsv
      */
     protected $pageSize = null;
 
+    /**
+     * @var Filter
+     */
+    protected $filter;
+
     /**
      * @param Filesystem $filesystem
      * @param Filter $filter
      * @param MetadataProvider $metadataProvider
      * @param int $pageSize
+     * @throws FileSystemException
      */
     public function __construct(
         Filesystem $filesystem,
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToXml.php b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
@@ -10,8 +10,10 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Convert\Excel;
 use Magento\Framework\Convert\ExcelFactory;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Ui\Component\MassAction\Filter;
 
 /**
@@ -20,7 +22,7 @@
 class ConvertToXml
 {
     /**
-     * @var DirectoryList
+     * @var WriteInterface
      */
     protected $directory;
 
@@ -49,12 +51,18 @@ class ConvertToXml
      */
     protected $fields;
 
+    /**
+     * @var Filter
+     */
+    protected $filter;
+
     /**
      * @param Filesystem $filesystem
      * @param Filter $filter
      * @param MetadataProvider $metadataProvider
      * @param ExcelFactory $excelFactory
      * @param SearchResultIteratorFactory $iteratorFactory
+     * @throws FileSystemException
      */
     public function __construct(
         Filesystem $filesystem,
@@ -87,6 +95,7 @@ protected function getOptions()
      * Returns DB fields list
      *
      * @return array
+     * @throws LocalizedException
      */
     protected function getFields()
     {
@@ -102,6 +111,7 @@ protected function getFields()
      *
      * @param DocumentInterface $document
      * @return array
+     * @throws LocalizedException
      */
     public function getRowData(DocumentInterface $document)
     {
diff --git a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
@@ -17,7 +17,7 @@
     </button>
     <?php if ($block->hasSplit()): ?>
         <button <?= $block->getToggleAttributesHtml() ?>>
-            <span>Select</span>
+            <span><?= /* @escapeNotVerified */ __('Select'); ?></span>
         </button>
 
         <?php if (!$block->getDisabled()): ?>
@@ -40,12 +40,10 @@
         <?php endif; ?>
     <?php endif; ?>
 </div>
-
-<script>
-require(['jquery'], function($){
-        $('.actions-split')
-            .on('click.splitDefault', '.action-default', function() {
-                $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
-            });
-});
-</script>
+<script type="text/x-magento-init">
+    {
+        ".actions-split": {
+            "Magento_Ui/js/grid/controls/button/split": {}
+        }
+    }
+</script>
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
@@ -115,14 +115,14 @@ define([
          * @returns {Group} Chainable.
          */
         _setClasses: function () {
-            var addtional = this.additionalClasses,
+            var additional = this.additionalClasses,
                 classes;
 
-            if (_.isString(addtional)) {
-                addtional = this.additionalClasses.split(' ');
+            if (_.isString(additional)) {
+                additional = this.additionalClasses.split(' ');
                 classes = this.additionalClasses = {};
 
-                addtional.forEach(function (name) {
+                additional.forEach(function (name) {
                     classes[name] = true;
                 }, this);
             }
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/group.js b/app/code/Magento/Ui/view/base/web/js/form/components/group.js
@@ -58,14 +58,14 @@ define([
          * @returns {Group} Chainable.
          */
         _setClasses: function () {
-            var addtional = this.additionalClasses,
+            var additional = this.additionalClasses,
                 classes;
 
-            if (_.isString(addtional)) {
-                addtional = this.additionalClasses.split(' ');
+            if (_.isString(additional)) {
+                additional = this.additionalClasses.split(' ');
                 classes = this.additionalClasses = {};
 
-                addtional.forEach(function (name) {
+                additional.forEach(function (name) {
                     classes[name] = true;
                 }, this);
             }
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js b/app/code/Magento/Ui/view/base/web/js/grid/controls/button/split.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+
+        $(element).on('click.splitDefault', '.action-default', function () {
+            $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
+        });
+    };
+});
diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
@@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()
     }
 
     /**
-     * Get admin maximum security failures from config
+     * Get admin maxiumum security failures from config
      *
      * @return int
      */
diff --git a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php
@@ -24,7 +24,7 @@ class EmailLink extends Link
     protected $_template = 'rss/email.phtml';
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Wishlist/Block/Rss/Link.php b/app/code/Magento/Wishlist/Block/Rss/Link.php
@@ -72,7 +72,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
@@ -503,7 +503,7 @@ public function isAllowInCart()
     /**
      * Retrieve customer name
      *
-     * @return string|void
+     * @return string|null
      */
     public function getCustomerName()
     {
diff --git a/app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php b/app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php
@@ -32,7 +32,7 @@ public function __construct(Data $helper)
     /**
      * Add tax data to result
      *
-     * @param \Magento\Checkout\CustomerData\Cart $subject
+     * @param \Magento\Catalog\Ui\DataProvider\Product\Listing\DataProvider $subject
      * @param array $result
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less
diff --git a/app/design/frontend/Magento/luma/web/css/source/_theme.less b/app/design/frontend/Magento/luma/web/css/source/_theme.less
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
diff --git a/lib/web/css/source/lib/variables/_forms.less b/lib/web/css/source/lib/variables/_forms.less
diff --git a/setup/pub/angular-sanitize/angular-sanitize.js b/setup/pub/angular-sanitize/angular-sanitize.js
diff --git a/setup/pub/angular-sanitize/angular-sanitize.min.js.map b/setup/pub/angular-sanitize/angular-sanitize.min.js.map
diff --git a/setup/src/Magento/Setup/Model/Grid/Module.php b/setup/src/Magento/Setup/Model/Grid/Module.php

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)`
`325`	`325`	`*`
`326`	`326`	`* @param Node\|array $node`
`327`	`327`	`* @param int $level`
`328`		`- * @return string`
	`328`	`+ * @return array`
`329`	`329`	`* @SuppressWarnings(PHPMD.CyclomaticComplexity)`
`330`	`330`	`* @SuppressWarnings(PHPMD.NPathComplexity)`
`331`	`331`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ function (node, e) {`
`144`	`144`	`*`
`145`	`145`	`* @param \Magento\Framework\Data\Tree\Node\|array $node`
`146`	`146`	`* @param int $level`
`147`		`- * @return string`
	`147`	`+ * @return array`
`148`	`148`	`*/`
`149`	`149`	`protected function _getNodeJson($node, $level = 0)`
`150`	`150`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme`
`21`	`21`	`/**`
`22`	`22`	`* Retrieve data object related with form`
`23`	`23`	`*`
`24`		`- * @return \Magento\Catalog\Model\Product \|\| \Magento\Catalog\Model\Category`
	`24`	`+ * @return \Magento\Catalog\Model\Product\|\Magento\Catalog\Model\Category`
`25`	`25`	`*/`
`26`	`26`	`public function getDataObject()`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function getSelectorOptions()`
`81`	`81`	`*`
`82`	`82`	`* @param string $labelPart`
`83`	`83`	`* @param int $templateId`
`84`		`- * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection`
	`84`	`+ * @return array`
`85`	`85`	`*/`
`86`	`86`	`public function getSuggestedAttributes($labelPart, $templateId = null)`
`87`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function isRssAllowed()`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
`72`		`- * @return string`
	`72`	`+ * @return array`
`73`	`73`	`*/`
`74`	`74`	`protected function getLinkParams()`
`75`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function getLabel()`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`
`65`		`- * @return string`
	`65`	`+ * @return array`
`66`	`66`	`*/`
`67`	`67`	`protected function getLinkParams()`
`68`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public function getAddToCompareUrl()`
`195`	`195`	`* Gets minimal sales quantity`
`196`	`196`	`*`
`197`	`197`	`* @param \Magento\Catalog\Model\Product $product`
`198`		`- * @return int\|null`
	`198`	`+ * @return float\|null`
`199`	`199`	`*/`
`200`	`200`	`public function getMinimalQty($product)`
`201`	`201`	`{`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public function getPrice($price, $includingTax = null)`
`178`	`178`	`* Returns price converted to current currency rate`
`179`	`179`	`*`
`180`	`180`	`* @param float $price`
`181`		`- * @return float`
	`181`	`+ * @return float\|string`
`182`	`182`	`*/`
`183`	`183`	`public function getCurrencyPrice($price)`
`184`	`184`	`{`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ protected function _construct()`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/**`
`110`		`- * @return string`
	`110`	`+ * @return array`
`111`	`111`	`*/`
`112`	`112`	`public function getRssData()`
`113`	`113`	`{`