merge magento/2.3-develop into magento-performance/MAGETWO-87675

Author: Magento CICD

app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

@@ -176,7 +176,7 @@
                 </fileUploader>
             </formElements>
         </field>
-        <field name="description" template="ui/form/field" sortOrder="50" formElement="wysiwyg">
+        <field name="description" template="Magento_Catalog/field-wysiwyg" sortOrder="50" formElement="wysiwyg">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="wysiwygConfigData" xsi:type="array">

app/code/Magento/Catalog/view/adminhtml/web/template/field-wysiwyg.html

@@ -0,0 +1,46 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="admin__field"
+     visible="visible"
+     css="$data.additionalClasses"
+     attr="'data-index': index"
+     ifnot="stageActive">
+    <label class="admin__field-label" if="$data.label" visible="$data.labelVisible" attr="for: uid">
+        <span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
+    </label>
+    <div class="admin__field-control"
+         css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
+        <render args="elementTmpl" ifnot="hasAddons()"/>
+
+        <div class="admin__control-addon" if="hasAddons()">
+            <render args="elementTmpl"/>
+
+            <label class="admin__addon-prefix" if="$data.addbefore" attr="for: uid">
+                <span text="addbefore"/>
+            </label>
+            <label class="admin__addon-suffix" if="$data.addafter" attr="for: uid">
+                <span text="addafter"/>
+            </label>
+        </div>
+
+        <render args="tooltipTpl" if="$data.tooltip"/>
+
+        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+
+        <label class="admin__field-error" if="error" attr="for: uid" text="error"/>
+
+        <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
+            <span translate="notice"/>
+        </div>
+
+        <div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>
+
+        <render args="$data.service.template" if="$data.hasService()"/>
+    </div>
+</div>
+
+<render if="stageActive" args="elementTmpl"/>

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

@@ -23,7 +23,7 @@
                            value=""
                            title="<?= /* @escapeNotVerified */ __('Qty') ?>"
                            class="input-text qty"
-                           data-validate="{'required-number':true,digits:true}"/>
+                           data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"/>
                 </div>
             </div>
             <?php endif; ?>

app/code/Magento/Cms/Model/Wysiwyg/CompositeConfigProvider.php

@@ -130,12 +130,16 @@ public function processWysiwygConfig($config)
     /**
      * Returns active editor path
      *
+     * @param \Magento\Framework\DataObject $config
      * @return string
      */
