🔃 [EngCom] Public Pull Requests - 2.3-develop

magento-engcom-team · web-flow · commit bed4c324757a · 2018-06-02T16:10:05.000+03:00
Accepted Public Pull Requests: - #15646: [Forwardport] Fixed typo error (by @vgelani) - #15658: [Forwardport] Fixed set template syntax issue (by @vgelani) - #15659: [Forwardport] chore: remove extraneous cursor property (by @DanielRuf) - #15667: [Forwardport] set correct annotation (by @vgelani) - #15670: [Forwardport] Wrong annotation in _toOptionArray - magento/framework/Data/� (by @vgelani) - #15682: [Forwardport] Wrong Last orders amount on dashboard #15660 (by @ankurvr) - #15576: [Forwardport] [fix] typo in method name _getCharg[e]ableOptionPrice (by @osrecio) - #15623: Fix translations (by @cherednichenkoa) - #15478: [Forwardport] Removed mageMenu widget dependency from breadcrumbs component #15178 (by @vovayatsyuk) - #15177: Adding support for variadic arguments' method in generated proxy c� (by @bartek9007) Fixed GitHub Issues: - #15601: Wrong annotation in formatDateTime - lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php (reported by @sanjay-wagento) has been fixed in #15667 by @vgelani in 2.3-develop branch Related commits: 1. 2feaf30 - #15601: Wrong annotation in formatDateTime - lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php (reported by @sanjay-wagento) has been fixed in #15670 by @vgelani in 2.3-develop branch Related commits: 1. 11923bc - #15660: Wrong order amount on dashboard on Last orders listing when having more than one website with different currencies (reported by @ankurvr) has been fixed in #15682 by @ankurvr in 2.3-develop branch Related commits: 1. f5f3c76 2. d696233 3. 424324e 4. eca36b2 5. 98265ab 6. ac220b7 7. 12041e1 - #14987: Invisible breadcrumbs at product page when mageMenu widget is not used (reported by @vovayatsyuk) has been fixed in #15478 by @vovayatsyuk in 2.3-develop branch Related commits: 1. 7b1d1b6 2. fd03f7c
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
@@ -20,7 +20,7 @@ class Dashboard extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'dashboard/index.phtml';
+    protected $_template = 'Magento_Backend::dashboard/index.phtml';
 
     /**
      * @return void
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -90,7 +90,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     /**
      * @var string
      */
-    protected $_template = 'dashboard/graph.phtml';
+    protected $_template = 'Magento_Backend::dashboard/graph.phtml';
 
     /**
      * Adminhtml dashboard data
diff --git a/app/code/Magento/Backend/Block/Dashboard/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Grid.php
@@ -17,7 +17,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     /**
      * @var string
      */
-    protected $_template = 'dashboard/grid.phtml';
+    protected $_template = 'Magento_Backend::dashboard/grid.phtml';
 
     /**
      * Setting default for every grid on dashboard
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -15,7 +15,7 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/salebar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -16,7 +16,7 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
     /**
      * @var string
      */
-    protected $_template = 'dashboard/totalbar.phtml';
+    protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
 
     /**
      * @var \Magento\Framework\Module\Manager
diff --git a/app/code/Magento/Backend/Block/Page/Copyright.php b/app/code/Magento/Backend/Block/Page/Copyright.php
@@ -18,5 +18,5 @@ class Copyright extends \Magento\Backend\Block\Template
      *
      * @var string
      */
-    protected $_template = 'page/copyright.phtml';
+    protected $_template = 'Magento_Backend::page/copyright.phtml';
 }
diff --git a/app/code/Magento/Backend/Block/Page/Footer.php b/app/code/Magento/Backend/Block/Page/Footer.php
@@ -17,7 +17,7 @@ class Footer extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/footer.phtml';
+    protected $_template = 'Magento_Backend::page/footer.phtml';
 
     /**
      * @var \Magento\Framework\App\ProductMetadataInterface
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
@@ -18,7 +18,7 @@ class Header extends \Magento\Backend\Block\Template
     /**
      * @var string
      */
-    protected $_template = 'page/header.phtml';
+    protected $_template = 'Magento_Backend::page/header.phtml';
 
     /**
      * Backend data
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
@@ -25,7 +25,7 @@ class Fieldset extends \Magento\Backend\Block\Template implements RendererInterf
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset.phtml';
 
     /**
      * Retrieve an element
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php
@@ -23,7 +23,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * @var string
      */
