Merge branch '2.3-develop' into MC-19585

Author: nikita-shcherbatykh

app/code/Magento/AmqpStore/README.md

@@ -1,3 +1,9 @@
-# Amqp Store
+# Magento_AmqpStore module
 
-**AmqpStore** provides ability to specify store before publish messages with Amqp.
+The Magento_AmqpStore module provides the ability to specify a store before publishing messages with the Advanced Message Queuing Protocol (AMQP).
+
+## Extensibility
+
+Extension developers can interact with the Magento_AmqpStore module using plugins. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AmqpStore module.

app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\System\Store\Edit\Form;
 
 /**
@@ -129,6 +132,7 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'label' => __('Sort Order'),
                 'value' => $storeModel->getSortOrder(),
                 'required' => false,
+                'class' => 'validate-number validate-zero-or-greater',
                 'disabled' => $storeModel->isReadOnly()
             ]
         );

app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\System\Store\Edit\Form;
 
 /**
@@ -85,6 +88,7 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'label' => __('Sort Order'),
                 'value' => $websiteModel->getSortOrder(),
                 'required' => false,
+                'class' => 'validate-number validate-zero-or-greater',
                 'disabled' => $websiteModel->isReadOnly()
             ]
         );

app/code/Magento/Backend/i18n/en_US.csv

@@ -258,7 +258,7 @@ Minute,Minute
 "To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
 "This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
 "Report an Issue","Report an Issue"
-"Store View:","Store View:"
+"Scope:","Scope:"
 "Stores Configuration","Stores Configuration"
 "Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
 "Additional Cache Management","Additional Cache Management"

app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml

@@ -9,7 +9,7 @@
 <?php if ($websites = $block->getWebsites()) : ?>
 
 <div class="store-switcher store-view">
-    <span class="store-switcher-label"><?= $block->escapeHtml(__('Store View:')) ?></span>
+    <span class="store-switcher-label"><?= $block->escapeHtml(__('Scope:')) ?></span>
     <div class="actions dropdown closable">
         <input type="hidden" name="store_switcher" id="store_switcher"
                data-role="store-view-id" data-param="<?= $block->escapeHtmlAttr($block->getStoreVarName()) ?>"

app/code/Magento/Catalog/Model/Product/Image/ParamsBuilder.php

@@ -68,11 +68,12 @@ public function __construct(
      * Build image params
      *
      * @param array $imageArguments
+     * @param int $scopeId
      * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function build(array $imageArguments): array
+    public function build(array $imageArguments, int $scopeId = null): array
     {
         $miscParams = [
             'image_type' => $imageArguments['type'] ?? null,
@@ -81,7 +82,7 @@ public function build(array $imageArguments): array
         ];
 
         $overwritten = $this->overwriteDefaultValues($imageArguments);
-        $watermark = isset($miscParams['image_type']) ? $this->getWatermark($miscParams['image_type']) : [];
+        $watermark = isset($miscParams['image_type']) ? $this->getWatermark($miscParams['image_type'], $scopeId) : [];
 
         return array_merge($miscParams, $overwritten, $watermark);
     }
@@ -117,27 +118,32 @@ private function overwriteDefaultValues(array $imageArguments): array
      * Get watermark
      *
      * @param string $type
+     * @param int $scopeId
      * @return array
      */
