Merge branch 'ACP2E-3461' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-VK-2024-11-27-CE

Author: vkolesny

app/code/Magento/ConfigurableProduct/Plugin/CatalogWidget/Block/Product/ProductsListPlugin.php

@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento\ConfigurableProduct\Plugin\CatalogWidget\Block\Product;
@@ -78,14 +77,22 @@ public function afterCreateCollection(ProductsList $subject, Collection $result)
             $connection = $this->resource->getConnection();
             $productIds = $connection->fetchCol(
                 $connection
-                ->select()
-                ->from(['e' => $this->resource->getTableName('catalog_product_entity')], ['link_table.parent_id'])
-                ->joinInner(
-                    ['link_table' => $this->resource->getTableName('catalog_product_super_link')],
-                    'link_table.product_id = e.' . $linkField,
-                    []
-                )
-                ->where('link_table.product_id IN (?)', $searchProducts)
+                    ->select()
+                    ->from(
+                        ['e' => $this->resource->getTableName('catalog_product_entity')],
+                        ['entity_table.entity_id']
+                    )
+                    ->joinInner(
+                        ['link_table' => $this->resource->getTableName('catalog_product_super_link')],
+                        'link_table.product_id = e.entity_id',
+                        []
+                    )
+                    ->joinInner(
+                        ['entity_table' => $this->resource->getTableName('catalog_product_entity')],
+                        'entity_table.' . $linkField . ' = link_table.parent_id',
+                        []
+                    )
+                    ->where('link_table.product_id IN (?)', $searchProducts)
             );
 
             $configurableProductCollection = $this->productCollectionFactory->create();

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/CatalogWidget/Block/Product/ProductListPluginTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -110,21 +110,17 @@ public function testAfterCreateCollectionSuccess(): void
         $select = $this->createMock(Select::class);
         $select->expects($this->once())
             ->method('from')
-            ->with(['e' => 'catalog_product_entity'], ['link_table.parent_id'])
+            ->with(['e' => 'catalog_product_entity'], ['entity_table.entity_id'])
             ->willReturn($select);
-        $select->expects($this->once())
+        $select->expects($this->exactly(2))
             ->method('joinInner')
-            ->with(
-                ['link_table' => 'catalog_product_super_link'],
-                'link_table.product_id = e.' . $linkField,
-                []
-            )->willReturn($select);
+            ->willReturn($select);
         $select->expects($this->once())->method('where')->with('link_table.product_id IN (?)', [1, 2]);
         $connection = $this->createMock(AdapterInterface::class);
         $connection->expects($this->once())->method('select')->willReturn($select);
         $connection->expects($this->once())->method('fetchCol')->willReturn([2]);
         $this->resource->expects($this->once())->method('getConnection')->willReturn($connection);
-        $this->resource->expects($this->exactly(2))
+        $this->resource->expects($this->exactly(3))
             ->method('getTableName')
             ->willReturnCallback(fn($param) => match ([$param]) {
                 ['catalog_product_entity'] => 'catalog_product_entity',