-    protected $_template = 'store/switcher/form/renderer/fieldset/element.phtml';
+    protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset/element.phtml';
 
     /**
      * Retrieve an element
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -68,10 +68,7 @@ public function __construct(
         $this->_storeManager = $storeManager;
         $this->_currencyLocator = $currencyLocator;
         $this->_localeCurrency = $localeCurrency;
-        $defaultBaseCurrencyCode = $this->_scopeConfig->getValue(
-            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-            'default'
-        );
+        $defaultBaseCurrencyCode = $currencyLocator->getDefaultCurrency($this->_request);
         $this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode);
     }
 
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -341,7 +341,7 @@ public function getOptionPrice($optionValue, $basePrice)
     {
         $option = $this->getOption();
 
-        return $this->_getChargableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice);
+        return $this->_getChargeableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice);
     }
 
     /**
@@ -395,14 +395,27 @@ public function getProductOptions()
     }
 
     /**
-     * Return final chargable price for option
-     *
      * @param float $price Price of option
      * @param boolean $isPercent Price type - percent or fixed
      * @param float $basePrice For percent price type
      * @return float
+     * @deprecated 102.0.4 typo in method name
+     * @see _getChargeableOptionPrice
      */
     protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
+    {
+        return $this->_getChargeableOptionPrice($price, $isPercent, $basePrice);
+    }
+
+    /**
+     * Return final chargeable price for option
+     *
+     * @param float $price Price of option
+     * @param boolean $isPercent Price type - percent or fixed
+     * @param float $basePrice For percent price type
+     * @return float
+     */
+    protected function _getChargeableOptionPrice($price, $isPercent, $basePrice)
     {
         if ($isPercent) {
             return $basePrice * $price / 100;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -231,7 +231,7 @@ public function getOptionPrice($optionValue, $basePrice)
             foreach (explode(',', $optionValue) as $value) {
                 $_result = $option->getValueById($value);
                 if ($_result) {
-                    $result += $this->_getChargableOptionPrice(
+                    $result += $this->_getChargeableOptionPrice(
                         $_result->getPrice(),
                         $_result->getPriceType() == 'percent',
                         $basePrice
@@ -246,7 +246,7 @@ public function getOptionPrice($optionValue, $basePrice)
         } elseif ($this->_isSingleSelection()) {
             $_result = $option->getValueById($optionValue);
             if ($_result) {
-                $result = $this->_getChargableOptionPrice(
+                $result = $this->_getChargeableOptionPrice(
                     $_result->getPrice(),
                     $_result->getPriceType() == 'percent',
                     $basePrice
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js b/app/code/Magento/Catalog/view/frontend/web/js/product/breadcrumbs.js
@@ -20,23 +20,6 @@ define([
                 menuContainer: '[data-action="navigation"] > ul'
             },
 
-            /** @inheritdoc */
-            _init: function () {
-                var menu,
-                    originalInit = this._super.bind(this);
-
-                // render breadcrumbs after navigation menu is loaded.
-                menu = $(this.options.menuContainer).data('mageMenu');
-
-                if (typeof menu === 'undefined') {
-                    $(this.options.menuContainer).on('menucreate', function () {
-                        originalInit();
-                    });
-                } else {
-                    this._super();
-                }
-            },
-
             /** @inheritdoc */
             _render: function () {
                 this._appendCatalogCrumbs();
@@ -89,14 +72,10 @@ define([
              * @private
              */
             _getCategoryCrumb: function (menuItem) {
-                var categoryId = /(\d+)/i.exec(menuItem.attr('id'))[0],
-                    categoryName = menuItem.text(),
-                    categoryUrl = menuItem.attr('href');
-
                 return {
-                    'name': 'category' + categoryId,
-                    'label': categoryName,
-                    'link': categoryUrl,
+                    'name': 'category',
+                    'label': menuItem.text(),
+                    'link': menuItem.attr('href'),
                     'title': ''
                 };
             },
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
@@ -30,8 +30,12 @@
             <span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"/>
             <translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"/>
             <span class="count" text="getCartLineItemsCount()"/>
-            <translate args="'Item in Cart'" if="getCartLineItemsCount() === 1"/>
-            <translate args="'Items in Cart'" if="getCartLineItemsCount() > 1"/>
+                <!-- ko if: (getCartLineItemsCount() === 1) -->
+                    <span translate="'Item in Cart'"/>
+                <!--/ko-->
+                <!-- ko if: (getCartLineItemsCount() > 1) -->
+                    <span translate="'Items in Cart'"/>
+                <!--/ko-->
         </div>
 
         <each args="getRegion('subtotalContainer')" render=""/>
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -709,7 +709,7 @@ protected function _getAdditionalElementTypes()
     }
 
     /**
-     * Temporary moved those $this->getRequest()->getParam('blabla') from the code accross this block
+     * Temporary moved those $this->getRequest()->getParam('blabla') from the code across this block
      * to getBlala() methods to be later set from controller with setters
      */
 
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -629,7 +629,7 @@ protected function _insertData()
     }
 
     /**
-     * Get new supper attribute id.
+     * Get new super attribute id.
      *
      * @return int
      */
diff --git a/app/code/Magento/Customer/Model/Session.php b/app/code/Magento/Customer/Model/Session.php
@@ -555,7 +555,7 @@ public function setAfterAuthUrl($url)
     }
 
     /**
-     * Reset core session hosts after reseting session ID
+     * Reset core session hosts after resetting session ID
      *
      * @return $this
      */
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js
@@ -20,7 +20,7 @@ define([
         defaultContext = require.s.contexts._,
         menuItem = $(
             '<li class="level0 category-item">' +
-            '<a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a>' +
+            '<a href="http://localhost.com/cat1.html">Cat1</a>' +
             '</li>'
         )[0],
 
@@ -116,14 +116,14 @@ define([
             });
 
             it('Check _getCategoryCrumb call', function () {
-                var item = $('<a href="http://localhost.com/cat1.html" id="ui-id-3">Cat1</a>');
+                var item = $('<a href="http://localhost.com/cat1.html">Cat1</a>');
 
                 expect(widget).toBeDefined();
                 expect(widget).toEqual(jasmine.any(Function));
                 expect(widget.prototype._getCategoryCrumb).toBeDefined();
                 expect(widget.prototype._getCategoryCrumb(item)).toEqual(jasmine.objectContaining(
                     {
-                        'name': 'category3',
+                        'name': 'category',
                         'label': 'Cat1',
                         'link': 'http://localhost.com/cat1.html'
                     }
@@ -232,7 +232,7 @@ define([
                 expect(result.length).toBe(1);
                 expect(result[0]).toEqual(jasmine.objectContaining(
                     {
-                        'name': 'category3',
+                        'name': 'category',
                         'label': 'Cat1',
                         'link': 'http://localhost.com/cat1.html'
                     }
@@ -243,10 +243,10 @@ define([
                 var result,
                     menuItems = $(
                         '<li class="level0 nav-1">' +
-                            '<a href="http://localhost.com/cat1.html" id="ui-id-3">cat1</a>' +
+                            '<a href="http://localhost.com/cat1.html">cat1</a>' +
                             '<ul>' +
                                 '<li class="level1 nav-1-1">' +
-                                    '<a href="http://localhost.com/cat1/cat21.html" id="ui-id-9">cat21</a>' +
+                                    '<a href="http://localhost.com/cat1/cat21.html">cat21</a>' +
                                 '</li>' +
                             '</ul>' +
                         '</li>'
@@ -262,14 +262,14 @@ define([
 
                 context = createContext(widget.prototype);
                 getParentMenuHandler = widget.prototype._getParentMenuItem.bind(context);
-                result = getParentMenuHandler($('#ui-id-9'));
+                result = getParentMenuHandler($('[href="http://localhost.com/cat1/cat21.html"]'));
 
                 expect(result).toBeDefined();
                 expect(result.length).toBe(1);
                 expect(result[0].tagName.toLowerCase()).toEqual('a');
-                expect(result.attr('id')).toEqual('ui-id-3');
+                expect(result.attr('href')).toEqual('http://localhost.com/cat1.html');
 
-                result = getParentMenuHandler($('#ui-id-3'));
+                result = getParentMenuHandler($('[href="http://localhost.com/cat1.html"]'));
 
                 expect(result).toBeNull();
             });
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
@@ -155,7 +155,8 @@ protected function _getMethodInfo(\ReflectionMethod $method)
         $parameterNames = [];
         $parameters = [];
         foreach ($method->getParameters() as $parameter) {
-            $parameterNames[] = '$' . $parameter->getName();
+            $name = $parameter->isVariadic() ? '... $' . $parameter->getName() : '$' . $parameter->getName();
+            $parameterNames[] = $name;
             $parameters[] = $this->_getMethodParameterInfo($parameter);
         }
 
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -260,8 +260,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
      * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
-     * @param null $locale
-     * @param null $timezone
+     * @param string|null $locale
+     * @param string|null $timezone
      * @param string|null $pattern
      * @return string
      */
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
@@ -124,8 +124,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
      * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
-     * @param null $locale
-     * @param null $timezone
+     * @param string|null $locale
+     * @param string|null $timezone
      * @param string|null $pattern
      * @return string
      */
diff --git a/lib/web/css/source/lib/_buttons.less b/lib/web/css/source/lib/_buttons.less
@@ -266,8 +266,7 @@
     &.disabled,
     &[disabled],
     fieldset[disabled] & {
-        cursor: not-allowed;
-        pointer-events: none; // Disabling of clicks
+        pointer-events: none; // Disabling of all pointer events
         .lib-css(opacity, @button__disabled__opacity);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ class Copyright extends \Magento\Backend\Block\Template`
`18`	`18`	`*`
`19`	`19`	`* @var string`
`20`	`20`	`*/`
`21`		`- protected $_template = 'page/copyright.phtml';`
	`21`	`+ protected $_template = 'Magento_Backend::page/copyright.phtml';`
`22`	`22`	`}`