🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes

Accepted Public Pull Requests:
 - #22470: Correct spelling (by @ravi-chandra3197)
 - #22469: Fix #20111 - display variables in popup while editing existing email template (by @Bartlomiejsz)
 - #22411: Checkout Totals Sort Order fields can't be empty and should be a number (by @barbanet)
 - #22456: Fixed issue of drop-down arrow direction in cart price rule (by @hiren0241)
 - #22446: Removes usage of classes which don't exist from DB migration scripts. (by @hostep)
 - #22424: PUT /V1/products/:sku/media/:entryId does not change the file (by @Nazar65)
 - #22285: make return_path_email and set_return_path configurable on website and store scope as well (by @mhauri)


Fixed GitHub Issues:
 - #20111: Email Template Information Insert Variable popup blank  (reported by @priti2jcommerce) has been fixed in #22469 by @Bartlomiejsz in 2.3-develop branch
   Related commits:
     1. 7d584ac
     2. 4f6a15a
     3. 65a61a5

 - #22434: While add cart price rule from admin click on Condition drop-down arrow direction not change. (reported by @bhavik43) has been fixed in #22456 by @hiren0241 in 2.3-develop branch
   Related commits:
     1. 27e048f

 - #22124: Magento 2.3.1: Catalog setup fails with error "Magento\Catalog\Setup\Media does not exist" (reported by @nussjustin) has been fixed in #22446 by @hostep in 2.3-develop branch
   Related commits:
     1. f22e16b
     2. 9e00ed2

 - #22402: PUT /V1/products/:sku/media/:entryId does not change the file (reported by @philippsander) has been fixed in #22424 by @Nazar65 in 2.3-develop branch
   Related commits:
     1. 9205c6f
     2. 986d384
     3. 24580ee

Author: magento-engcom-team

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -327,11 +327,11 @@
                     <label>Port (25)</label>
                     <comment>For Windows server only.</comment>
                 </field>
-                <field id="set_return_path" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="set_return_path" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Set Return-Path</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesnocustom</source_model>
                 </field>
-                <field id="return_path_email" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="return_path_email" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Return-Path Email</label>
                     <validate>validate-email</validate>
                     <backend_model>Magento\Config\Model\Config\Backend\Email\Address</backend_model>

app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php

@@ -71,8 +71,10 @@ public function create($sku, ProductAttributeMediaGalleryEntryInterface $entry)
         $product->setMediaGalleryEntries($existingMediaGalleryEntries);
         try {
             $product = $this->productRepository->save($product);
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (InputException $inputException) {
             throw $inputException;
+            // phpcs:ignore Magento2.Exceptions.ThrowCatch
         } catch (\Exception $e) {
             throw new StateException(__("The product can't be saved."));
         }
@@ -105,7 +107,10 @@ public function update($sku, ProductAttributeMediaGalleryEntryInterface $entry)
 
             if ($existingEntry->getId() == $entry->getId()) {
                 $found = true;
-                if ($entry->getFile()) {
+
+                $file = $entry->getContent();
+
+                if ($file && $file->getBase64EncodedData() || $entry->getFile()) {
                     $entry->setId(null);
                 }
                 $existingMediaGalleryEntries[$key] = $entry;

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -7,6 +7,8 @@
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Catalog\Model\Product\Gallery\ReadHandler as GalleryReadHandler;
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
@@ -16,11 +18,10 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface;
 use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 use Magento\Store\Model\Store;
-use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
-use Magento\Framework\Indexer\DimensionFactory;
 
 /**
  * Product collection
@@ -442,7 +443,7 @@ protected function _preparePriceExpressionParameters($select)
      */
     public function getPriceExpression($select)
     {
-        //@todo: Add caching of price expresion
+        //@todo: Add caching of price expression
         $this->_preparePriceExpressionParameters($select);
         return $this->_priceExpression;
     }

app/code/Magento/Catalog/Setup/CategorySetup.php

@@ -10,7 +10,6 @@
 use Magento\Catalog\Block\Adminhtml\Category\Helper\Pricestep;
 use Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\Available;
 use Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby;
-use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage;
 use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category as CategoryFormHelper;
 use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight as WeightFormHelper;
 use Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate;
@@ -54,6 +53,8 @@
 use Magento\Theme\Model\Theme\Source\Theme;
 
 /**
+ * Setup category with default entities.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CategorySetup extends EavSetup
@@ -593,7 +594,6 @@ public function getDefaultEntities()
                         'label' => 'Base Image',
                         'input' => 'media_image',
                         'frontend' => ImageFrontendModel::class,
-                        'input_renderer' => BaseImage::class,
                         'required' => false,
                         'sort_order' => 0,
                         'global' => ScopedAttributeInterface::SCOPE_STORE,
@@ -626,7 +626,6 @@ public function getDefaultEntities()
                         'type' => 'varchar',
                         'label' => 'Media Gallery',
                         'input' => 'gallery',
-                        'backend' => Media::class,
                         'required' => false,
                         'sort_order' => 4,
                         'group' => 'Images',

app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php

@@ -8,12 +8,14 @@
 
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Directory\Model\AllowedCountriesFactory;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
+/**
+ * Migrate store allowed countries to website.
+ */
 class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, PatchVersionInterface
 {
     /**
@@ -27,7 +29,7 @@ class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, Patc
     private $storeManager;
 
     /**
-     * @var AllowedCountriesFactory
+     * @var AllowedCountries
      */
     private $allowedCountries;
 
@@ -48,10 +50,11 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
+
         $this->moduleDataSetup->getConnection()->beginTransaction();
 
         try {
@@ -149,7 +152,7 @@ private function mergeAllowedCountries(array $countries, array $newCountries, $i
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -159,15 +162,15 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
         return '2.0.9';
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

app/code/Magento/Email/Model/Template.php

@@ -326,7 +326,7 @@ public function getVariablesOptionArray($withGroup = false)
                 $optionArray[] = ['value' => '{{' . $value . '}}', 'label' => __('%1', $label)];
             }
             if ($withGroup) {
-                $optionArray = ['label' => __('Template Variables'), 'value' => $optionArray];
+                $optionArray = [['label' => __('Template Variables'), 'value' => $optionArray]];
             }
         }
         return $optionArray;
@@ -418,6 +418,8 @@ public function setOptions(array $options)
     }
 
     /**
+     *  Return filter factory.
+     *
      * @return \Magento\Email\Model\Template\FilterFactory
      */
     protected function getFilterFactory()