🔃 [Magento Community Engineering] Community Contributions - 2.4-develop

Accepted Community Pull Requests:
 - #26246: #26245: Magento does not send an email about a refunded grouped product (by @atwixfirster)
 - #26279: Fix issue #26276 with clonning quote billing address street (by @yutv)
 - #25488: Update composer dependency to fix Redis Key Expiery (by @toxix)
 - #26502: {ASI} :- Error message to be cached for grid data storage component (by @konarshankar07)
 - #26781: Code hygeine in bundle option graphql resolver (by @moloughlin)
 - #26782: Module_Cms MFTF test improvements (by @ajithkumar-maragathavel)
 - #26715: Unit test for \Magento\Captcha\Observer\ResetAttemptForBackendObserver and ResetAttemptForFrontendObserver (by @karyna-tsymbal-atwix)
 - #26770: Unit tests for Magento\Csp\Model\Mode\ConfigManager and Magento\Csp\Observer\Render (by @karyna-tsymbal-atwix)
 - #25249: upgrade method delete by ids to inject array skus (by @sarron93)
 - #24843: Issue #24842: Unable to delete custom option file in admin order create (by @adrian-martinez-interactiv4)
 - #26142: Textarea patch 1 (by @textarea)
 - #26764: LoadCssAsync html format fixed for critical css  (by @srsathish92)
 - #25246: Warning when Search Terms page is opened by clicking option at the footer  (by @vishalverma279)
 - #26714: Deprecated redundant class (by @drpayyne)


Fixed GitHub Issues:
 - #26245: Magento does not send an email about a refunded grouped product (reported by @atwixfirster) has been fixed in #26246 by @atwixfirster in 2.4-develop branch
   Related commits:
     1. 7141278
     2. a5f0d30
     3. b1d99e5
     4. dfc44a1

 - #26276: Checkout. Quote Address Street cloning issue (reported by @yutv) has been fixed in #26279 by @yutv in 2.4-develop branch
   Related commits:
     1. 2687221
     2. 4e81fd8
     3. 974f5e9

 - #25487: Redis cache grows unilimmited (reported by @toxix) has been fixed in #25488 by @toxix in 2.4-develop branch
   Related commits:
     1. 49809a7
     2. d4931ec
     3. 02edd9d
     4. 3b89fc4
     5. 85e71f5
     6. a8f1ee7
     7. 566c625
     8. 6d0fa26

 - #863: How to switch base,thumbnail images in magento 2 back end  (reported by @nmohanswe) has been fixed in #26502 by @konarshankar07 in 2.4-develop branch
   Related commits:
     1. c9d5e8e
     2. 8357cf8
     3. a17c2a5
     4. 7fafb2d
     5. 9de1e59
     6. c3ba2ce
     7. 0aef9ad
     8. 7ef0c88
     9. a1d2a84
     10. 1f2ed90

 - #24842: Unable to delete custom option file in admin order create (reported by @adrian-martinez-interactiv4) has been fixed in #24843 by @adrian-martinez-interactiv4 in 2.4-develop branch
   Related commits:
     1. 504dd91
     2. 3eb4110
     3. 6e4a041

 - #26141: Modal Popup and Custom subTitle erased (reported by @textarea) has been fixed in #26142 by @textarea in 2.4-develop branch
   Related commits:
     1. 81b580a
     2. 75b6674
     3. 86023f9
     4. a121250
     5. fcce5b8
     6. c4db941
     7. 435c3fe

 - #26760: Validate html error when enable critical css (reported by @minhluan259) has been fixed in #26764 by @srsathish92 in 2.4-develop branch
   Related commits:
     1. f9697f5
     2. bf21c4b
     3. 2881e48
     4. 1e50859

 - #25245: Warning when Search Terms page is opened by clicking option  at the footer (reported by @vishalverma279) has been fixed in #25246 by @vishalverma279 in 2.4-develop branch
   Related commits:
     1. 6b3bd36
     2. c7483ba
     3. 7b99e51
     4. c58a7e3
     5. 1e14f00
     6. 1760043
     7. d1f1eba

 - #14885: Refactoring: Code duplication EmailSender / ShipmentSender and so on (reported by @amenk) has been fixed in #26714 by @drpayyne in 2.4-develop branch
   Related commits:
     1. 4e1bfde
     2. 2f591a8
     3. 5967ed4
     4. 997a0de

Author: magento-engcom-team

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php

