🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento#18656: [Backport] Fix product details causing Validation error (by @gelanivishal)
 - magento#18595: [Backport] Fix disappearing navigation arrows in fotorama zoom (by @luukschakenraad)
 - magento#18619: [Backport] Add required fields to templates (by @miguelbalparda)
 - magento#18586: [Backport] Added missing throw tag for exception to docblock of construct (by @dmytro-ch)
 - magento#18599: [Backport] Do not use new Phrase in Link Current class (by @dmytro-ch)
 - magento#18593: Calendar icon in advance pricing alignment solved (by @speedy008)
 - magento#18587: [Backport] Prevent XSS on checkout (by @dmytro-ch)
 - magento#18569: [Backport] Make it possible to disable report bugs link (by @gelanivishal)
 - magento#18561: [2.2] added component status based filtering (by @gelanivishal)


Fixed GitHub Issues:
 - magento#18585: Navigation arrows zoomed fotorama disappear (reported by @luukschakenraad) has been fixed in magento#18595 by @luukschakenraad in 2.2-develop branch
   Related commits:
     1. ad09de9
     2. e031bdc

 - magento#18581: Calendar Icon aligement Issue  (reported by @jignesh26) has been fixed in magento#18593 by @speedy008 in 2.2-develop branch
   Related commits:
     1. a2b163b

 - magento#12070: M2.2.0 Admin Grid column ordering/positioning not working when single store mode set On (reported by @gwharton) has been fixed in magento#18561 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. 7fd27fe

.github/ISSUE_TEMPLATE.md

@@ -5,19 +5,20 @@
      - Information on your environment,
      - Steps to reproduce,
      - Expected and actual results,
+    Fields marked with (*) are required. Please don't remove the template.
 
     Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
 -->
 
-### Preconditions
+### Preconditions (*)
 <!---
     Please provide as detailed information about your environment as possible.
     For example Magento version, tag, HEAD, PHP & MySQL version, etc..
 -->
 1. 
 2. 
 
-### Steps to reproduce
+### Steps to reproduce (*)
 <!---
     It is important to provide a set of clear steps to reproduce this bug.
     If relevant please include code samples
@@ -26,10 +27,10 @@
 2. 
 3. 
 
-### Expected result
+### Expected result (*)
 <!--- Tell us what should happen -->
 1. [Screenshots, logs or description]
 
-### Actual result
+### Actual result (*)
 <!--- Tell us what happens instead -->
 1. [Screenshots, logs or description]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,28 +6,29 @@ about: Technical issue with the Magento 2 core components
 
 <!---
 Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+Fields marked with (*) are required. Please don't remove the template.
 -->
 
-### Preconditions
+### Preconditions (*)
 <!---
 Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
 -->
 1.
 2.
 
-### Steps to reproduce
+### Steps to reproduce (*)
 <!---
 Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
 -->
 1.
 2.
 
-### Expected result
+### Expected result (*)
 <!--- Tell us what do you expect to happen. -->
 1. [Screenshots, logs or description]
 2.
 
-### Actual result
+### Actual result (*)
 <!--- Tell us what happened instead. Include error messages and issues. -->
 1. [Screenshots, logs or description]
 2.

.github/ISSUE_TEMPLATE/developer-experience-issue.md

@@ -6,12 +6,13 @@ about: Issues related to customization, extensibility, modularity
 
 <!---
 Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+Fields marked with (*) are required. Please don't remove the template.
 -->
 
-### Summary
+### Summary (*)
 <!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
 
-### Examples
+### Examples (*)
 <!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
 
 ### Proposed solution

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,13 +5,13 @@ about: Please consider reporting directly to https://github.com/magento/communit
 ---
 
 <!---
-Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum.
+Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum. Fields marked with (*) are required. Please don't remove the template.
 -->
 
-### Description
+### Description (*)
 <!--- Describe the feature you would like to add. -->
 
-### Expected behavior
+### Expected behavior (*)
 <!--- What is the expected behavior of this feature? How is it going to work? -->
 
 ### Benefits

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,12 +3,13 @@
     To help us process this pull request we recommend that you add the following information:
      - Summary of the pull request,
      - Issue(s) related to the changes made,
-     - Manual testing scenarios,
+     - Manual testing scenarios
+    Fields marked with (*) are required. Please don't remove the template.
 -->
 
 <!--- Please provide a general summary of the Pull Request in the Title above -->
 
-### Description
+### Description (*)
 <!---
     Please provide a description of the changes proposed in the pull request.
     Letting us know what has changed and why it needed changing will help us validate this pull request.
@@ -22,15 +23,15 @@
 1. magento/magento2#<issue_number>: Issue title
 2. ...
 
-### Manual testing scenarios
+### Manual testing scenarios (*)
 <!---
     Please provide a set of unambiguous steps to test the proposed code change.
     Giving us manual testing scenarios will help with the processing and validation process.
 -->
 1. ...
 2. ...
 
