🔃 [Magento Community Engineering] Community Contributions

Accepted Community Pull Requests:
 - #26842: Unit test for Magento\Catalog\Observer\SetSpecialPriceStartDate has added (by @mmezhensky)
 - #26979: #26800 Fixed Undefined variable  in ProductLink/Management (by @srsathish92)
 - #26615: Add missing annotations to MFTF tests (by @sta1r)
 - #25311: Add afterGetList method in CustomerRepository plugin to retrieve is_s� (by @enriquei4)
 - #25828: MFTF: Extract Action Groups to separate files - magento/module-customer (by @lbajsarowicz)


Fixed GitHub Issues:
 - #26800: Undefined variable $type in Product-Link Management (reported by @angelobono) has been fixed in #26979 by @srsathish92 in 2.4-develop branch
   Related commits:
     1. 84eb1fc
     2. 55d1f18
     3. bb15005

 - #13252: Fetching customer entity through API will not return 'is_subscribed' extension attribute (reported by @koenner01) has been fixed in #25311 by @enriquei4 in 2.4-develop branch
   Related commits:
     1. b2d553a
     2. 8f5bfad
     3. 8b33f69
     4. d867655
     5. c9f9d71
     6. 5020752

 - #26331: [ MFTF ] Mess in ActionGroups: invalid names, multiple nodes. (reported by @lbajsarowicz) has been fixed in #25828 by @lbajsarowicz in 2.4-develop branch
   Related commits:
     1. 14f95d9
     2. 63582cd
     3. 64b820d
     4. 0652d0e
     5. 7ac6b48
     6. b5500f7
     7. 632b3e5
     8. bf9315b
     9. f7c59ba
     10. eaeacf1
     11. df511be
     12. b7e5bcf
     13. b7165b9
     14. 171215d
     15. c6c52d6

Author: magento-engcom-team

app/code/Magento/CardinalCommerce/Test/Mftf/Test/AdminCardinalCommerceSettingsHiddenTest.xml

@@ -11,6 +11,7 @@
         <annotations>
             <stories value="Cardinal Commerce Settings"/>
             <features value="CardinalCommerce"/>
+            <stories value="Configure CardinalCommerce"/>
             <title value="CardinalCommerce settings hidden" />
             <description value="CardinalCommerce config shouldn't be visible if the 3D secure is disabled for Authorize.Net."/>
             <severity value="MINOR"/>

app/code/Magento/Catalog/Api/ProductLinkManagementInterface.php

@@ -17,6 +17,7 @@ interface ProductLinkManagementInterface
      *
      * @param string $sku
      * @param string $type
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return \Magento\Catalog\Api\Data\ProductLinkInterface[]
      */
     public function getLinkedItemsByType($sku, $type);
@@ -28,6 +29,7 @@ public function getLinkedItemsByType($sku, $type);
      * @param \Magento\Catalog\Api\Data\ProductLinkInterface[] $items
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
      * @return bool
      */
     public function setProductLinks($sku, array $items);

app/code/Magento/Catalog/Model/ProductLink/Management.php

@@ -6,37 +6,42 @@
 
 namespace Magento\Catalog\Model\ProductLink;
 
-use Magento\Catalog\Api\Data;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\InputException;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\LinkTypeProvider;
+use Magento\Catalog\Api\ProductLinkManagementInterface;
 
-class Management implements \Magento\Catalog\Api\ProductLinkManagementInterface
+/**
+ * Manage product links from api
+ */
+class Management implements ProductLinkManagementInterface
 {
     /**
-     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     * @var ProductRepositoryInterface
      */
     protected $productRepository;
 
     /**
-     * @var \Magento\Catalog\Model\Product\LinkTypeProvider
+     * @var LinkTypeProvider
      */
     protected $linkTypeProvider;
 
     /**
-     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
+     * @param ProductRepositoryInterface $productRepository
+     * @param LinkTypeProvider $linkTypeProvider
      */
     public function __construct(
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
-        \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
+        ProductRepositoryInterface $productRepository,
+        LinkTypeProvider $linkTypeProvider
     ) {
         $this->productRepository = $productRepository;
         $this->linkTypeProvider = $linkTypeProvider;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLinkedItemsByType($sku, $type)
     {
@@ -63,47 +68,42 @@ public function getLinkedItemsByType($sku, $type)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setProductLinks($sku, array $items)
     {
+
+        if (empty($items)) {
+            throw InputException::invalidFieldValue('items', 'empty array');
+        }
+
         $linkTypes = $this->linkTypeProvider->getLinkTypes();
 
         // Check if product link type is set and correct
-        if (!empty($items)) {
-            foreach ($items as $newLink) {
-                $type = $newLink->getLinkType();
-                if ($type == null) {
-                    throw InputException::requiredField("linkType");
-                }
-                if (!isset($linkTypes[$type])) {
-                    throw new NoSuchEntityException(
-                        __('The "%1" link type wasn\'t found. Verify the type and try again.', $type)
-                    );
-                }
+        foreach ($items as $newLink) {
+            $type = $newLink->getLinkType();
+            if ($type == null) {
+                throw InputException::requiredField("linkType");
+            }
+            if (!isset($linkTypes[$type])) {
+                throw new NoSuchEntityException(
+                    __('The "%1" link type wasn\'t found. Verify the type and try again.', $type)
+                );
             }
         }
 
         $product = $this->productRepository->get($sku);
 
-        // Replace only links of the specified type
         $existingLinks = $product->getProductLinks();
-        $newLinks = [];
-        if (!empty($existingLinks)) {
-            foreach ($existingLinks as $link) {
-                if ($link->getLinkType() != $type) {
-                    $newLinks[] = $link;
-                }
-            }
-            $newLinks = array_merge($newLinks, $items);
-        } else {
-            $newLinks = $items;
-        }
+        $newLinks = array_merge($existingLinks, $items);
+
         $product->setProductLinks($newLinks);
         try {
             $this->productRepository->save($product);
         } catch (\Exception $exception) {
-            throw new CouldNotSaveException(__('The linked products data is invalid. Verify the data and try again.'));
+            throw new CouldNotSaveException(
+                __('The linked products data is invalid. Verify the data and try again.')
+            );
         }
 
         return true;