🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - magento#20297: update-button-issue-while-updating-billing-and-shipping-address (by @priti2jcommerce)
 - magento#20306: issue fixed magento#20304 No space between step title and saved address in c� (by @cedarvinda)
 - magento#20302: Small PHPDocs fixes [Reports module] (by @SikailoISM)
 - magento#20283: Adjusted documentation for ReadInterface to reflect Exception (by @troendheim)
 - magento#20258: Missing echo of php vars in widget template file - tabshoriz.phtml (by @df2k2)
 - magento#20214: Fixed-Hamburger-Icon-was-available-Page (by @amol2jcommerce)
 - magento#20207:  Meassage icon is not proper aligned (by @speedy008)
 - magento#20241: Fixed - Admin - dropdown toggle arrow not working on closing magento#20240 (by @niravkrish)
 - magento#20224: 'review-text-is-not-show-uniformly' :: add your review text is not sh… (by @nainesh2jcommerce)
 - magento#19812: Fixed The ui-component field validation error not opening accordion tab that owns the field (field does not get focused) (by @ravi-chandra3197)
 - magento#20130: Fixed issue magento#20030 :Customer EAV Decimal Attribute required allow 0 (by @shikhamis11)
 - magento#19870: Added required error message. (by @vinogcs)
 - magento#19532: Resolved issue if checkbox custom option is optional (by @suneet64)
 - magento#19414: Forward Port: fixed-2.3-dev-19371: Attribute Heading border misaligned (by @suryakant-krish)
 - magento#19305: fixed issue magento#19292 for 2.3-develop (by @webkul-ratnesh)
 - magento#19007: magento#4154 - There is no ability to add a tab to product page at a desired position (by @vasilii-b)
 - magento#20416: Improve auth.json.sample (by @brendanfalkowski)


Fixed GitHub Issues:
 - magento#20304: No space between step title and saved address in checkout  (reported by @swetacedcoss) has been fixed in magento#20306 by @cedarvinda in 2.3-develop branch
   Related commits:
     1. 196ba8e

 - magento#20210: Hamburger Icon was available on a page where menu was not present. Issue in responsive view (reported by @swetacedcoss) has been fixed in magento#20214 by @amol2jcommerce in 2.3-develop branch
   Related commits:
     1. a0bfa97
     2. bbe41a2

 - magento#20240: Admin - dropdown toggle arrow not working on closing (reported by @saphaljha) has been fixed in magento#20241 by @niravkrish in 2.3-develop branch
   Related commits:
     1. 52130ac
     2. c1d987b
     3. 75d3b00
     4. 860e4e3

 - magento#20221: add your review text is not show uniformly in Mobile view (reported by @preeti-gupta123) has been fixed in magento#20224 by @nainesh2jcommerce in 2.3-develop branch
   Related commits:
     1. 16b480f
     2. e6a72f0

 - magento#17926: The ui-component field validation error not opening accordion tab that owns the field (field does not get focused) (reported by @allanpaiste) has been fixed in magento#19812 by @ravi-chandra3197 in 2.3-develop branch
   Related commits:
     1. a06ae36
     2. 6e9ad78

 - magento#20030: Customer EAV Decimal Attribute required allow 0 (reported by @nthurston) has been fixed in magento#20130 by @shikhamis11 in 2.3-develop branch
   Related commits:
     1. 53d861a
     2. 1c464c2
     3. 44a2149

 - magento#19371: Attribute Heading border misaligned. (reported by @suryakant-krish) has been fixed in magento#19414 by @suryakant-krish in 2.3-develop branch
   Related commits:
     1. 77fa704
     2. 976d80c
     3. c835aa1
     4. f03953b

 - magento#19292: Pagination controls are missing on wishlist page (reported by @webkul-shruti) has been fixed in magento#19305 by @webkul-ratnesh in 2.3-develop branch
   Related commits:
     1. 23e6250
     2. 3ebcc33
     3. edc8404
     4. 4ddc22b
     5. 60a0dd4
     6. ce8765b
     7. 4fb3c8d
     8. 71ee75b
     9. b153c06
     10. ff416b9
     11. 00a2131
     12. 8923046
     13. 7c5b9a5
     14. dc407d9
     15. 2b3deab
     16. 4bfacbb
     17. c41ec76
     18. e068042
     19. 8b06ed6
     20. 5e2bbb6
     21. bd89f7b
     22. 35c033e
     23. 4fbcf8c
     24. 249aa07
     25. 177f814
     26. c772d44
     27. e99d90a
     28. 4a14950

 - magento#4154: There is no abilitity to add a tab to product page at a desired position (reported by @stasleo) has been fixed in magento#19007 by @vasilii-b in 2.3-develop branch
   Related commits:
     1. c91649a
     2. c1d0f31
     3. 1ad7d45