-### Contribution checklist
+### Contribution checklist (*)
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)

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

@@ -21,7 +21,7 @@
                     $label = $block->getChildData($alias, 'title');
                 ?>
                 <div class="data item title"
-                     aria-labeledby="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title"
+                     aria-labelledby="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title"
                      data-role="collapsible" id="tab-label-<?= /* @escapeNotVerified */ $alias ?>">
                     <a class="data switch"
                        tabindex="-1"

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -26,7 +26,7 @@
                class="cart items data table"
                data-mage-init='{"shoppingCart":{"emptyCartButton": "action.clear",
                "updateCartActionContainer": "#update_cart_action_container"}}'>
-            <caption role="heading" aria-level="2" class="table-caption"><?= /* @escapeNotVerified */ __('Shopping Cart Items') ?></caption>
+            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Shopping Cart Items') ?></caption>
             <thead>
                 <tr>
                     <th class="col item" scope="col"><span><?= /* @escapeNotVerified */ __('Item') ?></span></th>

app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml

@@ -111,7 +111,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
         </td>
     </tr>
     <tr class="item-actions">
-        <td colspan="100">
+        <td colspan="4">
             <div class="actions-toolbar">
                 <?= /* @escapeNotVerified */ $block->getActions($_item) ?>
             </div>

app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

@@ -8,7 +8,7 @@
     <text args="currentBillingAddress().prefix"/> <text args="currentBillingAddress().firstname"/> <text args="currentBillingAddress().middlename"/>
     <text args="currentBillingAddress().lastname"/> <text args="currentBillingAddress().suffix"/><br/>
     <text args="_.values(currentBillingAddress().street).join(', ')"/><br/>
-    <text args="currentBillingAddress().city "/>, <span html="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
+    <text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
     <text args="getCountryName(currentBillingAddress().countryId)"/><br/>
     <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
 

app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

@@ -8,7 +8,7 @@
     <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
     <text args="address().lastname"/> <text args="address().suffix"/><br/>
     <text args="_.values(address().street).join(', ')"/><br/>
-    <text args="address().city "/>, <span html="address().region"></span> <text args="address().postcode"/><br/>
+    <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
     <text args="getCountryName(address().countryId)"/><br/>
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
 

app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

@@ -8,7 +8,7 @@
     <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
     <text args="address().lastname"/> <text args="address().suffix"/><br/>
     <text args="_.values(address().street).join(', ')"/><br/>
-    <text args="address().city "/>, <span html="address().region"></span> <text args="address().postcode"/><br/>
+    <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
     <text args="getCountryName(address().countryId)"/><br/>
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
 

app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php

