🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #19350: [Forwardport] local themes should be added to git repo (by @torhoehn)
 - #19332: chore: remove unused code in admin view of catalog (by @DanielRuf)
 - #19322: Fixed configurable product widget issue (by @gelanivishal)
 - #19318: [Forwardport] Fixed child items showing on My Account order view (by @torhoehn)
 - #19298: [Forwardport] Fix issue port 19286 - Wrong pager style (by @speedy008)
 - #19146: Add availability to leave empty config for events.xml (by @lisovyievhenii)
 - magento-engcom/import-export-improvements#150: Define $session property in History model (by @denispapec)


Fixed GitHub Issues:
 - #18949: dev/tools/grunt/configs/themes.js gets replaced after update magento (reported by @iget-master) has been fixed in #19350 by @torhoehn in 2.3-develop branch
   Related commits:
     1. adb97a3

 - #19315: Issue with configurable products in widgets, not added to cart (reported by @jcourtei) has been fixed in #19322 by @gelanivishal in 2.3-develop branch
   Related commits:
     1. ada1c5f
     2. 8b1afea

 - #16434: Bundle Product Options not showing in Customer Account - Items Ordered  (reported by @robertkent) has been fixed in #19318 by @torhoehn in 2.3-develop branch
   Related commits:
     1. 7e78060

 - #19286: Wrong pager style (reported by @gujjwal00) has been fixed in #19298 by @speedy008 in 2.3-develop branch
   Related commits:
     1. ded5c49
     2. 2f60707
     3. d445e48

 - #15931: events.xml cant have no childrens, others can [Magento 2.2.4] (reported by @NopeNopeNope) has been fixed in #19146 by @lisovyievhenii in 2.3-develop branch
   Related commits:
     1. 16f2e0d
     2. 7ae271e

Author: magento-engcom-team

.gitignore

@@ -33,7 +33,6 @@ atlassian*
 /.php_cs
 /.php_cs.cache
 /grunt-config.json
-/dev/tools/grunt/configs/local-themes.js
 /pub/media/*.*
 !/pub/media/.htaccess
 /pub/media/attribute/*

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js

@@ -469,26 +469,6 @@ define([
             }
         },
 
-        /**
-         * toggles Selects states (for IE) except those to be shown in popup
-         */
-        /*_toggleSelectsExceptBlock: function(flag) {
-         if(Prototype.Browser.IE){
-         if (this.blockForm) {
-         var states = new Array;
-         var selects = this.blockForm.getElementsByTagName("select");
-         for(var i=0; i<selects.length; i++){
-         states[i] = selects[i].style.visibility
-         }
-         }
-         if (this.blockForm) {
-         for(i=0; i<selects.length; i++){
-         selects[i].style.visibility = states[i]
-         }
-         }
-         }
-         },*/
-
         /**
          * Close configuration window
          */

app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml

@@ -33,7 +33,7 @@
                                 <div class="product-item-actions">
                                     <div class="actions-primary">
                                         <?php if ($_product->isSaleable()): ?>
-                                            <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
+                                            <?php if (!$_product->getTypeInstance()->isPossibleBuyFromList($_product)): ?>
                                                 <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
                                                         class="action tocart primary"
                                                         data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'>

app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml

@@ -66,7 +66,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                         <?php if ($showCart): ?>
                                             <div class="actions-primary">
                                                 <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                    <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)): ?>
                                                         <button class="action tocart primary"
                                                                 data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
                                                                 type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">

app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml

@@ -65,7 +65,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                             <?php if ($showCart): ?>
                                                 <div class="actions-primary">
                                                     <?php if ($_item->isSaleable()): ?>
-                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                        <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)): ?>
                                                             <button class="action tocart primary"
                                                                     data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
                                                                     type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">

app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml

@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-69455"/>
             <group value="persistent"/>
+            <skip>
+                <issueId value="MAGETWO-96656"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>

app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml

@@ -61,7 +61,7 @@
                                         <?php if ($showCart): ?>
                                             <div class="actions-primary">
                                                 <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                    <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)): ?>
                                                         <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
                                                             <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                         </button>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml

@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-69988"/>
             <group value="сonfigurable_product"/>
+            <skip>
+                <issueId value="MAGETWO-96658"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>

app/code/Magento/ImportExport/Model/History.php

@@ -42,6 +42,11 @@ class History extends \Magento\Framework\Model\AbstractModel
      */
     protected $reportHelper;
 
+    /**
+     * @var \Magento\Backend\Model\Auth\Session
+     */
+    protected $session;
+
     /**
      * Class constructor
      *
@@ -293,6 +298,8 @@ public function setSummary($summary)
     }
 
     /**
+     * Load the last inserted item
+     *
      * @return $this
      */
     public function loadLastInsertItem()

app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest.xml

@@ -16,6 +16,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-69826"/>
             <group value="urlRewrite"/>
+            <skip>
+                <issueId value="MAGETWO-96713"/>
+            </skip>
         </annotations>
 
         <!-- Preconditions-->

app/design/frontend/Magento/luma/web/css/source/_extends.less

@@ -1506,6 +1506,10 @@
             position: relative;
             z-index: 1;
         }
+        .limiter {
+            display: inline-block;
+            float: right;
+        }
 
         .toolbar-amount {
             .lib-css(line-height, @pager__line-height);

lib/internal/Magento/Framework/Event/Test/Unit/Config/_files/invalidEventsXmlArray.php

@@ -4,10 +4,6 @@
  * See COPYING.txt for license details.
  */
 return [
-    'without_event_handle' => [
-        '<?xml version="1.0"?><config></config>',
-        ["Element 'config': Missing child element(s). Expected is ( event ).\nLine: 1\n"],
-    ],
     'event_without_required_name_attribute' => [
         '<?xml version="1.0"?><config><event name="some_name"></event></config>',
         ["Element 'event': Missing child element(s). Expected is ( observer ).\nLine: 1\n"],

lib/internal/Magento/Framework/Event/etc/events.xsd

@@ -9,7 +9,7 @@
     <xs:element name="config">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="event" type="eventDeclaration" minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="event" type="eventDeclaration" minOccurs="0" maxOccurs="unbounded">
                     <xs:unique name="uniqueObserverName">
                         <xs:annotation>
                             <xs:documentation>