Author: magento-engcom-team

app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml

@@ -18,7 +18,7 @@
     <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
     <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
     <li>
-        <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
+        <a href="<?= $block->escapeHtmlAttr($_tabHref) ?>" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>" title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>" class="<?= $block->escapeHtmlAttr($_tabClass) ?>" data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
             <span>
                 <span class="changed" title="<?= /* @escapeNotVerified */ __('The information in this tab has been changed.') ?>"></span>
                 <span class="error" title="<?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>

app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml

@@ -14,7 +14,8 @@
         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
 
         <!--Trigger SEO drop down-->
-        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="moveToSEOSection"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
         <waitForPageLoad stepKey="WaitForDropDownSEO"/>
 
         <!--Fill URL input-->

app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml

@@ -99,8 +99,8 @@
         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku2"/>
 
         <!--Trigger SEO drop down-->
-        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed2"/>
-        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="moveToSEOSection"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
 
         <!--Fill URL input-->
         <fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>

app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml

@@ -60,15 +60,7 @@
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
 
-        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
-        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
-
-        <!--Trigger SEO drop down-->
-        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
-        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
-
-        <!--Fill URL input-->
-        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension"/>
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts"/>
 
         <!--Save the product-->
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
@@ -104,7 +96,8 @@
         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku2"/>
 
         <!--Trigger SEO drop down-->
-        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed2"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="moveToSEOSection"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
         <waitForPageLoad stepKey="WaitForDropDownSEO2"/>
 
         <!--Fill URL input-->

app/code/Magento/Catalog/Block/Product/View/Details.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Block\Product\View;
+
+/**
+ * Product details block.
+ *
+ * Holds a group of blocks to show as tabs.
+ *
+ * @api
+ */
+class Details extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * Get sorted child block names.
+     *
+     * @param string $groupName
+     * @param string $callback
+     * @throws \Magento\Framework\Exception\LocalizedException
+     *
+     * @return array
+     */
+    public function getGroupSortedChildNames(string $groupName, string $callback): array
+    {
+        $groupChildNames = $this->getGroupChildNames($groupName, $callback);
+        $layout = $this->getLayout();
+
+        $childNamesSortOrder = [];
+
+        foreach ($groupChildNames as $childName) {
+            $alias = $layout->getElementAlias($childName);
+            $sortOrder = (int)$this->getChildData($alias, 'sort_order') ?? 0;
+
+            $childNamesSortOrder[$sortOrder] = $childName;
+        }
+
+        ksort($childNamesSortOrder, SORT_NUMERIC);
+
+        return $childNamesSortOrder;
+    }
+}

app/code/Magento/Catalog/Model/Product/Option/Type/Select.php

@@ -71,7 +71,7 @@ public function validateUserValue($values)
         }
         if (!$this->_isSingleSelection()) {
             $valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId())->load();
