🔃 [EngCom] Public Pull Requests - 2.1-develop

Stanislav Idolov · web-flow · commit b91b8f2ac2db · 2018-06-13T10:34:14.000+03:00
Accepted Public Pull Requests: - #16043: [Backport] fix for dropdown toggle icon in cart (by @chirag-wagento) - #16024: [Backport 2.1] Wishlist: Remove unnecessary parameter from invoking toHtml() method (by @rogyar) - #16031: [Backport] #13899 Solve Canada Zip Code pattern (by @hitesh-wagento) - #16026: Fixed a minor styling issue in page footer in order to align the columns indentations (by @dmytro-ch) - #15874: [Backport-2.1] Trim username on customer account login page (by @dankhrapiyush) - #15915: [Backport] Fixes in catalog component blocks [2.1-develop] (by @chirag-wagento) - #15643: [Backport] Fixed Purchased Order Form button should visible properly (by @vgelani) - #15917: [Backport] [Resolved : Changing @tab-content__border variable has no effect in B� (by @hitesh-wagento) - #15880: [Backport] [Resolved : limiter float too generic] (by @hitesh-wagento) Fixed GitHub Issues: - #13899: Postal code (zip code) for Canada should allow postal codes without space (reported by @sl02) has been fixed in #16031 by @hitesh-wagento in 2.1-develop branch Related commits: 1. bc26a3a 2. 8f03ac9 3. 2587e0f 4. e7db130 - #6058: IE11 user login email validation fails if field has leading or trailing space (reported by @dnadle) has been fixed in #15874 by @dankhrapiyush in 2.1-develop branch Related commits: 1. f8397eb 2. 43835fc 3. 14721c7 - #14999: Changing @tab-content__border variable has no effect in Blank theme (reported by @denistrator) has been fixed in #15917 by @hitesh-wagento in 2.1-develop branch Related commits: 1. 5b34517 - #15323: limiter float too generic (reported by @DanielRuf) has been fixed in #15880 by @hitesh-wagento in 2.1-develop branch Related commits: 1. 950a668
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
@@ -60,7 +60,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
@@ -186,7 +186,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
@@ -174,7 +174,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/Customer/view/frontend/templates/form/login.phtml b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
@@ -50,3 +50,13 @@
         </form>
     </div>
 </div>
+
+<script type="text/x-magento-init">
+    {
+        ".field.email": {
+            "Magento_Customer/js/trim-username": {
+                "formSelector": "form.form-login"
+            }
+        }
+    }
+</script>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/trim-username.js b/app/code/Magento/Customer/view/frontend/web/js/trim-username.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    $.widget('mage.trimUsername', {
+        options: {
+            cache: {},
+            formSelector: 'form',
+            emailSelector: 'input[type="email"]'
+        },
+
+        /**
+         * Widget initialization
+         * @private
+         */
+        _create: function () {
+            // We need to look outside the module for backward compatibility, since someone can already use the module.
+            // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the
+            // newsletter email field or any other "email" field.
+            this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector);
+            this._bind();
+        },
+
+        /**
+         * Event binding, will monitor change, keyup and paste events.
+         * @private
+         */
+        _bind: function () {
+            if (this.options.cache.email.length) {
+                this._on(this.options.cache.email, {
+                    'change': this._trimUsername,
+                    'keyup': this._trimUsername,
+                    'paste': this._trimUsername
+                });
+            }
+        },
+
+        /**
+         * Trim username
+         * @private
+         */
+        _trimUsername: function () {
+            var username = this._getUsername().trim();
+
+            this.options.cache.email.val(username);
+        },
+
+        /**
+         * Get username value
+         * @returns {*}
+         * @private
+         */
+        _getUsername: function () {
+            return this.options.cache.email.val();
+        }
+    });
+
+    return $.mage.trimUsername;
+});
diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml
@@ -81,6 +81,7 @@
     <zip countryCode="CA">
         <codes>
             <code id="pattern_1" active="true" example="A1B 2C3">^[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}\s[0-9]{1}[a-zA-z]{1}[0-9]{1}$</code>
+            <code id="pattern_2" active="true" example="A1B2C3">^[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}[0-9]{1}$</code>
         </codes>
     </zip>
     <zip countryCode="IC">
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/Wishlist/view/frontend/templates/item/list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
@@ -20,7 +20,7 @@ $columns = $block->getColumns();
         <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li data-row="product-item" class="product-item" id="item_' . $item->getId() . '">' : '</li><li class="product-item" id="item_' . $item->getId() . '">' ?>
             <div class="product-item-info">
                 <?php foreach ($columns as $column): ?>
-                    <?php $column->setItem($item); echo $column->toHtml($item);?>
+                    <?= $column->setItem($item)->toHtml() ?>
                 <?php endforeach; ?>
             </div>
         <?php echo($iterator == count($block->getItems())+1) ? '</li>' : '' ?>
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less
@@ -188,11 +188,10 @@
         .lib-icon-font-symbol(@icon-list);
     }
 
