merge magento/2.4-develop into magento-tsg/2.4-develop-pr10

Author: magento-mts-svc

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -2121,7 +2121,9 @@ private function getChildrenCategories(int $categoryId): array
                 if (in_array($category['parent_id'], $categoryIds)
                     && in_array($category['parent_id'], $anchorCategory)) {
                     $categoryIds[] = (int)$category[$linkField];
-                    if ($category['is_anchor'] == 1) {
+                    // Storefront approach is to treat non-anchor children of anchor category as anchors.
+                    // Adding their's IDs to $anchorCategory for consistency.
+                    if ($category['is_anchor'] == 1 || in_array($category['parent_id'], $anchorCategory)) {
                         $anchorCategory[] = (int)$category[$linkField];
                     }
                 }

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php

@@ -68,6 +68,14 @@ protected function setUp()
      */
     public function testExecuteWithPaymentOperation()
     {
+        /** @var OrderService|MockObject $orderService */
+        $orderService = $this->getMockBuilder(OrderService::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $orderService->method('place')
+            ->willThrowException(new LocalizedException(__('Transaction has been declined.')));
+        $this->_objectManager->addSharedInstance($orderService, OrderService::class);
+
         $quote = $this->getQuote('2000000001');
         $session = $this->_objectManager->get(Quote::class);
         $session->setQuoteId($quote->getId());
@@ -82,14 +90,6 @@ public function testExecuteWithPaymentOperation()
         $this->getRequest()->setMethod(Http::METHOD_POST);
         $this->getRequest()->setPostValue(['order' => $data]);
 
-        /** @var OrderService|MockObject $orderService */
-        $orderService = $this->getMockBuilder(OrderService::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderService->method('place')
-            ->willThrowException(new LocalizedException(__('Transaction has been declined.')));
-        $this->_objectManager->addSharedInstance($orderService, OrderService::class);
-
         $this->dispatch('backend/sales/order_create/save');
         $this->assertSessionMessages(
             self::equalTo(['Transaction has been declined.']),

dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php

@@ -142,7 +142,7 @@ private static function getAddedFilesList($changedFilesBaseDir)
             function () {
                 // if no list files, probably, this is the dev environment
                 // phpcs:ignore Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
-                @exec('git diff --cached --name-only', $addedFiles);
+                @exec('git diff --cached --name-only --diff-filter=A', $addedFiles);
                 return $addedFiles;
             }
         );