-            $valueCount = is_array($value) ? count($value) : 1;
+            $valueCount = is_array($value) ? count($value) : 0;
             if ($valuesCollection->count() != $valueCount) {
                 $this->setIsValid(false);
                 throw new LocalizedException(

app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

@@ -136,19 +136,21 @@
                     </arguments>
                 </block>
             </container>
-            <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="Magento_Catalog::product/view/details.phtml" after="product.info.media">
+            <block class="Magento\Catalog\Block\Product\View\Details" name="product.info.details" template="Magento_Catalog::product/view/details.phtml" after="product.info.media">
                 <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" as="description" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info">
                     <arguments>
                         <argument name="at_call" xsi:type="string">getDescription</argument>
                         <argument name="at_code" xsi:type="string">description</argument>
                         <argument name="css_class" xsi:type="string">description</argument>
                         <argument name="at_label" xsi:type="string">none</argument>
                         <argument name="title" translate="true" xsi:type="string">Details</argument>
+                        <argument name="sort_order" xsi:type="string">10</argument>
                     </arguments>
                 </block>
                 <block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="Magento_Catalog::product/view/attributes.phtml" group="detailed_info">
                     <arguments>
                         <argument translate="true" name="title" xsi:type="string">More Information</argument>
+                        <argument name="sort_order" xsi:type="string">20</argument>
                     </arguments>
                 </block>
             </block>

app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml

@@ -6,8 +6,9 @@
 
 // @codingStandardsIgnoreFile
 
+/** @var \Magento\Catalog\Block\Product\View\Details $block */
 ?>
-<?php if ($detailedInfoGroup = $block->getGroupChildNames('detailed_info', 'getChildHtml')):?>
+<?php if ($detailedInfoGroup = $block->getGroupSortedChildNames('detailed_info', 'getChildHtml')):?>
     <div class="product info detailed">
         <?php $layout = $block->getLayout(); ?>
         <div class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'>

app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php

@@ -143,6 +143,7 @@ public function setRequestScope($scope)
 
     /**
      * Set scope visibility
+     *
      * Search value only in scope or search value in scope and global
      *
      * @param bool $flag
@@ -296,7 +297,7 @@ protected function _applyOutputFilter($value)
      * Validate value by attribute input validation rule
      *
      * @param string $value
-     * @return string|true
+     * @return array|true
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */

app/code/Magento/Eav/Model/Attribute/Data/Text.php

@@ -72,20 +72,17 @@ public function validateValue($value)
             return true;
         }
 
-        if (empty($value) && $value !== '0') {
+        if (empty($value) && $value !== '0' && $attribute->getDefaultValue() === null) {
             $label = __($attribute->getStoreLabel());
             $errors[] = __('"%1" is a required value.', $label);
         }
 
-        $result = $this->validateLength($attribute, $value);
-        if (count($result) !== 0) {
-            $errors = array_merge($errors, $result);
-        }
+        $validateLengthResult = $this->validateLength($attribute, $value);
+        $errors = array_merge($errors, $validateLengthResult);
+
+        $validateInputRuleResult = $this->validateInputRule($value);
+        $errors = array_merge($errors, $validateInputRuleResult);
 
-        $result = $this->_validateInputRule($value);
-        if ($result !== true) {
-            $errors = array_merge($errors, $result);
-        }
         if (count($errors) == 0) {
             return true;
         }
@@ -141,7 +138,7 @@ public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::O
      * @param string $value
      * @return array errors
      */
-    private function validateLength(\Magento\Eav\Model\Attribute $attribute, $value): array
+    private function validateLength(\Magento\Eav\Model\Attribute $attribute, string $value): array
     {
         $errors = [];
         $length = $this->_string->strlen(trim($value));
@@ -162,4 +159,16 @@ private function validateLength(\Magento\Eav\Model\Attribute $attribute, $value)
 
         return $errors;
     }
+
+    /**
+     * Validate value by attribute input validation rule.
+     *
+     * @param string $value
+     * @return array
+     */
+    private function validateInputRule(string $value): array
+    {
+        $result = $this->_validateInputRule($value);
+        return \is_array($result) ? $result : [];
+    }
 }

app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php

@@ -4,21 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Report statistics admin controller
- *
- * @author      Magento Core Team <[email protected]>
- */
 namespace Magento\Reports\Controller\Adminhtml\Report;
 
 use Magento\Backend\Model\Auth\Session as AuthSession;
 use Magento\Backend\Model\Session;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
 /**
+ * Report statistics admin controller.
+ *
  * @api
  * @since 100.0.2
  */
-abstract class Statistics extends \Magento\Backend\App\Action
+abstract class Statistics extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -49,7 +47,7 @@ abstract class Statistics extends \Magento\Backend\App\Action
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
-     * @param [] $reportTypes
+     * @param array $reportTypes
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,

app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php

@@ -81,7 +81,7 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Sales\Model\ResourceModel\Report\OrderFactory $reportOrderFactory
-     * @param null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)