-    private function getActiveEditorPath()
+    private function getActiveEditorPath($config)
     {
-        if (!isset($this->activeEditorPath)) {
-            $this->activeEditorPath = $this->activeEditor->getWysiwygAdapterPath();
+        if (!isset($this->activeEditorPath) || $this->activeEditorPath !== $config->getData('activeEditorPath')) {
+            $this->activeEditorPath = $config->getData('activeEditorPath')
+                ? $config->getData('activeEditorPath')
+                : $this->activeEditor->getWysiwygAdapterPath();
+            $config->setData('activeEditorPath', $this->activeEditorPath);
         }
         return $this->activeEditorPath;
     }
@@ -149,7 +153,7 @@ private function getActiveEditorPath()
      */
     private function updateConfig($config, array $configProviders)
     {
-        $adapterType = $this->getActiveEditorPath();
+        $adapterType = $this->getActiveEditorPath($config);
         //Extension point to update plugin settings by adapter type
         $providerClass = isset($configProviders[$adapterType])
             ? $configProviders[$adapterType]

app/code/Magento/Cms/Model/Wysiwyg/Config.php

@@ -201,13 +201,13 @@ public function getConfig($data = [])
 
         $config->setData('directives_url_quoted', preg_quote($config->getData('directives_url')));
 
-        if ($this->_authorization->isAllowed('Magento_Cms::media_gallery')) {
-            $this->configProvider->processGalleryConfig($config);
-        }
-
         if (is_array($data)) {
             $config->addData($data);
         }
+
+        if ($this->_authorization->isAllowed('Magento_Cms::media_gallery')) {
+            $this->configProvider->processGalleryConfig($config);
+        }
         if ($config->getData('add_widgets')) {
             $this->configProvider->processWidgetConfig($config);
         }

app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml

@@ -12,7 +12,7 @@
  * Modified by Magento, Modifications Copyright © Magento, Inc. All rights reserved.
  */
 
-/** @var \Magento\Framework\View\Element\Template $block */
+/** @var \Magento\Swagger\Block\Index $block */
 
 $schemaUrl = $block->getSchemaUrl();
 ?>

app/code/Magento/Swatches/Helper/Media.php

@@ -68,9 +68,9 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
     protected $swatchImageTypes = ['swatch_image', 'swatch_thumb'];
 
     /**
-     * @var \Magento\Theme\Model\ResourceModel\Theme\Collection
+     * @var array
      */
-    private $registeredThemesCache;
+    private $imageConfig;
 
     /**
      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
@@ -256,18 +256,14 @@ public function getFolderNameSize($swatchType, $imageConfig = null)
      */
     public function getImageConfig()
     {
-        $imageConfig = [];
-        foreach ($this->getRegisteredThemes() as $theme) {
-            $config = $this->viewConfig->getViewConfig([
-                'area' => Area::AREA_FRONTEND,
-                'themeModel' => $theme,
-            ]);
-            $imageConfig = array_merge(
-                $imageConfig,
-                $config->getMediaEntities('Magento_Catalog', Image::MEDIA_TYPE_CONFIG_NODE)
+        if (!$this->imageConfig) {
+            $this->imageConfig = $this->viewConfig->getViewConfig()->getMediaEntities(
+                'Magento_Catalog',
+                Image::MEDIA_TYPE_CONFIG_NODE
             );
         }
-        return $imageConfig;
+
+        return $this->imageConfig;
     }
 
     /**
@@ -338,16 +334,4 @@ protected function prepareFile($file)
     {
         return ltrim(str_replace('\\', '/', $file), '/');
     }
-
-    /**
-     * @return \Magento\Theme\Model\ResourceModel\Theme\Collection
-     */
-    private function getRegisteredThemes()
-    {
-        if ($this->registeredThemesCache === null) {
-            $this->registeredThemesCache = $this->themeCollection->loadRegisteredThemes();
-        }
-
-        return $this->registeredThemesCache;
-    }
 }

app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php

@@ -30,9 +30,6 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Image\Factory */
     protected $imageFactoryMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Theme\Model\ResourceModel\Theme\Collection */
-    protected $themeCollectionMock;
-
     /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\Config */
     protected $viewConfigMock;
 
@@ -59,10 +56,6 @@ protected function setUp()
         $this->storeManagerMock = $this->createPartialMock(\Magento\Store\Model\StoreManager::class, ['getStore']);
 
         $this->imageFactoryMock = $this->createMock(\Magento\Framework\Image\Factory::class);
-        $this->themeCollectionMock = $this->createPartialMock(
-            \Magento\Theme\Model\ResourceModel\Theme\Collection::class,
-            ['loadRegisteredThemes']
-        );
 
         $this->viewConfigMock = $this->createMock(\Magento\Framework\View\Config::class);
 
@@ -83,7 +76,6 @@ protected function setUp()
                 'fileStorageDb' => $this->fileStorageDbMock,
                 'storeManager' => $this->storeManagerMock,
                 'imageFactory' => $this->imageFactoryMock,
-                'themeCollection' => $this->themeCollectionMock,
                 'configInterface' => $this->viewConfigMock,
             ]
         );
@@ -248,10 +240,6 @@ public function testGetImageConfig()
 
     protected function generateImageConfig()
     {
-        $themeMock = $this->createMock(\Magento\Theme\Model\Theme::class);
-        $themesArrayMock = [$themeMock];
-        $this->themeCollectionMock->expects($this->any())->method('loadRegisteredThemes')->willReturn($themesArrayMock);
-
         $configMock = $this->createMock(\Magento\Framework\Config\View::class);
 
         $this->viewConfigMock

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

@@ -23,10 +23,12 @@ define([
             value: '',
             $wysiwygEditorButton: '',
             links: {
-                value: '${ $.provider }:${ $.dataScope }'
+                value: '${ $.provider }:${ $.dataScope }',
+                stageActive: false
             },
             template: 'ui/form/field',
             elementTmpl: 'ui/form/element/wysiwyg',
+            stageActive: false,
             content:        '',
             showSpinner:    false,
             loading:        false,