Merge branch '2.4.8-develop' of github.com:magento-commerce/magento2ce into graphql-api-enhancements

Author: svera

app/code/Magento/Backend/App/Area/FrontNameResolver.php

@@ -117,6 +117,9 @@ public function getFrontName($checkHost = false)
     /**
      * Return whether the host from request is the backend host
      *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return bool
      */
     public function isHostBackend()
@@ -128,10 +131,11 @@ public function isHostBackend()
         if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {
             $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);
         } else {
-            $backendUrl = $this->config->getValue(Store::XML_PATH_UNSECURE_BASE_URL);
+            $xmlPath = $this->request->isSecure() ? Store::XML_PATH_SECURE_BASE_URL : Store::XML_PATH_UNSECURE_BASE_URL;
+            $backendUrl = $this->config->getValue($xmlPath);
             if ($backendUrl === null) {
                 $backendUrl = $this->scopeConfig->getValue(
-                    Store::XML_PATH_UNSECURE_BASE_URL,
+                    $xmlPath,
                     ScopeInterface::SCOPE_STORE
                 );
             }

app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php

@@ -129,6 +129,7 @@ public function testIsHostBackend(
             ->willReturnMap(
                 [
                     [Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
+                    [Store::XML_PATH_SECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
                     [
                         FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_URL,
                         ScopeInterface::SCOPE_STORE,
@@ -160,7 +161,6 @@ public function testIsHostBackend(
                     ->setHost(parse_url($url, PHP_URL_HOST))
                     ->setPort(parse_url($url, PHP_URL_PORT))
             );
-
         $this->assertEquals($expectedValue, $this->model->isHostBackend());
     }
 

app/code/Magento/Config/Block/System/Config/Form/Field/File.php

@@ -55,7 +55,7 @@ protected function _getDeleteCheckbox()
             $html .= '<input type="hidden" name="' .
                 parent::getName() .
                 '[value]" value="' .
-                $this->_escaper->escapeHtml($this->getValue()) .
+                $this->_escaper->escapeHtmlAttr($this->getValue()) .
                 '" />';
             $html .= '</div>';
         }

app/code/Magento/Downloadable/Test/Fixture/DownloadableProduct.php

@@ -19,6 +19,7 @@
 use Magento\TestFramework\Fixture\Api\DataMerger;
 use Magento\TestFramework\Fixture\Api\ServiceFactory;
 use Magento\TestFramework\Fixture\Data\ProcessorInterface;
+use Magento\Downloadable\Api\DomainManagerInterface;
 
 class DownloadableProduct extends Product
 {
@@ -43,6 +44,8 @@ class DownloadableProduct extends Product
         ],
     ];
 
+    private const DOMAINS = ['example.com','www.example.com'];
+
     /**
      * DownloadableProduct constructor
      *
@@ -61,7 +64,8 @@ public function __construct(
         private readonly ProductRepositoryInterface $productRepository,
         private readonly DirectoryList $directoryList,
         private readonly Link $link,
-        private readonly File $file
+        private readonly File $file,
+        private readonly DomainManagerInterface $domainManager
     ) {
         parent::__construct($serviceFactory, $dataProcessor, $dataMerger, $productRepository);
     }
@@ -74,9 +78,17 @@ public function __construct(
      */
     public function apply(array $data = []): ?DataObject
     {
+        $this->domainManager->addDomains(self::DOMAINS);
+
         return parent::apply($this->prepareData($data));
     }
 
+    public function revert(DataObject $data): void
+    {
+        $this->domainManager->removeDomains(self::DOMAINS);
+        parent::revert($data);
+    }
+
     /**
      * Prepare product data
      *
@@ -112,13 +124,22 @@ private function prepareLinksData(array $data): array
     {
         $links = [];
         foreach ($data['extension_attributes']['downloadable_product_links'] as $link) {
+
+            if ($link['link_type'] == 'url') {
+                $link['link_url'] = 'http://example.com/downloadable.txt';
+                $link['link_file'] = '';
+            } else {
+                $link['link_file'] = $this->generateDownloadableLink($link['link_file'] ?? 'test-' . uniqid() . '.txt');
+                $link['link_url'] = '';
+            }
+
             $links[] = [
                 'id' => null,
                 'title' => $link['title'] ?? 'Test Link%uniqid%',
                 'price' => $link['price'] ?? 0,
                 'link_type' => $link['link_type'] ?? 'file',
-                'link_url' => null,
-                'link_file' => $this->generateDownloadableLink($link['link_file'] ?? 'test-' . uniqid() . '.txt'),
+                'link_url' => $link['link_url'],
+                'link_file' => $link['link_file'],
                 'is_shareable' => $link['is_shareable'] ?? 0,
                 'number_of_downloads' => $link['number_of_downloads'] ?? 5,
                 'sort_order' => $link['sort_order'] ?? 10,

app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Scheduled.php

@@ -1,12 +1,10 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Indexer\Block\Backend\Grid\Column\Renderer;
 
-use Magento\Customer\Model\Customer;
-
 /**
  * Renderer for 'Scheduled' column in indexer grid
  */
@@ -44,11 +42,10 @@ public function render(\Magento\Framework\DataObject $row)
      *
      * @param string $indexer
      * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function isPreferRealtime(string $indexer): bool
     {
-        return in_array($indexer, [
-            Customer::CUSTOMER_GRID_INDEXER_ID,
-        ]);
+        return false;
     }
 }

app/code/Magento/Indexer/Test/Unit/Block/Backend/Grid/Column/Renderer/ScheduledTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -46,9 +46,9 @@ public function testRender($indexer, $rowValue, $class, $text)
     public static function typeProvider()
     {
         return [
-            ['customer_grid', true, 'grid-severity-major', __('Update by Schedule')],
-            ['customer_grid', false, 'grid-severity-notice', __('Update on Save')],
-            ['customer_grid', '', 'grid-severity-notice', __('Update on Save')],
+            ['customer_grid', true, 'grid-severity-notice', __('Update by Schedule')],
+            ['customer_grid', false, 'grid-severity-major', __('Update on Save')],
+            ['customer_grid', '', 'grid-severity-major', __('Update on Save')],
             ['catalog_product_price', true, 'grid-severity-notice', __('Update by Schedule')],
             ['catalog_product_price', false, 'grid-severity-major', __('Update on Save')],
             ['catalog_product_price', '', 'grid-severity-major', __('Update on Save')],

app/code/Magento/Indexer/composer.json

@@ -8,8 +8,7 @@
         "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/framework-amqp": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*"
+        "magento/module-backend": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Indexer/etc/module.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Magento_Indexer" >
         <sequence>
-            <module name="Magento_Customer"/>
             <module name="Magento_Store"/>
             <module name="Magento_AdminNotification"/>
         </sequence>

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Multishipping\Model\Checkout\Type;
@@ -703,7 +703,7 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
         $store = $order->getStore();
         $amountPrice = $store->getBaseCurrency()
             ->convert($shippingPrice, $store->getCurrentCurrencyCode());
-        $order->setBaseShippingAmount($shippingPrice);
+        $order->setBaseShippingAmount((float)$shippingPrice);
         $order->setShippingAmount($amountPrice);
 
         $order->setQuote($quote);

app/code/Magento/OrderCancellationGraphQl/Model/Validator/ValidateOrderCancellationReason.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ */
+declare(strict_types=1);
+
+namespace Magento\OrderCancellationGraphQl\Model\Validator;
+
+use Magento\OrderCancellation\Model\Config\Config;
+use Magento\Sales\Model\Order;
+
+/**
+ * Validate cancellation reason of order
+ */
+class ValidateOrderCancellationReason
+{
+    /**
+     * @var Config $config
+     */
+    private Config $config;
+
+    /**
+     * ValidateOrderCancellationReason Constructor
+     *
+     * @param Config $config
+     */
+    public function __construct(
+        Config $config
+    ) {
+        $this->config = $config;
+    }
+
+    /**
+     * Validate cancellation reason
+     *
+     * @param Order $order
+     * @param string $reason
+     * @return bool
+     */
+    public function validateReason(
+        Order $order,
+        string $reason
+    ): bool {
+        $cancellationReasons = array_map(
+            'strtolower',
+            $this->config->getCancellationReasons($order->getStore())
+        );
+
+        return !in_array(strtolower(trim($reason)), $cancellationReasons);
+    }
+}