-    private function getWatermark(string $type): array
+    private function getWatermark(string $type, int $scopeId = null): array
     {
         $file = $this->scopeConfig->getValue(
             "design/watermark/{$type}_image",
-            ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE,
+            $scopeId
         );
 
         if ($file) {
             $size = $this->scopeConfig->getValue(
                 "design/watermark/{$type}_size",
-                ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE,
+                $scopeId
             );
             $opacity = $this->scopeConfig->getValue(
                 "design/watermark/{$type}_imageOpacity",
-                ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE,
+                $scopeId
             );
             $position = $this->scopeConfig->getValue(
                 "design/watermark/{$type}_position",
-                ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE,
+                $scopeId
             );
             $width = !empty($size['width']) ? $size['width'] : null;
             $height = !empty($size['height']) ? $size['height'] : null;

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

@@ -299,12 +299,16 @@ protected function _populateForUrlGeneration($rowData)
      */
     private function isNeedToPopulateForUrlGeneration($rowData, $newSku, $oldSku): bool
     {
-        if ((empty($newSku) || !isset($newSku['entity_id']))
-            || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
-                && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
-            || (array_key_exists($rowData[ImportProduct::COL_SKU], $oldSku)
-                && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
-                && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)) {
+        if ((
+            (empty($newSku) || !isset($newSku['entity_id']))
+                || ($this->import->getRowScope($rowData) == ImportProduct::SCOPE_STORE
+                    && empty($rowData[self::URL_KEY_ATTRIBUTE_CODE]))
+                || (array_key_exists(strtolower($rowData[ImportProduct::COL_SKU]), $oldSku)
+                    && !isset($rowData[self::URL_KEY_ATTRIBUTE_CODE])
+                    && $this->import->getBehavior() === ImportExport::BEHAVIOR_APPEND)
+            )
+            && !isset($rowData["categories"])
+        ) {
             return false;
         }
         return true;
@@ -477,7 +481,7 @@ protected function currentUrlRewritesRegenerate()
             $url = $currentUrlRewrite->getIsAutogenerated()
                 ? $this->generateForAutogenerated($currentUrlRewrite, $category)
                 : $this->generateForCustom($currentUrlRewrite, $category);
-            $urlRewrites = array_merge($urlRewrites, $url);
+            $urlRewrites = $url + $urlRewrites;
         }
 
         $this->product = null;

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

@@ -50,7 +50,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                                 <?php if (isset($_formatedOptionValue['full_view'])) :?>
                                     <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
                                 <?php else :?>
-                                    <?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
+                                    <?= $block->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
                                 <?php endif; ?>
                             </dd>
                         <?php endforeach; ?>

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -44,7 +44,10 @@
                             <!-- ko if: Array.isArray(option.value) -->
                                 <span data-bind="html: option.value.join('<br>')"></span>
                             <!-- /ko -->
-                            <!-- ko ifnot: Array.isArray(option.value) -->
+                            <!-- ko if: (!Array.isArray(option.value) && option.option_type == 'file') -->
+                                <span data-bind="html: option.value"></span>
+                            <!-- /ko -->
+                            <!-- ko if: (!Array.isArray(option.value) && option.option_type != 'file') -->
                                 <span data-bind="text: option.value"></span>
                             <!-- /ko -->
                         </dd>

app/code/Magento/Cron/Console/Command/CronInstallCommand.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Cron\Console\Command;
 
 use Magento\Framework\Crontab\CrontabManagerInterface;
@@ -19,6 +21,9 @@
  */
 class CronInstallCommand extends Command
 {
+    private const COMMAND_OPTION_FORCE = 'force';
+    private const COMMAND_OPTION_NON_OPTIONAL = 'non-optional';
+
     /**
      * @var CrontabManagerInterface
      */
@@ -44,19 +49,27 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
         $this->setName('cron:install')
             ->setDescription('Generates and installs crontab for current user')
-            ->addOption('force', 'f', InputOption::VALUE_NONE, 'Force install tasks');
+            ->addOption(self::COMMAND_OPTION_FORCE, 'f', InputOption::VALUE_NONE, 'Force install tasks')
+            // @codingStandardsIgnoreStart
+            ->addOption(self::COMMAND_OPTION_NON_OPTIONAL, 'd', InputOption::VALUE_NONE, 'Install only the non-optional (default) tasks');
+            // @codingStandardsIgnoreEnd
 
         parent::configure();
     }
 
     /**
-     * {@inheritdoc}
+     * Executes "cron:install" command.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int|null
+     * @throws LocalizedException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -65,8 +78,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return Cli::RETURN_FAILURE;
         }
 
+        $tasks = $this->tasksProvider->getTasks();
+        if ($input->getOption(self::COMMAND_OPTION_NON_OPTIONAL)) {
+            $tasks = $this->extractNonOptionalTasks($tasks);
+        }
+
         try {
-            $this->crontabManager->saveTasks($this->tasksProvider->getTasks());
+            $this->crontabManager->saveTasks($tasks);
         } catch (LocalizedException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             return Cli::RETURN_FAILURE;
@@ -76,4 +94,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return Cli::RETURN_SUCCESS;
     }
+
+    /**
+     * Returns an array of non-optional tasks
+     *
+     * @param array $tasks
+     * @return array
+     */
+    private function extractNonOptionalTasks(array $tasks = []): array
+    {
+        $defaultTasks = [];
+
+        foreach ($tasks as $taskCode => $taskParams) {
+            if (!$taskParams['optional']) {
+                $defaultTasks[$taskCode] = $taskParams;
+            }
+        }
+
+        return $defaultTasks;
+    }
 }