Merge branch '2.4.8-develop' into lynx-2.4.8

Author: svera

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/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);

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'),

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'),