🔃 [Magento Community Engineering] Community Contributions - 2.3-develop expedited

Accepted Community Pull Requests:
 - #24158: 24151 collapsed js issue fix (by @sunilit42)
 - #23372: Use variadics instead of func_get_args() (by @kassner)
 - #24072: Set isMultiShipping to 0 in database so it can be used correctly by rest api requests on checkout page (by @websnap)
 - #23253: Fixed issue #21650 (by @geet07)
 - #23820: #3993; Fix same level categories (position)re-index on category move. (by @sergey-solo)
 - #21798: It is not possible to add MS tile image meta via default_head_blocks.xml (by @vasilii-b)


Fixed GitHub Issues:
 - #24151: Uncaught TypeError: Cannot read property 'collapsed' of null (reported by @TomashKhamlai) has been fixed in #24158 by @sunilit42 in 2.3-develop branch
   Related commits:
     1. 8189449
     2. 8e08b21

 - #3993: Category Sort Order is not saved in Flat Table (reported by @stanislav-zgr) has been fixed in #23820 by @sergey-solo in 2.3-develop branch
   Related commits:
     1. 089bebc
     2. 592922e

 - #5023: It is not possible to add MS tile image meta via default_head_blocks.xml (reported by @chicgeek) has been fixed in #21798 by @vasilii-b in 2.3-develop branch
   Related commits:
     1. a2551af
     2. 3d193bf
     3. 2faa1ec
     4. 56a368f
     5. b488bd4
     6. 8892b0b
     7. a917ee7

Author: magento-engcom-team

app/code/Magento/Catalog/Model/Category.php

@@ -448,7 +448,9 @@ public function move($parentId, $afterCategoryId)
         if ($this->flatState->isFlatEnabled()) {
             $flatIndexer = $this->indexerRegistry->get(Indexer\Category\Flat\State::INDEXER_ID);
             if (!$flatIndexer->isScheduled()) {
-                $flatIndexer->reindexList([$this->getId(), $oldParentId, $parentId]);
+                $sameLevelCategories = explode(',', $this->getParentCategory()->getChildren());
+                $list = array_unique(array_merge($sameLevelCategories, [$this->getId(), $oldParentId, $parentId]));
+                $flatIndexer->reindexList($list);
             }
         }
         $productIndexer = $this->indexerRegistry->get(Indexer\Category\Product::INDEXER_ID);

app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml

@@ -58,10 +58,16 @@ require([
 
                 var parentSection = groupElement.parents('.section-config');
                 parentSection.addClass('highlighted');
+                parentSection.addClass('active');
                 setTimeout(function() {
                     parentSection.removeClass('highlighted', 2000, "easeInBack");
                 }, 3000);
                 if (!parentSection.hasClass('active')) {
+                    if(section == 'payment') {
+                        var openSection = jQuery('.open').first().attr('id');
+                        var splitIdArray = openSection.split('_');
+                        section = section + '_' + splitIdArray[1];
+                    }
                     Fieldset.toggleCollapse(section + '_' + group);
                 }
             }

app/code/Magento/Multishipping/Controller/Checkout/Plugin.php

@@ -1,11 +1,15 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Controller\Checkout;
 
+/**
+ * Turns Off Multishipping mode for Quote.
+ */
 class Plugin
 {
     /**
@@ -30,6 +34,10 @@ public function __construct(\Magento\Checkout\Model\Cart $cart)
      */
     public function beforeExecute(\Magento\Framework\App\Action\Action $subject)
     {
-        $this->cart->getQuote()->setIsMultiShipping(0);
+        $quote = $this->cart->getQuote();
+        if ($quote->getIsMultiShipping()) {
+            $quote->setIsMultiShipping(0);
+            $this->cart->saveQuote();
+        }
     }
 }

app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/PluginTest.php

@@ -4,6 +4,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Test\Unit\Controller\Checkout;
 
 use Magento\Multishipping\Controller\Checkout\Plugin;
@@ -30,16 +33,27 @@ protected function setUp()
         $this->cartMock = $this->createMock(\Magento\Checkout\Model\Cart::class);
         $this->quoteMock = $this->createPartialMock(
             \Magento\Quote\Model\Quote::class,
-            ['__wakeUp', 'setIsMultiShipping']
+            ['__wakeUp', 'setIsMultiShipping', 'getIsMultiShipping']
         );
         $this->cartMock->expects($this->once())->method('getQuote')->will($this->returnValue($this->quoteMock));
         $this->object = new \Magento\Multishipping\Controller\Checkout\Plugin($this->cartMock);
     }
 
-    public function testExecuteTurnsOffMultishippingModeOnQuote()
+    public function testExecuteTurnsOffMultishippingModeOnMultishippingQuote(): void
     {
         $subject = $this->createMock(\Magento\Checkout\Controller\Index\Index::class);
+        $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(1);
         $this->quoteMock->expects($this->once())->method('setIsMultiShipping')->with(0);
+        $this->cartMock->expects($this->once())->method('saveQuote');
+        $this->object->beforeExecute($subject);
+    }
+
+    public function testExecuteTurnsOffMultishippingModeOnNotMultishippingQuote(): void
+    {
+        $subject = $this->createMock(\Magento\Checkout\Controller\Index\Index::class);
+        $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(0);
+        $this->quoteMock->expects($this->never())->method('setIsMultiShipping');
+        $this->cartMock->expects($this->never())->method('saveQuote');
         $this->object->beforeExecute($subject);
     }
 }

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

