Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-2969

Author: aplapana

app/code/Magento/Backend/ViewModel/RequireJsConfigModifierInterface.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\ViewModel;
+
+/**
+ * View model interface for requirejs configuration modifier
+ */
+interface RequireJsConfigModifierInterface
+{
+    /**
+     * Modifies requirejs configuration
+     *
+     * @param array $config requirejs configuration
+     * @return array
+     */
+    public function modify(array $config): array;
+}

app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml

@@ -5,12 +5,20 @@
  */
 
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var \Magento\Backend\Block\Page\RequireJs $block */
+
+$requireJsConfig = [
+    'baseUrl' => $block->getViewFileUrl('/'),
+];
+
+$configModifier = $block->getConfigModifier();
+$requireJsConfig = $configModifier instanceof \Magento\Backend\ViewModel\RequireJsConfigModifierInterface
+    ? $configModifier->modify($requireJsConfig)
+    : $requireJsConfig;
 
 $scriptString = '
     var BASE_URL = \'' . /* @noEscape */ $block->getUrl('*') . '\';
     var FORM_KEY = \'' . /* @noEscape */ $block->getFormKey() . '\';
-    var require = {
-        \'baseUrl\': \'' . /* @noEscape */ $block->getViewFileUrl('/') . '\'
-    };';
-
-echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
+    var require = ' . /* @noEscape */ json_encode($requireJsConfig) .';';
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

app/code/Magento/Catalog/Controller/Product/Compare/Index.php

@@ -6,8 +6,8 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\View\Result\PageFactory;
 
@@ -81,6 +81,8 @@ public function execute()
             $this->_catalogSession->setBeforeCompareUrl(
                 $this->urlDecoder->decode($beforeUrl)
             );
+        } else {
+            $this->_catalogSession->unsBeforeCompareUrl();
         }
         return $this->resultPageFactory->create();
     }

app/code/Magento/Catalog/CustomerData/CompareProducts.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -43,25 +44,33 @@ class CompareProducts implements SectionSourceInterface
      */
     private $storeManager;
 
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
     /**
      * @param \Magento\Catalog\Helper\Product\Compare $helper
      * @param \Magento\Catalog\Model\Product\Url $productUrl
      * @param \Magento\Catalog\Helper\Output $outputHelper
      * @param ScopeConfigInterface|null $scopeConfig
      * @param StoreManagerInterface|null $storeManager
+     * @param UrlInterface|null $urlBuilder
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Compare $helper,
         \Magento\Catalog\Model\Product\Url $productUrl,
         \Magento\Catalog\Helper\Output $outputHelper,
         ?ScopeConfigInterface $scopeConfig = null,
-        ?StoreManagerInterface $storeManager = null
+        ?StoreManagerInterface $storeManager = null,
+        ?UrlInterface $urlBuilder = null
     ) {
         $this->helper = $helper;
         $this->productUrl = $productUrl;
         $this->outputHelper = $outputHelper;
         $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
         $this->storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->urlBuilder = $urlBuilder ?? ObjectManager::getInstance()->get(UrlInterface::class);
     }
 
     /**
@@ -73,7 +82,7 @@ public function getSectionData()
         return [
             'count' => $count,
             'countCaption' => $count == 1 ? __('1 item') : __('%1 items', $count),
-            'listUrl' => $this->helper->getListUrl(),
+            'listUrl' => $this->urlBuilder->getUrl('catalog/product_compare/index'),
             'items' => $count ? $this->getItems() : [],
             'websiteId' => $this->storeManager->getWebsite()->getId()
         ];

app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php

@@ -17,11 +17,15 @@
 use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class CompareProductsTest extends TestCase
 {
     /**
@@ -64,6 +68,11 @@ class CompareProductsTest extends TestCase
      */
     private $websiteMock;
 
+    /**
+     * @var UrlInterface|MockObject
+     */
+    private $urlBuilder;
+
     /**
      * @var array
      */
