Merge remote-tracking branch 'origin/2.4.8-develop' into spartans_pr_13032025

wip44850 · wip44850 · commit 2a424614b37c · 2025-03-19T12:24:22.000+05:30
diff --git a/app/code/Magento/Backend/App/Area/FrontNameResolver.php b/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
                 );
             }
diff --git a/app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php b/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());
     }
 
diff --git a/app/code/Magento/Downloadable/Test/Fixture/DownloadableProduct.php b/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,
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/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);
diff --git a/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml b/app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml
@@ -11,7 +11,7 @@
     <entity name="SearchTerm" type="searchTerm">
         <data key="query_text" unique="suffix">Query text</data>
         <data key="store_id">1</data>
-        <data key="redirect" unique="suffix">http://example.com/</data>
+        <data key="redirect" unique="suffix">https://example.com/</data>
         <data key="display_in_terms">0</data>
     </entity>
     <entity name="UpdatedSearchTermData1" type="searchTerm">
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GiftMessage/CartItemWithGiftMessageTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GiftMessage/CartItemWithGiftMessageTest.php
@@ -102,12 +102,12 @@ public function testCartQueryWithVirtualItem(): void
                 [
                     'title' => 'Example 1',
                     'price' => 0.00,
-                    'link_type' => 'file'
+                    'link_type' => 'url'
                 ],
                 [
                     'title' => 'Example 2',
                     'price' => 0.00,
-                    'link_type' => 'file'
+                    'link_type' => 'url'
                 ]
             ]
         ], as: 'product'),
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlCache/CacheIdFactorProviders/Customer/CustomerGroupProviderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlCache/CacheIdFactorProviders/Customer/CustomerGroupProviderTest.php
@@ -1,17 +1,23 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\GraphQl\GraphQlCache\CacheIdFactorProviders\Customer;
 
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Group;
+use Magento\Customer\Test\Fixture\Customer as CustomerFixture;
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\GraphQlCache\Model\CacheId\CacheIdCalculator;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -35,57 +41,70 @@ class CustomerGroupProviderTest extends GraphQlAbstract
      */
     private $customerRepository;
 
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
     protected function setUp(): void
     {
-        $objectManager = Bootstrap::getObjectManager();
-        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
-        $this->customerGroup = $objectManager->get(Group::class);
-        $this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->customerGroup = Bootstrap::getObjectManager()->get(Group::class);
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+        $this->fixtures = Bootstrap::getObjectManager()->get(DataFixtureStorageManager::class)->getStorage();
     }
 
     /**
      * Tests that cache id header changes based on customer group and remains consistent for same customer group
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      */
-    public function testCacheIdHeaderWithCustomerGroup()
+    #[
+        DataFixture(ProductFixture::class, as: 'product'),
+        DataFixture(CustomerFixture::class, as: 'customer'),
+    ]
+    public function testCacheIdHeaderWithCustomerGroup(): void
     {
-        $sku = 'simple_product';
+        $customerEmail = $this->fixtures->get('customer')->getEmail();
         $query = <<<QUERY
- {
-           products(filter: {sku: {eq: "{$sku}"}})
-           {
-               items {
-                   id
-                   name
-                   sku
-                   description {
-                   html
+         {
+               products(filter: {sku: {eq: "{$this->fixtures->get('product')->getSku()}"}})
+               {
+                   items {
+                       id
+                       name
+                       sku
+                       description {
+                       html
+                       }
                    }
                }
            }
-       }
-QUERY;
-        $response = $this->graphQlQueryWithResponseHeaders($query, [], '', $this->getHeaderMap());
+        QUERY;
+        $response = $this->graphQlQueryWithResponseHeaders(
+            $query,
+            [],
+            '',
+            $this->getHeaderMap($customerEmail)
+        );
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
         $cacheId = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         $this->assertTrue((boolean)preg_match('/^[0-9a-f]{64}$/i', $cacheId));
-        $groupCode = 'Retailer';
-        $customer = $this->customerRepository->get('customer@example.com');
-        $customerGroupId = $this->customerGroup->load($groupCode, 'customer_group_code')->getId();
+        $customer = $this->customerRepository->get($customerEmail);
+        $customerGroupId = $this->customerGroup->load('Retailer', 'customer_group_code')->getId();
         // change the customer group of this customer from the default group
         $customer->setGroupId($customerGroupId);
         $this->customerRepository->save($customer);
         $responseAfterCustomerGroupChange = $this->graphQlQueryWithResponseHeaders(
             $query,
             [],
             '',
-            $this->getHeaderMap()
+            $this->getHeaderMap($customerEmail)
+        );
+        $this->assertArrayHasKey(
+            CacheIdCalculator::CACHE_ID_HEADER,
+            $responseAfterCustomerGroupChange['headers']
         );
-        $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $responseAfterCustomerGroupChange['headers']);
         $cacheIdCustomerGroupChange = $responseAfterCustomerGroupChange['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify that the the cache id generated is a 64 character long
+        // Verify that the cache id generated is a 64 character long
         $this->assertTrue((boolean)preg_match('/^[0-9a-f]{64}$/i', $cacheId));
         // check that the cache ids generated before and after customer group changes are not equal
         $this->assertNotEquals($cacheId, $cacheIdCustomerGroupChange);
@@ -96,28 +115,28 @@ public function testCacheIdHeaderWithCustomerGroup()
             $query,
             [],
             '',
-            $this->getHeaderMap()
+            $this->getHeaderMap($customerEmail)
         );
-        $cacheIdDefaultCustomerGroup = $responseDefaultCustomerGroup['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         //Verify that the cache id is same as original $cacheId
-        $this->assertEquals($cacheIdDefaultCustomerGroup, $cacheId);
+        $this->assertEquals(
+            $responseDefaultCustomerGroup['headers'][CacheIdCalculator::CACHE_ID_HEADER],
+            $cacheId
+        );
     }
 
     /**
      * Authentication header map
      *
      * @param string $username
-     * @param string $password
-     *
      * @return array
      *
      * @throws AuthenticationException
+     * @throws EmailNotConfirmedException
      */
-    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    private function getHeaderMap(string $username): array
     {
-        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, 'password');
 
         return ['Authorization' => 'Bearer ' . $customerToken];
     }
-
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/DownloadableProductCartItemPriceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/DownloadableProductCartItemPriceTest.php
@@ -56,12 +56,12 @@ protected function setUp(): void
                 [
                     'title' => 'Example 1',
                     'price' => 0.00,
-                    'link_type' => 'file'
+                    'link_type' => 'url'
                 ],
                 [
                     'title' => 'Example 2',
                     'price' => 0.00,
-                    'link_type' => 'file'
+                    'link_type' => 'url'
                 ],
             ]
         ], as: 'product'),