@@ -78,11 +78,7 @@ public function addParentFilterData(int $parentId, int $parentEntityId, string $
     public function getOptionsByParentId(int $parentId) : array
     {
         $options = $this->fetch();
-        if (!isset($options[$parentId])) {
-            return [];
-        }
-
-        return $options[$parentId];
+        return $options[$parentId] ?? [];
     }
 
     /**
@@ -115,7 +111,7 @@ private function fetch() : array
 
         $this->extensionAttributesJoinProcessor->process($optionsCollection);
         if (empty($optionsCollection->getData())) {
-            return null;
+            return [];
         }
 
         /** @var \Magento\Bundle\Model\Option $option */

app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForBackendObserverTest.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Captcha\Test\Unit\Observer;
+
+use Magento\Captcha\Model\ResourceModel\Log;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Captcha\Observer\ResetAttemptForBackendObserver;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Unit test for \Magento\Captcha\Observer\ResetAttemptForBackendObserver
+ */
+class ResetAttemptForBackendObserverTest extends TestCase
+{
+    /**
+     * Test that the method resets attempts for Backend
+     */
+    public function testExecuteExpectsDeleteUserAttemptsCalled()
+    {
+        $logMock = $this->createMock(Log::class);
+        $logMock->expects($this->once())->method('deleteUserAttempts')->willReturnSelf();
+
+        $resLogFactoryMock = $this->createMock(LogFactory::class);
+        $resLogFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($logMock);
+
+        /** @var MockObject|Observer $eventObserverMock */
+        $eventObserverMock = $this->createPartialMock(Observer::class, ['getUser']);
+        $eventMock = $this->createMock(Event::class);
+        $eventObserverMock->expects($this->once())
+            ->method('getUser')
+            ->willReturn($eventMock);
+
+        $objectManager = new ObjectManagerHelper($this);
+        /** @var ResetAttemptForBackendObserver $observer */
+        $observer = $objectManager->getObject(
+            ResetAttemptForBackendObserver::class,
+            ['resLogFactory' => $resLogFactoryMock]
+        );
+        $this->assertInstanceOf(Log::class, $observer->execute($eventObserverMock));
+    }
+}

app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForFrontendObserverTest.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Captcha\Test\Unit\Observer;
+
+use Magento\Captcha\Model\ResourceModel\Log;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Captcha\Observer\ResetAttemptForFrontendObserver;
+use Magento\Customer\Model\Customer;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Unit test for \Magento\Captcha\Observer\ResetAttemptForFrontendObserver
+ */
+class ResetAttemptForFrontendObserverTest extends TestCase
+{
+    /**
+     * Test that the method resets attempts for Frontend
+     */
+    public function testExecuteExpectsDeleteUserAttemptsCalled()
+    {
+        $logMock = $this->createMock(Log::class);
+        $logMock->expects($this->once())->method('deleteUserAttempts')->willReturnSelf();
+
+        $resLogFactoryMock = $this->createMock(LogFactory::class);
+        $resLogFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($logMock);
+
+        /** @var MockObject|Observer $eventObserverMock */
+        $eventObserverMock = $this->createPartialMock(Observer::class, ['getModel']);
+        $eventObserverMock->expects($this->once())
+            ->method('getModel')
+            ->willReturn($this->createMock(Customer::class));
+
+        $objectManager = new ObjectManagerHelper($this);
+        /** @var ResetAttemptForFrontendObserver $observer */
+        $observer = $objectManager->getObject(
+            ResetAttemptForFrontendObserver::class,
+            ['resLogFactory' => $resLogFactoryMock]
+        );
+        $this->assertInstanceOf(Log::class, $observer->execute($eventObserverMock));
+    }
+}

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

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Api;
+
+/**
+ * @api
+ * @since 100.0.2
+ */
+interface CategoryListDeleteBySkuInterface
+{
+    /**
+     * Delete by skus list
+     *
+     * @param int      $categoryId
+     * @param string[] $productSkuList
+     * @return bool
+     *
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\InputException
+     */
+    public function deleteBySkus(int $categoryId, array $productSkuList): bool;
+}

app/code/Magento/Catalog/Model/CategoryLinkRepository.php

@@ -6,35 +6,52 @@
 
 namespace Magento\Catalog\Model;
 
-use Magento\Framework\Exception\InputException;
+use Magento\Catalog\Api\CategoryLinkRepositoryInterface;
+use Magento\Catalog\Api\CategoryListDeleteBySkuInterface;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
 
-class CategoryLinkRepository implements \Magento\Catalog\Api\CategoryLinkRepositoryInterface
+/**
+ * @inheritdoc
+ */
+class CategoryLinkRepository implements CategoryLinkRepositoryInterface, CategoryListDeleteBySkuInterface
 {
     /**
      * @var CategoryRepository
      */
     protected $categoryRepository;
 
     /**
-     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     * @var ProductRepositoryInterface
      */
     protected $productRepository;
 
     /**
-     * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
-     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+     * @var Product
+     */
+    private $productResource;
+
+    /**
+     * @param CategoryRepositoryInterface $categoryRepository
+     * @param ProductRepositoryInterface $productRepository
+     * @param Product $productResource
      */
     public function __construct(
-        \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
-        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+        CategoryRepositoryInterface $categoryRepository,
+        ProductRepositoryInterface $productRepository,
+        Product $productResource = null
     ) {
         $this->categoryRepository = $categoryRepository;
         $this->productRepository = $productRepository;
+        $this->productResource = $productResource ?? ObjectManager::getInstance()->get(Product::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink)
     {
@@ -60,15 +77,15 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink)
     {
         return $this->deleteByIds($productLink->getCategoryId(), $productLink->getSku());
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteByIds($categoryId, $sku)
     {
@@ -101,4 +118,44 @@ public function deleteByIds($categoryId, $sku)
         }
         return true;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteBySkus(int $categoryId, array $productSkuList): bool
+    {
+        $category = $this->categoryRepository->get($categoryId);
+        $products = $this->productResource->getProductsIdsBySkus($productSkuList);
+
+        if (!$products) {
+            throw new InputException(__("The category doesn't contain the specified products."));
+        }
+
+        $productPositions = $category->getProductsPosition();
+
+        foreach ($products as $productId) {
+            if (isset($productPositions[$productId])) {
+                unset($productPositions[$productId]);
+            }
+        }
+
+        $category->setPostedProducts($productPositions);
+
+        try {
+            $category->save();
+        } catch (\Exception $e) {
+            throw new CouldNotSaveException(
+                __(
+                    'Could not save products "%products" to category %category',
+                    [
+                        "products" => implode(',', $productSkuList),
+                        "category" => $category->getId()
+                    ]
+                ),
+                $e
+            );
+        }
+
+        return true;
+    }
 }