merge magento/2.3-develop into magento-qwerty/MAGETWO-55809

Author: magento-cicd2

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

@@ -20,7 +20,7 @@
             <a href="#"
                onclick="tree.collapseTree(); return false;"><?= $block->escapeHtml(__('Collapse All')) ?></a>
             <span class="separator">|</span> <a href="#"
-                                                onclick="tree.expandTree(); return false;"><?= $block->escapeHtml(_('Expand All')) ?></a>
+                                                onclick="tree.expandTree(); return false;"><?= $block->escapeHtml(__('Expand All')) ?></a>
         <?php endif; ?>
     </div>
     <?php if ($block->getRoot()) :?>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml

@@ -175,7 +175,7 @@ $formName = $block->getFormName();
                     <label class="admin__field-label">
                         <span><?= $block->escapeHtml(__('Image Size')) ?></span>
                     </label>
-                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(_('{size}')) ?>"></div>
+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{size}')) ?>"></div>
                 </div>
 
                 <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">

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

@@ -9,6 +9,9 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
+ * Base abstract form element.
+ *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.1.0
  */
@@ -59,7 +62,7 @@ public function prepare()
             if (empty($config['rawOptions'])) {
                 $options = $this->convertOptionsValueToString($options);
             }
-            $config['options'] = array_values(array_merge_recursive($config['options'], $options));
+            $config['options'] = array_values(array_replace_recursive($config['options'], $options));
         }
         $this->setData('config', (array)$config);
         parent::prepare();
@@ -84,11 +87,14 @@ abstract public function getIsSelected($optionValue);
      */
     protected function convertOptionsValueToString(array $options)
     {
-        array_walk($options, function (&$value) {
-            if (isset($value['value']) && is_scalar($value['value'])) {
-                $value['value'] = (string)$value['value'];
+        array_walk(
+            $options,
+            static function (&$value) {
+                if (isset($value['value']) && is_scalar($value['value'])) {
+                    $value['value'] = (string)$value['value'];
+                }
             }
-        });
+        );
         return $options;
     }
 }

app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+// phpcs:ignore Magento2.Security.IncludeFile
+require_once __DIR__ . '/second_store.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
+if ($storeId = $store->load('fixture_second_store', 'code')->getId()) {
+    /** @var \Magento\Config\Model\ResourceModel\Config $configResource */
+    $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+    $configResource->saveConfig(
+        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
+        'EUR',
+        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+    $configResource->saveConfig(
+        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
+        'EUR',
+        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+    /**
+     * Configuration cache clean is required to reload currency setting
+     */
+    /** @var Magento\Config\App\Config\Type\System $config */
+    $config = $objectManager->get(\Magento\Config\App\Config\Type\System::class);
+    $config->clean();
+}
+
+
+/** @var \Magento\Directory\Model\ResourceModel\Currency $rate */
+$rate = $objectManager->create(\Magento\Directory\Model\ResourceModel\Currency::class);
+$rate->saveRates(
+    [
+        'USD' => ['EUR' => 2],
+        'EUR' => ['USD' => 0.5]
+    ]
+);

dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_currency.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
+$storeId = $store->load('fixture_second_store', 'code')->getId();
+
+if ($storeId) {
+    $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+    $configResource->deleteConfig(
+        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_DEFAULT,
+        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+    $configResource->deleteConfig(
+        \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
+        \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+}
+
+// phpcs:ignore Magento2.Security.IncludeFile
+require_once 'second_store_rollback.php';