app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php

@@ -24,6 +24,7 @@ class CatalogProductCompareClearObserver implements ObserverInterface
 
     /**
      * @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
@@ -39,7 +40,7 @@ public function __construct(
      * Reset count of compared products cache
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return $this
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)

app/code/Magento/Reports/Observer/CatalogProductViewObserver.php

@@ -10,6 +10,7 @@
 
 /**
  * Reports Event observer model
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class CatalogProductViewObserver implements ObserverInterface
 {
@@ -49,6 +50,7 @@ class CatalogProductViewObserver implements ObserverInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,

app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php

@@ -25,6 +25,7 @@ class CheckoutCartAddProductObserver implements ObserverInterface
 
     /**
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         EventSaver $eventSaver,

app/code/Magento/Reports/Observer/CustomerLogoutObserver.php

@@ -38,7 +38,7 @@ public function __construct(
      * Customer logout processing
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return $this
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)

app/code/Magento/Reports/Observer/SendfriendProductObserver.php

@@ -25,6 +25,7 @@ class SendfriendProductObserver implements ObserverInterface
 
     /**
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         EventSaver $eventSaver,

app/code/Magento/Reports/Observer/WishlistAddProductObserver.php

@@ -25,6 +25,7 @@ class WishlistAddProductObserver implements ObserverInterface
 
     /**
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         EventSaver $eventSaver,

app/code/Magento/Reports/Observer/WishlistShareObserver.php

@@ -25,6 +25,7 @@ class WishlistShareObserver implements ObserverInterface
 
     /**
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         EventSaver $eventSaver,

app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml

@@ -19,6 +19,9 @@
         </referenceContainer>
         <referenceBlock name="product.info.details">
             <block class="Magento\Review\Block\Product\Review" name="reviews.tab" as="reviews" template="Magento_Review::review.phtml" group="detailed_info" ifconfig="catalog/review/active">
+                <arguments>
+                    <argument name="sort_order" xsi:type="string">30</argument>
+                </arguments>
                 <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form" ifconfig="catalog/review/active">
                     <container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before"/>
                 </block>

app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js

@@ -162,6 +162,10 @@ define([
             }
 
             this.error(hasErrors || message);
+
+            if (hasErrors || message) {
+                this.open();
+            }
         },
 
         /**

app/code/Magento/Ui/view/base/web/js/form/element/abstract.js

@@ -408,6 +408,7 @@ define([
                 isValid = this.disabled() || !this.visible() || result.passed;
 
             this.error(message);
+            this.error.valueHasMutated();
             this.bubble('error', message);
 
             //TODO: Implement proper result propagation for form

app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html

@@ -36,7 +36,7 @@
             class="action-select admin__action-multiselect"
             data-role="advanced-select"
             data-bind="
-            css: {_active: multiselectFocus},
+            css: {_active: listVisible},
             click: function(data, event) {
                 toggleListVisible(data, event)
             }
@@ -73,7 +73,7 @@
             class="action-select admin__action-multiselect"
             data-role="advanced-select"
             data-bind="
-            css: {_active: multiselectFocus},
+            css: {_active: listVisible},
             click: function(data, event) {
                 toggleListVisible(data, event)
             }