Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MC-19689

dhorytskyi · dhorytskyi · commit d37b4b7d286c · 2019-09-03T17:02:41.000-05:00
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -23,7 +23,7 @@
         <section id="advanced" translate="label" type="text" sortOrder="910" showInDefault="0" showInWebsite="0" showInStore="0">
             <label>Advanced</label>
             <tab>advanced</tab>
-            <resource>Magento_Backend::advanced</resource>
+            <resource>Magento_Config::advanced</resource>
             <group id="modules_disable_output" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Disable Modules Output</label>
                 <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset\Modules\DisableOutput</frontend_model>
diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
@@ -11,17 +11,14 @@
 $id = $block->getContainerId() . random_int(0, PHP_INT_MAX);
 
 $config = [
-    'Magento_Braintree/js/paypal/button' => [
-        'id' => $id,
-        'clientToken' => $block->getClientToken(),
-        'displayName' => $block->getMerchantName(),
-        'actionSuccess' => $block->getActionSuccess(),
-        'environment' => $block->getEnvironment()
-    ]
+    'id' => $id,
+    'clientToken' => $block->getClientToken(),
+    'displayName' => $block->getMerchantName(),
+    'actionSuccess' => $block->getActionSuccess(),
+    'environment' => $block->getEnvironment()
 ];
-
 ?>
-<div data-mage-init='<?= /* @noEscape */ json_encode($config); ?>'
+<div data-mage-init='{"Magento_Braintree/js/paypal/button":<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($config) ?>}'
     class="paypal checkout paypal-logo braintree-paypal-logo<?= /* @noEscape */ $block->getContainerId(); ?>-container">
     <div data-currency="<?= /* @noEscape */ $block->getCurrency(); ?>"
        data-locale="<?= /* @noEscape */ $block->getLocale(); ?>"
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
@@ -3,10 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main;
 
 use Magento\Backend\Block\Widget\Form;
 
+/**
+ * Form attribute set
+ *
+ * Class \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Formset
+ */
 class Formset extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -43,7 +50,7 @@ protected function _prepareForm()
 
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create();
-        $fieldset = $form->addFieldset('set_name', ['legend' => __('Edit Attribute Set Name')]);
+        $fieldset = $form->addFieldset('set_name', ['legend' => $this->getAttributeSetLabel()]);
         $fieldset->addField(
             'attribute_set_name',
             'text',
@@ -84,4 +91,18 @@ protected function _prepareForm()
         $form->setOnsubmit('return false;');
         $this->setForm($form);
     }
+
+    /**
+     * Get Attribute Set Label
+     *
+     * @return \Magento\Framework\Phrase
+     */
+    private function getAttributeSetLabel()
+    {
+        if ($this->getRequest()->getParam('id', false)) {
+            return __('Edit Attribute Set Name');
+        }
+
+        return __('Attribute Set Information');
+    }
 }
diff --git a/app/code/Magento/Catalog/i18n/en_US.csv b/app/code/Magento/Catalog/i18n/en_US.csv
@@ -813,3 +813,5 @@ Details,Details
 "Edit Category Design","Edit Category Design"
 "A total of %1 record(s) haven't been deleted. Please see server logs for more details.","A total of %1 record(s) haven't been deleted. Please see server logs for more details."
 "Are you sure you want to delete this category?","Are you sure you want to delete this category?"
+"Attribute Set Information","Attribute Set Information"
+
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
@@ -8,8 +8,14 @@
 $viewModel = $block->getData('viewModel');
 ?>
 <div class="breadcrumbs"></div>
+<?php
+$widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($viewModel->getJsonConfigurationHtmlEscaped());
+$widgetOptions = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($widget['breadcrumbs']);
+?>
 <script type="text/x-magento-init">