@@ -158,12 +158,12 @@ public function testGetCartItemPricesForDownloadableProductWithoutSeparateLinks(
                 [
                     'title' => 'Example 1',
                     'price' => 10,
-                    'link_type' => 'file'
+                    'link_type' => 'url'
                 ],
                 [
                     'title' => 'Example 2',
                     'price' => 10,
-                    'link_type' => 'file'
+                    'link_type' => 'url'
                 ],
             ]
         ], as: 'product'),

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ public function testIsHostBackend(`
`129`	`129`	`->willReturnMap(`
`130`	`130`	`[`
`131`	`131`	`[Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],`
	`132`	`+ [Store::XML_PATH_SECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],`
`132`	`133`	`[`
`133`	`134`	`FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_URL,`
`134`	`135`	`ScopeInterface::SCOPE_STORE,`
`@@ -160,7 +161,6 @@ public function testIsHostBackend(`
`160`	`161`	`->setHost(parse_url($url, PHP_URL_HOST))`
`161`	`162`	`->setPort(parse_url($url, PHP_URL_PORT))`
`162`	`163`	`);`
`163`		`-`
`164`	`164`	`$this->assertEquals($expectedValue, $this->model->isHostBackend());`
`165`	`165`	`}`
`166`	`166`
Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,12 @@ public function testCartQueryWithVirtualItem(): void`
`102`	`102`	`[`
`103`	`103`	`'title' => 'Example 1',`
`104`	`104`	`'price' => 0.00,`
`105`		`- 'link_type' => 'file'`
	`105`	`+ 'link_type' => 'url'`
`106`	`106`	`],`
`107`	`107`	`[`
`108`	`108`	`'title' => 'Example 2',`
`109`	`109`	`'price' => 0.00,`
`110`		`- 'link_type' => 'file'`
	`110`	`+ 'link_type' => 'url'`
`111`	`111`	`]`
`112`	`112`	`]`
`113`	`113`	`], as: 'product'),`
Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,12 @@ protected function setUp(): void`
`56`	`56`	`[`
`57`	`57`	`'title' => 'Example 1',`
`58`	`58`	`'price' => 0.00,`
`59`		`- 'link_type' => 'file'`
	`59`	`+ 'link_type' => 'url'`
`60`	`60`	`],`
`61`	`61`	`[`
`62`	`62`	`'title' => 'Example 2',`
`63`	`63`	`'price' => 0.00,`
`64`		`- 'link_type' => 'file'`
	`64`	`+ 'link_type' => 'url'`
`65`	`65`	`],`
`66`	`66`	`]`
`67`	`67`	`], as: 'product'),`
`@@ -158,12 +158,12 @@ public function testGetCartItemPricesForDownloadableProductWithoutSeparateLinks(`
`158`	`158`	`[`
`159`	`159`	`'title' => 'Example 1',`
`160`	`160`	`'price' => 10,`
`161`		`- 'link_type' => 'file'`
	`161`	`+ 'link_type' => 'url'`
`162`	`162`	`],`
`163`	`163`	`[`
`164`	`164`	`'title' => 'Example 2',`
`165`	`165`	`'price' => 10,`
`166`		`- 'link_type' => 'file'`
	`166`	`+ 'link_type' => 'url'`
`167`	`167`	`],`
`168`	`168`	`]`
`169`	`169`	`], as: 'product'),`