-    .limiter {
-        float: right;
-
-        .products.wrapper ~ .toolbar & {
+    .toolbar {
+        .products.wrapper ~ & .limiter {
             display: block;
+            float: right;
         }
     }
 }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -1401,7 +1401,7 @@
         &.active {
             > .title {
                 .lib-icon-font-symbol(
-                @_icon-font-content: @icon-prev,
+                @_icon-font-content: @icon-up,
                 @_icon-font-position: after
                 );
             }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_sections.less b/app/design/frontend/Magento/blank/web/css/source/_sections.less
@@ -20,9 +20,7 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .product.data.items {
-        .lib-data-tabs(
-            @_tab-content-border-top-status: true
-        );
+        .lib-data-tabs();
     }
 }
 
diff --git a/app/design/frontend/Magento/blank/web/css/source/_variables.less b/app/design/frontend/Magento/blank/web/css/source/_variables.less
@@ -15,6 +15,17 @@
 @font-family-name__base: 'Open Sans';
 @font-family__base: @font-family-name__base, @font-family__sans-serif;
 
+//
+//  Sections variables
+//  _____________________________________________
+
+//
+//  Tabs
+//  ---------------------------------------------
+
+@tab-content__border-top-status: true;
+
+
 //
 //  Sidebar
 //  ---------------------------------------------
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
@@ -235,10 +235,10 @@
         }
     }
 
-    .limiter {
-        float: right;
-        .products.wrapper ~ .toolbar & {
+    .toolbar {
+        .products.wrapper ~ & .limiter {
             display: block;
+            float: right;
         }
     }
 }
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -58,6 +58,10 @@
                     }
                 }
             }
+            
+            #po_number {
+                margin-bottom: 20px;
+            }
         }
 
         .payment-method-title {
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -327,6 +327,9 @@
         .widget.block {
             .lib-css(margin, @indent__base 0);
         }
+        .links .widget.block {
+            margin: 0;
+        }
     }
 
     .no-display:extend(.abs-no-display all) {
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
@@ -42,6 +42,48 @@ public function testPostCodesThrowsExceptionIfCountryDoesNotExist()
         $this->validator->validate('12345', 'INVALID-CODE');
     }
 
+    /**
+     * @dataProvider getCanadaInvalidPostCodes
+     */
+    public function testInvalidCanadaZipCode($countryId, $invalidPostCode)
+    {
+        $this->assertFalse($this->validator->validate($invalidPostCode, $countryId));
+    }
+
+    /**
+     * @dataProvider getCanadaValidPostCodes
+     */
+    public function testValidCanadaZipCode($countryId, $validPostCode)
+    {
+        $this->assertTrue($this->validator->validate($validPostCode, $countryId));
+    }
+
+    /**
+     * @return array
+     */
+    public function getCanadaInvalidPostCodes()
+    {
+        return [
+            ['countryId' => 'CA', 'postcode' => '12345'],
+            ['countryId' => 'CA', 'postcode' => 'A1B2C3D'],
+            ['countryId' => 'CA', 'postcode' => 'A1B2C'],
+            ['countryId' => 'CA', 'postcode' => 'A1B  2C3'],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function getCanadaValidPostCodes()
+    {
+        return [
+            ['countryId' => 'CA', 'postcode' => 'A1B2C3'],
+            ['countryId' => 'CA', 'postcode' => 'A1B 2C3'],
+            ['countryId' => 'CA', 'postcode' => 'Z9Y 8X7'],
+            ['countryId' => 'CA', 'postcode' => 'Z9Y8X7'],
+        ];
+    }
+
     /**
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)

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
`@@ -60,7 +60,7 @@ public function getLabel()`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`
`63`		`- * @return string`
	`63`	`+ * @return array`
`64`	`64`	`*/`
`65`	`65`	`protected function getLinkParams()`
`66`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public function getAddToCompareUrl()`
`186`	`186`	`* Gets minimal sales quantity`
`187`	`187`	`*`
`188`	`188`	`* @param \Magento\Catalog\Model\Product $product`
`189`		`- * @return int\|null`
	`189`	`+ * @return float\|null`
`190`	`190`	`*/`
`191`	`191`	`public function getMinimalQty($product)`
`192`	`192`	`{`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public function getPrice($price, $includingTax = null)`
`174`	`174`	`* Returns price converted to current currency rate`
`175`	`175`	`*`
`176`	`176`	`* @param float $price`
`177`		`- * @return float`
	`177`	`+ * @return float\|string`
`178`	`178`	`*/`
`179`	`179`	`public function getCurrencyPrice($price)`
`180`	`180`	`{`
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`	`{`