-        {
-            ".breadcrumbs": <?= $viewModel->getJsonConfigurationHtmlEscaped() ?>
+    {
+        ".breadcrumbs": {
+            "breadcrumbs": <?= /* @noEscape */ $widgetOptions ?>
         }
+    }
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
@@ -15,7 +15,10 @@
 // phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
 ?>
 <?php if ($block->getCollection()->getSize()) :?>
-    <div class="toolbar toolbar-products" data-mage-init='<?= /* @noEscape */ $block->getWidgetOptionsJson() ?>'>
+    <?php $widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($block->getWidgetOptionsJson());
+        $widgetOptions = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($widget['productListToolbarForm']);
+    ?>
+    <div class="toolbar toolbar-products" data-mage-init='{"productListToolbarForm":<?= /* @noEscape */ $widgetOptions ?>}'>
         <?php if ($block->isExpanded()) :?>
             <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
         <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
@@ -135,7 +135,9 @@ define([
                         // trigger global event, so other modules will be able add parameters to redirect url
                         $('body').trigger('catalogCategoryAddToCartRedirect', eventData);
 
-                        if (eventData.redirectParameters.length > 0) {
+                        if (eventData.redirectParameters.length > 0 &&
+                            window.location.href.split(/[?#]/)[0] === res.backUrl
+                        ) {
                             parameters = res.backUrl.split('#');
                             parameters.push(eventData.redirectParameters.join('&'));
                             res.backUrl = parameters.join('#');
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
@@ -47,7 +47,8 @@
         <see selector="{{StoreFrontRemoveItemModalSection.message}}" userInput="Are you sure you would like to remove this item from the shopping cart?" stepKey="seeDeleteConfirmationMessage"/>
         <click selector="{{StoreFrontRemoveItemModalSection.ok}}" stepKey="confirmDelete"/>
         <waitForPageLoad stepKey="waitForDeleteToFinish"/>
-        <click selector="{{CheckoutCartProductSection.RemoveItem}}" stepKey="deleteProductFromCheckoutCart"/>
+        <dontSeeElement selector="{{CheckoutCartProductSection.RemoveItem}}" stepKey="dontSeeDeleteProductFromCheckoutCart"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
         <waitForPageLoad stepKey="WaitForPageLoad3"/>
         <see userInput="You have no items in your shopping cart." stepKey="seeNoItemsInShoppingCart"/>
     </test>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -261,6 +261,10 @@ define([
                 $(document).trigger('ajax:removeFromCart', {
                     productIds: [productData['product_id']]
                 });
+
+                if (window.location.href.indexOf(this.shoppingCartUrl) === 0) {
+                    window.location.reload();
+                }
             }
         },
 
diff --git a/app/code/Magento/Config/README.md b/app/code/Magento/Config/README.md
@@ -1,8 +1,6 @@
-#Config
+# Magento_Config module
+
 The Config module is designed to implement system configuration functionality.
-It provides mechanisms to add, edit, store and retrieve the configuration data
-for each scope (there can be a default scope as well as scopes for each website and store).
+It provides mechanisms to add, edit, store and retrieve the configuration data for each scope (there can be a default scope as well as scopes for each website and store).
 
-Modules can add items to be configured on the system configuration page by creating 
-system.xml files in their etc/adminhtml directories. These system.xml files get merged 
-to populate the forms in the config page.
+Modules can add items to be configured on the system configuration page by creating system.xml files in their etc/adminhtml directories. These system.xml files get merged to populate the forms in the config page.
diff --git a/app/code/Magento/Config/etc/acl.xml b/app/code/Magento/Config/etc/acl.xml
@@ -12,7 +12,10 @@
                 <resource id="Magento_Backend::stores">
                     <resource id="Magento_Backend::stores_settings">
                         <resource id="Magento_Config::config" title="Configuration" translate="title" sortOrder="20">
-                            <resource id="Magento_Config::advanced" title="Advanced Section" translate="title" sortOrder="90" />
+                            <!--
+                            @deprecated Magento_Config::advanced section ('Advanced Section') is disabled and is not displayed in the admin panel
+                            -->
+                            <resource id="Magento_Config::advanced" title="Advanced Section" translate="title" sortOrder="90" disabled="true" />
                             <resource id="Magento_Config::config_admin" title="Advanced Admin Section" translate="title" sortOrder="100" />
                             <resource id="Magento_Config::config_design" title="Design Section" translate="title" sortOrder="40" />
                             <resource id="Magento_Config::config_general" title="General Section" translate="title" sortOrder="20" />
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
@@ -7,14 +7,15 @@
 /** @var \Magento\Customer\Block\CustomerData $block */
 ?>
 <script type="text/x-magento-init">
-<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
-        '*' => ['Magento_Customer/js/customer-data' => [
-            'sectionLoadUrl' => $block->getCustomerDataUrl('customer/section/load'),
-            'expirableSectionLifetime' => $block->getExpirableSectionLifetime(),
-            'expirableSectionNames' => $block->getExpirableSectionNames(),
-            'cookieLifeTime' => $block->getCookieLifeTime(),
-            'updateSessionUrl' => $block->getCustomerDataUrl('customer/account/updateSession'),
-        ]],
-    ]);
-?>
+    {
+        "*": {
+            "Magento_Customer/js/customer-data": {
+                "sectionLoadUrl": "<?= $block->escapeJs($block->escapeUrl($block->getCustomerDataUrl('customer/section/load'))) ?>",
+                "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
+                "expirableSectionNames": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getExpirableSectionNames()) ?>,
+                "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
+                "updateSessionUrl": "<?= $block->escapeJs($block->escapeUrl($block->getCustomerDataUrl('customer/account/updateSession'))) ?>"
+            }
+        }
+    }
 </script>
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml
@@ -7,18 +7,19 @@
 /* @var $block \Magento\Customer\Block\CustomerScopeData */
 ?>
 <script type="text/x-magento-init">
-<?= /* @noEscape */ $block->encodeConfiguration([
-        '*' => ['Magento_Customer/js/invalidation-processor' => [
-            'invalidationRules' => [
-                'website-rule' => [
-                    'Magento_Customer/js/invalidation-rules/website-rule' => [
-                        'scopeConfig' => [
-                            'websiteId' => $block->getWebsiteId(),
-                        ]
-                    ]
-                ]
-            ]
-        ]],
-    ]);
-?>
+    {
+        "*": {
+            "Magento_Customer/js/invalidation-processor": {
+                "invalidationRules": {
+                    "website-rule": {
+                        "Magento_Customer/js/invalidation-rules/website-rule": {
+                            "scopeConfig": {
+                                "websiteId": "<?= $block->escapeJs($block->getWebsiteId()) ?>"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 </script>
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/section-config.phtml b/app/code/Magento/Customer/view/frontend/templates/js/section-config.phtml
@@ -7,15 +7,16 @@
 /** @var \Magento\Customer\Block\SectionConfig $block */
 ?>
 <script type="text/x-magento-init">
-<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
-        '*' => ['Magento_Customer/js/section-config' => [
-            'sections' => $block->getSections(),
-            'clientSideSections' => $block->getClientSideSections(),
-            'baseUrls' => array_unique([
-                $block->getUrl(null, ['_secure' => true]),
-                $block->getUrl(null, ['_secure' => false]),
-            ]),
-        ]],
-    ]);
-?>
+    {
+        "*": {
+            "Magento_Customer/js/section-config": {
+                "sections": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSections()) ?>,
+                "clientSideSections": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getClientSideSections()) ?>,
+                "baseUrls": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode(array_unique([
+                    $block->getUrl(null, ['_secure' => true]),
+                    $block->getUrl(null, ['_secure' => false]),
+                ])) ?>
+            }
+        }
+    }
 </script>
diff --git a/app/code/Magento/InstantPurchase/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/InstantPurchase/view/frontend/layout/catalog_product_view.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="product.info.addtocart">
             <block name="product.info.addtocart.instantPurchase" class="Magento\InstantPurchase\Block\Button" template="Magento_InstantPurchase::button.phtml" before="-">
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -59,7 +59,7 @@ $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElem
 
     $priceElementId = $priceElementIdPrefix . $productId . $block->getIdSuffix();
     $popupId = 'msrp-popup-' . $productId . $block->getRandomString(20);
-    $data = ['addToCart' => [
+    $data = [
         'origin'=> 'msrp',
         'popupId' => '#' . $popupId,
         'productName' => $block->escapeJs($block->escapeHtml($product->getName())),
@@ -72,11 +72,11 @@ $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElem
         'closeButtonId' => '#map-popup-close',
         'addToCartUrl' => $addToCartUrl,
         'paymentButtons' => '[data-label=or]'
-    ]];
+    ];
     if ($block->getRequest()->getFullActionName() === 'catalog_product_view') {
-        $data['addToCart']['addToCartButton'] = '#product_addtocart_form [type=submit]';
+        $data['addToCartButton'] = '#product_addtocart_form [type=submit]';
     } else {
-        $data['addToCart']['addToCartButton'] = sprintf(
+        $data['addToCartButton'] = sprintf(
             'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
             (int) $productId . ',' .
             sprintf(
@@ -91,7 +91,7 @@ $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElem
        id="<?= /* @noEscape */ ($popupId) ?>"
        class="action map-show-info"
        <?php //phpcs:disable ?>
-       data-mage-init='<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($data) ?>'>
+       data-mage-init='{"addToCart":<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($data) ?>}'>
         <?php //phpcs:enable ?>
         <?= $block->escapeHtml(__('Click for price')) ?>
     </a>
diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <!--<update handle="MAP_price_msrp_item"/>-->
     <update handle="msrp_popup"/>
     <body>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml
@@ -8,30 +8,30 @@ use Magento\Paypal\Block\Express\InContext\Minicart\Button;
 /** @var \Magento\Paypal\Block\Express\InContext\Component $block */
 
 $configuration = [
-    '*' => [
-        'Magento_Paypal/js/in-context/express-checkout' => [
-            'id' => Button::PAYPAL_BUTTON_ID,
-            'path' => $block->getUrl(
-                'paypal/express/gettoken',
-                [
-                    '_secure' => $block->getRequest()->isSecure()
-                ]
-            ),
-            'merchantId' => $block->getMerchantId(),
-            'button' => $block->isButtonContext(),
-            'clientConfig' => [
-                'locale' => $block->getLocale(),
-                'environment' => $block->getEnvironment(),
-                'button' => [
-                    Button::PAYPAL_BUTTON_ID,
-                ],
-            ]
+    'id' => Button::PAYPAL_BUTTON_ID,
+    'path' => $block->getUrl(
+        'paypal/express/gettoken',
+        [
+            '_secure' => $block->getRequest()->isSecure()
+        ]
+    ),
+    'merchantId' => $block->getMerchantId(),
+    'button' => $block->isButtonContext(),
+    'clientConfig' => [
+        'locale' => $block->getLocale(),
+        'environment' => $block->getEnvironment(),
+        'button' => [
+            Button::PAYPAL_BUTTON_ID,
         ]
     ]
 ];
 
 ?>
 <div style="display: none;" id="<?= /* @noEscape */ Button::PAYPAL_BUTTON_ID ?>"></div>
 <script type="text/x-magento-init">
-    <?= /* @noEscape */ json_encode($configuration) ?>
+    {
+        "*": {
+            "Magento_Paypal/js/in-context/express-checkout": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($configuration) ?>
+        }
+    }
 </script>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
@@ -7,7 +7,9 @@
 /**
  * @var \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton $block
  */
+$widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($block->getJsInitParams());
+$widgetConfig = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($widget['Magento_Paypal/js/in-context/button']);
 ?>
-<div data-mage-init='<?= /* @noEscape */ $block->getJsInitParams() ?>'
+<div data-mage-init='{"Magento_Paypal/js/in-context/button":<?= /* @noEscape */ $widgetConfig ?>}'
      class="paypal checkout paypal-logo <?= $block->escapeHtml($block->getContainerId()) ?>-container">
-</div>
+</div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml
@@ -5,7 +5,11 @@
  */
 
 /**
- * @var \Magento\Paypal\Block\Express\Shortcut $block
+ * @var \Magento\Paypal\Block\Express\InContext\SmartButton $block
  */
+$widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($block->getJsInitParams());
+$widgetConfig = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode(
+    $widget['Magento_Paypal/js/in-context/product-express-checkout']
+);
 ?>
-<div data-mage-init='<?= /* @noEscape */ $block->getJsInitParams() ?>'></div>
+<div data-mage-init='{"Magento_Paypal/js/in-context/product-express-checkout":<?= /* @noEscape */ $widgetConfig ?>}'></div>
diff --git a/app/code/Magento/ProductVideo/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/ProductVideo/view/frontend/layout/catalog_product_view.xml
@@ -5,7 +5,7 @@
 * See COPYING.txt for license details.
 */
 -->
-<page layout="1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="product.info.media">
             <block class="Magento\ProductVideo\Block\Product\View\Gallery" name="product.info.media.video" after="product.info.media.image" template="Magento_ProductVideo::product/view/gallery.phtml"/>
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
diff --git a/app/code/Magento/Theme/view/frontend/requirejs-config.js b/app/code/Magento/Theme/view/frontend/requirejs-config.js
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php
diff --git a/lib/web/jquery/jquery.storageapi.min.js b/lib/web/jquery/jquery.storageapi.min.js
diff --git a/lib/web/jquery/patches/jquery-ui.js b/lib/web/jquery/patches/jquery-ui.js
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml b/setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml
