Merge branch '2.4-develop' into spartans_pr_02072025

magento-devops-queue-mgr-svc · web-flow · commit 9f2f19e38f79 · 2025-07-02T19:30:54.000-05:00
diff --git a/app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php b/app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php
@@ -138,16 +138,15 @@ function (array $args) {
      */
     public static function getOutputFormatDataProvider(): array
     {
-        $ar_DZ = "\u{062C}.\u{0645}.\u{200F}\u{00A0}%s";
-        if (version_compare(PHP_VERSION, '8.3', '>=')) {
-            $ar_DZ = "%s\u{00A0}\u{062C}.\u{0645}.\u{200F}";
-        }
+        // Use dynamic detection for problematic locale/currency combinations!
+        $ar_DZ_EGP = self::getExpectedFormatForLocale('ar_DZ', 'EGP');
+
         return [
             'en_US:USD' => ['en_US', 'USD', '$%s'],
             'en_US:PLN' => ['en_US', 'PLN', "PLN\u{00A0}%s"],
             'en_US:PKR' => ['en_US', 'PKR', "PKR\u{00A0}%s"],
             'af_ZA:VND' => ['af_ZA', 'VND', "\u{20AB}%s"],
-            'ar_DZ:EGP' => ['ar_DZ', 'EGP', $ar_DZ],
+            'ar_DZ:EGP' => ['ar_DZ', 'EGP', $ar_DZ_EGP],
             'ar_SA:USD' => ['ar_SA', 'USD', "%s\u{00A0}US$"],
             'ar_SA:LBP' => ['ar_SA', 'LBP', "%s\u{00A0}\u{0644}.\u{0644}.\u{200F}"],
             'fa_IR:USD' => ['fa_IR', 'USD', "\u{200E}$%s"],
@@ -162,6 +161,62 @@ public static function getOutputFormatDataProvider(): array
         ];
     }
 
+    /**
+     * Get expected format for a specific locale/currency combination
+     * This handles cases where intl extension version affects formatting
+     *
+     * @param string $locale
+     * @param string $currency
+     * @return string
+     */
+    private static function getExpectedFormatForLocale(string $locale, string $currency): string
+    {
+        // Define known problematic combinations and their expected formats
+        $problematicFormats = [
+            'ar_DZ:EGP' => [
+                'old' => "\u{062C}.\u{0645}.\u{200F}\u{00A0}%s",
+                'new' => "%s\u{00A0}\u{062C}.\u{0645}.\u{200F}"
+            ]
+        ];
+
+        $key = $locale . ':' . $currency;
+
+        if (isset($problematicFormats[$key])) {
+            // Check if we're using a newer intl version that changes formatting
+            if (self::isNewerIntlVersion()) {
+                return $problematicFormats[$key]['new'];
+            }
+            return $problematicFormats[$key]['old'];
+        }
+
+        // For non-problematic combinations, return a default format
+        // This could be enhanced with more specific formats as needed
+        return "%s";
+    }
+
+    /**
+     * Check if the current intl extension version uses newer formatting rules
+     *
+     * @return bool
+     */
+    private static function isNewerIntlVersion(): bool
+    {
+        // Check intl extension version
+        if (extension_loaded('intl')) {
+            $intlVersion = INTL_ICU_VERSION ?? '0.0.0';
+
+            // ICU 72+ (released around 2022) introduced changes to RTL formatting
+            // This is a more reliable indicator than PHP version
+            if (version_compare($intlVersion, '72.0', '>=')) {
+                return true;
+            }
+        }
+
+        // Fallback: Check PHP version as a rough indicator
+        // This is less reliable but provides some backward compatibility
+        return version_compare(PHP_VERSION, '8.3', '>=');
+    }
+
     /**
      * @dataProvider getFormatTxtNumberFormatterDataProvider
      * @param string $locale
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
@@ -887,8 +887,16 @@ public function canShip()
     private function checkItemShipping(): bool
     {
         foreach ($this->getAllItems() as $item) {
-            $qtyToShip = !$item->getParentItem() || $item->getParentItem()->getProductType() !== Type::TYPE_BUNDLE ?
-                $item->getQtyToShip() : $item->getSimpleQtyToShip();
+            if (!$item->getParentItem() || $item->getParentItem()->getProductType() !== Type::TYPE_BUNDLE) {
+                $qtyToShip = $item->getQtyToShip();
+            } else {
+                if ($item->getParentItem()->getProductType() === Type::TYPE_BUNDLE &&
+                    $item->getParentItem()->getProduct()->getShipmentType() == Type\AbstractType::SHIPMENT_TOGETHER) {
+                    $qtyToShip = $item->getParentItem()->getQtyToShip();
+                } else {
+                    $qtyToShip = $item->getSimpleQtyToShip();
+                }
+            }
 
             if ($qtyToShip > 0 && !$item->getIsVirtual() && !$item->getLockedDoShip()) {
                 return true;
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -1,13 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Sales\Test\Unit\Model;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Framework\Api\SearchCriteria;
@@ -213,6 +215,49 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * @return void
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    public function testCanShipBundleWithToghetherShipment(): void
+    {
+        $this->order->setActionFlag($this->order::ACTION_FLAG_UNHOLD, false);
+        $this->order->setActionFlag($this->order::ACTION_FLAG_SHIP, true);
+
+        $bundleItem = $this->createMock(Item::class);
+        $bundleItem->expects($this->any())->method('getParentItem')->willReturn(null);
+        $bundleItem->expects($this->exactly(2))->method('getQtyToShip')->willReturn(0);
+        $bundleItem->expects($this->any())->method('getProductType')->willReturn(Type::TYPE_BUNDLE);
+
+        $product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getShipmentType'])
+            ->getMock();
+        $product->expects($this->any())
+            ->method('getShipmentType')
+            ->willReturn(Type\AbstractType::SHIPMENT_TOGETHER);
+        $bundleItem->expects($this->any())->method('getProduct')->willReturn($product);
+
+        $childProduct = $this->createMock(Item::class);
+        $childProduct->expects($this->any())->method('getParentItem')->willReturn($bundleItem);
+
+        $orderItems = [$bundleItem, $childProduct];
+        $this->searchCriteriaBuilder->expects($this->once())->method('addFilter')->willReturnSelf();
+
+        $searchCriteria = $this->getMockBuilder(SearchCriteria::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->searchCriteriaBuilder->expects($this->once())->method('create')->willReturn($searchCriteria);
+        $itemsCollection = $this->getMockBuilder(OrderItemSearchResultInterface::class)
+            ->onlyMethods(['getItems'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $itemsCollection->expects($this->once())->method('getItems')->willReturn($orderItems);
+        $this->itemRepository->expects($this->once())->method('getList')->willReturn($itemsCollection);
+
+        $this->assertFalse($this->order->canShip());
+    }
+
     /**
      * Test testGetItems method.
      */
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php
@@ -61,7 +61,7 @@ public function resolve(
         $wishlist = $value['model'];
 
         if ($context->getExtensionAttributes()->getStore() instanceof StoreInterface) {
-            $args['store_id'] = $context->getExtensionAttributes()->getStore()->getId();
+            $args['website_id'] = $context->getExtensionAttributes()->getStore()->getWebsiteId();
         }
 
         /** @var WishlistItemCollection $wishlistItemCollection */
@@ -95,6 +95,7 @@ public function resolve(
      * @param Wishlist $wishlist
      * @param array $args
      * @return WishlistItemCollection
+     * @throws LocalizedException
      */
     private function getWishListItems(Wishlist $wishlist, array $args): WishlistItemCollection
     {
@@ -104,8 +105,15 @@ private function getWishListItems(Wishlist $wishlist, array $args): WishlistItem
         /** @var WishlistItemCollection $wishlistItemCollection */
         $wishlistItemCollection = $this->wishlistItemCollectionFactory->create();
         $wishlistItemCollection->addWishlistFilter($wishlist);
-        if (isset($args['store_id'])) {
-            $wishlistItemCollection->addStoreFilter($args['store_id']);
+        if (isset($args['website_id']) && $args['website_id']) {
+            $website = $this->storeManager->getWebsite($args['website_id']);
+            $stores = [];
+            foreach ($website->getStores() as $store) {
+                $stores[] = $store->getId();
+            }
+            if ($stores) {
+                $wishlistItemCollection->addStoreFilter($stores);
+            }
         } else {
             $wishlistItemCollection->addStoreFilter(array_map(function (StoreInterface $store) {
                 return $store->getId();
diff --git a/app/code/Magento/WishlistGraphQl/Test/Unit/Model/Resolver/WishlistItemsTest.php b/app/code/Magento/WishlistGraphQl/Test/Unit/Model/Resolver/WishlistItemsTest.php
@@ -8,11 +8,12 @@
 namespace Magento\WishlistGraphQl\Test\Unit\Model\Resolver;
 
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\GraphQl\Model\Query\ContextExtensionInterface;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\GraphQl\Model\Query\ContextExtensionInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
 use Magento\Wishlist\Model\ResourceModel\Item;
 use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
 use Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory as WishlistItemCollectionFactory;
@@ -21,6 +22,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class WishlistItemsTest extends TestCase
 {
     /**
@@ -49,14 +53,13 @@ protected function setUp(): void
      */
     public function testResolve(): void
     {
-        $storeId = $itemId = 1;
+        $webId = $storeId = $itemId = 1;
 
         $field = $this->createMock(Field::class);
-        $context = $this->getMockBuilder(ContextInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $context = $this->createMock(ContextInterface::class);
         $store = $this->createMock(StoreInterface::class);
-        $store->expects($this->once())->method('getId')->willReturn($storeId);
+        $store->expects($this->once())->method('getWebsiteId')->willReturn($webId);
+        $store->expects($this->any())->method('getId')->willReturn($storeId);
 
         $extensionAttributes = $this->getMockBuilder(ContextExtensionInterface::class)
             ->disableOriginalConstructor()
@@ -87,7 +90,7 @@ public function testResolve(): void
             ->willReturnSelf();
         $wishlistCollection->expects($this->once())
             ->method('addStoreFilter')
-            ->with($storeId)
+            ->with([$storeId])
             ->willReturnSelf();
         $wishlistCollection->expects($this->once())->method('setVisibilityFilter')->willReturnSelf();
         $wishlistCollection->expects($this->once())->method('setCurPage')->willReturnSelf();
@@ -100,6 +103,10 @@ public function testResolve(): void
             ->method('create')
             ->willReturn($wishlistCollection);
 
+        $website = $this->createMock(Website::class);
+        $website->expects($this->any())->method('getStores')->willReturn([$store]);
+        $this->storeManager->expects($this->once())->method('getWebsite')->with($webId)->willReturn($website);
+
         $resolver = new WishlistItems($this->wishlistItemCollectionFactory, $this->storeManager);
         $resolver->resolve($field, $context, $info, ['model' => $wishlist]);
     }