@@ -60,6 +60,7 @@ class Tablerate extends \Magento\Shipping\Model\Carrier\AbstractCarrier implemen
      * @param \Magento\Quote\Model\Quote\Address\RateResult\MethodFactory $resultMethodFactory
      * @param \Magento\OfflineShipping\Model\ResourceModel\Carrier\TablerateFactory $tablerateFactory
      * @param array $data
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function __construct(

app/code/Magento/Theme/etc/config.xml

@@ -46,6 +46,7 @@ Disallow: /*SID=
             </header>
             <footer translate="copyright">
                 <copyright>Copyright &#169; 2013-present Magento, Inc. All rights reserved.</copyright>
+                <report_bugs>1</report_bugs>
             </footer>
         </design>
         <theme>

app/code/Magento/Theme/etc/di.xml

@@ -213,6 +213,10 @@
                     <item name="path" xsi:type="string">design/footer/absolute_footer</item>
                     <item name="fieldset" xsi:type="string">other_settings/footer</item>
                 </item>
+                <item name="footer_report_bugs" xsi:type="array">
+                    <item name="path" xsi:type="string">design/footer/report_bugs</item>
+                    <item name="fieldset" xsi:type="string">other_settings/footer</item>
+                </item>
                 <item name="default_robots" xsi:type="array">
                     <item name="path" xsi:type="string">design/search_engine_robots/default_robots</item>
                     <item name="fieldset" xsi:type="string">other_settings/search_engine_robots</item>

app/code/Magento/Theme/i18n/en_US.csv

@@ -185,3 +185,7 @@ Settings,Settings
 "2 columns with left bar","2 columns with left bar"
 "2 columns with right bar","2 columns with right bar"
 "3 columns","3 columns"
+ID,ID
+View,View
+Action,Action
+"Display Report Bugs Link","Display Report Bugs Link"

app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml

@@ -234,6 +234,20 @@
                     <dataScope>footer_copyright</dataScope>
                 </settings>
             </field>
+            <field name="footer_report_bugs" formElement="select">
+                <settings>
+                    <dataType>text</dataType>
+                    <label translate="true">Display Report Bugs Link</label>
+                    <dataScope>footer_report_bugs</dataScope>
+                </settings>
+                <formElements>
+                    <select>
+                        <settings>
+                            <options class="Magento\Config\Model\Config\Source\Yesno"/>
+                        </settings>
+                    </select>
+                </formElements>
+            </field>
         </fieldset>
         <fieldset name="search_engine_robots" sortOrder="120">
             <settings>

app/code/Magento/Theme/view/frontend/layout/default.xml

@@ -119,7 +119,7 @@
                     </arguments>
                 </block>
                 <block class="Magento\Theme\Block\Html\Footer" name="copyright" template="Magento_Theme::html/copyright.phtml"/>
-                <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" />
+                <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" ifconfig="design/footer/report_bugs"/>
             </container>
         </referenceContainer>
         <referenceContainer name="before.body.end">

app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js

@@ -224,7 +224,7 @@ define([
          */
         build: function (parent, node, name) {
             var defaults    = parent && parent.childDefaults || {},
-                children    = node.children,
+                children    = this.filterDisabledChildren(node.children),
                 type        = getNodeType(parent, node),
                 dataScope   = getDataScope(parent, node),
                 component,
@@ -294,6 +294,35 @@ define([
             return node;
         },
 
+        /**
+         * Filter out all disabled components.
+         *
+         * @param {Object} children
+         * @returns {*}
+         */
+        filterDisabledChildren: function (children) {
+            var cIds;
+
+            //cleanup children config.componentDisabled = true
+            if (children && typeof children === 'object') {
+                cIds = Object.keys(children);
+
+                if (cIds) {
+                    _.each(cIds, function (cId) {
+                        if (typeof children[cId] === 'object' &&
+                            children[cId].hasOwnProperty('config') &&
+                            typeof children[cId].config === 'object' &&
+                            children[cId].config.hasOwnProperty('componentDisabled') &&
+                            children[cId].config.componentDisabled === true) {
+                            delete children[cId];
+                        }
+                    });
+                }
+            }
+
+            return children;
+        },
+
         /**
          * Init component.
          *

app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less

@@ -43,7 +43,7 @@
         height: @action__height;
         margin-left: -@action__height;
         overflow: hidden;
-        position: relative;
+        position: absolute;
         vertical-align: top;
         z-index: 1;
 

dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php

@@ -96,35 +96,6 @@ function ($file) {
         );
     }
 
-    public function testAppCodeUsage()
-    {
-        $files = Files::init();
-        $componentRegistrar = new ComponentRegistrar();
-        $libPaths = $componentRegistrar->getPaths(ComponentRegistrar::LIBRARY);
-        $invoker = new AggregateInvoker($this);
-        $invoker(
-            function ($file) use ($libPaths) {
-                $content = file_get_contents($file);
-                foreach ($libPaths as $libPath) {
-                    if (strpos($file, $libPath) === 0) {
-                        $this->assertSame(
-                            0,
-                            preg_match('~(?<![a-z\\d_:]|->|function\\s)__\\s*\\(~iS', $content),
-                            'Function __() is defined outside of the library and must not be used there. ' .
-                            'Replacement suggestion: new \\Magento\\Framework\\Phrase()'
-                        );
-                    }
-                }
-            },
-            $files->getPhpFiles(
-                Files::INCLUDE_PUB_CODE |
-                Files::INCLUDE_LIBS |
-                Files::AS_DATA_SET |
-                Files::INCLUDE_NON_CLASSES
-            )
-        );
-    }
-
     /**
      * @inheritdoc
      */

lib/internal/Magento/Framework/View/Element/Html/Link/Current.php

@@ -104,21 +104,21 @@ protected function _toHtml()
         if ($this->isCurrent()) {
             $html = '<li class="nav item current">';
             $html .= '<strong>'
-                . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel()))
+                . $this->escapeHtml(__($this->getLabel()))
                 . '</strong>';
             $html .= '</li>';
         } else {
             $html = '<li class="nav item' . $highlight . '"><a href="' . $this->escapeHtml($this->getHref()) . '"';
             $html .= $this->getTitle()
-                ? ' title="' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getTitle())) . '"'
+                ? ' title="' . $this->escapeHtml(__($this->getTitle())) . '"'
                 : '';
             $html .= $this->getAttributesHtml() . '>';
 
             if ($this->getIsHighlighted()) {
                 $html .= '<strong>';
             }
 
-            $html .= $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel()));
+            $html .= $this->escapeHtml(__($this->getLabel()));
 
             if ($this->getIsHighlighted()) {
                 $html .= '</strong>';

lib/web/fotorama/fotorama.js

@@ -2092,7 +2092,7 @@ fotoramaVersion = '4.6.4';
                 o_navTop = opts.navposition === 'top';
                 classes.remove.push(selectClass);
 
-                $arrs.toggle(opts.arrows);
+                $arrs.toggle(!!opts.arrows);
             } else {
                 o_nav = false;
                 $arrs.hide();