Merge remote-tracking branch 'origin/2.3-develop' into MC-19242

Author: adifucan

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/Braintree/Model/Paypal/Helper/OrderPlace.php

@@ -19,6 +19,7 @@
 /**
  * Class OrderPlace
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class OrderPlace extends AbstractHelper
 {
@@ -79,9 +80,10 @@ public function __construct(
     public function execute(Quote $quote, array $agreement)
     {
         if (!$this->agreementsValidator->isValid($agreement)) {
-            throw new LocalizedException(__(
+            $errorMsg = __(
                 "The order wasn't placed. First, agree to the terms and conditions, then try placing your order again."
-            ));
+            );
+            throw new LocalizedException($errorMsg);
         }
 
         if ($this->getCheckoutMethod($quote) === Onepage::METHOD_GUEST) {
@@ -91,12 +93,7 @@ public function execute(Quote $quote, array $agreement)
         $this->disabledQuoteAddressValidation($quote);
 
         $quote->collectTotals();
-        try {
-            $this->cartManagement->placeOrder($quote->getId());
-        } catch (\Exception $e) {
-            $this->orderCancellationService->execute($quote->getReservedOrderId());
-            throw $e;
-        }
+        $this->cartManagement->placeOrder($quote->getId());
     }
 
     /**

app/code/Magento/Braintree/Plugin/OrderCancellation.php

@@ -72,7 +72,9 @@ public function aroundPlaceOrder(
             ];
             if (in_array($payment->getMethod(), $paymentCodes)) {
                 $incrementId = $quote->getReservedOrderId();
-                $this->orderCancellationService->execute($incrementId);
+                if ($incrementId) {
+                    $this->orderCancellationService->execute($incrementId);
+                }
             }
 
             throw $e;

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/Catalog/Model/Product/Option.php

@@ -167,6 +167,8 @@ protected function _getResource()
     }
 
     /**
+     * Construct function
+     *
      * @return void
      */
     protected function _construct()
@@ -215,6 +217,8 @@ public function hasValues($type = null)
     }
 
     /**
+     * Get values
+     *
      * @return ProductCustomOptionValuesInterface[]|null
      */
     public function getValues()
@@ -345,7 +349,8 @@ public function groupFactory($type)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @since 101.0.0
      */
@@ -396,6 +401,8 @@ public function beforeSave()
     }
 
     /**
+     * After save
+     *
      * @return \Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -424,7 +431,8 @@ public function afterSave()
 
     /**
      * Return price. If $flag is true and price is percent
-     *  return converted percent to price
+     *
+     * Return converted percent to price
      *
      * @param bool $flag
      * @return float
@@ -555,7 +563,7 @@ protected function _clearReferences()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -649,6 +657,8 @@ public function getSku()
     }
 
     /**
+     * Get file extension
+     *
      * @return string|null
      */
     public function getFileExtension()
@@ -657,6 +667,8 @@ public function getFileExtension()
     }
 
     /**
+     * Get Max Characters
+     *
      * @return int|null
      */
     public function getMaxCharacters()
@@ -665,6 +677,8 @@ public function getMaxCharacters()
     }
 
     /**
+     * Get image size X
+     *
      * @return int|null
      */
     public function getImageSizeX()
@@ -673,6 +687,8 @@ public function getImageSizeX()
     }
 
     /**
+     * Get image size Y
+     *
      * @return int|null
      */
     public function getImageSizeY()
@@ -780,6 +796,8 @@ public function setSku($sku)
     }
 
     /**
+     * Set File Extension
+     *
      * @param string $fileExtension
      * @return $this
      */
@@ -789,6 +807,8 @@ public function setFileExtension($fileExtension)
     }
 
     /**
+     * Set Max Characters
+     *
      * @param int $maxCharacters
      * @return $this
      */
@@ -798,6 +818,8 @@ public function setMaxCharacters($maxCharacters)
     }
 
     /**
+     * Set Image Size X
+     *
      * @param int $imageSizeX
      * @return $this
      */
@@ -807,6 +829,8 @@ public function setImageSizeX($imageSizeX)
     }
 
     /**
+     * Set Image Size Y
+     *
      * @param int $imageSizeY
      * @return $this
      */
@@ -816,6 +840,8 @@ public function setImageSizeY($imageSizeY)
     }
 
     /**
+     * Set value
+     *
      * @param ProductCustomOptionValuesInterface[] $values
      * @return $this
      */
@@ -826,7 +852,7 @@ public function setValues(array $values = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface|null
      */
@@ -852,6 +878,8 @@ public function getRegularPrice()
     }
 
     /**
+     * Get Product Option Collection
+     *
      * @param Product $product
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
      */
@@ -882,7 +910,7 @@ public function getProductOptionCollection(Product $product)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
      * @return $this
@@ -894,6 +922,8 @@ public function setExtensionAttributes(
     }
 
     /**
+     * Get option repository
+     *
      * @return Option\Repository
      */
     private function getOptionRepository()
@@ -906,6 +936,8 @@ private function getOptionRepository()
     }
 
     /**
+     * Get metadata pool
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()
@@ -931,7 +963,7 @@ private function cleanFileExtensions()
         preg_match_all('/(?<extensions>[a-z0-9]+)/i', strtolower($rawExtensions), $matches);
         if (!empty($matches)) {
             $extensions = implode(', ', array_unique($matches['extensions']));
+            $this->setFileExtension($extensions);
         }
-        $this->setFileExtension($extensions);
     }
 }