@@ -88,6 +97,9 @@ protected function setUp(): void
         $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->urlBuilder = $this->getMockBuilder(UrlInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->storeManagerMock = $this->getMockBuilder(
             StoreManagerInterface::class
@@ -97,7 +109,7 @@ protected function setUp(): void
         $this->websiteMock = $this->getMockBuilder(
             Website::class
         )->onlyMethods(
-            ['getId',]
+            ['getId']
         )->disableOriginalConstructor()
             ->getMock();
 
@@ -110,8 +122,8 @@ protected function setUp(): void
                 'productUrl' => $this->productUrlMock,
                 'outputHelper' => $this->outputHelperMock,
                 'scopeConfig'  => $this->scopeConfigMock,
-                'storeManager' => $this->storeManagerMock
-
+                'storeManager' => $this->storeManagerMock,
+                'urlBuilder' => $this->urlBuilder
             ]
         );
     }
@@ -219,9 +231,10 @@ public function testGetSectionData()
             ->method('getItemCollection')
             ->willReturn($itemCollectionMock);
 
-        $this->helperMock->expects($this->once())
-            ->method('getListUrl')
+        $this->urlBuilder->expects($this->once())
+            ->method('getUrl')
             ->willReturn('http://list.url');
+
         $this->storeManagerMock->expects($this->any())->method('getWebsite')->willReturn($this->websiteMock);
         $this->websiteMock->expects($this->any())->method('getId')->willReturn(1);
         $this->assertEquals(
@@ -269,8 +282,8 @@ public function testGetSectionDataNoItems()
         $this->helperMock->expects($this->never())
             ->method('getItemCollection');
 
-        $this->helperMock->expects($this->once())
-            ->method('getListUrl')
+        $this->urlBuilder->expects($this->once())
+            ->method('getUrl')
             ->willReturn('http://list.url');
 
         $this->storeManagerMock->expects($this->any())->method('getWebsite')->willReturn($this->websiteMock);
@@ -314,8 +327,8 @@ public function testGetSectionDataSingleItem()
             ->method('getItemCollection')
             ->willReturn($itemCollectionMock);
 
-        $this->helperMock->expects($this->once())
-            ->method('getListUrl')
+        $this->urlBuilder->expects($this->once())
+            ->method('getUrl')
             ->willReturn('http://list.url');
 
         $this->assertEquals(

app/code/Magento/Catalog/view/frontend/layout/default.xml

@@ -65,6 +65,7 @@
         <referenceContainer name="after.body.start">
             <block class="Magento\Framework\View\Element\Js\Components" name="head.components" as="components" template="Magento_Catalog::js/components.phtml"/>
         </referenceContainer>
+        <block class="Magento\Framework\View\Element\Template" name="head.critical" as="head.critical" template="Magento_Theme::html/container.phtml"/>
         <block class="Magento\Framework\View\Element\Template" name="head.additional" as="head.additional" template="Magento_Theme::html/container.phtml"/>
     </body>
 </page>

app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js

@@ -117,7 +117,7 @@ define([
             /**
              * Subscribers list
              */
-            subsctibers = {};
+            subscribers = {};
 
         (function () {
             /**
@@ -189,12 +189,12 @@ define([
              * @return void
              */
             processSubscribers: function (initialized, config) {
-                if (subsctibers[config.namespace]) {
-                    _.each(subsctibers[config.namespace], function (callback) {
+                if (subscribers[config.namespace]) {
+                    _.each(subscribers[config.namespace], function (callback) {
                         callback(initialized);
                     });
 
-                    delete subsctibers[config.namespace];
+                    delete subscribers[config.namespace];
                 }
             },
 
@@ -209,9 +209,9 @@ define([
                 if (storages[namespace]) {
                     callback(storages[namespace]);
                 } else {
-                    subsctibers[namespace] ?
-                        subsctibers[namespace].push(callback) :
-                        subsctibers[namespace] = [callback];
+                    subscribers[namespace] ?
+                        subscribers[namespace].push(callback) :
+                        subscribers[namespace] = [callback];
                 }
             },
 

app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html

@@ -23,43 +23,45 @@ <h1>{{trans "Payment Transaction Failed"}}</h1>
 
 <ul>
     <li>
-        <strong>{{trans "Reason"}}</strong><br />
+        <strong>{{trans "Reason"}}</strong><br>
         {{var reason}}
     </li>
     <li>
-        <strong>{{trans "Checkout Type"}}</strong><br />
+        <strong>{{trans "Checkout Type"}}</strong><br>
         {{var checkoutType}}
     </li>
     <li>
-        <strong>{{trans "Customer:"}}</strong><br />
+        <strong>{{trans "Customer:"}}</strong><br>
         <a href="mailto:{{var customerEmail}}">{{var customer}}</a> &lt;{{var customerEmail}}&gt;
     </li>
     <li>
-        <strong>{{trans "Items"}}</strong><br />
+        <strong>{{trans "Items"}}</strong><br>
         {{var items|raw}}
     </li>
     <li>
-        <strong>{{trans "Total:"}}</strong><br />
+        <strong>{{trans "Total:"}}</strong><br>
         {{var total}}
     </li>
     <li>
-        <strong>{{trans "Billing Address:"}}</strong><br />
+        <strong>{{trans "Billing Address:"}}</strong><br>
         {{var billingAddressHtml|raw}}
     </li>
+    {{depend shippingMethod}}
     <li>
-        <strong>{{trans "Shipping Address:"}}</strong><br />
+        <strong>{{trans "Shipping Address:"}}</strong><br>
         {{var shippingAddressHtml|raw}}
     </li>
     <li>
-        <strong>{{trans "Shipping Method:"}}</strong><br />
+        <strong>{{trans "Shipping Method:"}}</strong><br>
         {{var shippingMethod}}
     </li>
+    {{/depend}}
     <li>
-        <strong>{{trans "Payment Method:"}}</strong><br />
+        <strong>{{trans "Payment Method:"}}</strong><br>
         {{var paymentMethod}}
     </li>
     <li>
-        <strong>{{trans "Date & Time:"}}</strong><br />
+        <strong>{{trans "Date & Time:"}}</strong><br>
         {{var dateAndTime}}
     </li>
 </ul>

app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js

@@ -193,15 +193,17 @@ define([
          */
         validateFields: function () {
             var addressFlat = addressConverter.formDataProviderToFlatData(
-                this.collectObservedData(),
-                'shippingAddress'
+                    this.collectObservedData(),
+                    'shippingAddress'
                 ),
                 address;
 
             if (this.validateAddressData(addressFlat)) {
                 addressFlat = uiRegistry.get('checkoutProvider').shippingAddress;
                 address = addressConverter.formAddressDataToQuoteAddress(addressFlat);
                 selectShippingAddress(address);
+            } else {
+                shippingService.isLoading(false);
             }
         },
 

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -12,6 +12,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Collection;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
@@ -289,6 +290,7 @@ protected function createSubDirectories($path)
      *
      * @return array
      * @deprecated
+     * @see isDirectoryAllowed
      */
     protected function getConditionsForExcludeDirs()
     {
@@ -317,6 +319,7 @@ protected function getConditionsForExcludeDirs()
      * @param array $conditions
      * @return \Magento\Framework\Data\Collection\Filesystem
      * @deprecated
+     * @see \Magento\Framework\Data\Collection\Filesystem::setDirsFilter
      */
     protected function removeItemFromCollection($collection, $conditions)
     {
@@ -415,7 +418,7 @@ public function getFilesCollection($path, $type = null)
             $mimeType = $itemStats['mimetype'] ?? $this->mime->getMimeType($item->getFilename());
             $item->setMimeType($mimeType);
 
-            if ($this->isImage($item->getBasename())) {
+            if ($this->isImageValid($item)) {
                 $thumbUrl = $this->getThumbnailUrl($item->getFilename(), true);
                 // generate thumbnail "on the fly" if it does not exists
                 if (!$thumbUrl) {
@@ -435,6 +438,12 @@ public function getFilesCollection($path, $type = null)
                     $this->logger->notice(sprintf("GetImageSize caused error: %s", $e->getMessage()));
                 }
             } else {
+                $this->logger->warning(
+                    sprintf(
+                        "The image %s is invalid and cannot be displayed in the gallery.",
+                        $item->getBasename()
+                    )
+                );
                 $thumbUrl = $this->_assetRepo->getUrl(self::THUMB_PLACEHOLDER_PATH_SUFFIX);
             }
 
@@ -1058,4 +1067,15 @@ private function getAllowedDirMask(string $path)
 
         return '/^(' . implode('|', array_unique(array_column($allowedDirs, $subfolderLevel - 1))) . ')$/';
     }
+
+    /**
+     * Checks if the file is an image and has a size greater than 0 to validate it can be processes in the gallery.
+     *
+     * @param Collection $item
+     * @return bool
+     */
+    private function isImageValid($item)
+    {
+        return $this->isImage($item->getBasename()) && $item->getSize() > 0;
+    }
 }