@@ -651,7 +651,8 @@ define([
         'validate-number': [
             function (value) {
                 return utils.isEmptyNoTrim(value) ||
-                    !isNaN(utils.parseNumber(value)) && /^\s*-?\d*(,\d*)*(\.\d*)?\s*$/.test(value);
+                    !isNaN(utils.parseNumber(value)) &&
+                    /^\s*-?\d*(?:[.,|'|\s]\d+)*(?:[.,|'|\s]\d{2})?-?\s*$/.test(value);
             },
             $.mage.__('Please enter a valid number in this field.')
         ],

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js

@@ -58,12 +58,36 @@ define([
                 expect(rules['validate-number'].handler(value)).toBe(true);
             });
 
+            it('Check on float without leading zero', function () {
+                var value = '.50';
+
+                expect(rules['validate-number'].handler(value)).toBe(true);
+            });
+
             it('Check on formatted float', function () {
                 var value = '1,000,000.50';
 
                 expect(rules['validate-number'].handler(value)).toBe(true);
             });
 
+            it('Check on space', function () {
+                var value = '10 000';
+
+                expect(rules['validate-number'].handler(value)).toBe(true);
+            });
+
+            it('Check on formatted float (For International price)', function () {
+                var value = '10.000,00';
+
+                expect(rules['validate-number'].handler(value)).toBe(true);
+            });
+
+            it('Check on formatted float (For International price)', function () {
+                var value = '10\'000.00';
+
+                expect(rules['validate-number'].handler(value)).toBe(true);
+            });
+
             it('Check on not a number', function () {
                 var value = 'string';
 

lib/internal/Magento/Framework/Phrase/__.php

@@ -7,13 +7,14 @@
 
 /**
  * Create value-object \Magento\Framework\Phrase
+ *
  * @SuppressWarnings(PHPMD.ShortMethodName)
+ * phpcs:disable Squiz.Functions.GlobalFunction
+ * @param array $argc
  * @return \Magento\Framework\Phrase
  */
-function __()
+function __(...$argc)
 {
-    $argc = func_get_args();
-
     $text = array_shift($argc);
     if (!empty($argc) && is_array($argc[0])) {
         $argc = $argc[0];

lib/internal/Magento/Framework/View/Page/Config/Metadata/MsApplicationTileImage.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\View\Page\Config\Metadata;
+
+use Magento\Framework\View\Asset\Repository as AssetRepository;
+
+/**
+ * Class MsApplicationTileImage
+ *
+ * Returns the URL for page `msapplication-TileImage` meta
+ */
+class MsApplicationTileImage
+{
+    /**#@+
+     * Constant of asset name
+     */
+    const META_NAME = 'msapplication-TileImage';
+
+    /**
+     * @var AssetRepository
+     */
+    private $assetRepo;
+
+    /**
+     * @param AssetRepository $assetRepo
+     */
+    public function __construct(AssetRepository $assetRepo)
+    {
+        $this->assetRepo = $assetRepo;
+    }
+
+    /**
+     * Get asset URL from given metadata content
+     *
+     * @param string $content
+     *
+     * @return string
+     */
+    public function getUrl(string $content): string
+    {
+        if (!parse_url($content, PHP_URL_SCHEME)) {
+            return $this->assetRepo->getUrl($content);
+        }
+
+        return $content;
+    }
+}

lib/internal/Magento/Framework/View/Page/Config/Renderer.php

@@ -9,6 +9,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\View\Asset\GroupedCollection;
 use Magento\Framework\View\Page\Config;
+use Magento\Framework\View\Page\Config\Metadata\MsApplicationTileImage;
 
 /**
  * Page config Renderer model
@@ -74,28 +75,37 @@ class Renderer implements RendererInterface
      */
     protected $urlBuilder;
 
+    /**
+     * @var MsApplicationTileImage
+     */
+    private $msApplicationTileImage;
+
     /**
      * @param Config $pageConfig
      * @param \Magento\Framework\View\Asset\MergeService $assetMergeService
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Psr\Log\LoggerInterface $logger
+     * @param MsApplicationTileImage|null $msApplicationTileImage
      */
     public function __construct(
         Config $pageConfig,
         \Magento\Framework\View\Asset\MergeService $assetMergeService,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\Escaper $escaper,
         \Magento\Framework\Stdlib\StringUtils $string,
-        \Psr\Log\LoggerInterface $logger
+        \Psr\Log\LoggerInterface $logger,
+        MsApplicationTileImage $msApplicationTileImage = null
     ) {
         $this->pageConfig = $pageConfig;
         $this->assetMergeService = $assetMergeService;
         $this->urlBuilder = $urlBuilder;
         $this->escaper = $escaper;
         $this->string = $string;
         $this->logger = $logger;
+        $this->msApplicationTileImage = $msApplicationTileImage ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(MsApplicationTileImage::class);
     }
 
     /**
@@ -179,6 +189,10 @@ protected function processMetadataContent($name, $content)
         if (method_exists($this->pageConfig, $method)) {
             $content = $this->pageConfig->$method();
         }
+        if ($content && $name === $this->msApplicationTileImage::META_NAME) {
+            $content = $this->msApplicationTileImage->getUrl($content);
+        }
+
         return $content;
     }