🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - magento/magento2#13616: Forwardport-pull-13485: Update code formatting in Swagger Block (by @p-bystritsky)
 - magento/magento2#13615: Forwardport-pull-13462: Switch updatecart qty input validators to dynamic instead of hardcoding (by @p-bystritsky)
 - magento/magento2#13506: Fix load order of view.xml when loading Swatch config (by @pmclain)


Fixed GitHub Issues:
 - magento/magento2#12647: Image Swatch size change not working (reported by @joachim-havloujian) has been fixed in magento/magento2#13506 by @pmclain in 2.3-develop branch
   Related commits:
     1. dfd734e

Author: magento-engcom-team

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/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